diff --git a/.codacy.yml b/.codacy.yml
new file mode 100644
index 0000000000..5abd839887
--- /dev/null
+++ b/.codacy.yml
@@ -0,0 +1,8 @@
+---
+engines:
+ duplication:
+   enabled: true
+   exclude_paths:
+     - elide-core/src/test/java/com/yahoo/elide/graphql/*
+exclude_paths:
+  - elide-core/src/test/java/com/yahoo/elide/graphql/*
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..ad35a4bc5f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,41 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+<!--- Please use code blocks when pasting code or sections of plain text (like logs)
+```java
+```
+-->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+<!--- Please use code blocks when pasting code or sections of plain text (like logs)
+```java
+```
+-->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+<!--- Please provide any relevant log information --->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Elide version used:
+* Environment name and version (Java 1.8.0_152):
+* Operating System and version:
+* Link to your project:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..97c5b4e4b8
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,20 @@
+Resolves #<issue number> (if appropriate)
+
+## Description
+<!--- Describe your changes in detail -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+
+## License
+I confirm that this contribution is made under an Apache 2.0 license and that I have the authority necessary to make this contribution on behalf of its copyright owner.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..990c4fb904
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,21 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "13:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: org.hibernate.validator:hibernate-validator
+    versions:
+    - 7.0.0.Final
+  - dependency-name: com.graphql-java:graphql-java
+    versions:
+    - "16.1"
+  - dependency-name: org.glassfish.jersey.inject:jersey-hk2
+    versions:
+    - 3.0.0
+  - dependency-name: org.glassfish.jersey.containers:jersey-container-servlet
+    versions:
+    - 3.0.0
diff --git a/.gitignore b/.gitignore
index 7eca438886..c618f5bbe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,13 @@ test-output/
 *.iml
 bin
 dependency-reduced-pom.xml
+*.jar
+*.class
+*tags
+**.swp
+.project
+*/.project
+*/*/.project
+*.factorypath
+*.vscode
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 396f45c477..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-  language: java
-  sudo: false
-  jdk:
-    - oraclejdk8
-  addons:
-    apt:
-      packages:
-      - libaio-dev
-  cache:
-    directories:
-      - "~/.m2"
-  env:
-    global:
-      - secure: VV+uJlBgXRCUSj3+khXnKvbrB0bxtay3yovKAchTT83Y6+iXUAgp3b7EA1QjT0l3Hz88Y+EAVuiZqwzFRidbZwbgApaxYMJKWjHTmr+VsXXJp29J1tyGtXR1K+DUG0HO/jiRCxMVythB68BnNMIXfprpmsLFpXhKMPf41fzMaAtqSYrPdJkNvEzBDhu5hIPG9apyEcpIZNhtfwnk18DntyGFC3OVAKzEma51s0tS6NeXiZNzTvc9j0d4Fr8vyWGclAp1XKMjWzpvfRyB2EFto076V+8tJ5E3czJjJs12SDwOvEdzYeCpGk3VWboiz9DuZn41IdTLYy89OmcIooZQHViMwiatcqqHREEbuuUWZLYMEh1bUHZHRWQf2AnUScDfJB1QUKVR8mbkSr5DXto4FIsHpqofoBloDveaXkWC735DqOPwbIwe2owGZfkQv19vPpVvF3e2LyFn1vf8blR3wFBItKKZyvBTbrIVM/YxuTDfswDVlhEgHTeet0TQSy4yEoMxGTHsfk8Ykc2B0JDheWH5zhhZBdozmV5TFbM50PXjLqfqWVDD+WqzGVer1Sokfv6MMERoWKvb/LEyKO4Eq3aHgXyy2GoRQHfUh9qOOvBnNpHbtacL+NzfggLZ1Ut97QIbEoWb3VPx6lbNKxiiC4DbwR7nnc92zNJM5YU6Dog=
-      - secure: SSqm3fI2slK6qcmfeRiWvQJ8kNd5VQD6wSkFM5NMCo7Uvo3peNNwCDiTpWMN6nNuM4LSJJhgGwDLZeIlRF4i74xgWpDznjZ4AoqgG1QeIjg/4Xdy+szz0+BiTdUhQnRsaKHfUoky4wm+Jrix1rYgz/eED6uiOHmgLWywD4+BEBHN37N5N6/vT7ELkxi/jzXWOunMA12Y6F+LFcw4A87qM94iFws94C0BEqfWRqaXYPZoQ7v5Yw7TilJuPGiL6pcdWyh5ObfAhIbHhhxmIvaMFWV7HGoB1rC2T/E/GQynKU/l1uQHTf/rNK70uUTCKz3usl28AnVsnyhjg7+Ivk22Z0pSnZtLw1TJT5prPdX+Cas8NEElk6zSS/h3lMmQuGZk8T6FmsqkDx3tkFiJqgxvbgGLZBMgYdm87OCzrM55ZTlxBOYErQQgFrevJ2oJV98Pb4DNCPx5uu/CVCbR+d1kZ6b91rabzjl+a3yiz10vnaO00dyW1gR1P0KHZiRactdds2jLsxBhr3MFDymZD7W+WhuI4RtP2/bsQQ1dnLIvWm+JYmDvr09/7k1uX7WCm9AkMb0u1gW19WYQT1Qct3hFfvKIbgv3gTNJz2+Alu3mqeIpSkmtdtGjVMij3/0OBdYBNC+BfaR4IQVnIbvyu0HmjtJgRji2TO/U7rCUKjOrm6c=
-  branches:
-    only:
-      - master
-      - "/^[0-9]+\\.[0-9]+\\.[0-9]+/"
-  # build steps
-  install: true
-  script: mvn clean verify # coveralls:report
-  after_success:
-    - test "${TRAVIS_PULL_REQUEST}" == "false" && mvn versioneye:update
-    - test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_TAG}" != "" && mvn deploy --settings travis/settings.xml
-#  before_deploy: cat travis/bintray_template.json | sed s/\$\{TRAVIS_TAG\}/${TRAVIS_TAG}/g > travis/release.json
-#  deploy:
-#    on:
-#      tags: true
-#    provider: bintray
-#    file: travis/release.json
-#    user:
-#      secure: TvyOrjLtOBgaBt986RSuRhyUYwBEPS3d3ug3Y7Bd0rRIw32jL8yH3GcSz+pf2wSb80CIm5xTRuyin3NEYAKGo2X4y2PQx6FkXrxxa4T/RR8u5OyAm4JqRjfB3ZCkSU5agvUCRPXSoch6r1FYZ/NL/tian3kw/ajKDutXurpyXAPCfXmRiQIqGUwzty+znIlmLvpwtsJMcOpSy/gqNJNqHSoLHSXTNETTFoeLvbogLhfl0em88LuApWC4sZIQTMtHPssugNYagxFpjUg16PCLdX5f7HolG8TLf7JjO/W7tXOwXHOl8sePVEtzZogJGWKtA8C9ob02uyPerGyK+lPyFPwf/2OhX4eVcq7W9WCTqnU3gR/ihkRe6ssqhOceWu3uSm9iZ5k9LUFgDId3VaDI3Tq1DI6TFTrco1F2qGSChB0avCITDGKhfeI/oiHD4a4T9AVKx7uyw7pTlkpRFvZMzKXHlq5FWml6pz4vY9+d26O23KTfKqbUhaLvHqN8O77ExjsPDpozIJtyZP8dA0od2xemZSy03GXhLpd9hu5P8t8q+c01EGNgTK93PCMcxjQddIGuYC8H87ElfinJ9XlnmTP9QVRky40NZiTSWZf1bXHZoFMV4t7zzJqw6LqENp8jeYzewM0hnW9TDTXmZMcXgg1bouyRnMBO9aN9SJvO69g=
-#    key:
-#      secure: ea9647jI7moJIjttA9YSCwKI0oXt53NiRBeN4+mngNT34u/8oCMpks2zXoc6RecYHfnX44gz9QO9F6c2PMn0alkGzZHZk46VhNx/kV0jXksIBs1WQK8gAR0hqkOpRgETUi+E9Gv/oZuA+ZSIr42YZ9X+DD2VwFE5S357GQhXeyZ+Z+OT2cr9bRxqMBjC7mbNUZuoCJMORuqQqbFIOkEIc0cHK8WZ9s8ZkMHlekr6cYdpL3WqPCjxs6j6fn7YfvGLgkspiM5WpNunQLbM9sLQt8O4lMNNPcPYJzMM4/cuXQxZ+JOARs5M7YJTjFkcHEufGYiqc6Ha5zpnqCo+d2QAc9atX+lMqr4TO7KuQjL+k6qqtzYRDg1QDZvz+lapEb5n6DPDNG92D8OQZMq4rYiRYqm9wOLQZ6TB3by9ClZJQZZT1+gsayCR8IHnp7LzaLFzQVOXCpht2pMx1Rk9z6lIvy3D2sCl7B8jIik9YoLr/86U4mg6kp/B9+3jtIC3S4Bxznm5v2ZMbzQlngm6z/26w86pJ8UYhK/nAh1TDYPZEWmyU0iScXAI8ocrhdPXKsd/grdEXnb+Ka7ct9EldINztDkoOpMcXvf2ZA1WdCevMtmelkaiW9nNenN94537JP+24RYNNdhZUg80X1B+Q8Mo1+QKcmhIhw+6BMqY4WVrghQ=
-#  after_deploy: echo "Pending"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2192987531..63cb0ad52f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,26 @@
-# How to Contribute
+# How to contribute
+First, thanks for taking the time to contribute to our project! There are many ways you can help out.
 
-When submitting a pull request (PR), please use the following guidelines:
+### Questions
+
+If you have a question that needs an answer, [create an issue](https://github.com/yahoo/elide/issues/new), and label it as a question.
+
+### Issues for bugs or feature requests
+
+If you encounter any bugs in the code, or want to request a new feature or enhancement, please [create an issue](https://github.com/yahoo/elide/issues/new) to report it. Kindly add a label to indicate what type of issue it is.
+
+### Contribute Code
+We welcome your pull requests for bug fixes. To implement something new, please create an issue first so we can discuss it together.
+
+***Creating a Pull Request***
+Please follow [best practices](https://github.com/trein/dev-best-practices/wiki/Git-Commit-Best-Practices) for creating git commits.  In addition: 
 
 - Make sure your code respects existing formatting conventions. In general, follow
   the same coding style as the code that you are modifying. If you are using
   IntelliJ, you can import our code style settings xml:
-  [elide-intellij-codestyle.xml](https://github.com/yahoo/elide/raw/master/elide-intellij-codestyle.xml).
-- Do add/update documentation appropriately for the change you are making.
+  [elide-intellij-codestyle.xml](https://github.com/yahoo/elide/raw/master/elide-intellij-codestyle.xml)
+  or [elide-eclipse.importorder](https://github.com/yahoo/elide/raw/master/elide-eclipse.importorder).
+- Do add/update [documentation](https://github.com/yahoo/elide-doc) appropriately for the change you are making.
 - Bugfixes should include a unit test or integration test reproducing the issue.
 - Do not use author tags/information in the code.
 - Always include license header on each file your create. See [this example](https://github.com/yahoo/elide/blob/master/elide-core/src/main/java/com/yahoo/elide/Elide.java)
@@ -16,3 +30,14 @@ When submitting a pull request (PR), please use the following guidelines:
   Each commit should compile on its own and ideally pass tests.
 - Keep formatting changes in separate commits to make code reviews easier and
   distinguish them from actual code changes.
+
+When your code is ready to be submitted, [submit a pull request](https://help.github.com/articles/creating-a-pull-request/) to begin the code review process.
+
+We only seek to accept code that you are authorized to contribute to the project. We have added a pull request template on our projects so that your contributions are made with the following confirmation: 
+
+> I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.
+
+## Code of Conduct
+
+We encourage inclusive and professional interactions on our project. We welcome everyone to open an issue, improve the documentation, report bug or submit a pull request. By participating in this project, you agree to abide by the [Yahoo Code of Conduct](Code-Of-Conduct.md). If you feel there is a conduct issue related to this project, please raise it per the Code of Conduct process and we will address it.
+
diff --git a/Code-Of-Conduct.md b/Code-Of-Conduct.md
new file mode 100644
index 0000000000..0d66153d1f
--- /dev/null
+++ b/Code-Of-Conduct.md
@@ -0,0 +1,54 @@
+# Yahoo Open Source Code of Conduct
+
+## Summary
+This Code of Conduct is our way to encourage good behavior and discourage bad behavior in our open source community. We invite participation from many people to bring different perspectives to support this project. We pledge to do our part to foster a welcoming and professional environment free of harassment. We expect participants to communicate professionally and thoughtfully during their involvement with this project. 
+
+Participants may lose their good standing by engaging in misconduct. For example: insulting, threatening, or conveying unwelcome sexual content. We ask participants who observe conduct issues to report the incident directly to the project's Response Team at opensource-conduct@yahooinc.com. Yahoo will assign a respondent to address the issue. We may remove harassers from this project. 
+
+This code does not replace the terms of service or acceptable use policies of the websites used to support this project. We acknowledge that participants may be subject to additional conduct terms based on their employment which may govern their online expressions.
+
+## Details
+This Code of Conduct makes our expectations of participants in this community explicit.
+* We forbid harassment and abusive speech within this community.
+* We request participants to report misconduct to the project’s Response Team.
+* We urge participants to refrain from using discussion forums to play out a fight.
+
+### Expected Behaviors
+We expect participants in this community to conduct themselves professionally. Since our primary mode of communication is text on an online forum (e.g. issues, pull requests, comments, emails, or chats) devoid of vocal tone, gestures, or other context that is often vital to understanding, it is important that participants are attentive to their interaction style.
+
+* **Assume positive intent.** We ask community members to assume positive intent on the part of other people’s communications. We may disagree on details, but we expect all suggestions to be supportive of the community goals.
+* **Respect participants.** We expect participants will occasionally disagree. Even if we reject an idea, we welcome everyone’s participation. Open Source projects are learning experiences. Ask, explore, challenge, and then respectfully assert if you agree or disagree. If your idea is rejected, be more persuasive not bitter.
+* **Welcoming to new members.** New members bring new perspectives. Some may raise questions that have been addressed before. Kindly point them to existing discussions. Everyone is new to every project once.
+* **Be kind to beginners.** Beginners use open source projects to get experience. They might not be talented coders yet, and projects should not accept poor quality code. But we were all beginners once, and we need to engage kindly.
+* **Consider your impact on others.** Your work will be used by others, and you depend on the work of others. We expect community members to be considerate and establish a balance their self-interest with communal interest.
+* **Use words carefully.** We may not understand intent when you say something ironic. Poe’s Law suggests that without an emoticon people will misinterpret sarcasm. We ask community members to communicate plainly.
+* **Leave with class.** When you wish to resign from participating in this project for any reason, you are free to fork the code and create a competitive project. Open Source explicitly allows this. Your exit should not be dramatic or bitter. 
+
+### Unacceptable Behaviors
+Participants remain in good standing when they do not engage in misconduct or harassment. To elaborate: 
+* **Don't be a bigot.** Calling out project members by their identity or background in a negative or insulting manner. This includes, but is not limited to, slurs or insinuations related to protected or suspect classes e.g. race, color, citizenship, national origin, political belief, religion, sexual orientation, gender identity and expression, age, size, culture, ethnicity, genetic features, language, profession, national minority statue, mental or physical ability.
+* **Don't insult.** Insulting remarks about a person’s lifestyle practices.
+* **Don't dox.** Revealing private information about other participants without explicit permission.
+* **Don't intimidate.** Threats of violence or intimidation of any project member.
+* **Don't creep.** Unwanted sexual attention or content unsuited for the subject of this project.
+* **Don't disrupt.** Sustained disruptions in a discussion.
+* **Let us help.** Refusal to assist the Response Team to resolve an issue in the community.
+
+We do not list all forms of harassment, nor imply some forms of harassment are not worthy of action. Any participant who *feels* harassed or *observes* harassment, should report the incident. Victim of harassment should not address grievances in the public forum, as this often intensifies the problem. Report it, and let us address it off-line.
+
+### Reporting Issues
+If you experience or witness misconduct, or have any other concerns about the conduct of members of this project, please report it by contacting our Response Team at opensource-conduct@yahooinc.com who will handle your report with discretion. Your report should include:
+* Your preferred contact information. We cannot process anonymous reports.
+* Names (real or usernames) of those involved in the incident.
+* Your account of what occurred, and if the incident is ongoing. Please provide links to or transcripts of the publicly available records (e.g. a mailing list archive or a public IRC logger), so that we can review it.
+* Any additional information that may be helpful to achieve resolution.
+
+After filing a report, a representative will contact you directly to review the incident and ask additional questions. If a member of the Yahoo Response Team is named in an incident report, that member will be recused from handling your incident. If the complaint originates from a member of the Response Team, it will be addressed by a different member of the Response Team. We will consider reports to be confidential for the purpose of protecting victims of abuse. 
+
+### Scope
+Yahoo will assign a Response Team member with admin rights on the project and legal rights on the project copyright. The Response Team is empowered to restrict some privileges to the project as needed. Since this project is governed by an open source license, any participant may fork the code under the terms of the project license. The Response Team’s goal is to preserve the project if possible, and will restrict or remove participation from those who disrupt the project. 
+
+This code does not replace the terms of service or acceptable use policies that are provided by the websites used to support this community. Nor does this code apply to communications or actions that take place outside of the context of this community. Many participants in this project are also subject to codes of conduct based on their employment. This code is a social-contract that informs participants of our social expectations. It is not a terms of service or legal contract.
+
+## License and Acknowledgment. 
+This text is shared under the [CC-BY-4.0 license](https://creativecommons.org/licenses/by/4.0/). This code is based on a study conducted by the [TODO Group](https://todogroup.org/) of many codes used in the open source community. If you have feedback about this code, contact our Response Team at the address listed above. 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 889b12121e..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-check-version:
-	mvn versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates
diff --git a/README.md b/README.md
index 06fed79b78..09b01ee600 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,235 @@
-[![Gitter](https://badges.gitter.im/yahoo/elide.svg)](https://gitter.im/yahoo/elide?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/yahoo/elide.svg?branch=master)](https://travis-ci.org/yahoo/elide) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core)
+# Elide
 
-![Elide Logo](https://cdn.rawgit.com/yahoo/elide/master/elide.svg)
+> _Opinionated APIs for web & mobile applications._
 
-##What Is Elide?
+![Elide Logo](elide-logo.svg)
 
-Elide is a Java library that lets you stand up a [JSON API](http://jsonapi.org) web service with minimal effort starting from a [JPA annotated data model](https://en.wikipedia.org/wiki/Java_Persistence_API). 
-Elide is designed to quickly build and deploy **production quality** web services that expose data models as services.  Elide provides:
-  1. **Access** to JPA entities via JSON API CRUD operations.  Entities can be explicitly included or excluded via annotations.
-  2. **Patch Extension** Elide supports the [JSON API Patch extension](http://jsonapi.org/extensions/jsonpatch/) allowing multiple create, edit, and delete operations in a single request.
-  3. **Atomic Requests** All requests to the library (including the patch extension) can be embedded in transactions to ensure operational integrity.
-  4. **Authorization** All operations on entities and their fields can be assigned custom permission checks limiting who has access to your data. 
-  5. **Audit** Logging can be customized for any operation on any entity.
-  6. **Extension** Elide allows the ability to customize business logic for any CRUD operation on the model.  Any persistence backend can be skinned with JSON-API by wiring in a JPA provider or by implementing a custom `DataStore`.
-  7. **Test** Elide includes a test framework that explores the full surface of the API looking for security vulnerabilities.
-  8. **Client API** Elide is developed in conjunction with a Javascript client library that insulates developers from changes to the specification.  Alternatively, Elide can be used with any [JSON API client library](http://jsonapi.org/implementations/).
+[![Discord](https://img.shields.io/discord/869678398241398854)](https://discord.com/widget?id=869678398241398854&theme=dark)
+[![Build Status](https://cd.screwdriver.cd/pipelines/6103/badge)](https://cd.screwdriver.cd/pipelines/6103)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core)
+[![Coverage Status](https://coveralls.io/repos/github/yahoo/elide/badge.svg?branch=master)](https://coveralls.io/github/yahoo/elide?branch=master)
+[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/context:java)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/alerts)
+[![Mentioned in Awesome Java](https://awesome.re/mentioned-badge.svg)](https://github.com/akullpp/awesome-java)
+[![Mentioned in Awesome GraphQL](https://awesome.re/mentioned-badge.svg)](https://github.com/chentsulin/awesome-graphql)
 
-##Documentation
+*Read this in other languages: [中文](translations/zh/README.md).*
 
-More information about Elide can be found at [elide.io](http://elide.io/).
+## Table of Contents
 
-## Elide on Maven
+- [Background](#background)
+- [Documentation](#documentation)
+- [Install](#install)
+- [Usage](#usage)
+- [Security](#security)
+- [Contribute](#contribute)
+- [License](#license)
 
-To integrate Elide into your project, simply include elide-core into your project's pom.xml:
+## Background
+
+[Elide](https://elide.io/) is a Java library that lets you setup model driven [GraphQL](http://graphql.org) or [JSON API](http://jsonapi.org) web service with minimal effort.  Elide supports two variants of APIs:
+
+1. A CRUD (Create, Read, Update, Delete) API for reading and manipulating models.
+2. An analytic API for aggregating measures over zero or more model attributes.
+
+Elide supports a number of features:
+
+### Security Comes Standard
+Control access to fields and entities through a declarative, intuitive permission syntax.
+
+### Mobile Friendly APIs
+JSON-API & GraphQL lets developers fetch entire object graphs in a single round trip. Only requested elements of the data model are returned.
+Our opinionated approach for mutations addresses common application scenarios:
+* Create a new object and add it to an existing collection in the same operation.
+* Create a set of related, composite objects (a subgraph) and connect it to an existing, persisted graph.
+* Differentiate between deleting an object vs disassociating an object from a relationship (but not deleting it).
+* Change the composition of a relationship to something different.
+* Reference a newly created object inside other mutation operations.
+
+Filtering, sorting, pagination, and text search are supported out of the box.
+
+### Atomicity For Complex Writes
+Elide supports multiple data model mutations in a single request in either JSON-API or GraphQL. Create objects, add them to relationships, modify or delete together in a single atomic request.
+
+## Analytic Query Support
+Elide supports analytic queries against models crafted with its powerful semantic layer.  Elide APIs work natively with [Yavin](https://github.com/yahoo/yavin) to visualize, explore, and report on your data.
+
+### Schema Introspection
+Explore, understand, and compose queries against your Elide API through generated Swagger documentation or GraphQL schema.
+
+### Customize
+Customize the behavior of data model operations with computed attributes, data validation annotations, and request lifecycle hooks.
+
+### Storage Agnostic
+Elide is agnostic to your particular persistence strategy. Use an ORM or provide your own implementation of a data store.
+
+## Documentation
+
+More information about Elide can be found at [elide.io](https://elide.io/).
+
+## Install
+
+To try out an Elide example service, check out this [Spring boot example project](https://github.com/yahoo/elide-spring-boot-example).
+
+Alternatively, use [elide-standalone](https://github.com/yahoo/elide/tree/master/elide-standalone) which allows you to quickly setup a local instance of Elide running inside an embedded Jetty application.
+
+## Usage 
+
+### For CRUD APIs
+
+The simplest way to use Elide is by leveraging [JPA](https://en.wikipedia.org/wiki/Java_Persistence_API) to map your Elide models to persistence:
+
+The models should represent the domain model of your web service:
+
+```java
+@Entity
+public class Book {
+
+    @Id
+    private Integer id;
+
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+Add Elide annotations to both expose your models through the web service and define security policies for access:
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("None")
+@UpdatePermission("None")
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+Add Lifecycle hooks to your models to embed custom business logic that execute inline with CRUD operations through the web service:
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("None")
+@UpdatePermission("None")
+@LifeCycleHookBinding(operation = UPDATE, hook = BookCreationHook.class, phase = PRECOMMIT)
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+
+public class BookCreationHook implements LifeCycleHook<Book> {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation,
+                        LifeCycleHookBinding.TransactionPhase phase,
+                        Book book,
+                        RequestScope requestScope,
+                        Optional<ChangeSpec> changes) {
+       //Do something
+    }
+}
 
-```xml
-<!-- Elide -->
-<dependency>
-    <groupId>com.yahoo.elide</groupId>
-    <artifactId>elide-core</artifactId>
-</dependency>
 ```
 
-Additionally, if you do not plan to write your own data store, select the appropriate data store for your setup and include it as well. For instance, if you plan on using the "in-memory database" (not recommended for production use) then you would add the following:
+Map expressions to security functions or predicates that get pushed to the persistence layer:
+
+```java
+    @SecurityCheck("Admin")
+    public static class IsAdminUser extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return isUserInRole(user, UserRole.admin);
+        }
+    }
+```
+
+To expose and query these models, follow the steps documented in [the getting started guide](https://elide.io/pages/guide/v5/01-start.html).
+
+For example API calls, look at:
+1. [*JSON-API*](https://elide.io/pages/guide/v5/10-jsonapi.html) 
+2. [*GraphQL*](https://elide.io/pages/guide/v5/11-graphql.html)
+
+### For Analytic APIs
 
-```xml
-<dependency>
-    <groupId>com.yahoo.elide</groupId>
-    <artifactId>elide-datastore-inmemorydb</artifactId>
-</dependency>
+Analytic models including tables, measures, dimensions, and joins can be created either as POJOs or with a friendly HJSON configuration language:
+
+```hjson
+{
+  tables: [
+    {
+      name: Orders
+      table: order_details
+      measures: [
+        {
+          name: orderTotal
+          type: DECIMAL
+          definition: 'SUM({{$order_total}})'
+        }
+      ]
+      dimensions: [
+        {
+          name: orderId
+          type: TEXT
+          definition: '{{$order_id}}'
+        }
+      ]
+    }
+  ]
+}
 ```
 
-##License
+More information on configuring or querying analytic models can be found [here](https://elide.io/pages/guide/v5/04-analytics.html).
+
+## Security
+
+Security is documented in depth [here](https://elide.io/pages/guide/v5/03-security.html).
+
+## Contribute
+Please refer to [the contributing.md file](CONTRIBUTING.md) for information about how to get involved. We welcome issues, questions, and pull requests.
+
+If you are contributing to Elide using an IDE, such as IntelliJ, make sure to install the [Lombok](https://projectlombok.org/) plugin.
+
+Community chat is now on [discord](https://discord.com/widget?id=869678398241398854&theme=dark).
+Legacy discussion is archived on [spectrum](https://spectrum.chat/elide).
+
+## License
+This project is licensed under the terms of the [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) open source license.
+Please refer to [LICENSE](LICENSE.txt) for the full terms.
+
+## Articles
+Intro to Elide video
+
+[![Intro to Elide](http://img.youtube.com/vi/WeFzseAKbzs/0.jpg)](http://www.youtube.com/watch?v=WeFzseAKbzs "Intro to Elide")
+
+[Create a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/create-a-json-api-rest-service-with-spring-boot-an)
+
+[Custom Security With a Spring Boot/Elide Json API Server](https://dzone.com/articles/custom-security-with-a-spring-bootelide-json-api-s)
+
+[Logging Into a Spring Boot/Elide JSON API Server](https://dzone.com/articles/logging-into-a-spring-bootelide-json-api-server)
+
+[Securing a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/securing-a-json-api-rest-service-with-spring-boot)
+
+[Creating Entities in a Spring Boot/Elide JSON API Server](https://dzone.com/articles/creating-entities-in-a-spring-bootelide-json-api-s)
 
-The use and distribution terms for this software are covered by the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html).
+[Updating and Deleting with a Spring Boot/Elide JSON API Server](https://dzone.com/articles/updating-and-deleting-with-a-spring-bootelide-json)
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000000..528cd6d06b
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,1701 @@
+# Change Log
+
+## 6.1.3
+**Fixes**
+ * [view commit](https://github.com/yahoo/elide/commit/1a644f6f5afec9f0de8dbf89a56006d9f5b3058a) Bump log4j-to-slf4j from 2.17.1 to 2.17.2 (#2560) 
+ * [view commit](https://github.com/yahoo/elide/commit/d2c906859486a1837ebca6add7d7ec881380b9ea) Bump version.jackson from 2.12.5 to 2.13.1 (#2527) 
+ * [view commit](https://github.com/yahoo/elide/commit/588b69f120c8e914da4becc3f8b83b4d8b71d92e) Update: Make `-` a valid TEXT value type character (#2565) 
+ * [view commit](https://github.com/yahoo/elide/commit/5b7051da2a0cc9b97b2dd29c5b95a04a794a6901) Bump spring.boot.version from 2.6.3 to 2.6.5 (#2566) 
+ * [view commit](https://github.com/yahoo/elide/commit/5e67e547d60483696508e2e90460eee21c391491) Fix graphiql comment bug and config store issues creating multiple files in a single request. (#2571) 
+ * [view commit](https://github.com/yahoo/elide/commit/14ae1c4f31914f44ac3f347a80235947da3231f7) Bump jackson-databind from 2.13.2 to 2.13.2.1 (#2569) 
+ * [view commit](https://github.com/yahoo/elide/commit/78c636ed19e57a98e84243689dcf6f14c054681d) Bump hibernate5.version from 5.6.5.Final to 5.6.7.Final (#2568) 
+ * [view commit](https://github.com/yahoo/elide/commit/cf3bbfed579710352e4501487f7939a162a13c9c) Bump groovy.version from 3.0.9 to 3.0.10 (#2567) 
+ * [view commit](https://github.com/yahoo/elide/commit/507ba6ced3ef2ef68c484541481f9c5b7499f342) Bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 (#2559) 
+ * [view commit](https://github.com/yahoo/elide/commit/c7d44ce56eee1f0dced6afc1520fd93309614f6e) Bump spring-cloud-context from 3.1.0 to 3.1.1 (#2557) 
+
+## 6.1.2
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/1355701e30f63ba7332e4b77efdf5166e21a3e61) Bump json-path from 2.6.0 to 2.7.0 (#2531) 
+   * [view commit](https://github.com/yahoo/elide/commit/1d105705f533d40b55469f3b6836935995e982b5) Ignoring Elide models embedded in complex attributes (#2535) 
+   * [view commit](https://github.com/yahoo/elide/commit/76a45fc895901fa212883e88a9be29fdad894b7c) Bump version.jetty from 9.4.44.v20210927 to 9.4.45.v20220203 (#2534) 
+   * [view commit](https://github.com/yahoo/elide/commit/0d1be94716765581ab230b5b1d77906d3882b283) Bump jedis from 4.1.0 to 4.1.1 (#2530) 
+   * [view commit](https://github.com/yahoo/elide/commit/73d2ce87b2af2a0dd2c4ad800030724d76f085e0) Bump mockito-core from 4.2.0 to 4.3.1 (#2518) 
+   * [view commit](https://github.com/yahoo/elide/commit/7367573a0aba833d1e1415b3ce74088e7ad695f0) Bump mockito-junit-jupiter from 4.2.0 to 4.3.1 (#2517) 
+   * [view commit](https://github.com/yahoo/elide/commit/72954a50f4f1e02cb257f9e7224491f1b3bef7a5) Bump spring.boot.version from 2.6.2 to 2.6.3 (#2510) 
+   * [view commit](https://github.com/yahoo/elide/commit/8a0cc1d198eb36d2e5681c44143230a969745534) Bump spring-cloud-context from 3.0.4 to 3.1.0 (#2512) 
+   * [view commit](https://github.com/yahoo/elide/commit/6409cb61e9555c6331f7e1b353456a0a11c51962) Bump classgraph from 4.8.138 to 4.8.139 (#2541) 
+   * [view commit](https://github.com/yahoo/elide/commit/b2c48a1dad67b1dbf28c80c4a9286360ea52ec91) Bump metrics.version from 4.2.7 to 4.2.8 (#2540) 
+   * [view commit](https://github.com/yahoo/elide/commit/cb3d4c05f60828757e239f75be13793d52841cbc) Bump maven-compiler-plugin from 3.9.0 to 3.10.0 (#2542) 
+   * [view commit](https://github.com/yahoo/elide/commit/a91983785f2f7c87857d13e5e64a00dd45a6c7f9) Bump log4j-over-slf4j from 1.7.35 to 1.7.36 (#2547) 
+   * [view commit](https://github.com/yahoo/elide/commit/d3377acdd7dd94f0919f305c3f19a5851ea1f342) Bump checkstyle from 9.2.1 to 9.3 (#2546) 
+   * [view commit](https://github.com/yahoo/elide/commit/a7f654cd10b74d452a08e6a9c12cdf7239eb3acc) Bump swagger-core from 1.6.4 to 1.6.5 (#2549) 
+   * [view commit](https://github.com/yahoo/elide/commit/43db0ba55f34e0052ac264fe95e676d4e3463d0d) Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 (#2544) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc1855fee8f236ffbdd90c21a30c8b15fe5f6d59) Bump nexus-staging-maven-plugin from 1.6.8 to 1.6.11 (#2548) 
+   * [view commit](https://github.com/yahoo/elide/commit/dfa92a6b48532ce43a5518eefb57df19d73385de) Bump micrometer-core from 1.8.2 to 1.8.3 (#2545) 
+   * [view commit](https://github.com/yahoo/elide/commit/ecce96462be68acbf95f3ba73f0c8ba3d46ed9a1) Bump maven-site-plugin from 3.10.0 to 3.11.0 (#2543) 
+   * [view commit](https://github.com/yahoo/elide/commit/8d70b62b4650b9c7c9d6dd7276306301dca5839d) Bump spring-websocket from 5.3.15 to 5.3.16 (#2553) 
+   * [view commit](https://github.com/yahoo/elide/commit/4b31a018ec4abac13cf9238f78e585857c465195) Bump gson from 2.8.9 to 2.9.0 (#2552) 
+   * [view commit](https://github.com/yahoo/elide/commit/3c5932522440ea4e0298e55bbb8eebfdd5a06ba6) Bump slf4j-api from 1.7.35 to 1.7.36 (#2550) 
+   * [view commit](https://github.com/yahoo/elide/commit/69056c88fa6dbb13de0a667f5c50defcdc34093d) Bump spring-core from 5.3.15 to 5.3.16 (#2554) 
+
+## 6.1.1
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/6646ce31a465a6648dcb74fb96aeb5c6d39a22bc) Redis Cache for Aggregation Store (#25
+   * [view commit](https://github.com/yahoo/elide/commit/df5d023f43876264b63fd3becfbff57a4e889789) Redis Result Storage Engine (#2507)   
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/9c9d4ca1fa15047e24fffcf2a7e0e7a9a46e6791) Disabling subscription scanning throug
+h application yaml in Spring. (#2521)                                                                                                    
+   * [view commit](https://github.com/yahoo/elide/commit/c038599b4f4d1d7b9a688365e0157425daf19c5b) Bump h2 from 2.0.206 to 2.1.210 (#2508
+)                                                                                                                                        
+   * [view commit](https://github.com/yahoo/elide/commit/3e69dabdd9479a8c070b811299ab535f5ba7a1db) Bump hibernate5.version from 5.6.1.Fin
+al to 5.6.5.Final (#2516)                                                                                                                
+   * [view commit](https://github.com/yahoo/elide/commit/75db2ed70dc6f00368a626d3e2bde584699c8fc1) Bump log4j-over-slf4j from 1.7.33 to 1
+.7.35 (#2522)                                                                                                                            
+                                                                                                                                 
+   * [view commit](https://github.com/yahoo/elide/commit/b932cbcba8c9ba993a4fe5b3f859d5691fd976b4) Bump guice from 5.0.1 to 5.1.0 (#2523)
+                                                                                                                                         
+   * [view commit](https://github.com/yahoo/elide/commit/fd2ab7709a90f183ee09cbbec6628af49c003ef5) Bump jedis from 4.0.1 to 4.1.0 (#2525)
+                                                                                                                                         
+   * [view commit](https://github.com/yahoo/elide/commit/d53275d1fb55de45a62269f39e97f0cdd76b573e) Bump slf4j-api from 1.7.33 to 1.7.35 (
+#2519)                                                                                                                                   
+   * [view commit](https://github.com/yahoo/elide/commit/d0552c5750608391d52e3e3286469901726a7d06) Support filters on query plans (#2526)
+
+## 6.1.0
+Minor release update for partial support for Elide configuration being 'refreshable' in Spring for a live service.  Advanced users overriding some beans may require compilation changes.  
+
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/c38eb980af7f953202cb53faaed14595d3709ed9) Refresh scope beans (#2409) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/833ea32e4a793bd1c7da1d1ad73417c216b1191a) [maven-release-plugin] prepare for nex
+t development iteration 
+   * [view commit](https://github.com/yahoo/elide/commit/7a3552d76f8887ab62a60a968412ca442bf745a1) make getColumnProjection() method use 
+different name for column Id for different source when alias are involved (#2500) 
+   * [view commit](https://github.com/yahoo/elide/commit/4c9bff306e4d0d0f9644c705a241edc7104cc1fe) Bump h2 from 2.0.202 to 2.0.206 (#2476
+) 
+   * [view commit](https://github.com/yahoo/elide/commit/c68b44abdf0b7465695f3fbc347cf3c044f4f1d5) Bump micrometer-core from 1.8.1 to 1.8
+.2 (#2505) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc8d202e113eaa319c2922e86d86d4a8eab31b41) Bump spring-core from 5.3.14 to 5.3.15
+ (#2504) 
+   * [view commit](https://github.com/yahoo/elide/commit/df1dfca185d72ce383b84d5ee803534d7ca16dd3) Bump spring-websocket from 5.3.14 to 5
+.3.15 (#2503) 
+   * [view commit](https://github.com/yahoo/elide/commit/2059c44511bdc4294dd5667baa7c0eed19bc0075) Bump slf4j-api from 1.7.32 to 1.7.33 (
+#2502) 
+   * [view commit](https://github.com/yahoo/elide/commit/5718774759f42be1b6b4f34c962d2b64457c3193) Bump log4j-over-slf4j from 1.7.32 to 1
+.7.33 (#2501) 
+
+## 6.0.7
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/7a3552d76f8887ab62a60a968412ca442bf745a1) make getColumnProjection() method use different name for column Id for different source when alias are involved (#2500) 
+   * [view commit](https://github.com/yahoo/elide/commit/4c9bff306e4d0d0f9644c705a241edc7104cc1fe) Bump h2 from 2.0.202 to 2.0.206 (#2476) 
+
+## 6.0.6
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/4caaae234214edf6a61bea57531de79520604d54) File Extension Support for Export Attachments (#2475) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/93baacfea6628cc724b7fb880326a702651b939b) Make CacheKey Unique for same model name across namespaces (#2477) 
+   * [view commit](https://github.com/yahoo/elide/commit/c38857cd07318d5f09b9b087056d627ab01bf156) Cleanup code warnings (#2473) 
+   * [view commit](https://github.com/yahoo/elide/commit/ca46fc6726ed161767d46e1060566ca234cdec5e) Bump build-helper-maven-plugin from 3.2.0 to 3.3.0 (#2481) 
+   * [view commit](https://github.com/yahoo/elide/commit/0f0e94b66532890d4f2ed9f7f34bf7499192d73d) Bump HikariCP from 5.0.0 to 5.0.1 (#2484) 
+   * [view commit](https://github.com/yahoo/elide/commit/c8e3aad63bbdef64c32baf9c538f66e298e1e19a) Bump checkstyle from 9.2 to 9.2.1 (#2485) 
+   * [view commit](https://github.com/yahoo/elide/commit/d13c7b78872df5d4ed7c083dd3883502d4133d8c) Bump maven-site-plugin from 3.9.1 to 3.10.0 (#2480) 
+   * [view commit](https://github.com/yahoo/elide/commit/a5f46a0bb816ab57c43c9b9535d9fd2b8aeb088f) Bump maven-scm-api from 1.12.0 to 1.12.2 (#2479) 
+   * [view commit](https://github.com/yahoo/elide/commit/adb52de7d01eac1e53174d6b7fdc872b7bc81b92) Bump wagon-ssh-external from 3.4.3 to 3.5.1 (#2478) 
+   * [view commit](https://github.com/yahoo/elide/commit/fd9ebf4ffa3a625df38840df723ac1c43605eea9) Bump artemis-jms-client-all from 2.19.0 to 2.20.0 (#2482) 
+   * [view commit](https://github.com/yahoo/elide/commit/e090ab5ed5344760d6239c680515f203548c1596) use alias to get column projection in query plan translator and while nesting projection (#2493) 
+   * [view commit](https://github.com/yahoo/elide/commit/7bf5de6d098acb36b60d40619d35a536cfe1a4ee) Aggregation Store: Fix filter by alias with parameterized metric. (#2494) 
+   * [view commit](https://github.com/yahoo/elide/commit/7f7d029924799a40b07e60f6aaead95cade0136d) Bump maven-jar-plugin from 3.2.0 to 3.2.1 (#2492) 
+   * [view commit](https://github.com/yahoo/elide/commit/8ec4c15d5c04670d364925f390ac1eff6f5bbf3f) Bump log4j-to-slf4j from 2.17.0 to 2.17.1 (#2487) 
+   * [view commit](https://github.com/yahoo/elide/commit/5dcf985d17c967c8882eb23e72a1d1764f53e7dd) Bump swagger-core from 1.6.3 to 1.6.4 (#2488) 
+   * [view commit](https://github.com/yahoo/elide/commit/faf7c68aaf907d2601a0151e7723580369280883) Bump mockito-junit-jupiter from 4.1.0 to 4.2.0 (#2496) 
+   * [view commit](https://github.com/yahoo/elide/commit/5e337f4f3e28642e08daa971b567926594a5f10e) Bump artemis-server from 2.19.0 to 2.20.0 (#2495) 
+   * [view commit](https://github.com/yahoo/elide/commit/493d048bc23c3fdd5029d6db2ff92f84f4368902) Bump artemis-jms-server from 2.19.0 to 2.20.0 (#2491) 
+   * [view commit](https://github.com/yahoo/elide/commit/a074e01864cc7834766e3571e60e0a4c5a15a008) Bump system-lambda from 1.2.0 to 1.2.1 (#2490) 
+   * [view commit](https://github.com/yahoo/elide/commit/d3bb5583a78fcbea62279cb2fb7c99b7da1ac9c6) Bump maven-scm-provider-gitexe from 1.12.0 to 1.12.2 (#2489) 
+   * [view commit](https://github.com/yahoo/elide/commit/1fc1935a940bdcdb8d6b8d6bb17de95e8469b8d5) Bump maven-compiler-plugin from 3.8.1 to 3.9.0 (#2497) 
+   * [view commit](https://github.com/yahoo/elide/commit/104dd73fdba0237a30939764f7267744227e573a) Bump dependency-check-maven from 6.5.2 to 6.5.3 (#2499) 
+   * [view commit](https://github.com/yahoo/elide/commit/35cb0d02603445ca9997bcef5e8085486040d4b4) Bump maven-jar-plugin from 3.2.1 to 3.2.2 (#2498) 
+   * [view commit](https://github.com/yahoo/elide/commit/5d9ce37e2f15a2703f530e83bf9a52eb0632ae6d) Bump calcite-core from 1.28.0 to 1.29.0 (#2483) 
+
+## 6.0.5
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/af4fdc3e859f9737b992f231a857793c912d3039) bump log4j2 (#2460) 
+   * [view commit](https://github.com/yahoo/elide/commit/16384c094b1974e293dc1f33d6330a6b0ac5821a) Use GraphqlBigDecimal for BigDecimal conversion (#2464) 
+   * [view commit](https://github.com/yahoo/elide/commit/6b2b60098436a3dd7db03697ffd4717122fa3bf6) use query with filter to populate query parameters in pagination (#2466) 
+   * [view commit](https://github.com/yahoo/elide/commit/ad03655829b88f6375b95d757be8abc0dbed4fd5) Bump spring-core from 5.3.13 to 5.3.14 (#2456) 
+   * [view commit](https://github.com/yahoo/elide/commit/9a4849d738692723c45dda410587b3e8c1be897a) Bump h2 from 1.4.200 to 2.0.202 (#2427) 
+   * [view commit](https://github.com/yahoo/elide/commit/865d5ac4c2006a8ac998082edbbd14844a375f8a) Bump log4j-api from 2.17.0 to 2.17.1 (#2468) 
+   * [view commit](https://github.com/yahoo/elide/commit/e0b40a7bb8255075d411bf6131ecd2c72f06dbb3) Bump log4j-api from 2.17.0 to 2.17.1 in /elide-spring (#2467) 
+   * [view commit](https://github.com/yahoo/elide/commit/a62df30e3a47af7c4657e8791e01c5403536d9d9) Bump metrics.version from 4.2.5 to 4.2.7 (#2455) 
+   * [view commit](https://github.com/yahoo/elide/commit/cea09b700eec6f45d361ebe9d32ed19e2949cba0) Bump dependency-check-maven from 6.5.0 to 6.5.2 (#2463) 
+   * [view commit](https://github.com/yahoo/elide/commit/6aac9bd0b2ceb2e06dfe1ee7b203fb186a4800db) Bump spring-websocket from 5.3.13 to 5.3.14 (#2461) 
+   * [view commit](https://github.com/yahoo/elide/commit/307f29ba0ac68533f45b2c66f96a5fd0cc7edb8b) Bump mockito-core from 4.1.0 to 4.2.0 (#2458) 
+   * [view commit](https://github.com/yahoo/elide/commit/7ca2d6d204550d2a0498d7ddd67b406620aae69b) jersey to 2.35 (#2472) 
+   * [view commit](https://github.com/yahoo/elide/commit/d554658425300df2210df1e67110f0b7588633e0) Enable lifecycle, check, and other entity scans by default for Spring. (#2470) 
+   * [view commit](https://github.com/yahoo/elide/commit/b931b4d5b2fb5a1ce4040762fc22f2df9f8d30eb) Disallow ConfigFile path to be changed in ConfigStore (#2471) 
+
+## 6.0.4
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/5e9c1d7ff097ec3143de5ab7b20d5bafcf4ff0b0) Fixing #137 (#2433) 
+   * [view commit](https://github.com/yahoo/elide/commit/de351f391f51d0d8a7586e9384c9f2657743a66f) Fixes #2263.  JSON-API json processing errors will now return a 400 i… (#2434) 
+   * [view commit](https://github.com/yahoo/elide/commit/ac520d61915aa77253fd69cee3c5713da85ede77) Bump caffeine from 3.0.4 to 3.0.5 (#2435) 
+   * [view commit](https://github.com/yahoo/elide/commit/1cce9a9c4d9d29ab29638e7297000a604954eabb) Bump jetty-webapp from 9.4.43.v20210629 to 9.4.44.v20210927 (#2436) 
+   * [view commit](https://github.com/yahoo/elide/commit/35ba78e82f7e230b5c8d3818ab67df7606e65f29) Fixes #2438 (#2441) 
+   * [view commit](https://github.com/yahoo/elide/commit/a4f89601fb6acc03e6a3a0e0b29d8412e733eb77) Bump metrics.version from 4.2.4 to 4.2.5 (#2442) 
+   * [view commit](https://github.com/yahoo/elide/commit/bd16677ae47419004707f5a7356aa952315c2746) Bump classgraph from 4.8.137 to 4.8.138 (#2445) 
+   * [view commit](https://github.com/yahoo/elide/commit/469fe23e1bc9c8c6639c8df083472f437a69d1ae) Issue608 (#2446) 
+   * [view commit](https://github.com/yahoo/elide/commit/8e1563b2e4abde911563b69a6b5a37ca6361d3a5) Bump micrometer-core from 1.8.0 to 1.8.1 (#2444) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc7b13da0aa6f276c034325be51793f6d6b866c0) Bump httpcore from 4.4.14 to 4.4.15 (#2443) 
+   * [view commit](https://github.com/yahoo/elide/commit/9e2ff4727fbb11947d55536f59409b2e80766290) Resolves #2447 (#2448) 
+   * [view commit](https://github.com/yahoo/elide/commit/2ad81220c9eecb5c009653d72b3204706200d03a) AsyncQueryOperation: fix index out of bounds error for empty list (#2449) 
+   * [view commit](https://github.com/yahoo/elide/commit/0f2187a533022c3847f2bc744d4e1bd6f03e2595) Spaces in physical column name (#2450) 
+
+## 6.0.3
+
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/54cdcb9fe67225cd463e1bf9357f0e1d2a42c152) Experimental HJSON Configuration Models and DataStore (#2418) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/38b030daa701f205215b56199705f3d689726527) Fix issue with Enum types in Aggregation Store filters (#2422) 
+   * [view commit](https://github.com/yahoo/elide/commit/21bf8717330d499fcb5baadadb6012c64f84062f) Bump mockito-core from 4.0.0 to 4.1.0 (#2421) 
+   * [view commit](https://github.com/yahoo/elide/commit/e2fcd71b026d3d3a2c207dd48941e38de945f290) Bump spring-websocket from 5.3.12 to 5.3.13 (#2412) 
+   * [view commit](https://github.com/yahoo/elide/commit/1444c00ca7fb2560d38358e01426dfd2eb20350b) Bump version.logback from 1.2.6 to 1.2.7 (#2415) 
+   * [view commit](https://github.com/yahoo/elide/commit/88648be470fc881b1a7019becb141c7ffb78b143) Bump spring-core from 5.3.12 to 5.3.13 (#2416) 
+   * [view commit](https://github.com/yahoo/elide/commit/aae18e32063a48d8b5fb7941becf3ddc6d814430) Bump version.junit from 5.8.1 to 5.8.2 (#2424) 
+   * [view commit](https://github.com/yahoo/elide/commit/a4a796bc72a7b60f145828bee9a3cabc6b9926c1) Bump classgraph from 4.8.132 to 4.8.137 (#2425) 
+   * [view commit](https://github.com/yahoo/elide/commit/a3da66f290a9e68f3e934eec890d479996f772b2) Bump checkstyle from 9.1 to 9.2 (#2426) 
+   * [view commit](https://github.com/yahoo/elide/commit/63b4863f97f621b5b3ccd726f7129b61342566d3) Bump dependency-check-maven from 6.4.1 to 6.5.0 (#2413) 
+   * [view commit](https://github.com/yahoo/elide/commit/d8050f843f8bb392eac26c454de63ab92264184a) Bump junit-platform-commons from 1.8.1 to 1.8.2 (#2429) 
+   * [view commit](https://github.com/yahoo/elide/commit/d2a0749a4903060d8bc064701758d3cfa693da9e) Bump junit-platform-launcher from 1.8.1 to 1.8.2 (#2430) 
+   * [view commit](https://github.com/yahoo/elide/commit/6a14913ac606860b713f332c91701bd66c553bb0) Bump micrometer-core from 1.7.5 to 1.8.0 (#2414) 
+   * [view commit](https://github.com/yahoo/elide/commit/9f4fd01e2c66e9e5a48cc5d79061ad8afb6c9930) Bump spring.boot.version from 2.5.6 to 2.6.1 (#2423) 
+   * [view commit](https://github.com/yahoo/elide/commit/decae2e5d7fb0ad44304af2b4a05c83ba26a809e) Bump mockito-junit-jupiter from 4.0.0 to 4.1.0 (#2428) 
+   * [view commit](https://github.com/yahoo/elide/commit/c8b79396be2432782911c385ec73d0c623a03c72) Security Fix: #147 (#2431) 
+   * [view commit](https://github.com/yahoo/elide/commit/6919c75bf8dd364267ff6e738166cc5d401d0412) Removing extra System.out from test.
+
+## 6.0.2
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/cc3b1f7edb491d5abfafaa2b2b1e0f3b7caa36bc) Aggregation Store: Arguments should require default values. (#2403) 
+   * [view commit](https://github.com/yahoo/elide/commit/113e7f2e821fb83eeb2915e61c42b81ee659db67) Added IT test for Hibernate Type annotation. (#2404) 
+   * [view commit](https://github.com/yahoo/elide/commit/b7712fc3d8860ab4c564d9cdea65334cfdc7f444) Bump classgraph from 4.8.129 to 4.8.130 (#2406) 
+   * [view commit](https://github.com/yahoo/elide/commit/ab97e119b0c88bf37dac9be38c03cb923173da22) Bump version.antlr4 from 4.9.2 to 4.9.3 (#2405) 
+   * [view commit](https://github.com/yahoo/elide/commit/c8266c116bb3dbd322cfefe86ea23c6320c6b9a8) Fixes async API resultset premature closure (#2410) 
+   * [view commit](https://github.com/yahoo/elide/commit/5f2dc6c29ee678eaf1c89a18e5a4a9abc41bfe37) Bump classgraph from 4.8.130 to 4.8.132 (#2417) 
+   
+## 6.0.1
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/85a20be1bd489054abcc5f4c7ed3314d3b0dd03a) Fixing bug where Hibernate is not detecting updates to complex attrib… (#2402) 
+   * [view commit](https://github.com/yahoo/elide/commit/2e5b5efafc9262dbf815fd492eee5e89cf0151fa) Bump mockito-junit-jupiter from 3.12.4 to 4.0.0 (#2398) 
+   
+## 6.0.0
+**Overview**
+
+Official Elide 6 Release.  Elide 6 is compiled with Java 11 (as opposed to 8).  GraphQL subscription support has been added.  Other changes since Elide 5 are summarized here [here](https://elide.io/pages/guide/v6/17-migration.html).
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/3d6107a429a60bb273675eb55aec35c4387f5636) Lifecycle events should trigger once for relationship updates (#2389) 
+   * [view commit](https://github.com/yahoo/elide/commit/7fcbc3ec80fb40bf267cd3a33074dce8e5d8e10b) Added a few additional tests around updating relationships (#2391) 
+   * [view commit](https://github.com/yahoo/elide/commit/e2c15ca498e105b501d63c7d295deeb80c61ab73) Bump gson from 2.8.8 to 2.8.9 (#2394) 
+   * [view commit](https://github.com/yahoo/elide/commit/3939bc4f1fdae70dd3cb8a92f962be544b81f39c) Bump classgraph from 4.8.128 to 4.8.129 (#2396) 
+   * [view commit](https://github.com/yahoo/elide/commit/27d2e82bbcd79d197265b6e7dd976344f02e43ed) Bump checkstyle from 9.0.1 to 9.1 (#2395) 
+   * [view commit](https://github.com/yahoo/elide/commit/5a63aad4d642d63fb8a398c31700b19eb4e3669f) Bump version.junit from 5.7.2 to 5.8.1 (#2326) 
+   * [view commit](https://github.com/yahoo/elide/commit/868f08abb047012f0bc08e1693a7b7cef8a273f0) Bump mockito-junit-jupiter from 3.12.1 to 3.12.4 (#2282) 
+   * [view commit](https://github.com/yahoo/elide/commit/4ce344f9bc00daddae70d77a6a5a6d1642de832b) Issue2376 (#2393) 
+
+## 6.0.0-pr7
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/f652404f0a26657addc821e911a6c61f8159a500) Only check preflush hooks for GraphQL mutations (#2371) 
+   * [view commit](https://github.com/yahoo/elide/commit/1bec9a04edb9917b34a9d168a3bec98f04fa8cad) Changing to Create Preflush (#2379) 
+   * [view commit](https://github.com/yahoo/elide/commit/6a54e45f4e0ebd214003a169b7eaa7244051d366) Sort in memory for computed properties (#2380) 
+   * [view commit](https://github.com/yahoo/elide/commit/5026c6bed03affed67f395a6bb9e4b6206dc62e5) Removing READ life cycle hooks. (#2381)
+   * [view commit](https://github.com/yahoo/elide/commit/844329422ed1edbcc563222b7e58c2ff861dd503) Adding test for #2376 (#2378) 
+   * [view commit](https://github.com/yahoo/elide/commit/fa377c038f5f1bfd11bbd26d6a16a1691afd91e5) Bump spring-core from 5.3.9 to 5.3.12 (#2375) 
+   * [view commit](https://github.com/yahoo/elide/commit/bcff59867ec1d1d36cd696fca34ad1df66088f59) Bump mockito-core from 3.12.4 to 4.0.0 (#2369) 
+   * [view commit](https://github.com/yahoo/elide/commit/4598a96a3c67f3ba1ace62e9daa35aaf7dd0cb32) Bump maven-javadoc-plugin from 3.3.0 to 3.3.1 (#2298) 
+   * [view commit](https://github.com/yahoo/elide/commit/b55cc49652543c18600a616174032d855d3a34a3) Bump hibernate5.version from 5.5.5.Final to 5.6.1.Final (#2384) 
+   * [view commit](https://github.com/yahoo/elide/commit/37ca4cb76545968f32e75bba490452ac1e119e2e) Bump dependency-check-maven from 6.3.2 to 6.4.1 (#2367) 
+   * [view commit](https://github.com/yahoo/elide/commit/63edada62c36bf004aa6920a31036b6b1cea116a) Bump spring-websocket from 5.3.11 to 5.3.12 (#2383) 
+   * [view commit](https://github.com/yahoo/elide/commit/eac97d952e0cb291651c339d84555617edf0f4c0) Bump spring.boot.version from 2.5.5 to 2.5.6 (#2386) 
+   * [view commit](https://github.com/yahoo/elide/commit/f87d43d0f891238dfe7c3b7fe677c3504eac5e3e) Bump jansi from 2.3.4 to 2.4.0 (#2385) 
+   * [view commit](https://github.com/yahoo/elide/commit/1906a6ead98423b52741f7f849f8946b019e1063) set bypasscache true for Async Export (#2387) 
+   * [view commit](https://github.com/yahoo/elide/commit/3815a731a36a49eb452cb787916ab09c07dd1c12) Bump commons-cli from 1.4 to 1.5.0 (#2388) 
+   
+## 6.0.0-pr6
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/b88c19ef352c7bff44d4375d4a5f3e6b55054c3e) Aggregation Store: Make EntityHydrator stream results. (#2333) 
+   * [view commit](https://github.com/yahoo/elide/commit/6f26ba6377010a22403698d48d49ef2a4f897fde) Changing Oath to Yahoo in Copyright messages (#2340) 
+   * [view commit](https://github.com/yahoo/elide/commit/5064f8a5a351b1f77b8025f68b20efc1b76d101e) Elide 6 : Refactor DataStoreTransaction Interface. (#2334) 
+   * [view commit](https://github.com/yahoo/elide/commit/9a63da30302650b557d0b85059494ff8e8220b7b) Fixing toOne relationship bug for GraphQL subscriptions (#2335) 
+   * [view commit](https://github.com/yahoo/elide/commit/0183fe7fe8c5933f82a4ffc3000b7ee638f5f14c) Subscription serialization (#2339) 
+   * [view commit](https://github.com/yahoo/elide/commit/bc9729f22c40de5b864c52186ca2e130daba4637) Issue2337 (#2341) 
+   * [view commit](https://github.com/yahoo/elide/commit/8455b9b8531b2ce031ac5912c96c2c07ce0360bf) Change GraphQL Preflush Hook Invocation (#2332) 
+   * [view commit](https://github.com/yahoo/elide/commit/ca04a4a3c7da52734e31b134c5edbae7efd25a55) Revised JSON-API path grammar to accept colon, space, and ampersand i… (#2342) 
+   * [view commit](https://github.com/yahoo/elide/commit/91d7022c76c673da76df1614617709b7c593d60a) Bump caffeine from 3.0.3 to 3.0.4 (#2327) 
+   * [view commit](https://github.com/yahoo/elide/commit/cd5a7dcac2e525f2c1a2570efe686eb81c135a8d) Bump graphql-java from 17.2 to 17.3 (#2346) 
+   * [view commit](https://github.com/yahoo/elide/commit/47c56d0c2ebbd5410a50fdd39a652b8eeb581138) Bump groovy.version from 3.0.8 to 3.0.9 (#2293) 
+   * [view commit](https://github.com/yahoo/elide/commit/caca78e6bbbba3416cd6892d30c258bfabc0de54) Bump version.logback from 1.2.5 to 1.2.6 (#2324) 
+   * [view commit](https://github.com/yahoo/elide/commit/5dfa639152cb75e689c4b9b52db8bf4953843b1a) Bump artemis-server from 2.18.0 to 2.19.0 (#2349) 
+   * [view commit](https://github.com/yahoo/elide/commit/064d5a86fbbcc5ab927bd3645d5c85ea4139c59e) Bump artemis-jms-server from 2.18.0 to 2.19.0 (#2348) 
+   * [view commit](https://github.com/yahoo/elide/commit/374ffd8ba987171a08d10a0f6655dc4a67918963) Bump spring.boot.version from 2.5.4 to 2.5.5 (#2350) 
+   * [view commit](https://github.com/yahoo/elide/commit/1addd8824d337b690ec5e595a5c94b1fbd87d641) Bump swagger-core from 1.6.2 to 1.6.3 (#2351) 
+   * [view commit](https://github.com/yahoo/elide/commit/6bc5f42fb18b04e926064418268e6c9335150ef1) Bump ant from 1.10.11 to 1.10.12 (#2352) 
+   * [view commit](https://github.com/yahoo/elide/commit/e19227b84e5a372c4831dee7c52e6122c6ceec56) Bump artemis-jms-client-all from 2.18.0 to 2.19.0 (#2354) 
+   * [view commit](https://github.com/yahoo/elide/commit/0e4ee93ab2f55fb91abc34cd55271f60ea613da5) Bump calcite-core from 1.27.0 to 1.28.0 (#2355) 
+   * [view commit](https://github.com/yahoo/elide/commit/b5514565b12f35a6fcaa1216d2cba1b5afdad7a8) Bump metrics.version from 4.2.3 to 4.2.4 (#2356) 
+   * [view commit](https://github.com/yahoo/elide/commit/cbf6efaa0795cf3484ee2dc9789c519a916dd99b) Bump maven-scm-provider-gitexe from 1.11.3 to 1.12.0 (#2353) 
+   * [view commit](https://github.com/yahoo/elide/commit/0d6b0753567d86fca4f06d9bedfacf51816922ae) Bump checkstyle from 9.0 to 9.0.1 (#2358) 
+   * [view commit](https://github.com/yahoo/elide/commit/196db51c342cc129ab37df9b7727217c9e3b8814) Bump handlebars-helpers from 4.2.0 to 4.3.0 (#2359) 
+   * [view commit](https://github.com/yahoo/elide/commit/c4f422a2946de88e961be64b5f67821c5c41b137) Remove export pagination limit (#2362) 
+   * [view commit](https://github.com/yahoo/elide/commit/9660cad7a1479d6ce9d7698e57cbf7b40e6ad92c) Bump classgraph from 4.8.116 to 4.8.128 (#2363) 
+   * [view commit](https://github.com/yahoo/elide/commit/20b4961ecc51a2819a54e42e50746ed612a3dc5d) Bump spring-websocket from 5.3.10 to 5.3.11 (#2360) 
+   * [view commit](https://github.com/yahoo/elide/commit/40481bee942e3a2ba2cfb90b6350f00da76ed190) Bump maven-scm-api from 1.11.3 to 1.12.0 (#2361) 
+   * [view commit](https://github.com/yahoo/elide/commit/830b9f2a997eefcd677090875bede2e21e19f1f4) Support 'hidden' flag for analytic models and fields. (#2357) 
+   * [view commit](https://github.com/yahoo/elide/commit/c3ea3c6a165df84449d717979466b85db5e0a575) Bump micrometer-core from 1.7.3 to 1.7.5 (#2366) 
+   * [view commit](https://github.com/yahoo/elide/commit/db01f98dbec1f78d99d44880dc048a47ab74ba96) Bump lombok from 1.18.20 to 1.18.22 (#2364) 
+   * [view commit](https://github.com/yahoo/elide/commit/cca1dcc92cc1ff37a026d5bd08fd5f747d5b59cb) Bump guava from 30.1.1-jre to 31.0.1-jre (#2365) 
+
+
+## 6.0.0-pr5
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/28c378c0c447923b67ab1674df50793480ed12df) Relaxing filter template matching to ignore aliases (#2322) 
+   * [view commit](https://github.com/yahoo/elide/commit/a4e58460b4a2e9bd04ba4707ad31e62dd1dafe01) Values validation on filters that had operators like contains should not be enforced (#2323) 
+   * [view commit](https://github.com/yahoo/elide/commit/3006b1e3aa672bb97c75d276ed9e3c469518976f) Bump junit-platform-launcher from 1.7.2 to 1.8.1 (#2313) 
+   * [view commit](https://github.com/yahoo/elide/commit/5acec4ea96d5786e9b5118d606de40104a6cb851) Bump dependency-check-maven from 6.2.2 to 6.3.2 (#2318) 
+   * [view commit](https://github.com/yahoo/elide/commit/69eb1e6d362bbd6f91d4ff102131f5a631506bce) No longer using attribute aliases to generate CSV export headers.  In… (#2325) 
+   * [view commit](https://github.com/yahoo/elide/commit/ae5afa1de35760c3603e743e63b8dbaad32b3951) Bump classgraph from 4.8.115 to 4.8.116 (#2296) 
+   * [view commit](https://github.com/yahoo/elide/commit/23d8cde402d17137d40ce92fabb68d10517a3f2c) Fixing bug for complex attributes contain a Map of Object (#2328) 
+   * [view commit](https://github.com/yahoo/elide/commit/64325a03c2d0e965e2543c3c52a9ddc0de570c03) Aggregation Store: Relaxing rules for how filter templates are compared against filter e… (#2329) 
+   * [view commit](https://github.com/yahoo/elide/commit/9ad0d58b66ead60ede9a13e164fbb5a3c736d889) support case statement in Calcite Aggregation Extractor (#2330) 
+
+## 6.0.0-pr4
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/0eb1624a401c9099c0e9f1f3fb539144cb3b97a1) Added new flag to enable subscription publishing in a separate service.  Disallow queries in subscription endpoint. (#2320) 
+
+## 6.0.0-pr3
+Prerelease candidate for Elide 6.  
+
+### New Features in Elide 6.X
+
+Elide 6 introduces several new features:
+ - Elide 6 is built using Java 11 (as opposed to Java 8).
+ - GraphQL subscription support (experimental) is added along with a JMS data store that can read Elide models from JMS topics.
+
+### API Changes
+
+Prior to Elide 6, updates to complex, embedded attributes in Elide models required every field to be set in the attribute or they would be overwritten with nulls.  Elide 6 is now aware of individual fields in complex, embedded attributes and only changes what has been sent by the client.  See [#2277](https://github.com/yahoo/elide/issues/2277) for more details.
+
+### Interface Changes
+
+ - EntityDictionary is now entirely constructed with a Builder.  All prior constructors have been removed.
+ - Security checks are now instantiated at boot and reused across requests.  This change requires security checks to be thread safe.
+
+### Module & Package Changes
+
+The following packages havea been removed:
+
+ - Legacy datastore packages elide-hibernate-3 and elide-hibernate-5 have been retired and can be replaced with the JPA data store.
+ - The Elide bridgeable datastore has been removed.
+ - The package elide-datastore-hibernate has been renamed to elide-datastore-jpql.   Internal package structure for the module was also changed.
+
+## 5.1.2
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/f54c0343fae51b8827da7bd719c460f39c3d56b1) Security Fix: #147 for elide-5.x (#2432) 
+
+## 5.1.1
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/076a3171fa9c2240c16a2d3f2ced259d46202f7a) Fixes async API resultset premature closure. (#2411) 
+
+## 5.1.0
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/2bd8e22fba35aeabc8f00b9836364b06a5abeea0) UPdating screwdriver build 
+   * [view commit](https://github.com/yahoo/elide/commit/40d1413a725d61689892044e0ba6f21716cd5a84) Disabling OWASP checks for legacy build (Elide 5) 
+   * [view commit](https://github.com/yahoo/elide/commit/cad5a714fd4eb3ce7dc6e95d8b1dba5a7ebbd379) (Similar to https://github.com/yahoo/elide/pull/2342) Revised JSON-API path grammar to accept colon, space, and ampersand in ID fields (#2343) 
+
+## 5.0.12
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/0b7eb0cb8b9fbb37fa412863a6d6fd1ac5734948) Add ability to retrieve data store properties in life cycle hooks. (#2278) 
+   * [view commit](https://github.com/yahoo/elide/commit/55e61646f17d5bdb94d4519ab210ac56840778db) Aggregation Store: Templated filter table arguments (#2290) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc0dffc51428b5b9ee255896169de91c69af0314) AggregationStore: Templated filter column arguments (#2297) 
+   * [view commit](https://github.com/yahoo/elide/commit/65eaaa12fc2b805135285287d4912d2329bc676d) Add ability to map unknown exceptions to custom exceptions (#2205) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/fe7009353573baf0206f7bb58617db97e067f900) Refactor class scanning for quarkus (#2284) 
+   * [view commit](https://github.com/yahoo/elide/commit/2a477c4fcf16d001e1ab87cc35e54662d77da870) Fixed bug where multiplex manager was not copying complex attributes from subordinate dictionaries (#2285) 
+   * [view commit](https://github.com/yahoo/elide/commit/84ea9f15d9783a981027061c47a2873a59c410f4) Updating screwdriver build for JDK11 and Elide 6 (#2286) 
+   * [view commit](https://github.com/yahoo/elide/commit/6f0435be5f2a4467ecb8be17b5393bbb54b3e690) Bump checkstyle from 8.45.1 to 9.0 (#2289) 
+   * [view commit](https://github.com/yahoo/elide/commit/65fa257e9af0a39fa1a1d23b66085f6edebfca59) Aggregation Store: Fix hjson metric projection maker config (#2295) 
+   * [view commit](https://github.com/yahoo/elide/commit/dc9d533f4a0709c8442a20716b742a1aea95d76d) Bump graphql-java from 17.1 to 17.2 (#2281) 
+   * [view commit](https://github.com/yahoo/elide/commit/ba8776d20bb345fae477f9a83987654087e28c0a) Bump version.jackson from 2.12.4 to 2.12.5 (#2280) 
+
+## 5.0.11
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/798c66204779a03bb4e34554ae243f9c4ea25bc7) Added support for filtering & sorting on complex model attributes. (#2273) 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/a01da5016669203413a2adb3b866290e95997a7c) Disable PR build from forked repo (#2269) 
+   * [view commit](https://github.com/yahoo/elide/commit/ccbb190dd03cb66325abc33820cc14ea252a5cb0) Return error to client when performing model edits in a GraphQL query… (#2274) 
+   * [view commit](https://github.com/yahoo/elide/commit/dadcdcde922ddd1f6fe9ee7a24f7508d2901c6d1) Bump mockito-junit-jupiter from 3.11.2 to 3.12.1 (#2268) 
+   * [view commit](https://github.com/yahoo/elide/commit/22f28238f387513f06537f252a8106fc04975567) Bump mockito-core from 3.11.2 to 3.12.4 (#2276) 
+   * [view commit](https://github.com/yahoo/elide/commit/b14b36dcf051c734e3143e0db67d7266d0b2066e) Bump spring.boot.version from 2.5.3 to 2.5.4 (#2265) 
+   * [view commit](https://github.com/yahoo/elide/commit/344d4e4e1783101a2bff47d79143a19fb3c3c9bb) Bump gson from 2.8.7 to 2.8.8 (#2266) 
+
+## 5.0.10
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/debf5ca4d4a53dde274642cfbc4bc04060cbd949) httpclient 4.5.13 (#2074) 
+   * [view commit](https://github.com/yahoo/elide/commit/10697e7f97790b41bfa63b0d8d007bcb95547cac) Bump classgraph from 4.8.113 to 4.8.114 (#2255) 
+   * [view commit](https://github.com/yahoo/elide/commit/b24fbce881aebcfbc58aac83592a335f2bc894f9) Bump micrometer-core from 1.7.2 to 1.7.3 (#2256) 
+   * [view commit](https://github.com/yahoo/elide/commit/0592714a73377945c205f4faf7bc4f23122e519b) loadObject should return unique result (#784) 
+   * [view commit](https://github.com/yahoo/elide/commit/a6d77b362ae629732912e6d6085d1f1ecd5e0b05) Bump maven-scm-provider-gitexe from 1.11.2 to 1.11.3 (#2258) 
+   * [view commit](https://github.com/yahoo/elide/commit/c25d63ee4504107bdadf3523c7321c632d2ca890) Bump maven-scm-api from 1.11.2 to 1.11.3 (#2254) 
+   * [view commit](https://github.com/yahoo/elide/commit/97c7b01538a4c8715f75b9586e8dff3f479053b3) Bump classgraph from 4.8.114 to 4.8.115 (#2261) 
+   * [view commit](https://github.com/yahoo/elide/commit/6a92b433ac59bd39c555a8b3e5dbd3ec9b1df965) Bump artemis-server from 2.17.0 to 2.18.0 (#2259) 
+   * [view commit](https://github.com/yahoo/elide/commit/1926ea9adb14b981aa4e9f7247906a4f5567e16b) Bump artemis-jms-client-all from 2.17.0 to 2.18.0 (#2257) 
+   * [view commit](https://github.com/yahoo/elide/commit/6df21a4cf84be5bbdefb2a725d1c0dba853d8fb8) Makes Elide JSONPath version proof (#2262) 
+
+## 5.0.9
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/8e15a2dccdb6d7d9107a5cc747355d5754371a83) Reduce boot startup time.  Reducing ClassGraph scans to a single scan (#2253) 
+
+## 5.0.8
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/5e8b945b8bd641c8120c8601126564e02eab8f5c) GraphQL Subscriptions PR1: Subscription model builder (#2243) 
+   * [view commit](https://github.com/yahoo/elide/commit/3d2873533534452f09e5c19ddd52395cd8ff6777) GraphQL Subscriptions PR2: Jms data store (#2244) 
+   * [view commit](https://github.com/yahoo/elide/commit/76fff8684b7ea31d3ee1483aa4078d7949e5442f) Added enhanced logging around JPQL queries (#2249) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/1520be9927ee83d836c5fbe869ca365e002a1464) Bump checkstyle from 8.44 to 8.45.1 (#2241) 
+   * [view commit](https://github.com/yahoo/elide/commit/bef2526fe2512f8c18653825fddfc89e18aec8cc) Bump classgraph from 4.8.110 to 4.8.113 (#2247) 
+   * [view commit](https://github.com/yahoo/elide/commit/648499b6a5996dd09716bbcdf9b12b11f095b48c) Add ability for a SQLDialect to override the system default SQL filte… (#2250) 
+   * [view commit](https://github.com/yahoo/elide/commit/49aae8b0b47b17c79db6c0f136d4be86991e0023) Bump graphql-java from 16.2 to 17.1 (#2246) 
+   * [view commit](https://github.com/yahoo/elide/commit/4d5cf76acf92afb3c14608cbfbbc3d996e230d57) Removing references to Verizon & Verizon Media from Elide project (#2229) 
+
+## 5.0.7
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/981125df2571d5a7ec2c0bde76a7c897b4a803c9) Bump ant from 1.10.10 to 1.10.11 in /elide-graphql (#2233) 
+   * [view commit](https://github.com/yahoo/elide/commit/9e4f2929f727a5042607d066a8b9d5a8b1f316b5) Bump maven-enforcer-plugin from 1.4.1 to 3.0.0 (#2232) 
+   * [view commit](https://github.com/yahoo/elide/commit/a51cc2f178d36002ade4905c0179cc3510f5db0d) Bump classgraph from 4.8.108 to 4.8.110 (#2230) 
+   * [view commit](https://github.com/yahoo/elide/commit/c55eca8c6cc828610faf39d0ea62d2a0a897696b) Add simple configuration to enable verbose errors. (#2236) 
+   * [view commit](https://github.com/yahoo/elide/commit/101f842daa06095652f898bda0f96fead4bb373e) GraphQL schema now namespaces internal types to avoid conflicts (#2237) 
+   * [view commit](https://github.com/yahoo/elide/commit/a874733a5c2ac3777e5946f6eddfade651d80c7a) Fix bug where dialect time conversion is skipped (#2238) 
+   * [view commit](https://github.com/yahoo/elide/commit/f0f455bee3d51e2333ad20005068f48ab563a7a9) Issue2239 (#2245) 
+
+## 5.0.6
+Fixes bug in 5.0.5
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/846755e07bc2a7092a8393c698205323cd333a2c) Fixed mismatching graphQL versions in pom (#2234) 
+
+## 5.0.5
+A major change for this release is a large upgrade of the graphql-java package to the latest version.
+
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/c8ce46d5e0d8323ac06187be86c39cc844a460f4) Added PREFLUSH phase for lifecycle hooks (#2224) 
+   * [view commit](https://github.com/yahoo/elide/commit/73102d5d6a2fdf35d70eb97d53a5123fe20a425c) Use include to set model description (#2222) 
+   * [view commit](https://github.com/yahoo/elide/commit/bca07bcf3aa10949ce5e86831ca27045f49aa2cf) Add support for Swagger ApiModel annotation (#2206) 
+   * [view commit](https://github.com/yahoo/elide/commit/90e332d27becbdada09b59b48c5ab614a0f33160) Added spanish translation for README.md (#2125) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/320df5eedbc3f6d01512fc6cf4be0be90c2cff4b) Exclude json-path from calcite (#2186) 
+   * [view commit](https://github.com/yahoo/elide/commit/6e550d1a14f63d1f5e047b1404359f840d87504c) Bump spring.boot.version from 2.5.1 to 2.5.2 (#2183) 
+   * [view commit](https://github.com/yahoo/elide/commit/76583615a1f17e971396f990414ef8de6bda055a) Bump mockito-core from 3.11.1 to 3.11.2 (#2182) 
+   * [view commit](https://github.com/yahoo/elide/commit/0b0ddbfd30ffeac94328d9e06dbd7c2272a7a31a) Bump version.jackson from 2.12.3 to 2.12.4 (#2192) 
+   * [view commit](https://github.com/yahoo/elide/commit/99721518c57e8208bf788dfb7c4e1a85b2c9977d) Bump mockito-junit-jupiter from 3.11.1 to 3.11.2 (#2181) 
+   * [view commit](https://github.com/yahoo/elide/commit/870fdfcf3dbcfc15f150c644954b2a6c3ff1e0b9) Bump metrics.version from 4.2.1 to 4.2.2 (#2194) 
+   * [view commit](https://github.com/yahoo/elide/commit/a387ba0556486946688480c3703e97f2c978ab3f) Bump commons-io from 2.10.0 to 2.11.0 (#2197) 
+   * [view commit](https://github.com/yahoo/elide/commit/c89b2b00fb24ee10506d4fa03a2fcc7cb102856f) Bump jetty-webapp from 9.4.41.v20210516 to 9.4.43.v20210629 (#2202) 
+   * [view commit](https://github.com/yahoo/elide/commit/fe862c969c608af94e5f6fb9a54c0066fec424dd) Bump spring-core from 5.3.8 to 5.3.9 (#2200) 
+   * [view commit](https://github.com/yahoo/elide/commit/5c48344d8926c18464277f8ef11069ba4c01969e) Bump commons-compress from 1.20 to 1.21 (#2201) 
+   * [view commit](https://github.com/yahoo/elide/commit/4351fca3d4cf49af223f42e723d8f10e20ce2c7c) Bump dependency-check-maven from 6.1.6 to 6.2.2 (#2148) 
+   * [view commit](https://github.com/yahoo/elide/commit/b0f68eb78cc029ea82db9c81285309b8a6b3c48b) Bump checkstyle from 8.41 to 8.44 (#2184) 
+   * [view commit](https://github.com/yahoo/elide/commit/adf25ee5712f2127885757d2055424401cffd42a) Bump jedis from 3.6.1 to 3.6.3 (#2210) 
+   * [view commit](https://github.com/yahoo/elide/commit/c1ce234484f194ec0436ebf386ecf988e9ae265f) Bump micrometer-core from 1.7.0 to 1.7.2 (#2209) 
+   * [view commit](https://github.com/yahoo/elide/commit/0c4e0e9187f81997ab6a1ceb9cfc50fc3e3848c8) Bump jansi from 2.3.3 to 2.3.4 (#2208) 
+   * [view commit](https://github.com/yahoo/elide/commit/7edc5d2b329f99f6d14a44f9bd8969d7c9444576) Bump version.logback from 1.2.3 to 1.2.5 (#2211) 
+   * [view commit](https://github.com/yahoo/elide/commit/5cdac5926b504bdf5ae566b1c487af768f00cfcf) Bump log4j-over-slf4j from 1.7.31 to 1.7.32 (#2212) 
+   * [view commit](https://github.com/yahoo/elide/commit/7d863fcbac6f6304223a50caddbb171a85ebc7fa) Resolves #2220 (#2221) 
+   * [view commit](https://github.com/yahoo/elide/commit/004c2e2aab78e131f5acc2f60fbaa3e689220112) Resolves #2215 (#2219) 
+   * [view commit](https://github.com/yahoo/elide/commit/272b3830afb064dbffdc44ac8586a9c4df3e7d94) Switch to discord (#2223) 
+   * [view commit](https://github.com/yahoo/elide/commit/d5e07dde01bbd12201ccba95f5c4289eab4957f3) Fix invite link for Discord (#2226) 
+   * [view commit](https://github.com/yahoo/elide/commit/e64008921d7ad27fc80c930d8fc1f8eb4847c132) Bump metrics.version from 4.2.2 to 4.2.3 (#2207) 
+   * [view commit](https://github.com/yahoo/elide/commit/9f8a03b8868befff6554ea28c92579a353a366ee) Bump spring.boot.version from 2.5.2 to 2.5.3 (#2214) 
+   * [view commit](https://github.com/yahoo/elide/commit/6cb71dd3211a333b42ebcfb8e77d5185d21f8c13) Bump hibernate5.version from 5.5.2.Final to 5.5.5.Final (#2227) 
+   * [view commit](https://github.com/yahoo/elide/commit/bcbf0cbdb1757f795207a78e00f097c31e6174c0) Bump slf4j-api from 1.7.31 to 1.7.32 (#2218) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc7da810dbef23aee6412bf2aaba29f9c6c0b897) Upgrade graphql-java from 6 to 16.2 (#2228) 
+
+## 5.0.4
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/987311f96ee5883279f63dc4fee8c888bdb52340) Fix defaultMaxPageSize setting (#2177) 
+   * [view commit](https://github.com/yahoo/elide/commit/f9c2304cdbd7a1fb0f62cb024a19b2f2335832f2) Make AS before table alias optional, i.e. dialect based (#2179) 
+   * [view commit](https://github.com/yahoo/elide/commit/f6eff8a0612919e2476a680a9d70964e5a0c14c6) Bump slf4j-api from 1.7.30 to 1.7.31 (#2172) 
+   * [view commit](https://github.com/yahoo/elide/commit/4756f7131e09efb6a37bd1f97f39eda148324e1a) Bump metrics.version from 4.2.0 to 4.2.1 (#2173) 
+   * [view commit](https://github.com/yahoo/elide/commit/fa65687f2aef93cb84a47698450fd7875ae3f9e5) Bump jetty-server from 9.4.40.v20210413 to 9.4.41.v20210516 (#2176) 
+   * [view commit](https://github.com/yahoo/elide/commit/16e251c4829459d629adfa5e4f7c8fedde752391) Bump log4j-over-slf4j from 1.7.30 to 1.7.31 (#2174) 
+
+## 5.0.3
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/6eef744fb655ee054ad2559284afa7ec082d3c2b) use column name to extract cache key in agg datastore (#2144) 
+   * [view commit](https://github.com/yahoo/elide/commit/655d8975589d9d40462e9abd1a7bfb468bac2894) use CheckPermission for CreateObject to include user checks and operation checks (#2143) 
+   * [view commit](https://github.com/yahoo/elide/commit/ce2433410a458438e8d3dfbe22416f916513267e) Bump spring.boot.version from 2.4.6 to 2.5.1 (#2149) 
+   * [view commit](https://github.com/yahoo/elide/commit/44129901a2a05c113e9bd98de8a591498e24a989) Bump mockito-junit-jupiter from 3.11.0 to 3.11.1 (#2151) 
+   * [view commit](https://github.com/yahoo/elide/commit/0310c513ef8c13580b23bc88e3e498463ffa4820) Bump commons-io from 2.9.0 to 2.10.0 (#2150) 
+   * [view commit](https://github.com/yahoo/elide/commit/96ae87384ea28304efe6160396326f74a0cca062) Bump hibernate5.version from 5.4.30.Final to 5.5.2.Final (#2152) 
+   * [view commit](https://github.com/yahoo/elide/commit/e55a4cc2380f09761cb039a6b35ec29066307322) Bump jedis from 3.6.0 to 3.6.1 (#2147) 
+   * [view commit](https://github.com/yahoo/elide/commit/52329bd57064352e042f01fecd3c15721dd9ac04) Bump jansi from 2.3.2 to 2.3.3 (#2155) 
+   * [view commit](https://github.com/yahoo/elide/commit/018b1c473631148f47d54e65ac0446714f05ab05) Bump json-path from 2.4.0 to 2.6.0 (#2130) 
+   * [view commit](https://github.com/yahoo/elide/commit/44da3b6f2e8dc40c99e9ff3fb38ecc7cacca322c) Bump spring-core from 5.3.7 to 5.3.8 (#2154) 
+   * [view commit](https://github.com/yahoo/elide/commit/f0c8c100194841f47ad588a42521abb57aa20953) Bump HikariCP from 4.0.2 to 4.0.3 (#2157) 
+   * [view commit](https://github.com/yahoo/elide/commit/d2751e0c8f9ab236ad3849ba5bbf4830c1a7f98c) Bump mockito-core from 3.11.0 to 3.11.1 (#2159) 
+   * [view commit](https://github.com/yahoo/elide/commit/19cfd236db24561a66faa9c43fd6c30e0c5893fe) Fix suggestionColumns to add correct columns (#2164) 
+   * [view commit](https://github.com/yahoo/elide/commit/e1c3e187fe53ea5c045620fe446abdee8273bfab) Bump classgraph from 4.8.105 to 4.8.108 (#2156) 
+   * [view commit](https://github.com/yahoo/elide/commit/5a21949eb0cf012f246f8a481d17736435a0802d) Allow multivalue params and fix header sanitization (#2169) 
+
+## 5.0.2
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/450874f676513d58485014897f4864aa50a98bfd) Support for EmbeddedId (#2132) 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/6622a0f857df15031e5e7abda2dca0750c35fce3) Updating suppressions.xml to ignore hibernate 3 CVE errors for the legacy hibernate 3 data store.  Use at your own risk or upgrade to hibernate 5 (#2127) 
+   * [view commit](https://github.com/yahoo/elide/commit/51b61f2841e9be5fa4f7afd8ecaab243cc793826) Bump hibernate-validator from 6.1.0.Final to 6.1.5.Final in /elide-async (#2126) 
+   * [view commit](https://github.com/yahoo/elide/commit/6a80b04abf4ee09e633a3cd1ded2df15f985c63b) Bump mockito-junit-jupiter from 3.9.0 to 3.11.0 (#2129) 
+   * [view commit](https://github.com/yahoo/elide/commit/3c1f14e9588b3ef3a5ecbb865d3d74ec69a2e46d) Bump calcite-core from 1.26.0 to 1.27.0 (#2131) 
+   * [view commit](https://github.com/yahoo/elide/commit/3da93d519295fc05ae845ab78ebe65f24120a47b) Bump junit-platform-launcher from 1.7.1 to 1.7.2 (#2113) 
+   * [view commit](https://github.com/yahoo/elide/commit/2e6beca2d833aace35c6cf76e306ecd2cfb04823) Bump jansi from 2.1.1 to 2.3.2 (#2083) 
+   * [view commit](https://github.com/yahoo/elide/commit/a633890761169e682088d9a1960a974b9f32d251) Bump gson from 2.8.6 to 2.8.7 (#2133) 
+   * [view commit](https://github.com/yahoo/elide/commit/e86211f739c2f288262a9481f34086ba4773d611) Fixing CVE-2021-22118 (#2137) 
+   * [view commit](https://github.com/yahoo/elide/commit/b9183cf0ec70988fa067bbe266fec006be93b063) Bump ant from 1.10.9 to 1.10.10 (#2077) 
+   * [view commit](https://github.com/yahoo/elide/commit/0b9cde0aa3aa5216adffc5da164b46f92f7ba2e6) Bump version.restassured from 4.3.3 to 4.4.0 (#2136) 
+   * [view commit](https://github.com/yahoo/elide/commit/a68f7670c8e0137e1fd86a9c82feafcf4e87331a) Bump mockito-core from 3.10.0 to 3.11.0 (#2138) 
+   * [view commit](https://github.com/yahoo/elide/commit/c66df3772034df94e7651e2fc1cae97dcd442c95) Bump commons-io from 2.8.0 to 2.9.0 (#2139) 
+   * [view commit](https://github.com/yahoo/elide/commit/53b029d1477ab7faeb1add5c0389f463363dd7cf) Bump micrometer-core from 1.6.6 to 1.7.0 (#2134) 
+   * [view commit](https://github.com/yahoo/elide/commit/cd52b90c9f472c01325fd285eeac1d0092e8af95) Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 (#2140) 
+   * [view commit](https://github.com/yahoo/elide/commit/f939e4a5f757fef7402a503630d04a66c1c843e4) Bump maven-gpg-plugin from 1.6 to 3.0.1 (#2135) 
+   * [view commit](https://github.com/yahoo/elide/commit/6cbffcbe143357215eeac1485005dc8ea66310a1) Bump nexus-staging-maven-plugin from 1.6.7 to 1.6.8 (#2078) 
+   * [view commit](https://github.com/yahoo/elide/commit/e46b8461c27d26112e3fe5794f8aaf5b4857ea67) Small edits to readme to reflect Elide 5. (#2141) 
+
+## 5.0.1
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/8b713e15d262f0b0087c9de79dc45fca16891ca0) Update README.md 
+   * [view commit](https://github.com/yahoo/elide/commit/a691913ed2bcb782c6659d3b24c3621ad0fa47da) Fix bug querying a dynamic analytic model by ID in GraphQL (#2120) 
+
+## 5.0.0
+
+Elide 5 Official Release.  See the [migration guide](https://elide.io/pages/guide/v5/17-migration.html) for a full recap of changes since Elide 4.
+
+**Features**
+
+Major changes since last pre-release include:
+   * Parameterized tables, metrics, & dimensions for Aggregation store models.
+   * A new security model (permission executor) for Aggregation store models.
+   * @Include at package level introduces the concept of 'Namespaces'.
+   * @Include includes metadata (that will soon be added to Swagger and Graphiql documents).
+   * A query optimizer was added for Aggregation Store.
+   * Metadata changes for the Aggregation Store to support richer search suggestions.
+   * [view commit](https://github.com/yahoo/elide/commit/63b444aa04e4c0e9b6fcb16cbb8560a9dba6fa79) Expose query params on security.RequestScope (#2067) 
+   * [view commit](https://github.com/yahoo/elide/commit/9facb56979112d0ce1d09f9a529b7a32950d4dd6) Allow custom serdes to override default ones (#1421). (#2103)
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/fdfe852b9498de2748f127e618b5436bf854edd2) Disable Dependency Check (#2017) 
+   * [view commit](https://github.com/yahoo/elide/commit/2cb51c39ababdbfbd270f7478710f05122d5c31b) Table Namespace Model Config (#2013) 
+   * [view commit](https://github.com/yahoo/elide/commit/7a901acc7407dedfe5794e3509683649e746bd58) Test Cases for Namespace Dynamic Configs (#2015) 
+   * [view commit](https://github.com/yahoo/elide/commit/89e96b0bb45da69b08e6c8df6d8d7d23090eec37) Resolution using Table Context (#2004) 
+   * [view commit](https://github.com/yahoo/elide/commit/ff182deee468044339501f0818a089a63189bb2f) Revert "Disable Dependency Check (#2017)" (#2023) 
+   * [view commit](https://github.com/yahoo/elide/commit/0c9fff2684f6bff02222fd36c9b12a686ee655ef) ClassType.of (#2027) 
+   * [view commit](https://github.com/yahoo/elide/commit/0cb3f2505270b755cc50a5a646719da32a533f33) Update README.md (#2024) 
+   * [view commit](https://github.com/yahoo/elide/commit/9fb218f29b6fd0b3c803bbe0216f0ee9366129ea) Bump version.jackson from 2.12.2 to 2.12.3 (#2005) 
+   * [view commit](https://github.com/yahoo/elide/commit/6143d108eb7b1a2250370409d5362c6722c95b23) Cleanup (#2026) 
+   * [view commit](https://github.com/yahoo/elide/commit/50a41527ad49571d5029b922382647184752027d) Fix handling in filter pushdown extractor (#2030) (#2038) 
+   * [view commit](https://github.com/yahoo/elide/commit/53b23330ff54b12041e530a931329986ddd3e454) Aggregation Store: Namespace Metadata changes (#2037) 
+   * [view commit](https://github.com/yahoo/elide/commit/e64bd8e8ab6ff8353b7a0bb1d4db03c8a4eedaac) Permission visitor normalization (#2035) 
+   * [view commit](https://github.com/yahoo/elide/commit/ea57369f2b8af263efd9de99bfe59cae1b88202a) Test Cases + Enable Namespace in Standalone and Spring (#2040) 
+   * [view commit](https://github.com/yahoo/elide/commit/b126fc12c0102fa8441e5900b81ad95d1b0bb3c3) Use TableContext to resolve join expressions. (#2036) 
+   * [view commit](https://github.com/yahoo/elide/commit/b911028feb3655bb897041047caa7602f3f0c761) Add missing default values for ElideAutoConfiguration (#2052) 
+   * [view commit](https://github.com/yahoo/elide/commit/256ca8e18dbae4b8ff6c1adbd8e37b236ef5e575) Refactor Column Projections (#2049) 
+   * [view commit](https://github.com/yahoo/elide/commit/4e611ab9f310af630c79dc9e475af45127e40246) Upgrade to GitHub-native Dependabot (#2041) 
+   * [view commit](https://github.com/yahoo/elide/commit/eda2eb0643884d0c145e132ad76c0e28e3ac699a) Bump metrics.version from 4.1.19 to 4.1.21 (#2062) 
+   * [view commit](https://github.com/yahoo/elide/commit/4e8ea8eebe887ecfca30d45491ff7cfa82c28bcd) Bump groovy.version from 3.0.7 to 3.0.8 (#2059) 
+   * [view commit](https://github.com/yahoo/elide/commit/e7224f95f46446e9787f6e03a8837fd65ae9368c) Bump spring-core from 5.2.9.RELEASE to 5.3.6 (#2058) 
+   * [view commit](https://github.com/yahoo/elide/commit/a4e09c25871bdef9ab5088ea4d2d3bef920f772d) Refactored AnyFieldExpression logic (#2050) 
+   * [view commit](https://github.com/yahoo/elide/commit/6591f9a7c5def55726e081dc0aecf15cbb915c44) Bump version.antlr4 from 4.9.1 to 4.9.2 (#2060) 
+   * [view commit](https://github.com/yahoo/elide/commit/d21f942a219ba7f32757f334d7e61c78e126d6be) Use only queried column args & default args for logical column expansion (#2054) 
+   * [view commit](https://github.com/yahoo/elide/commit/ee220445dbd72d789e09dbea5c233b46b4768f3e) Bump junit-jupiter-params from 5.7.0 to 5.7.1 (#2057) 
+   * [view commit](https://github.com/yahoo/elide/commit/dd33ea956b389e5fb37ea313564b7c80f0891bb9) Bump spring.boot.version from 2.4.3 to 2.4.5 (#2033) 
+   * [view commit](https://github.com/yahoo/elide/commit/26f9d627781a4023f19c81065bd0434159b9da1e) Bump guava from 30.1-jre to 30.1.1-jre (#2056) 
+   * [view commit](https://github.com/yahoo/elide/commit/21b4c5a728a2fd55339282b1e13bfb02cf26c875) get permission executor from datastore for each model that it manages. (#2070) 
+   * [view commit](https://github.com/yahoo/elide/commit/16107fbc78798004044ae626930d82159b4dabca) Bump maven-site-plugin from 3.7.1 to 3.9.1 (#2055) 
+   * [view commit](https://github.com/yahoo/elide/commit/10a8a027e896e0ed928ef2f8e4c3bf5808c023da) Source sparse fields from entity projection (#2051) 
+   * [view commit](https://github.com/yahoo/elide/commit/cc1a380deaf5ea3ca3c9f7e0df716198f717a4fe) Bump commons-lang3 from 3.11 to 3.12.0 (#1913) 
+   * [view commit](https://github.com/yahoo/elide/commit/b7d1e10c5d98bc7e5fd811df45395e0a0216561f) Bump mockito-core from 3.6.28 to 3.9.0 (#2034) 
+   * [view commit](https://github.com/yahoo/elide/commit/5c260f3ea1fc87ad6d3fb7be9b6354d67a294804) [Security] Bump version.jetty from 9.4.39.v20210325 to 9.4.40.v20210413 (#2032) 
+   * [view commit](https://github.com/yahoo/elide/commit/d2843b24f4a1ed35907726ff62f09049ce37d081) Optional flow (#2069) 
+   * [view commit](https://github.com/yahoo/elide/commit/222f1e1b616343984d71243a0f8c23cb2610b4a6) Bump micrometer-core from 1.6.4 to 1.6.6 (#2006) 
+   * [view commit](https://github.com/yahoo/elide/commit/73eb5ded68c41c661516fed08684a53bcb89c9b1) Add ability to handle conversion of Date instances to ISO8601DateSerde (#2047) 
+   * [view commit](https://github.com/yahoo/elide/commit/bdeef8376dfd3c35b1f12d0fc41a51385b16fa5d) Bump caffeine from 2.8.8 to 3.0.2 (#2064) 
+   * [view commit](https://github.com/yahoo/elide/commit/40cc29938d205453201062f930a8724a18572740) Bump dependency-check-maven from 6.1.5 to 6.1.6 (#2081) 
+   * [view commit](https://github.com/yahoo/elide/commit/ea7919943a77cb7ee33668170e7da16e9e338bc4) bump dependency-check (#2076) 
+   * [view commit](https://github.com/yahoo/elide/commit/1bb35bea711c420f00cfd97596dfa9177e15277e) Populating namespaces in metadatastore (#2071) 
+   * [view commit](https://github.com/yahoo/elide/commit/e722d3e2ac0acf976920871dd0a52a14f2cfd545) Refactor tableSource for Column and Argument (#2075) 
+   * [view commit](https://github.com/yahoo/elide/commit/b8a9ae644bff7db48b761d83cfac20821f8029e3) Context for partially resolving expressions (#2068) 
+   * [view commit](https://github.com/yahoo/elide/commit/066142e9acd4bd2582aa4e2eb5683a8bbd31d100) Remove usage of {{}} for time demensions (#2011) 
+   * [view commit](https://github.com/yahoo/elide/commit/0a3776bacb5809845d9a04a1263db9760f117b92) Injection Protection for parameterized metrics/dimensions (#2090) 
+   * [view commit](https://github.com/yahoo/elide/commit/35e214dd718e164e30529eff4feab4d5fcd62d27) Resolve arguments in FromSubquery (#2089) 
+   * [view commit](https://github.com/yahoo/elide/commit/e5e5f921b666bd7a6277832b6afa2d7f7cbe25a8) change permission executor cache to store set of fields (#2091) 
+   * [view commit](https://github.com/yahoo/elide/commit/bf246b21912e4b299e4330089198ba2eee01fbec) Generate dynamic alias for join source (#2065) 
+   * [view commit](https://github.com/yahoo/elide/commit/20cccc1e7386d25e7f112e912822afdfc612e79a) Validate required arguments (#2092) 
+   * [view commit](https://github.com/yahoo/elide/commit/c82b507d31043f0956023f9b83040b71277df02e) Aggregation Store: Verify write requests are denied (#2096) 
+   * [view commit](https://github.com/yahoo/elide/commit/b75011e6d084b36ce3b9ada52e309cf1cf5bdba5) Add AggregationStorePermissionExecutor (#2086) 
+   * [view commit](https://github.com/yahoo/elide/commit/0cb5028cb5c37225e4f30d5a08469499cc9fba22) add validation for security checks in agg model table, namespace and fields (#2088) 
+   * [view commit](https://github.com/yahoo/elide/commit/c3d71ad98a89137ed78e86deb091897836203f75) Propogate client query arguments to join tables (#2095) 
+   * [view commit](https://github.com/yahoo/elide/commit/32856f2244a3334028099eeb7ecd13b69fa41016) Aggregation Store ID Column Metadata (#2099) 
+   * [view commit](https://github.com/yahoo/elide/commit/06fbda9b30433d71d45e62ceab5727246c59b904) use AggregationStorePermissionExecutor for Aggregation Store Model (#2102) 
+   * [view commit](https://github.com/yahoo/elide/commit/4f0ff5f77322d56d33e3de3c961f96bb9ce5d26f) Aggregation Store - Optimizer complex formula tests (#2101) 
+   * [view commit](https://github.com/yahoo/elide/commit/6d341a829a16ea8c1dc0fb2815e320601545467d) Parse table and column arguments in Expression parser (#2105) 
+   * [view commit](https://github.com/yahoo/elide/commit/7bc4ed6f28c7ac31f1fa8071bb30ae0f5f8f7407) Added column metadata for HJSON ID column (#2104) 
+   * [view commit](https://github.com/yahoo/elide/commit/58c194cd875ffaeb01219bc3aa7fded0c8fb3da3) Bump hibernate-search-orm from 5.11.8.Final to 5.11.9.Final (#2085) 
+   * [view commit](https://github.com/yahoo/elide/commit/815b201d91369e2580ad43e81d75c462f4c494c5) Bump jacoco-maven-plugin from 0.8.6 to 0.8.7 (#2080) 
+   * [view commit](https://github.com/yahoo/elide/commit/bc656ea2fdef26b6d522d55d39a034085eeb5a25) Bump classgraph from 4.8.104 to 4.8.105 (#2079) 
+   * [view commit](https://github.com/yahoo/elide/commit/15df48408d453340eed0911a1fbc52b21f03a9ef) Bump jedis from 3.5.1 to 3.6.0 (#2106) 
+   * [view commit](https://github.com/yahoo/elide/commit/f0626ea0a2bd5244f85a6211f05681e732d4046b) Bump version.junit from 5.7.1 to 5.7.2 (#2107) 
+   * [view commit](https://github.com/yahoo/elide/commit/607b6cdb5b2f65e3752f1cdea5189404838d2994) Bump metrics.version from 4.1.21 to 4.2.0 (#2109) 
+   * [view commit](https://github.com/yahoo/elide/commit/e1c93d9f34829c4ee142a4919b5fde26502eaa11) Verify table arguments. (#2110) 
+   * [view commit](https://github.com/yahoo/elide/commit/4e62925ecfa7119e5476f74f9acc5058579aac21) Prevent nesting for columns that reference joins that contain $$column references (#2098) 
+   * [view commit](https://github.com/yahoo/elide/commit/27aa83a604ee5a4b6a1be7c5f9ab112ba2e8ae37) Bump mockito-core from 3.9.0 to 3.10.0 (#2111) 
+   * [view commit](https://github.com/yahoo/elide/commit/b2eadb111297a8167f2715e027b9284c765adb32) Verify column arguments. (#2114) 
+   * [view commit](https://github.com/yahoo/elide/commit/2594c061c2b76b2e5258d596f6280b8434b766dc) Code cleanup for elide-model-config (#2115) 
+   * [view commit](https://github.com/yahoo/elide/commit/e1f90ce023aff7b1d0a87250c314a66d240ef418) Bump javassist from 3.27.0-GA to 3.28.0-GA (#2084) 
+   * [view commit](https://github.com/yahoo/elide/commit/4b8310f782f755f20fa79b52b7e4d13480b140f9) Remove usage of SQLReferenceTable. (#2116) 
+   * [view commit](https://github.com/yahoo/elide/commit/5ee0719fee3e24d45a1a8f46b251d11acecbe2f6) Bump spring.boot.version from 2.4.5 to 2.4.6 (#2117) 
+
+## 5.0.0-pr34
+5th public release candidate for Elide 5.0.  Major features will likely come in the next release as this release lays foundation for parameterized attributes and Handlebars templating support in HJSON configuration files.  
+
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/4c33506fd7df9e0bbaf19f5d7cfb239c2a27b80e) Add 2 new filter operators - between and notbetween (#1962)
+   * Hibernate 3 & 5 stores now benefit from same N+1 improvement as JPA store.
+
+**Configuration Changes**
+   * [view commit](https://github.com/yahoo/elide/commit/86b7b041643f45a7757d8e621ff213a424a9f4c3) Physical Column Reference within handlebars must start with '$' (#1953)
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/f2ed4903b05b83b0e82449a43eda49fefc48dc28) NPE when projection has no permission for relationshipName (#1989) 
+   * [view commit](https://github.com/yahoo/elide/commit/212dcab497c321f67b66d619748b023201f2c819) Remove source from ColumnProjection (#1918)
+   * [view commit](https://github.com/yahoo/elide/commit/a5a6a45b223a005a2c6fa14e58fb969bbaa21900) Added IT test for numeric value prefix, postfix, infix, and in operators (#1908)
+   * [view commit](https://github.com/yahoo/elide/commit/0669b000f4c00c539dccbcab3e15e8336653a383) Query Plan Optimizer (Part 2) (#1919)
+   * [view commit](https://github.com/yahoo/elide/commit/82abcb7f32c5a94d82820bab09609333769d7640) Part 3 of Query Plan Optimization: Extract physical columns from join clause. (#1920)
+   * [view commit](https://github.com/yahoo/elide/commit/7a11ee300605ed0130d89a036ed221d49f1b1d9c) Agg Store Model Changes for Parameterized Metric Support (#1921)
+   * [view commit](https://github.com/yahoo/elide/commit/e1e07dbeabb690560754c84200b67e7a8d4d9229) Part 4 of Query Plan Optimization : Fix Metric Nesting (#1924) 
+   * [view commit](https://github.com/yahoo/elide/commit/e891dec78d7a2e0639691c404b33e666b131b2b9) issue 1904 - fix lombok build warnings (#1944)
+   * [view commit](https://github.com/yahoo/elide/commit/80060c6b960497b346c7325408dcc2459bbdfd70) Fix Lombok EqualsAndHashCode warnings (#1948)
+   * [view commit](https://github.com/yahoo/elide/commit/ed74d2599328232dcf92da0b249f180ecc56f808) Sonar integration (#1484)
+   * [view commit](https://github.com/yahoo/elide/commit/c006d4fc8e9e03685c14e93c1499f8317c723d34) Replace all occurrence of '{{}}' within grain expression (#1954)
+   * [view commit](https://github.com/yahoo/elide/commit/5e18149831ff5101d7c9c07bda69f3bda2ce000e) Elide graphql javadoc warning fixes (#1951)
+   * [view commit](https://github.com/yahoo/elide/commit/7d1c3c9ef88828725f86e5d6885c649f5ca2619d) Support arguments at dimension, measure, and table level. (#1952)
+   * [view commit](https://github.com/yahoo/elide/commit/6b9fe00b85461bb3ad17310348cec20ad411512d) Parameterized Metrics: Aggregation Store Model Changes Set 2 (#1957)
+   * [view commit](https://github.com/yahoo/elide/commit/ed941827e1027083367b4df9794501909279c667) diamonds to reduce duplication (#1947)
+   * [view commit](https://github.com/yahoo/elide/commit/5aa899ebbc6af4bfb538a4c04deef2218348a178) Issue 1929 - define function as lambda (#1945)
+   * [view commit](https://github.com/yahoo/elide/commit/dc7a367e14c9f43b2d013f5037341055a29f0491) Issue 1929 - Address Sonar suggestions (#1925)
+   * [view commit](https://github.com/yahoo/elide/commit/cd008a45ad379004b92c5114150016027aa07b80) Query plan optimizer phase5 (#1961)
+   * [view commit](https://github.com/yahoo/elide/commit/c30dd7553780d9abcd7d91656a97967789719fed) updated README with elide intro video (#1967)
+   * [view commit](https://github.com/yahoo/elide/commit/6feae4c15089559bd39693bbdd38a26be1bdd50a) fix build warnings (#1970)
+   * [view commit](https://github.com/yahoo/elide/commit/2be6ef0a57182e17ed4658f9d4cd2289d8cf2256) Fix elide-model-config javadoc warnings (#1972)
+   * [view commit](https://github.com/yahoo/elide/commit/67ffeb7e9dc2ee1af46970d7263f11470c47f42b) Fix javadoc to remove warnings (#1966)
+   * [view commit](https://github.com/yahoo/elide/commit/0e85109b24e6637f46b73d9722fc08cc01cfa639) elide-datastore-aggregation - fix javadoc build warning (#1963)
+   * [view commit](https://github.com/yahoo/elide/commit/3abe188ed5f45bfc492dafe8637a6bd465a08c6e) Random Async/TableExport  IT failure fix (#1974)
+   * [view commit](https://github.com/yahoo/elide/commit/e51178e12f6ffc6934cf08012fa084ec94499dd0) Test case for ParameterizedMetrics Aggregation Store Model changes (#1968)
+   * [view commit](https://github.com/yahoo/elide/commit/e72169c59d0d6c679c018901c7009ecf6cc23362) Remove dead code from GraphQLEntityProjectionMaker.java (#1977)
+   * [view commit](https://github.com/yahoo/elide/commit/4c8d6a4f57bc34f08017de12b1276ebe331b9849) Populate $$user and $$request context (#1975)
+   * [view commit](https://github.com/yahoo/elide/commit/234905d972c491934ce3774771c9733193b45007) Phase 6: Query Optimization - Calcite parser (#1976)
+   * [view commit](https://github.com/yahoo/elide/commit/7a0b59711bb5e269afbc6b15426a8aff94a5e447) Removed QueryPlanResolver.  Replaced it with MetricProjectionMaker.  Small fix to Calcite parser builder to use the SQL conformance of the underlying dialect (#1980)
+   * [view commit](https://github.com/yahoo/elide/commit/43598e8411d544b31d9807ded4f248e25ef334a4) Add Table Level Query Hints (#1981)
+   * [view commit](https://github.com/yahoo/elide/commit/737b4ee7d0791a757a496b21f60dd7e8d944f9a0) Phase 8 of Aggregation Store Optimizer: Adding more tests (#1984)
+   * [view commit](https://github.com/yahoo/elide/commit/530fbe65d758da483c9d17bd82193ce7e94681e4) Add join metadata to SQLTable. (#1988)
+   * [view commit](https://github.com/yahoo/elide/commit/98f612f023448a93324aaed11e00d6d4fa730c74) Issue 1929 - Clean up code quality (#1964)
+   * [view commit](https://github.com/yahoo/elide/commit/601aeb158afd8e982f14f0bc2df9681435b6e2c9) Projection may not have permission for relationshipName (#1989)
+   * [view commit](https://github.com/yahoo/elide/commit/9e510ad89e97906c3f281d25388687bef59c3400) refactor Functional Interfaces (#1990)
+   * [view commit](https://github.com/yahoo/elide/commit/f4c71e62309d59c533414719294045cd9077684a) refactor test (#1992)
+   * [view commit](https://github.com/yahoo/elide/commit/4835eabc8bf423267450dc5ef508b1778625befc) Expression reference ast and parser (#1994)
+   * [view commit](https://github.com/yahoo/elide/commit/bfd3ca6c4bb9f25307c08f7f8e524dba098926dc) bump JPA (#1997)
+   * [view commit](https://github.com/yahoo/elide/commit/89619d233aa877230f49bf962f979a0af34f941f) Adding explicit support for dialect operators to help determine when column nesting is possible. (#1996)
+   * [view commit](https://github.com/yahoo/elide/commit/a62e387639d12f06296c9d17ee43d1a11f7841c0) Consolidate DataStoreIT (#1995)
+   * [view commit](https://github.com/yahoo/elide/commit/699e5df3ae0d3d3f486efde7a643ccb7afc40d7a) Formula Validation using ExpressionParser (#1998)
+   * [view commit](https://github.com/yahoo/elide/commit/8010ad922008139a80ec6195fabaf5d0f315fba6) TimeDimension Grain Arg match check between Having Filter and Projection (#1999)
+   * [view commit](https://github.com/yahoo/elide/commit/fc1c8ead8941d48451d7433d5c4fd42d847129ea) reuse isEmpty (#2000)
+   * [view commit](https://github.com/yahoo/elide/commit/145829ee58b7a168c59ca58d502c629670ab0664) Hibernate jpa (#1993)
+   * [view commit](https://github.com/yahoo/elide/commit/f4e3038ae54d10e080df1ad69e97efc4000e4d84) Bump metrics.version from 4.1.17 to 4.1.19 (#1987)
+   * [view commit](https://github.com/yahoo/elide/commit/4c8f99a99858c013981361ce1db21e464acca887) Migration to Maven Central (#2001)
+   * [view commit](https://github.com/yahoo/elide/commit/5f8082ff008e8725388aca5badcf0d4737e51e06) Bump mockito-junit-jupiter from 3.3.3 to 3.9.0 (#1986)
+   * [view commit](https://github.com/yahoo/elide/commit/2863cf6abff716e879832bef5cd2d2a2258b0c23) Bump lombok from 1.18.16 to 1.18.20 (#1982)
+   * [view commit](https://github.com/yahoo/elide/commit/7258368d3333ceb2b12687d6af0af5a5918986be) Optimizer phase11 (#2002)
+   * [view commit](https://github.com/yahoo/elide/commit/9bdaceffabc7901bdc4b6531dec9e07f850179e5) Bump system-lambda from 1.1.1 to 1.2.0 (#1914)
+   * [view commit](https://github.com/yahoo/elide/commit/65a2f04292dd42ab99cedcacf66677b8e5ad0c3e) Bump dependency-check-maven from 6.1.1 to 6.1.5 (#1978)
+   * [view commit](https://github.com/yahoo/elide/commit/0f49a1077dcd0e15ae76aed11345369cd5354f4b) Bump wagon-ssh-external from 3.4.2 to 3.4.3 (#1915)
+   * [view commit](https://github.com/yahoo/elide/commit/0fc466757ca3489b82a215e9b62c8b32f8263287) Bump classgraph from 4.8.102 to 4.8.104 (#2008)
+
+## 5.0.0-pr32
+4th public release candidate for Elide 5.0
+
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/6c97725cec25be900fd1466f627d3d0e722ed508) N+1 performance improvements in the JPA data store.  The JPA store will now return proxied collections (allowing the ORM to batch fetch the collection) and filter, sort, and paginate in memory whenever fetching a collection (N>1) of collections.  There is a feature flag to enable/disable this behavior. (#1876) 
+
+**API Changes**
+   * [view commit](https://github.com/yahoo/elide/commit/a2c66e96df6239b1e545772308aaf4a9b50df80e) RSQL now supports attribute arguments in filter expressions.  This will allow fully parameterized attributes. (#1877) 
+   * [view commit](https://github.com/yahoo/elide/commit/1c6cfbe04941b27b9de28cf04084744439c8f5e6) The Aggregation Store now supports filters on metrics that have not been requested/projected in the client request. (#1897) 
+
+**Interface Changes**
+The following changes were made to make it easier to migrate from Elide 4:
+
+   * [view commit](https://github.com/yahoo/elide/commit/7fb6049eaa3e53145b5b619668577a3493d60d3e) Added back support for legacy life cycle annotations (#1875)
+   * [view commit](https://github.com/yahoo/elide/commit/f1ed11a1eb4eedc758615352ce8833d50a03386a) Added flag to force OperationChecks to run at transaction commit.
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/852ce04c8dffb0673577d91d0b7e5763f79c52e0) Async IT cleanup (#1855) 
+   * [view commit](https://github.com/yahoo/elide/commit/e2005d6babde1a0da3ba66fc507fc6ecf5773052) Cleanup unnecessary syntax (#1854) 
+   * [view commit](https://github.com/yahoo/elide/commit/8338d3d8de7b5b1b06d27dd2218842db983ed8df) Bump dependency-check-maven from 5.3.2 to 6.1.1 (#1863) 
+   * [view commit](https://github.com/yahoo/elide/commit/6c428b39f2d9cd0e710ee242ee295ec9038680a9) Bump version.jackson from 2.11.3 to 2.12.1 (#1758) 
+   * [view commit](https://github.com/yahoo/elide/commit/59f0c3cafed60c462b82e13e45cd0664afa7b7cf) Cleanup tests (#1856) 
+   * [view commit](https://github.com/yahoo/elide/commit/8dcbfc52f383eea2b5b5ca198585d5f85077c854) Move Include to package-info (#1853) 
+   * [view commit](https://github.com/yahoo/elide/commit/6a959198974a1ea8c7ae6919a8dc4923a4aa0e8d) Fix Config Path to work correctly with Windows (#1865) 
+   * [view commit](https://github.com/yahoo/elide/commit/9fc8e7e8a7d19f1daf708deb099ae09a33ecbc9c) use pipeline cache (#1869) 
+   * [view commit](https://github.com/yahoo/elide/commit/3a131fcc3038464be94d8a9a0d79b1e6c48c12ee) Export Controller Disable on Async Disabled or Export Disabled (#1868) 
+   * [view commit](https://github.com/yahoo/elide/commit/81f658e6ac86ecc9c139e47f8d265fb63b038d48) Bump rxjava from 2.2.20 to 2.2.21 (#1874) 
+   * [view commit](https://github.com/yahoo/elide/commit/93b4c7fce13375d6c93cf2725ab493ce915f6cc1) bump jetty to 9.4.38.v20210224 for CVE-2020-27223 (#1883) 
+   * [view commit](https://github.com/yahoo/elide/commit/36fb16341927b92f9b134e4bde1915e7b33f5e65) Correct exception logging (#1882) 
+   * [view commit](https://github.com/yahoo/elide/commit/8274a6341e06c7201049e8e8f0a48f07bd99a0ef) Cleanup IDE warnings (#1894) 
+   * [view commit](https://github.com/yahoo/elide/commit/d1407c5163212af8f68cbe4e08e335a691e49c82) try-resource block to avoid resource leak (#1898) 
+   * [view commit](https://github.com/yahoo/elide/commit/71e37b70fc4e06b595d633ec6e8a930469c059f2) Removed the duplicate entry for dependency - javax.persistence-api in pom.xml (#1895) 
+   * [view commit](https://github.com/yahoo/elide/commit/bb9afc3d59dd98794601d5fdd039d4f557a2f904) Bump hibernate-search-orm from 5.11.7.Final to 5.11.8.Final (#1878) 
+   * [view commit](https://github.com/yahoo/elide/commit/51e3b057673ad8ec218d888f0225bd8f9c930009) Bump guice from 4.2.3 to 5.0.1 (#1872) 
+   * [view commit](https://github.com/yahoo/elide/commit/adad62718648be6518cb035262ba4eb58ab285a7) refactor async IT and Fix alias in JSON format (#1870) 
+   * [view commit](https://github.com/yahoo/elide/commit/8cf5aeae76f18014a7df0a7e3def703d97ab594f) Bump version.antlr4 from 4.9 to 4.9.1 (#1880) 
+   * [view commit](https://github.com/yahoo/elide/commit/5c7c32d2ab11b27470042513fbfbafc49cf81124) Bump version.jackson from 2.12.1 to 2.12.2 (#1879) 
+   * [view commit](https://github.com/yahoo/elide/commit/b73d1d9ee7cf79c3661badbe017f452b3ce30109) Bump checkstyle from 8.37 to 8.41 (#1871) 
+   * [view commit](https://github.com/yahoo/elide/commit/c19d8c2237e960d792dc2ef6375356433b4fac21) Classtype cleanup (#1905) 
+   * [view commit](https://github.com/yahoo/elide/commit/d31f74535e2e0f67a1d0fa40d33b43f9d49e66df) Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 (#1860) 
+   * [view commit](https://github.com/yahoo/elide/commit/b8bbc362545cdf9f613508799e3a012d9f4c2b8d) Bump micrometer-core from 1.5.6 to 1.6.4 (#1859) 
+   * [view commit](https://github.com/yahoo/elide/commit/0817c848724a86e4a8b11afa1b5f81966fcaf09e) Bump HikariCP from 3.4.5 to 4.0.2 (#1857) 
+
+## 5.0.0-pr31
+3rd public release candidate for Elide 5.0
+
+**Features**
+   * 'hasmember' and 'hasnomember' operators now work across toMany relationships.
+   * elide-async includes a data export API in CSV and JSON.
+
+**API Changes**
+   * Time dimensions (Aggregation Store) now have support for multiple time grains that can be selected by the client at query time.
+   * Invalid sparse fields returns a 4xx error to the requesting client.
+
+**Interface Changes**
+   * `JPQLPredicateGenerator` has a new contract allowing the generation of more complex JPQL expressions.
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/acb9e3047db287f6d6503abbaf83befbef04f209) Added javadoc and small improvements to new Elide types. (#1783) 
+   * [view commit](https://github.com/yahoo/elide/commit/9ce54149fec0e36da281673da40f586068f6459b) Passing query parameters and headers to patch extension request scope (#1781) 
+   * [view commit](https://github.com/yahoo/elide/commit/b012115bd4753517196d4305d8002a96b3e76c57) add join expression for all column projection including metrics (#1789) 
+   * [view commit](https://github.com/yahoo/elide/commit/2952559ba91b092b0bd1a51fb84f7c2b69cb937e) Field name must start with lower case (#1799) 
+   * [view commit](https://github.com/yahoo/elide/commit/e5354ea169d10ed13d4af00b0cca149b37ba3b1d) Add core support for parameterized attributes. (#1800) 
+   * [view commit](https://github.com/yahoo/elide/commit/37a7860a067379dcee8831bfc58f816d3ee82dd6) Issue#1779 Invalid sparse fields should return 4xx (#1801) 
+   * [view commit](https://github.com/yahoo/elide/commit/1d04e914c89ad894560fe36d8d11e96fb2774981) Async Refactor: Part 1 (#1777) 
+   * [view commit](https://github.com/yahoo/elide/commit/93ebb969254204bd315de860bd064ca77e70cfab) TableExportHook Binding (#1802) 
+   * [view commit](https://github.com/yahoo/elide/commit/4cc5a72bf152cc34c1d489f69221b8797f36ee38) Remove jetty from starter (#1807) 
+   * [view commit](https://github.com/yahoo/elide/commit/dd69d567f445b9a62dda30b9ff8093ea4455c08b) Async Refactor Cleanup (#1804) 
+   * [view commit](https://github.com/yahoo/elide/commit/c3a735c617807ab7d947103b442caadb08172524) Bump ant from 1.10.8 to 1.10.9 in /elide-graphql (#1810) 
+   * [view commit](https://github.com/yahoo/elide/commit/ba73bc2a5617fed8feeee5b419a0f0808081628f) Elide 5 Agg Store: Multiple time grains (#1806) 
+   * [view commit](https://github.com/yahoo/elide/commit/994c0a865027795133ac5731ff4b47b4f910ab4e) Fix for FieldType in FilterPredicate (#1814) 
+   * [view commit](https://github.com/yahoo/elide/commit/7a162860be33acca6cb6fc8109a8e9071497e03e) Metadatastore Models Permission (#1816) 
+   * [view commit](https://github.com/yahoo/elide/commit/34fbcd282798c6668f61ff35202c3c2aa783857f) TableExport Spring Controller (#1811) 
+   * [view commit](https://github.com/yahoo/elide/commit/dcb6336070c158b923a8e5a7ec92502ea57f36ee) Add dynamic table type (#1815) 
+   * [view commit](https://github.com/yahoo/elide/commit/84688c81b2020355f55e03250146a2a3cb515484) Bump junit-platform-launcher from 1.6.0 to 1.7.1 (#1819) 
+   * [view commit](https://github.com/yahoo/elide/commit/d1be9578498603d9b0f73161cc09555c5c34d3d6) Convert user provided alias before using in SQL (#1821) 
+   * [view commit](https://github.com/yahoo/elide/commit/c02e0d107dc5236626d4a08cafbae749f7111ce5) updating contrib guidelines for hackathon (#1826) 
+   * [view commit](https://github.com/yahoo/elide/commit/0db416741427385c77840648e2001a9f776a7b28) Bump spring.boot.version from 2.4.1 to 2.4.2 (#1796) 
+   * [view commit](https://github.com/yahoo/elide/commit/5186f34a1f9d82129294790c3055aa3ae5a69ba6) Update CONTRIBUTING.md (#1827) 
+   * [view commit](https://github.com/yahoo/elide/commit/00509f41da2d821ef0464c6a0e762c2e09c50be7) Async: Test Coverage (#1825) 
+   * [view commit](https://github.com/yahoo/elide/commit/106bb161fbeb937b15a19dd40f4ab9d17037ed6d) Export : Standalone API Resource (#1817) 
+   * [view commit](https://github.com/yahoo/elide/commit/9f09fb8c90ab84bfd4efd8dc0dba3a883c03061c) Update CONTRIBUTING.md (#1828) 
+   * [view commit](https://github.com/yahoo/elide/commit/d77f1240a3fa5abf824aea54d0533be844235359) Created new interface for dynamic configuration (#1830) 
+   * [view commit](https://github.com/yahoo/elide/commit/5283569e556181cdc145f0090eac74ee6a9d3e1c) Issue#1798 Remove Singleton Pattern for Async Service Classes (#1831) 
+   * [view commit](https://github.com/yahoo/elide/commit/1758431ef49e845f6b515b6961afb3bd3629fcdb) Bump jedis from 3.3.0 to 3.5.1 (#1794) 
+   * [view commit](https://github.com/yahoo/elide/commit/e3568815ab6eec1471c32adcc3272afbc139eab4) Data Export: JSON API support (#1824) 
+   * [view commit](https://github.com/yahoo/elide/commit/39d1add6c7f756aae279889bf3574594c1f76cda) Bump wagon-ssh-external from 3.4.0 to 3.4.2 (#1793) 
+   * [view commit](https://github.com/yahoo/elide/commit/66be9ae2277fe7c3ea21edc1a701cc8ab498a22e) Validators for JSON and Graphql Exporter (#1833) 
+   * [view commit](https://github.com/yahoo/elide/commit/4f24e6aed8daa025835a15765e515a2aa5f3e47a) Revising JPQPredicateGenerator contract to allow for more complex JPQ… (#1834) 
+   * [view commit](https://github.com/yahoo/elide/commit/af0aad2498f81659177eff1bbcfbf49213baf7b9) Exclude Models based on Conditions (#1835) 
+   * [view commit](https://github.com/yahoo/elide/commit/4387ca571472cddf2f33b5699fd41f259cf94cec) Add 'hasmember' operator support across to-many relationships. (#1843) 
+   * [view commit](https://github.com/yahoo/elide/commit/da92f9c81b30848fa05c1052e50782e0ddeb47c7) added one more hasmember operator IT test (#1844) 
+   * [view commit](https://github.com/yahoo/elide/commit/8b7b7a7c86f0d149977a58784422ab531aed2859) Bump version.jetty from 9.4.35.v20201120 to 9.4.36.v20210114 (#1840) 
+   * [view commit](https://github.com/yahoo/elide/commit/4b1501cba9dcf1ee8f67b97a3b0aa7261b950836) Bump classgraph from 4.8.98 to 4.8.102 (#1836) 
+   * [view commit](https://github.com/yahoo/elide/commit/e6e2013d41a05eca5567b9ca4b099afdfb57dd1c) Bump version.junit from 5.7.0 to 5.7.1 (#1837) 
+   * [view commit](https://github.com/yahoo/elide/commit/f04b48379a22983128c1e0654808bbdc1276f43f) Bump metrics.version from 4.1.16 to 4.1.17 (#1838) 
+   * [view commit](https://github.com/yahoo/elide/commit/1d0b2760e334815e58c1e9992cd2ef689dd61e2e) Bump hk2-api from 2.5.0 to 3.0.1 (#1759) 
+   * [view commit](https://github.com/yahoo/elide/commit/2eb90f1b8513e246930e5419e838b3fb1f7bbb98) Integration Tests for Table Export (#1842) 
+   * [view commit](https://github.com/yahoo/elide/commit/cea07da78f49da8b63328bd838962c70f8330228) Small Fix -  Removing system.out from TableExport (#1850) 
+   * [view commit](https://github.com/yahoo/elide/commit/34d521aaf2c268ab23a48f155fbfcd012470312b) Removing mysql connector as a dependency (no longer needed) (#1848) 
+   * [view commit](https://github.com/yahoo/elide/commit/49501c10202064527e0d31c3030fe12a4a4d710b) Fixing the regular expression for required filter templates (#1849) 
+   * [view commit](https://github.com/yahoo/elide/commit/b7e708537fc0c5fde20c6c1ae515f028b29141ed) Small Fix (#1851) 
+
+## 5.0.0-pr30
+2nd public release candidate for Elide 5.0.
+
+**Features**
+   * New Apache Druid dialect for the Aggregation data store.
+
+**Interface Changes**
+We hope this will be the last round of interface changes:
+   * Fixing #698 - Migrating from Object to Java Generics for DataStoreTransaction.
+   * Introducing a new `Type` abstraction for Elide models to eventually allow dynamic model registration at runtime.  The new Type abstraction changes some core interfaces for Security and Data Stores.
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/7583e0633d31cbbc561ec7253c19a42c4f07cee3) [Security] Bump hibernate-validator from 6.0.2.Final to 6.1.0.Final 
+   * [view commit](https://github.com/yahoo/elide/commit/b95380261a97f46eac99420b606dcd12b438e11b) Bump guice from 4.2.2 to 4.2.3 
+   * [view commit](https://github.com/yahoo/elide/commit/b45bce669cc7beb1ae03044f78f647e13fb75d52) Bump classgraph from 4.8.90 to 4.8.95 
+   * [view commit](https://github.com/yahoo/elide/commit/2b46cb4c9b1392553e67d0e9f94112c867199fac) Bump groovy.version from 3.0.6 to 3.0.7 
+   * [view commit](https://github.com/yahoo/elide/commit/a6e66f40c73a27ecc9ac806d51e199b0725f2aa7) Bump version.junit from 5.6.2 to 5.7.0 
+   * [view commit](https://github.com/yahoo/elide/commit/ecc73c6719030d5fdf1393b6de7c7afd894a4425) Upgrade spring.boot version 
+   * [view commit](https://github.com/yahoo/elide/commit/6bef7a67718a8cb4df7d14dce5a307acfe36f8c9) Bump metrics.version from 4.1.14 to 4.1.16 
+   * [view commit](https://github.com/yahoo/elide/commit/c458e53f829586b81f7f896bf32e6a1526358b99) Bump mockito-core from 3.6.0 to 3.6.28 
+   * [view commit](https://github.com/yahoo/elide/commit/29064bbf520f2259f5df5bf122bb1fef65c4accb) Updating jetty version for security issue 
+   * [view commit](https://github.com/yahoo/elide/commit/703927eb86d02ceed5916e05bc303b7635d189ef) Closes #1740 More meaningful handling of constraint violations 
+   * [view commit](https://github.com/yahoo/elide/commit/d286bca4ff68b630dec6f5ea5cbe10ab88b6c674) Add suppresion for hibernate 3 CVE 
+   * [view commit](https://github.com/yahoo/elide/commit/03cbd10231cf444968c020453215a46d68ee83e0) SD Build Status Badge 
+   * [view commit](https://github.com/yahoo/elide/commit/d4205b4ac5d70be4edb89b8b5ad4ec9841b8632b) Issue#1697 Validate Query Parameters 
+   * [view commit](https://github.com/yahoo/elide/commit/b3a904f5c830d2d14df18a7a77820cd588b78cb5) Bump version.antlr4 from 4.8-1 to 4.9 
+   * [view commit](https://github.com/yahoo/elide/commit/392a5df115726de79c4c38025266adf3e68e7de2) Bump version.restassured from 4.3.2 to 4.3.3 
+   * [view commit](https://github.com/yahoo/elide/commit/7f61879e6666cc041c5535ec36f5e1fef54ff6c7) Bump classgraph from 4.8.95 to 4.8.98 
+   * [view commit](https://github.com/yahoo/elide/commit/fbc06b8e090d1d7438794b879ebbb3f16c59e66a) Speeding up swagger builder on service boot 
+   * [view commit](https://github.com/yahoo/elide/commit/7dcb449ad9bf24c3c12601209803a0f05420e380) Only build swagger if the controller is activated 
+   * [view commit](https://github.com/yahoo/elide/commit/6ce117b6c68f6a2fc484e3c9ba7b76ace9c596ff) Added baseUrl configuration setting for Spring and Standalone
+   * [view commit](https://github.com/yahoo/elide/commit/172f3833738466c50648a2f4c3644eae46706aa2) Issue#1750 Fix SQL query generation for record count 
+   * [view commit](https://github.com/yahoo/elide/commit/ff9d0524ff9895196010c130a9ecdb2e6de71177) Bump commons-io from 2.6 to 2.8.0 
+
+## 5.0.0-pr29
+For 4.x line release notes, please check out this file on the [elide-4.x branch](https://github.com/yahoo/elide/blob/elide-4.x/changelog.md).
+
+PR29 is the first public release candidate for Elide 5.0
+
+**Features**
+Elide 5 introduces three primary new features:
+
+   * A new semantic modeling layer and analytic query API for OLAP style queries against your database.
+   * An asynchronous API for API read requests with long durations.
+   * A mechanism to version elide models and the corresponding API.
+
+**API Changes**
+The only notable API change are:
+
+   * Improved error responses that are more compatible with the JSON-API specification.
+   * FIQL operators are now case sensitive by default. New case insensitive operators have been introduced allowing greater flexibility. It is possible to revert to elide 4 semantics through configuration.
+
+**Interface Changes**
+In addition to new features, Elide 5 streamlines a number of public interfaces to simplify concepts. This includes:
+
+   * A simpler Check class hierarchy.
+   * A new NonTransferable permission (which replaces SharePermission).
+   * Changes to Elide’s User abstraction for authentication.
+   * Lifecycle hooks have been restructured to better decouple their logic from Elide models.
+   * Initializers have been removed. Dependency Injection is available for models, checks, lifecycle hooks, and serdes.
+   * A simpler and more powerful DataStoreTransaction interface.
+   * GraphQL has its own FilterDialect interface.
+   * The Include annotation now defaults to marking models as root level.
+   * Elide settings has been stripped of unnecessary configuration options.
+ 
+**Module & Package Changes**
+Because Elide 5 is a major release, we took time to reorganize the module & package structure including:
+
+   * elide-example has been removed. The only Elide examples we plan to maintain are the spring boot and standalone examples.
+   * elide-contrib submodules have been promoted to mainline modules elide-swagger and elide-test.
+   * elide-annotations has been absorbed into elide-core.
+   * New modules were created for elide-async (async API), elide-model-config (the semantic layer), and elide-datastore/elide-datastore-aggregation (the analytics module).
+   * Some classes in elide-core were reorganized into new packages.
+
+## 4.8.0
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/233591723cd04a3b6da54c5234a824712ca613b4) (Similar to https://github.com/yahoo/elide/pull/2342) Revised JSON-API path grammar to accept colon, space, and ampersand in ID fields (#2344) 
+   * [view commit](https://github.com/yahoo/elide/commit/f68bbce9a535e320929440b2408ea74b4c9edffc) Updating screwdriver build 
+   * [view commit](https://github.com/yahoo/elide/commit/69b3edc7f935a39133ced3a97a9a496d58cfafcc) Disabling OWASP checks for legacy build (Elide 4) 
+
+## 4.7.2
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/eeab22ce7cc591c9747b40e509fea4a77e56c8af) Removed elide-example module 
+
+## 4.7.1
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/032894eb40944db1d16a9d5090128aa7e3561df6) bump dependency versions (#1884) 
+   * [view commit](https://github.com/yahoo/elide/commit/707ef1390261c85fbe4631388024af4ec303004f) Modifications from pom on master (#2028) 
+   * [view commit](https://github.com/yahoo/elide/commit/18cd1d67507956cb7c11829dcbb766969f2987b2) Fix bug in filter pushdown extractor (#2030) 
+   * [view commit](https://github.com/yahoo/elide/commit/7dcb3df09527b0e1f79585ee5b23b8644b578403) normalize permission expression before converting to filter expression (#2039) 
+   * [view commit](https://github.com/yahoo/elide/commit/38e66ac9fc59c7694de382ecdbe4a3bae356d88e) sonar (#2044) 
+   * [view commit](https://github.com/yahoo/elide/commit/9788e6cdd4f335d3c071630ed5d1f81be188e9d6) Add ability to handle conversion of Date instances to ISO8601DateSerde (#2046) 
+
+## 4.7.0
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/ec8e6602cc1a8183079f18ae98ed753625690e65) Removing jetty from spring boot starter (#1805) 
+   * [view commit](https://github.com/yahoo/elide/commit/eccbdbc87e7bba04c02d3865fbf605daf1d724c6) Upgrading ant on elide-4.x for CVE (#1813) 
+
+## 4.6.11
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/9ada9013455397b64ce113d9129cbfa67e941467) Adding request query parameters to patch extension request scope (#1782) 
+
+## 4.6.10
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/f0b3e00049800431b361d9b6f66436dde37f0161) Fixed generated relationship URLs for JSON-API Links in Elide 4 
+
+## 4.6.9
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/e1be594a896dad79cc7c8011e3ba92750d36455a) Adding simple setting to enable JSON-API links 
+   * [view commit](https://github.com/yahoo/elide/commit/42f2bd55c381dfcba2c971413b84a025a7cc5dac) Adding baseURL setting for JSON-API links for Elide 4 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/97791f75648a34204914961e1700ebb7710b3429) Bump checkstyle from 8.36.1 to 8.36.2 (#1559) 
+   * [view commit](https://github.com/yahoo/elide/commit/8a93716912da746d875799e646084010ad518319) Bump mockito-core from 3.5.11 to 3.5.13 (#1558) 
+   * [view commit](https://github.com/yahoo/elide/commit/7c80d9a972150ffe9f5fcdb400f440a8facd2628) Bump jersey-container-jetty-servlet from 2.31 to 2.32 (#1560) 
+   * [view commit](https://github.com/yahoo/elide/commit/22005b59fe72f03dc3d74f1d0aa09a952c15e3b5) Bump version.jersey from 2.31 to 2.32 (#1557) 
+   * [view commit](https://github.com/yahoo/elide/commit/43e6598eb1c3d60ae04925e6e89795867d7bac34) Bump version.jackson from 2.11.2 to 2.11.3 (#1570) 
+   * [view commit](https://github.com/yahoo/elide/commit/fe5787ee2a760925e75a3c781e7282e637a8adb4) Bump version.jetty from 9.4.31.v20200723 to 9.4.32.v20200930 (#1571) 
+   * [view commit](https://github.com/yahoo/elide/commit/41a349efbe8a53638e9c80f91d184364cc7b440f) Bump groovy.version from 3.0.5 to 3.0.6 (#1573) 
+   * [view commit](https://github.com/yahoo/elide/commit/94bf7ec54ae7a9db2f8cd2f3916a91e3fee1cf27) Bump lombok from 1.18.12 to 1.18.14 (#1589) 
+   * [view commit](https://github.com/yahoo/elide/commit/733ec09842f7a38ae7851b0a67fa3ac67855ebe6) Bump liquibase-core from 4.0.0 to 4.1.1 (#1599) 
+   * [view commit](https://github.com/yahoo/elide/commit/33ad32bba3a1ed1a0e8172415aa0c3b47aec39a0) Bump rxjava from 2.2.19 to 2.2.20 (#1588) 
+   * [view commit](https://github.com/yahoo/elide/commit/210d18d12e1deaefe26918727fe05a61a6ec87a1) Bump lombok from 1.18.14 to 1.18.16 (#1600) 
+   * [view commit](https://github.com/yahoo/elide/commit/70c2d5a4eb8ad12613e1304918ec5e94cd7d37a0) Bump mysql-connector-java from 8.0.21 to 8.0.22 (#1601) 
+   * [view commit](https://github.com/yahoo/elide/commit/6915ec99a2df7a0cb6c9949f09f036176da1ee3f) Bump postgresql from 42.2.16 to 42.2.18 (#1598) 
+   * [view commit](https://github.com/yahoo/elide/commit/bb17ebe5716f3691e7cf4ffbf42924e09aedac40) Bump metrics.version from 4.1.12.1 to 4.1.13 (#1587) 
+   * [view commit](https://github.com/yahoo/elide/commit/2900a5f3d3335e58fe3fdf2f967978c285ab54dd) Bump jersey-container-servlet-core from 2.31 to 2.32 (#1556) 
+   * [view commit](https://github.com/yahoo/elide/commit/e9827162fc319685cdd1e4f3fd672c7b1d6c7a95) Bump mockito-core from 3.5.13 to 3.6.0 (#1613) 
+   * [view commit](https://github.com/yahoo/elide/commit/ff18972f729914cc9693437c24614c137a7b32a4) Bump metrics.version from 4.1.13 to 4.1.14 (#1610) 
+   * [view commit](https://github.com/yahoo/elide/commit/77ce02abae1529914ed4e5eb6f7b896fa00673ba) Migrating build to screwdriver (#1631) 
+   * [view commit](https://github.com/yahoo/elide/commit/271cadc63554b5543ada5c7b95822d2f405364ff) [Security] Bump version.jetty from 9.4.32.v20200930 to 9.4.34.v20201102 (#1635) 
+   * [view commit](https://github.com/yahoo/elide/commit/e14c3fb136900171a392092a9bd9569dab1cddbb) Fixing broken links (#1642) 
+   * [view commit](https://github.com/yahoo/elide/commit/f8f65b95b764dee30e1b166b310506af8ae46950) Bump encoder from 1.2.2 to 1.2.3 (#1651) 
+   * [view commit](https://github.com/yahoo/elide/commit/6e20980990413c3f1749d1228b1037845e944cc2) Bump version.restassured from 4.3.1 to 4.3.2 (#1650) 
+   * [view commit](https://github.com/yahoo/elide/commit/78f464a6c04608c2657b56fb18245471078fd3b2) Bump jansi from 1.14 to 2.0.1 (#1627) 
+   * [view commit](https://github.com/yahoo/elide/commit/597634d31b1c610f91c41a0e81adee134954fc18) Bump checkstyle from 8.36.2 to 8.37 (#1625) 
+   * [view commit](https://github.com/yahoo/elide/commit/1dfbc5ca3df5d0082f58675167efd6ad51d7dafc) Bump resteasy.version from 3.13.1.Final to 3.13.2.Final (#1572) 
+   * [view commit](https://github.com/yahoo/elide/commit/c9c3c3851ff3fdda0479461eeba483fca4dd2f82) Bumped packages to fix CVE errors in Elide 4 
+   * [view commit](https://github.com/yahoo/elide/commit/75fa9b0b459368616c6f16e84022a9154539a2a9) prototype code 
+   * [view commit](https://github.com/yahoo/elide/commit/6b267a01b9e35f645652dd900274ca779dbe5832) Improved performance by reducing N squared computation 
+   * [view commit](https://github.com/yahoo/elide/commit/cd69d666f5a3031f3d48d9b02bd58466a44cc3ec) Improved boot time for swagger builder after profiling.  Also bumped guava for CVE. 
+   * [view commit](https://github.com/yahoo/elide/commit/2966c2974fbb3f7d2951d37911f9ea7a4aa969b0) Updated screwdriver yaml 
+   * [view commit](https://github.com/yahoo/elide/commit/d17a1e27169b388d6421b8aa91b50acd10a9b79f) A few more fixes 
+   * [view commit](https://github.com/yahoo/elide/commit/5815249af02f7217329f3e5543c34771801a9f36) Added baseURL for GraphQLController 
+
+## 4.6.8
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/3d3c831696401e26a24d254fa1158675a23adca1) H2 MVCC setting is removed (#1483) 
+   * [view commit](https://github.com/yahoo/elide/commit/0245327d6f0c4bb4f04a0bba18fe9fc3f4b64287) bump H2 (#1489) 
+   * [view commit](https://github.com/yahoo/elide/commit/d66cde4834b0f59ce20e433c6a5a87029751d1fb) path matcher (#1482) 
+   * [view commit](https://github.com/yahoo/elide/commit/fbb619bd743c93a2238f8c5a068438ec8f9c79fc) escape quotes in quoted strings (#1481) 
+   * [view commit](https://github.com/yahoo/elide/commit/689be5026a6f0b7157e1606d9150242eac843117) Provide backward compatible methods for baseUrlEndPoint changes. (#1510) 
+   * [view commit](https://github.com/yahoo/elide/commit/95eebf4b19a292030803ede58841fc63ed22d093) Bump mockito-core from 3.4.4 to 3.5.0 (#1508) 
+   * [view commit](https://github.com/yahoo/elide/commit/868c3d50fdca44c29482d2319c7831a9efdda8ab) Bump postgresql from 42.2.14 to 42.2.16 (#1513) 
+   * [view commit](https://github.com/yahoo/elide/commit/0e77f59daa4fd45918acce4cabd5e887b2ed8aaa) Bump mockito-core from 3.5.0 to 3.5.5 (#1514) 
+   * [view commit](https://github.com/yahoo/elide/commit/43636e8c839fb88213dcd81cb64911a3a77f4735) Bump metrics.version from 4.1.11 to 4.1.12.1 (#1485) 
+   * [view commit](https://github.com/yahoo/elide/commit/a07be579df2b2f8418d63e81d8b3a77579be9e79) Bump version.jackson from 2.11.1 to 2.11.2 (#1476) 
+   * [view commit](https://github.com/yahoo/elide/commit/c275b0175dabd4e47ff2fb1e80b9683576c2121b) Bump version.jetty from 9.4.30.v20200611 to 9.4.31.v20200723 (#1475) 
+   * [view commit](https://github.com/yahoo/elide/commit/3ce7b5702e5d50db3ca64aa190918cb0c3088fa3) Bump mockito-core from 3.5.5 to 3.5.10 (#1522) 
+   * [view commit](https://github.com/yahoo/elide/commit/c66e195e7460fff576c1d17c76a253103a18f9ac) Bump classgraph from 4.8.87 to 4.8.90 (#1530) 
+   * [view commit](https://github.com/yahoo/elide/commit/dc92e7e3c4025a1145b8f9b9122feb84fe775728) Bump checkstyle from 8.35 to 8.36 (#1518) 
+   * [view commit](https://github.com/yahoo/elide/commit/c581212008369d045e189c7a27115cc695280b51) Fixes #1520 by using explicit left join when sorting over relationships (#1521) 
+   * [view commit](https://github.com/yahoo/elide/commit/f7277bd15c1488ca9fd625958e1879b3f71c4ba5) Bump resteasy.version from 3.13.0.Final to 3.13.1.Final (#1536) 
+   * [view commit](https://github.com/yahoo/elide/commit/5441813ab5686ae6624f72f15e49a9b5faf72421) Bump version.junit from 5.6.2 to 5.7.0 (#1535) 
+   * [view commit](https://github.com/yahoo/elide/commit/534a158add89f453b0bdd55c81cc1e1a1f21adf6) Bump checkstyle from 8.36 to 8.36.1 (#1534) 
+   * [view commit](https://github.com/yahoo/elide/commit/9f306905c95d96c4aeea6fcca8d5c75d09a64362) Bump spring-boot-dependencies from 2.3.2.RELEASE to 2.3.3.RELEASE (#1507) 
+   * [view commit](https://github.com/yahoo/elide/commit/c6036da5273c5d246105932f2b56ae82230f8adc) Bump mockito-core from 3.5.10 to 3.5.11 (#1543) 
+   * [view commit](https://github.com/yahoo/elide/commit/3e0a29b2d66ac641b24ee46efcf829f2e5638de7) Bump spring-boot-dependencies from 2.3.3.RELEASE to 2.3.4.RELEASE (#1542) 
+   * [view commit](https://github.com/yahoo/elide/commit/bed08454508138cb0383e3c43dbb81da7e4740b7) Bump jacoco-maven-plugin from 0.8.5 to 0.8.6 (#1540) 
+   
+## 4.6.7
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/6ae9bd3623247f0da12c81798327abdb217c29ab) Added support for JSON-API links in entity response.  (#1445) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/e86b48c5abf1f13478279515ac21d4f4df5c56e9) Process collection in operator getFieldValue (#1427) 
+   * [view commit](https://github.com/yahoo/elide/commit/7a62b3f0b5db5585ba1fd937c00d454ee047167e) Only issue page total query if data load returns records (#1429) 
+   * [view commit](https://github.com/yahoo/elide/commit/cafbd29d62b8878225530830ff107f67c9c341e1) Convert DateTimeParseException into IllegalArgumentException (#1440) 
+   * [view commit](https://github.com/yahoo/elide/commit/2925b681cb8defbcaa8067782945abcec1dcbcc2) make ThreadLocal usage static as per recommendations (#1441) 
+   * [view commit](https://github.com/yahoo/elide/commit/d36b17b973c9095b3c9df04eb44519da5f1e55cf) Bump liquibase-core from 3.10.0 to 3.10.1 (#1439) 
+   * [view commit](https://github.com/yahoo/elide/commit/858d33dacf84494b3e75604b9ba6df3d50d5b6c6) Bump swagger-core from 1.6.1 to 1.6.2 (#1438) 
+   * [view commit](https://github.com/yahoo/elide/commit/066b5d613e0c4c099117415eb379f964f62329d8) Bump mysql-connector-java from 8.0.20 to 8.0.21 (#1437) 
+   * [view commit](https://github.com/yahoo/elide/commit/e17877cb67226f7ec8db2a857ccb53b93b2d3b2d) Bump checkstyle from 8.33 to 8.34 (#1436) 
+   * [view commit](https://github.com/yahoo/elide/commit/ce8fbe7afa83609bffd1d892efb9c251ea385864) Bump jackson-module-jaxb-annotations from 2.11.0 to 2.11.1 (#1435) 
+   * [view commit](https://github.com/yahoo/elide/commit/eecb5641c8109c34dcc3e72a82b5225311702f2b) Bump version.jackson from 2.10.4 to 2.11.1 (#1413) 
+   * [view commit](https://github.com/yahoo/elide/commit/0061d91771b0b668edb60126e99fa6b21c1a7c26) Bump resteasy.version from 3.12.0.Final to 3.12.1.Final (#1433) 
+   * [view commit](https://github.com/yahoo/elide/commit/7ceb68872081104943bf69936b59365c950a87d7) Bump metrics.version from 4.1.9 to 4.1.10.1 (#1434) 
+   * [view commit](https://github.com/yahoo/elide/commit/add535fc209e36e9a9a4791c299187802869144e) Using spring's dependency management (#1442) 
+   * [view commit](https://github.com/yahoo/elide/commit/d6b46aefd442179ef43377daf851711b61e68089) Fix for Graphql Fragment Error in Debug Mode - Elide 4.x (#1446) 
+   * [view commit](https://github.com/yahoo/elide/commit/11ee675dd9545f7226a7ba658886ddd748946458) Fix CVE errors 21-Jul (#1457) 
+   * [view commit](https://github.com/yahoo/elide/commit/bc5fac28101c57d31cba58948b2929351f0a74c3) Bump commons-lang3 from 3.10 to 3.11 (#1456) 
+   * [view commit](https://github.com/yahoo/elide/commit/ca7c84d7b18871f1a20766769595b03bb140bf93) Bump groovy.version from 3.0.2 to 3.0.5 (#1458) 
+   * [view commit](https://github.com/yahoo/elide/commit/7ae7144f4d304544364355fedca9cfaf3ccbdc01) Bump liquibase-core from 3.10.1 to 4.0.0 (#1455) 
+   * [view commit](https://github.com/yahoo/elide/commit/bf6ed0af30e7019fd9d10b2082a4aee021abb6d2) Bump metrics.version from 4.1.10.1 to 4.1.11 (#1453) 
+   * [view commit](https://github.com/yahoo/elide/commit/53be250e7b7d4e66610cbb1e426b11893707ef15) Bump mockito-core from 3.3.3 to 3.4.4 (#1452) 
+   * [view commit](https://github.com/yahoo/elide/commit/02cb0de1c2dea224e5bcb9c10d86466485206ee8) Bump version.restassured from 4.3.0 to 4.3.1 (#1451) 
+   * [view commit](https://github.com/yahoo/elide/commit/305cea366065d0ea46972ffef4f583e6aeb85ed3) Bump resteasy.version from 3.12.1.Final to 3.13.0.Final (#1450) 
+   * [view commit](https://github.com/yahoo/elide/commit/afe843d9a888f7b015575c0cb389f1c6275ce9ad) Resolves #1461 (#1463) 
+   * [view commit](https://github.com/yahoo/elide/commit/5bc03c686721c8f4c2574acd539e644b60ee8010) Bump checkstyle from 8.34 to 8.35 (#1467) 
+   * [view commit](https://github.com/yahoo/elide/commit/95db95f92482eb102d7337d8af9e20624a436b5b) Bump spring-boot-dependencies from 2.3.1.RELEASE to 2.3.2.RELEASE (#1466) 
+
+## 4.6.6
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/4e06a82860911d870863bd3fb2cad94753b55ed2) Add support for composite IDs.  Issue756 (#1412) 
+   * [view commit](https://github.com/yahoo/elide/commit/3d229393b37023da2df7ef481a199da613aaf925) Add support for ISO8601 to java.time.Instant serialization/deserialization (#1417)
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/4edac24dee840bfe9f6bbf331ecbec4042970712) add queryParams variants for post(), patch() and delete() (#1411) 
+   * [view commit](https://github.com/yahoo/elide/commit/64fb49abcdbd0d683ef9dc4cb7b8dd30adab48b6) Bump ant from 1.10.7 to 1.10.8 (#1394) 
+   * [view commit](https://github.com/yahoo/elide/commit/51aa322e9b069f990ea626058e26c42d412399d5) Bump maven-shade-plugin from 3.2.3 to 3.2.4 (#1396) 
+   * [view commit](https://github.com/yahoo/elide/commit/7681ec1db3e516c85cc10b4948b4ff873b6e2d4d) Bump tomcat.version from 9.0.35 to 9.0.37 (#1418) 
+ 
+   * [view commit](https://github.com/yahoo/elide/commit/ffc7a96e30199a401500e4e67c513639d6441d9d) [README] - Fix the standalone README Java sample (#1415) 
+   * [view commit](https://github.com/yahoo/elide/commit/a06aae4650df64df8b168d66588565edc21c0cf6) Bump classgraph from 4.8.86 to 4.8.87 (#1419) 
+   * [view commit](https://github.com/yahoo/elide/commit/388e6a57bdf4cc55d01cc83a42ab824e774e1293) Bump spring.boot.version from 2.3.0.RELEASE to 2.3.1.RELEASE (#1395) 
+   * [view commit](https://github.com/yahoo/elide/commit/fd235f53233e18665657fd669497492b84c82271) Bump postgresql from 42.2.12 to 42.2.14 (#1392) 
+   * [view commit](https://github.com/yahoo/elide/commit/5fd439e5615f8aff2f2568ca2de9b702643f721a) Bump version.jetty from 9.4.29.v20200521 to 9.4.30.v20200611 (#1393) 
+   * [view commit](https://github.com/yahoo/elide/commit/fea32190fcaf46a911ecad3242817c373bdf8a43) Bump build-helper-maven-plugin from 3.1.0 to 3.2.0 (#1391) 
+   * [view commit](https://github.com/yahoo/elide/commit/dae9b09fc3bc3dcc14ee0bb14499bf55e0f3bced) Issue 683 (#1384).  In memory filter support for predicates that traverse to-many relationships. 
+
+## 4.6.5
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/bd516473fbeeb47ca05eaf510734f06432c4280a) Disabling Legacy Filter Dialect in Swagger Documentation (#1363) 
+   * [view commit](https://github.com/yahoo/elide/commit/d3cbcc23e9c7719b1a73f627121c6bc5fcb1bf23) Bumping Hibernate Validator Version (#1377) 
+   * [view commit](https://github.com/yahoo/elide/commit/6186da248b7249bcd858a4a433bfdbc50744af60) Bump classgraph from 4.8.78 to 4.8.86 (#1373) 
+   * [view commit](https://github.com/yahoo/elide/commit/e71dd40dfb8adf1b997a345317b016338e2b8153) make sub-ordinate dictionaries inherit injector from multiplexManager's dictionary. (#1380) 
+   * [view commit](https://github.com/yahoo/elide/commit/57dea8e19495e67f83130bb58f99aa2e5c915184) Bump liquibase-core from 3.8.9 to 3.10.0 (#1372) 
+   * [view commit](https://github.com/yahoo/elide/commit/4054908fa66648a0feb2c3001d234556f2fcb463) Bump checkstyle from 8.32 to 8.33 (#1361) 
+   * [view commit](https://github.com/yahoo/elide/commit/27d841954541ebe1a1648fde5a294b003ef1d7e0) Bump junit-jupiter-params from 5.6.0 to 5.6.2 (#1356) 
+   * [view commit](https://github.com/yahoo/elide/commit/2c3c32e7ee729426850f54da9295961192af17d6) Bump jersey-container-servlet-core from 2.30.1 to 2.31 (#1358) 
+   * [view commit](https://github.com/yahoo/elide/commit/7910f05a4ea7cd614798580082f8350843888fde) Bump version.log4j from 2.13.2 to 2.13.3 (#1355) 
+
+## 4.6.4
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/96d8f4c1ad42728e75b7b841c7dad6f58d006f8f) Supported embedded entities in graphql (#1339) 
+   * [view commit](https://github.com/yahoo/elide/commit/9c6c73223c643afa1afe314a205089178ba963ed) Bump version.jersey from 2.30.1 to 2.31 (#1346) 
+   * [view commit](https://github.com/yahoo/elide/commit/86b2189c0149ae09ba027bb438b826ef72ccb477) Bump jersey-container-jetty-servlet from 2.30.1 to 2.31 (#1345) 
+   * [view commit](https://github.com/yahoo/elide/commit/e914202a877c6f7375568d17087647d58bcdf866) Bump spring.boot.version from 2.2.7.RELEASE to 2.3.0.RELEASE (#1344) 
+   * [view commit](https://github.com/yahoo/elide/commit/1cffc61af0ff3e962cf3c5f5b87e35ba54c17291) Bump metrics.version from 4.1.8 to 4.1.9 (#1343) 
+   * [view commit](https://github.com/yahoo/elide/commit/ac5f89655b7f8154853b0d84bddef45438d5fd83) Bump version.jetty from 9.4.28.v20200408 to 9.4.29.v20200521 (#1341) 
+   * [view commit](https://github.com/yahoo/elide/commit/46932c7b1cb7777653c529dcc9d5f3e889390405) Bump guava from 28.2-jre to 29.0-jre (#1340) 
+
+## 4.6.3
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/78c90514ea02fe290907b9318b17c4977cf5b86a) Fixing Invalid CVE Build Error (The wrong package is being flagged) (#1323) 
+   * [view commit](https://github.com/yahoo/elide/commit/a14ccfbb7b558d27799b4e7b1916850519639708) Bump version.jackson from 2.10.3 to 2.11.0 (#1282) 
+   * [view commit](https://github.com/yahoo/elide/commit/227c2dd64ea2deb8828d8fcc81bc342e0e0d4d02) Removed redundant fetch join for filters (#1326) 
+   * [view commit](https://github.com/yahoo/elide/commit/9387412f7a4fa31f3f4818933be0537ee0baa6bd) Add Eclipse import order (#1327) 
+   * [view commit](https://github.com/yahoo/elide/commit/fd9f4ee543913144193ed881472c5939cd0d9969) Bump metrics.version from 4.1.6 to 4.1.8 (#1324) 
+   * [view commit](https://github.com/yahoo/elide/commit/094512b7f853a83cbcb25455deba8830756cebd9) Bump javassist from 3.26.0-GA to 3.27.0-GA (#1318) 
+   * [view commit](https://github.com/yahoo/elide/commit/32b7da5ac3f88e72e438bb573fb542719e7f2752) Bump maven-shade-plugin from 3.2.1 to 3.2.3 (#1315) 
+   * [view commit](https://github.com/yahoo/elide/commit/31292d0c87a02db03929aa48d7d2dd18ca33e893) Bump jedis from 3.2.0 to 3.3.0 (#1317) 
+   * [view commit](https://github.com/yahoo/elide/commit/2c2f181dd524c4648b9360f938073744dcef4451) Bump mysql-connector-java from 8.0.19 to 8.0.20 (#1314) 
+   * [view commit](https://github.com/yahoo/elide/commit/5e86be3f9ee12d6a0c809996002490849c889803) Bump wagon-ssh-external from 3.3.4 to 3.4.0 (#1316) 
+   * [view commit](https://github.com/yahoo/elide/commit/665d587fbf625af11a18224b45d74f0602d7ccc0) Bump tomcat.version from 9.0.34 to 9.0.35 (#1312) 
+
+
+## 4.6.2
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/ed6cc703f514d15ddb8eac4f90672075bc334aa6) Adding read only transaction support to JPA store (#1298) 
+   * [view commit](https://github.com/yahoo/elide/commit/04394a077ac3d23d3192cf66c325d4ad85a9d292) GraphQL to-many filter support(#1305)
+   * [view commit](https://github.com/yahoo/elide/commit/e28ade021782c5fb63cc0531e3a454dba385d5cf) Allow customizing the handling of ReadPermission for filter joins (#1301) 
+   * [view commit](https://github.com/yahoo/elide/commit/21a8332e352ae5626b9d106fbf41007092ecc630) Limited support for new memberof operator (#1291) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/10484b5bc41ee4db664f2c4347f2327be1df8c29) Better errors for missing IDs in Patch Extension Request. (#1278) 
+   * [view commit](https://github.com/yahoo/elide/commit/4f74602c7be16a63c5ef17a045fe649d910d6621) Patch Extension Lifecycle tests (#1293) 
+   * [view commit](https://github.com/yahoo/elide/commit/64987609a9aa5513f363cbedf9db64237e0936f3) Fixing GraphQL 500 errors due to client API errors (#1304) 
+   * [view commit](https://github.com/yahoo/elide/commit/e2b02ad70be80240bdff01b8c0796f0c5a908a4d) Fixing bug where legacy hibernate 5 entity manager store recycles the entity manager (#1308) 
+   * [view commit](https://github.com/yahoo/elide/commit/ba4e3019f50544c9a3a1617add04aa73c4f78688) Update pom.xml 
+   * [view commit](https://github.com/yahoo/elide/commit/c818de6e458fea6214fa10c7cef16e9a317c9214) Fixing Dom4J Owasp Build Failure (by upgrading hibernate 5) (#1309) 
+   * [view commit](https://github.com/yahoo/elide/commit/afe1bce535db091c7e664ce91ca3fbfc14bbdc90) Bump classgraph from 4.8.69 to 4.8.78 (#1302) 
+   * [view commit](https://github.com/yahoo/elide/commit/d8dd0d4567d6720e2c678558c81853e1dd5a65d1) Bump maven-javadoc-plugin from 3.1.1 to 3.2.0 (#1290) 
+   * [view commit](https://github.com/yahoo/elide/commit/81b9197caa48831b32c058e2956a6f005e309f81) Bump jackson-module-jaxb-annotations from 2.10.3 to 2.11.0 (#1288) 
+   * [view commit](https://github.com/yahoo/elide/commit/db5619f782b4ab8d5ceafcd50b615e58cc8185b2) Bump swagger-core from 1.6.0 to 1.6.1 (#1287) 
+   * [view commit](https://github.com/yahoo/elide/commit/fa4dae6a20a820d1d9f08bd957f424964bbd2229) Bump version.log4j from 2.13.1 to 2.13.2 (#1285) 
+   * [view commit](https://github.com/yahoo/elide/commit/1ce3b3cf7197f905ef8164be9229106202d5503a) Bump checkstyle from 8.30 to 8.32 (#1283) 
+
+## 4.6.1
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/d2fefd4b998995469a3cc6fd13f76204a057ce2a) shortcut the test (#1269) 
+   * [view commit](https://github.com/yahoo/elide/commit/e495fc2881d3f7dbfd82b914c23204779ef7534d) Bump classgraph from 4.8.65 to 4.8.69 (#1268) 
+   * [view commit](https://github.com/yahoo/elide/commit/85b13b62646509674fb7dfa41b179b20d3cba49b) Bump snakeyaml from 1.25 to 1.26 (#1264) 
+   * [view commit](https://github.com/yahoo/elide/commit/966db764b738667d8d674ca020224f0bb9936784) Bump version.junit from 5.6.1 to 5.6.2 (#1263) 
+   * [view commit](https://github.com/yahoo/elide/commit/6c13c002a543b606ff2e1bc79249f13ea1d024f1) Bump version.restassured from 4.2.0 to 4.3.0 (#1266) 
+   * [view commit](https://github.com/yahoo/elide/commit/6993e35fbfabff4144b028e53fa24398dd2d2e39) Short Circuit Filter Expression Security If User Checks would pass/fail. (#1275) 
+   * [view commit](https://github.com/yahoo/elide/commit/5e0b345fe1d944dccd5e47e94eb029312b9a6e6f) Bump postgresql from 42.2.11 to 42.2.12 (#1267) 
+   * [view commit](https://github.com/yahoo/elide/commit/6ca8592344f4e7b94ac9f0e4de27944c1f870000) Bump metrics.version from 4.1.5 to 4.1.6 (#1265) 
+   * [view commit](https://github.com/yahoo/elide/commit/48807cd236f2097eb3f1a04ff5348446e3644422) Bump version.jetty from 9.4.27.v20200227 to 9.4.28.v20200408 (#1262) 
+   * [view commit](https://github.com/yahoo/elide/commit/005f02108b33de18b0075e1dc34c6eb2b94eb435) Bump tomcat.version from 9.0.33 to 9.0.34 (#1261) 
+
+## 4.6.0
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/90a4f1e9ab5bae620f31fb511cc9522f55004710) Bump rxjava from 2.2.17 to 2.2.19 (#1253) 
+   * [view commit](https://github.com/yahoo/elide/commit/1d18f9f3925be263ffd16e512e521806ac3ca851) Fixing Spring JSON-API controller to allow JSON-API PATCH content type (#1258) 
+   * [view commit](https://github.com/yahoo/elide/commit/52d7ab1f16a57717c49b73ce2b9725562ac01a94) Bump commons-lang3 from 3.9 to 3.10 (#1257) 
+   * [view commit](https://github.com/yahoo/elide/commit/16f21a04d3be4c3aeefc283586676a7e55cf24e7) Fixes #1244: Incorrect pagination with ToMany filtering (#1254) 
+   * [view commit](https://github.com/yahoo/elide/commit/0c4b3ab3a59ae4b5c4fdaff1dcdec47313233c50) Bump liquibase-core from 3.8.5 to 3.8.9 (#1260) 
+   * [view commit](https://github.com/yahoo/elide/commit/ac313fb67a3e6a21365cb138a38c264c838ac573) Bump version.junit from 5.6.0 to 5.6.1 (#1252) 
+   * [view commit](https://github.com/yahoo/elide/commit/64b4b762bf32c210512d308fedc655d3e2f65e07) Bump resteasy.version from 3.11.0.Final to 3.11.2.Final (#1256) 
+   * [view commit](https://github.com/yahoo/elide/commit/fe2ba95966dbf0a902fae8e4e421764f997b2588) Bump hibernate-search-orm from 5.11.4.Final to 5.11.5.Final (#1247) 
+   * [view commit](https://github.com/yahoo/elide/commit/1106bc5387567e0bec148029b9cd54d22e982f5f) Bump mockito-core from 3.2.4 to 3.3.3 (#1251) 
+   * [view commit](https://github.com/yahoo/elide/commit/3dc10e0022b353b9b0edcbb73b1992bf0848155a) Bump jersey-container-servlet-core from 2.30 to 2.30.1 (#1249) 
+   * [view commit](https://github.com/yahoo/elide/commit/674e2a7b2ae0a6ea5f95360b3ba9cb314a014216) Bump dependency-check-maven from 5.3.0 to 5.3.2 (#1246) 
+
+## 4.5.16
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/912b246451cff7b5833fc173cbc3fbf68cccce2e) Optimize field annotation lookup (#1243) 
+
+## 4.5.15
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/7048968af3a0838da51ccfcaf0d1cff468b2f9f8) Improve performance of initial class scans (#1238) 
+   * [view commit](https://github.com/yahoo/elide/commit/d2d6234daafeea5fb00f622b17565622ef58a267) Allow replacement of custom serde scan (#1242) 
+   * [view commit](https://github.com/yahoo/elide/commit/57bd29c0904d4060d2f8a9ec57c8fa244d01db1f) Patch security fix to make it compatiable with non-ORM data stores (#1240) 
+   * [view commit](https://github.com/yahoo/elide/commit/cfad3ffda19d4dfaf019076663aeff014a9bada6) Fixed N+1 problems for all toOne relationships (#1241) 
+
+## 4.5.14
+**Security**
+   * [view commit](https://github.com/yahoo/elide/commit/7239e47eca00226550300e5e67cdabbf12145ef0) Enforce ReadPermission for filter expression fields (#1236) 
+   * [view commit](https://github.com/yahoo/elide/commit/d56cf079510bd9f118685d0f347f8373603787b5) Fixes Issue #1211 (XSS mitigation for swagger controller) (#1237) 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/194ba9293ad996c0667666ab58857ba552ff3bc9) Bump jersey-container-jetty-servlet from 2.29.1 to 2.30.1 (#1199) 
+   * [view commit](https://github.com/yahoo/elide/commit/f6aef5939102fc7046ee353488ec5b5053a58a94) Update pom.xml 
+   * [view commit](https://github.com/yahoo/elide/commit/a8be84c248ff63be61da51a59c8973405ad8ce08) Bump classgraph from 4.8.60 to 4.8.65 (#1198) 
+   * [view commit](https://github.com/yahoo/elide/commit/2b540be444a567ba5796c41a6f1a10eb4a829fa9) Bump junit-jupiter-params from 5.5.2 to 5.6.0 (#1189) 
+   * [view commit](https://github.com/yahoo/elide/commit/b786396b0feac006b8de0de37d39e16fe5439188) Bump guava from 28.1-jre to 28.2-jre (#1193) 
+   * [view commit](https://github.com/yahoo/elide/commit/0ac62236032f364f4fef74ef42c6241b81cade83) Bump maven-checkstyle-plugin from 3.1.0 to 3.1.1 (#1191) 
+   * [view commit](https://github.com/yahoo/elide/commit/68234cf8fb2fdd9cfaf3a3e90e349728d4d56517) Bump resteasy.version from 3.9.3.Final to 3.11.0.Final (#1223) 
+   * [view commit](https://github.com/yahoo/elide/commit/2cceb052a74197079672801235f134cf9654af3f) Bump postgresql from 42.2.9 to 42.2.11 (#1217) 
+   * [view commit](https://github.com/yahoo/elide/commit/1b4695f1e026a82dfde877fbd0b68d4a9df94396) Bump version.jackson from 2.10.2 to 2.10.3 (#1231) 
+   * [view commit](https://github.com/yahoo/elide/commit/8e2ee9072245f61090512297a4a1f0111ef654fc) Bump jackson-module-jaxb-annotations from 2.10.2 to 2.10.3 (#1234) 
+   * [view commit](https://github.com/yahoo/elide/commit/1c489b622fbeecaa423321331d6b21cc2ae8935e) Bump spring.boot.version from 2.2.4.RELEASE to 2.2.5.RELEASE (#1232) 
+   * [view commit](https://github.com/yahoo/elide/commit/96e98eb520281d2d9ab58e19f8391ff6d9b58100) Bump checkstyle from 8.29 to 8.30 (#1233) 
+   * [view commit](https://github.com/yahoo/elide/commit/fe7ebb06c26f071c8d0da180d262377fc2e0197e) Bump build-helper-maven-plugin from 3.0.0 to 3.1.0 (#1230) 
+   * [view commit](https://github.com/yahoo/elide/commit/16c042515bbfbe56882e07d0cbe7e2d29985c49a) Bump metrics.version from 4.1.2 to 4.1.5 (#1229) 
+   * [view commit](https://github.com/yahoo/elide/commit/af16bdb4e637564173b2f7ef2b9d9554b1370f8d) Bump version.log4j from 2.13.0 to 2.13.1 (#1228) 
+   * [view commit](https://github.com/yahoo/elide/commit/c725b7777e3b2fe4e1e1fa76ef1b7fec6da26518) Bump version.jersey from 2.30 to 2.30.1 (#1227) 
+   * [view commit](https://github.com/yahoo/elide/commit/045c192516bbc463dad71695ef147cc5e7b30e9c) Bump version.jetty from 9.4.26.v20200117 to 9.4.27.v20200227 (#1226) 
+
+## 4.5.13
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/236ed8f9af121a2ebc32dcb9f40c47062c742f6e) Added IsEmpty operation for filter predicate (#1176) 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/f7e29a00b1b000acf5eaa3ae07b2094a52aa3c0b) Refactor tests (#1145) 
+   * [view commit](https://github.com/yahoo/elide/commit/601265ebabe4230230a176313c0204780c4f29c1) Hibernate Entity Manager DataStore Harness (#1156) 
+   * [view commit](https://github.com/yahoo/elide/commit/777287ef45e36020afafc4229dcee199c55263d7) Update test dependency on example models (#1155) 
+   * [view commit](https://github.com/yahoo/elide/commit/021a0498bc588b1c3204f14d9f692f3afd4b1c97) Bump spring.boot.version from 2.2.2.RELEASE to 2.2.4.RELEASE (#1158) 
+   * [view commit](https://github.com/yahoo/elide/commit/00b46fe99d7a733f1202db4d83ac76323dbdf92f) Bump version.antlr4 from 4.7.2 to 4.8-1 (#1153) 
+   * [view commit](https://github.com/yahoo/elide/commit/15a6bd4bcc42ffb615e5378b50a198c9d25e7739) Bump version.jackson from 2.10.1 to 2.10.2 (#1148) 
+   * [view commit](https://github.com/yahoo/elide/commit/acee35cf44598b64ef77dacb0ec0a561b71917fc) Revert "Bump version.jackson from 2.10.1 to 2.10.2 (#1148)" (#1159) 
+   * [view commit](https://github.com/yahoo/elide/commit/d23bb54b05358a09545bd42be53b75b445ce1cb1) Bump jersey-container-servlet-core from 2.29.1 to 2.30 (#1152) 
+   * [view commit](https://github.com/yahoo/elide/commit/6622d45a387147c66171c7f3d53707f4655deea1) Bump version.jetty from 9.4.25.v20191220 to 9.4.26.v20200117 (#1147) 
+   * [view commit](https://github.com/yahoo/elide/commit/180b0ac78ce73b28d99046808c9db1d587833bd6) Bump mysql-connector-java from 8.0.18 to 8.0.19 (#1151) 
+   * [view commit](https://github.com/yahoo/elide/commit/b440ed2b9c2372f3121fa0b3b0c2084dbdd27b20) Bump dependency-check-maven from 5.2.4 to 5.3.0 (#1161) 
+   * [view commit](https://github.com/yahoo/elide/commit/bcacaf347315e066c72a6da0ba97754962876a65) JsonApiDocument hashCode and equals were inconsistent (#1163) 
+   * [view commit](https://github.com/yahoo/elide/commit/d6e2093e4144da3b821c700228e5276b13c56ffe) null access suggestions (#1172) 
+   * [view commit](https://github.com/yahoo/elide/commit/04b1fce458fc40438080442a372e4d77a75de5dc) Core tests (#1162) 
+   * [view commit](https://github.com/yahoo/elide/commit/c726f1d6558025e94a8f691f1b1cf66a34494515) Send INFO to Console, TRACE to trace.log (#1173) 
+   * [view commit](https://github.com/yahoo/elide/commit/90df07ded2fe011fd47e11504acd93395c2f4d6e) Consolidate JSON API Content Type constant (#1174) 
+   * [view commit](https://github.com/yahoo/elide/commit/c82214d8ab0316e7b9c19056ca9025bb0f955fbf) Removed Groovy as Dependency (#1175) 
+   * [view commit](https://github.com/yahoo/elide/commit/290adb51d74a943fc05399c0d814186e68623a07) Honor ApiModelProperty annotations for relationships (#1180) 
+   * [view commit](https://github.com/yahoo/elide/commit/349434ee81d31b7221503a7e71433062b7c644fe) bump checkstyle to 8.29 (#1181) 
+   * [view commit](https://github.com/yahoo/elide/commit/ff88afb94f5a94ea0f800c740b07ce960d5943da) Use isEmpty utilitity (#1182) 
+   * [view commit](https://github.com/yahoo/elide/commit/ebddf047a1e10a48a7df798a8000d43a8bfe9b69) Bump lombok from 1.18.10 to 1.18.12 (#1184) 
+   * [view commit](https://github.com/yahoo/elide/commit/1ffbf4fa02ce59bf4c0ba8e458eeb94936108e97) Bump log4j-over-slf4j from 1.7.29 to 1.7.30 (#1177) 
+   * [view commit](https://github.com/yahoo/elide/commit/062c78af07ee4550ac31e9532524a6f7e5daa5bf) Bump version.restassured from 4.1.2 to 4.2.0 (#1169) 
+   * [view commit](https://github.com/yahoo/elide/commit/82bec83a2461501f47121833c397327a148bf33c) Bump version.junit from 5.5.2 to 5.6.0 (#1168) 
+   * [view commit](https://github.com/yahoo/elide/commit/9006bdbbc49c8fe95b4d5819c3e088e12bf5e7a5) Bump rxjava from 2.2.16 to 2.2.17 (#1166) 
+   * [view commit](https://github.com/yahoo/elide/commit/9d3bad32544d4278b711ff812d80342f0b2c8df7) Bump version.jersey from 2.29.1 to 2.30 (#1170) 
+   * [view commit](https://github.com/yahoo/elide/commit/76d8b60d7af862c7657bbdc1ec3077bf09d65916) Bump jackson-module-jaxb-annotations from 2.10.1 to 2.10.2 (#1150) 
+   * [view commit](https://github.com/yahoo/elide/commit/6f47ded351c3d6beeb3a480157dc7436409769e0) Bump version.jackson from 2.10.1 to 2.10.2 (#1165) 
+
+## 4.5.12
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/cd2a159d6958b11d0ee107370fca2dcc5b3175dc) Adds a registry based mechanism for registering Custom GraphQL scalars  (#1131) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/fa5da76eeb8ded88d72f015886c9e67159620067) Move repeated @Sql annotations to class level (#1119) 
+   * [view commit](https://github.com/yahoo/elide/commit/5c43ee875977bf16b7dba55f734f7146511adf2e) Fixing OWASP security warning for Tomcat dependency in Spring Web (#1132) 
+   * [view commit](https://github.com/yahoo/elide/commit/4181a10a779f5a6bcc9aa8e7bd248fcb5daddf5a) Bump liquibase-core from 3.8.1 to 3.8.5 (#1135) 
+   * [view commit](https://github.com/yahoo/elide/commit/13b4b11067e8903608de0971ab12097f30af72c0) Bump classgraph from 4.4.12 to 4.8.60 (#1134) 
+   * [view commit](https://github.com/yahoo/elide/commit/d71bf7d1720807c114ae23f3f9094e480d6bd925) Bump maven-source-plugin from 3.2.0 to 3.2.1 (#1125) 
+   * [view commit](https://github.com/yahoo/elide/commit/4772f58556c878af73b8f442741dc212fa5d9a89) Bump version.jetty from 9.4.24.v20191120 to 9.4.25.v20191220 (#1122) 
+   * [view commit](https://github.com/yahoo/elide/commit/3052faece86feab4718ef300dc684d1ece5e76a3) Bump jedis from 3.1.0 to 3.2.0 (#1121) 
+   * [view commit](https://github.com/yahoo/elide/commit/b2c99ac9ce46b51fb4b4c638f0370ea499c612a6) Bump version.log4j from 2.12.1 to 2.13.0 (#1120) 
+   * [view commit](https://github.com/yahoo/elide/commit/404945c46dc8938d8a83a097b2d57a01dca3b29f) Bump dependency-check-maven from 5.2.3 to 5.2.4 (#1081) 
+   * [view commit](https://github.com/yahoo/elide/commit/1eb3d57e5405a918da114a57bcb485566248efad) Fix travis log length (#1142) 
+
+## 4.5.9
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/c5de4be19d1a103abff08fe90abb5a60af39fc5a) Entity dictionary auto-scan for security checks and lifecycle hooks. (#1108) 
+   * [view commit](https://github.com/yahoo/elide/commit/d92fadc66e502ef279f11a3e3cdafdabdc2ecb7b) Added manual override in JpaDataStore to explicitly bind entities (#1114) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/b86539e654a7b092a3f479f74c0b3a11e64f0669) Migrate legacy getting started to elide standalone readme (#1106) 
+   * [view commit](https://github.com/yahoo/elide/commit/2b41c138d6a9388384628b872138cd2cb777fb68) Added license and link to central docs (#1107) 
+   * [view commit](https://github.com/yahoo/elide/commit/4b36a95ef897f6edbc4430a28de423982a9600c3) Update README.md 
+   * [view commit](https://github.com/yahoo/elide/commit/d36520b9afe1fde93caea93b1e5aee7fb432e4c9) Update README.md 
+   * [view commit](https://github.com/yahoo/elide/commit/02a43983fddfaa16ddd7b7d890694867c99ff4de) Bump slf4j-api from 1.7.28 to 1.7.30 (#1115) 
+   * [view commit](https://github.com/yahoo/elide/commit/415ffcef4981bbdc4632b693a2d7a49d340938aa) Bump mockito-core from 3.1.0 to 3.2.4 (#1111) 
+   * [view commit](https://github.com/yahoo/elide/commit/fc3c39fd5a27a4b7543f98f57e3f25069606a60d) Bump rxjava from 2.2.14 to 2.2.16 (#1110) 
+   * [view commit](https://github.com/yahoo/elide/commit/43c2e488c0c184e2db876fa807951c3ba139555c) Bump spring.boot.version from 2.2.1.RELEASE to 2.2.2.RELEASE (#1099) 
+   * [view commit](https://github.com/yahoo/elide/commit/d1366a53b03f27a2e1188c5ebc2a67f318b72c28) Bump metrics.version from 4.1.1 to 4.1.2 (#1104) 
+   * [view commit](https://github.com/yahoo/elide/commit/80cc3ea7a035d8b4d3965bb97442b2b2ee931fff) Bump hibernate-search-orm from 5.11.3.Final to 5.11.4.Final (#1102) 
+   * [view commit](https://github.com/yahoo/elide/commit/fc9de75ab137e37674b8da44cb4de7f4aac14834) Bump postgresql from 42.2.8 to 42.2.9 (#1100) 
+
+## 4.5.8
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/6e05ce93624855a5968eac4f989131e10d518e08) Elide can bind non JPA entities.  Class scanning logic is consolidated. (#1088) 
+   
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/872c43cdf64bce31acd45f54a30d2a1e855b01f2) Bump liquibase-core from 3.8.0 to 3.8.1 (#1082) 
+   * [view commit](https://github.com/yahoo/elide/commit/d3f73941bed705404c4d667072193edfb71338a1) Bump version.jetty from 9.4.22.v20191022 to 9.4.24.v20191120 (#1086) 
+   * [view commit](https://github.com/yahoo/elide/commit/08fd3f53373c41a386b38c5679fa19a427061a50) Bump jackson-module-jaxb-annotations from 2.10.0 to 2.10.1 (#1080) 
+   * [view commit](https://github.com/yahoo/elide/commit/c37a342b65513a69064c42fb80cc6b190bcfef7e) Upgraded dependencies to pass OWASP security scan (#1096) 
+   * [view commit](https://github.com/yahoo/elide/commit/1b9c8aa1acec370f8f1d5f112c4658acef1eddb7) Bump resteasy.version from 3.9.0.Final to 3.9.3.Final (#1091) 
+   * [view commit](https://github.com/yahoo/elide/commit/2d0f033bd1f10803c2b6152407ffdc3d2ac4bba2) Bump swagger-core from 1.5.24 to 1.6.0 (#1079) 
+   * [view commit](https://github.com/yahoo/elide/commit/482e344eabd052287a255bb8f8efddfb2b34e4e7) Bump wagon-ssh-external from 3.3.3 to 3.3.4 (#1078) 
+   * [view commit](https://github.com/yahoo/elide/commit/b4900d5dd42c27ff6b65f18070b0aca7650c9d61) Bump version.jackson from 2.10.0 to 2.10.1 (#1076) 
+
+## 4.5.7
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/1625319a2755cc615716c322057156c45645b707) Added Elide Support For Spring Boot (#1070) 
+   * [view commit](https://github.com/yahoo/elide/commit/cba356a4afed56760d670e41f1b822ef8cd3dc1a) Expose audit logger in standalone (#1075) 
+   4.1.1 (#1033) 
+   * [view commit](https://github.com/yahoo/elide/commit/6248156e848e84d64b76a99a4c89122f2434430a) Expose opaque user in audits (#1074) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/a1f04eb8bbbdde02379c4ce9e462fa3aacc589ed) Bump mockito-core from 3.0.0 to 3.1.0 (#1036) 
+   * [view commit](https://github.com/yahoo/elide/commit/26ec44156b4578e3c7d8cd9e9d6bd21812707ccd) Added awesome badges for Java & GraphQL (#1045) 
+   * [view commit](https://github.com/yahoo/elide/commit/124ada06d4490fb7973b822b2f14b1f1a21b1ebe) Bump jersey-container-jetty-servlet from 2.29 to 2.29.1 (#1030) 
+   * [view commit](https://github.com/yahoo/elide/commit/4faca446b90fbfc53cf23986e35a80c124b0e537) Bump jetty-continuation from 9.4.19.v20190610 to 9.4.22.v20191022 (#1050) 
+   * [view commit](https://github.com/yahoo/elide/commit/2ce4d51168bfc975b37fe846ef17b997c53f5abd) Bump log4j-over-slf4j from 1.7.26 to 1.7.28 (#1048) 
+   * [view commit](https://github.com/yahoo/elide/commit/748da7726c9dd7db22c6c2c7aedad3137395a489) Bump swagger-core from 1.5.23 to 1.5.24 (#1047) 
+   * [view commit](https://github.com/yahoo/elide/commit/19a9e5ace0c30389f3c5a407607c4d1964a6a459) Update README.md (#1062) 
+   * [view commit](https://github.com/yahoo/elide/commit/600e4423a6c0ee87d4f1ac7b6ae711fc4a66dcef) Updated Elide standalone docs to point to main elide.io getting started docs (#1063) 
+   * [view commit](https://github.com/yahoo/elide/commit/ffea4422f664e4bcc0b4e68cfb4db386b53a65a3) Update README.md (#1065) 
+   * [view commit](https://github.com/yahoo/elide/commit/643454ac2f64eeeb722a0355602a0c9ed3e62f00) Bump rxjava from 2.2.13 to 2.2.14 (#1061) 
+   * [view commit](https://github.com/yahoo/elide/commit/5b2fd8079b7bc0ce13c3729c28831dd17c41cf69) Bump maven-jar-plugin from 3.1.2 to 3.2.0 (#1060) 
+   * [view commit](https://github.com/yahoo/elide/commit/bd6f02cbd307d7dc7ec91778de20aafa9afe1b8d) Bump maven-source-plugin from 3.1.0 to 3.2.0 (#1059) 
+   * [view commit](https://github.com/yahoo/elide/commit/c96f889a3e31596d54932a521fb4614fdc1b9b62) Bump dependency-check-maven from 5.2.1 to 5.2.3 (#1069) 
+   * [view commit](https://github.com/yahoo/elide/commit/7533433829951b4872f892d6b85ea79c8ec4e6be) Bump log4j-over-slf4j from 1.7.28 to 1.7.29 (#1058) 
+   * [view commit](https://github.com/yahoo/elide/commit/2fd764bcdfa6f6ac322c49954294bd5abd7fc9fb) Bump version.jetty from 9.4.21.v20190926 to 9.4.22.v20191022 (#1046) 
+   * [view commit](https://github.com/yahoo/elide/commit/55261b095c1d0f8797d38efc6401479790cf0972) Bump metrics.version from 4.1.0 to 
+
+## 4.5.6
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/01f630782f1bf6d51acd293fab811d3c63998014) Fix elide4.5.5 (#1040) 
+      * There was a compilation change required in FilterExpressionCheck that break SEMVER.
+      * elide-blog-example had pom issues that prevented artifacts syncing with maven central.
+
+## 4.5.5
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/1b293735fa2e316fc6c1697efb10e16f80c79ff5) Bump version.jackson from 2.9.9 to 2.9.10 (#981) 
+   * [view commit](https://github.com/yahoo/elide/commit/b3f913ca4464dfd8400257e0f51025aa5c088a31) Update jackson-databind to use version property (#988) 
+   * [view commit](https://github.com/yahoo/elide/commit/c9483378230ead3413cc8e2e37134469637d132f) update types (#946) 
+   * [view commit](https://github.com/yahoo/elide/commit/cb2b6a9837ac0b6cd8a59864847a95dbe42097ce) Bump lombok from 1.18.8 to 1.18.10 (#984) 
+   * [view commit](https://github.com/yahoo/elide/commit/1be081714e8f82ea98ff3b7355d4219277be2e27) Update Apache Commons Beanutils and ANTLR4 CharStreams (#942) 
+   * [view commit](https://github.com/yahoo/elide/commit/93af9b282859952d961374fb1e720c2bfefc3e82) Bump version.jackson from 2.9.10 to 2.10.0 (#989) 
+   * [view commit](https://github.com/yahoo/elide/commit/59ce2b0197cadad4c7d281d07613a30920bd0943) Bump maven-shade-plugin from 3.1.0 to 3.2.1 (#985) 
+   * [view commit](https://github.com/yahoo/elide/commit/fc09deb880ebbc048a72a1b5fb6ea44f37bdc1ad) Bump resteasy.version from 3.1.4.Final to 3.9.0.Final (#979) 
+   * [view commit](https://github.com/yahoo/elide/commit/c65b8c60eac93de9f4565351d8894e00252a1db7) Bump javax.ws.rs-api from 2.0.1 to 2.1.1 (#980) 
+   * [view commit](https://github.com/yahoo/elide/commit/f1aacfff1f2a88c5b87892925457c6a306eb3cf3) Bump javax.transaction-api from 1.2 to 1.3 (#982) 
+   * [view commit](https://github.com/yahoo/elide/commit/0f354bd3408e5c1ab55b427bca36ef935d3ed35c) Bump jedis from 3.0.1 to 3.1.0 (#983) 
+   * [view commit](https://github.com/yahoo/elide/commit/04424843476ccca18f9c3fa7093ad48fefaaf444) ISSUE 864 Fix primitive id field RSQL filter (#866) 
+   * [view commit](https://github.com/yahoo/elide/commit/f6c430238247e4fed1ca401de748aa633980a109) Bump liquibase-core from 3.5.3 to 3.8.0 (#1000) 
+   * [view commit](https://github.com/yahoo/elide/commit/45adbb85b187cd198be5b14ed17aad338a37f4aa) Issue 952 remove testng (#1004) 
+   * [view commit](https://github.com/yahoo/elide/commit/210868f4961be7a5d22d5a15f4226be6da95ad91) Fixed release distribution for elide-example (#1003) 
+   * [view commit](https://github.com/yahoo/elide/commit/c33239dfda53b17c7c2bdd79eba8c9dc7cec5c0b) Bump gson from 2.8.5 to 2.8.6 (#1001) 
+   * [view commit](https://github.com/yahoo/elide/commit/4ce68469660d9a64b613b41314dc35b1b9fb35f7) Bump swagger-core from 1.5.22 to 1.5.23 (#999) 
+   * [view commit](https://github.com/yahoo/elide/commit/6f26ba7ddab303c4f2618c684dfd0a4f33cf7272) Bump jersey-container-servlet-core from 2.29 to 2.29.1 (#998) 
+   * [view commit](https://github.com/yahoo/elide/commit/1a68e3975d590e45942953799249a263b1fce3f5) Bump commons-collections4 from 4.1 to 4.4 (#1013) 
+   * [view commit](https://github.com/yahoo/elide/commit/58f4114bbd90e5b8b6d5e1359fda9f7bf6415f76) Bump hibernate-search-orm from 5.11.2.Final to 5.11.3.Final (#1012) 
+   * [view commit](https://github.com/yahoo/elide/commit/ffabb8784ac718dfbaa4dc34567df57de53ce738) Bump jacoco-maven-plugin from 0.8.4 to 0.8.5 (#1011) 
+   * [view commit](https://github.com/yahoo/elide/commit/65a911c9a3410ca84e9578f9cdad9d8167fe3701) Bump postgresql from 42.2.7 to 42.2.8 (#1009) 
+   * [view commit](https://github.com/yahoo/elide/commit/105cff0782d93e3b7b9704fe3cd6a56ab145700a) Fixes #1007 (#1014) 
+   * [view commit](https://github.com/yahoo/elide/commit/8af100d2035281460a5d1314e4f783225ba92d44) Bump javassist from 3.25.0-GA to 3.26.0-GA (#997) 
+   * [view commit](https://github.com/yahoo/elide/commit/9d3f2f0b568be2445a3dce78f4e0f77b7b001634) Bump rest-assured from 4.1.1 to 4.1.2 (#996) 
+   * [view commit](https://github.com/yahoo/elide/commit/7c4238953a2f24203d5e30322e2c900a1d083ff9) Bump version.jetty from 9.4.20.v20190813 to 9.4.21.v20190926 (#995) 
+   * [view commit](https://github.com/yahoo/elide/commit/14655adaebf31b1e2b980bb5330ce582b3a5c5ee) Bump mysql-connector-java from 8.0.17 to 8.0.18 (#1032) 
+   * [view commit](https://github.com/yahoo/elide/commit/252dbbc38d400967109517e10a941af86b8f4c5b) Avoid checking share permission for redundant add (#1037) 
+   * [view commit](https://github.com/yahoo/elide/commit/ab3136b539af522d93b8d76da7929b4efb57c1fd) Bump rxjava from 2.2.12 to 2.2.13 (#1031) 
+
+## 4.5.4
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/5a10ae4e7897abd1304f9438fe66f5d4ad786f69) Nested update (#978) 
+
+## 4.5.3
+**Features**
+   * [view commit](https://github.com/yahoo/elide/commit/150601868be35b4b47db274d0dfb7eae025b48c8) Add heroku archetype project (#966) 
+
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/887c7cc6e715c848404bdc842dab5a5c9987245c) Bump mockito-core from 2.2.26 to 3.0.0 (#973) 
+   * [view commit](https://github.com/yahoo/elide/commit/074facbf3f2d52878714fe2908ed231496f9f77c) Suppress databind vulnerability warnings until December (#977) 
+   * [view commit](https://github.com/yahoo/elide/commit/7479cf55dad6bfd4c9f123d74518928c2447d780) Bump commons-lang3 from 3.5 to 3.9 (#971) 
+   * [view commit](https://github.com/yahoo/elide/commit/97da49df4f4afca54f55cb20ce4aa0e78f2ce050) Bump rest-assured from 4.0.0 to 4.1.1 (#970) 
+   * [view commit](https://github.com/yahoo/elide/commit/b343831f6e6ceda81fe9b0aa9030d0dc08d1621d) Bump gson from 2.8.0 to 2.8.5 (#967) 
+   * [view commit](https://github.com/yahoo/elide/commit/e2de2a8a7f052ee2564ae8257fd1059892329ca7) Fixed Swagger generation bug where an entity has nothing to sort by (#975) 
+   * [view commit](https://github.com/yahoo/elide/commit/7b7aba5cc1070f1e337348083f923708e75f2be5) Fix GraphQL Nested UPDATE bug. (#974) 
+   * [view commit](https://github.com/yahoo/elide/commit/d88c2569bc9fb99235dbc221f53eec858c836d66) Bump maven-javadoc-plugin from 3.1.0 to 3.1.1 (#972) 
+   * [view commit](https://github.com/yahoo/elide/commit/f4042814b1e621460e86971f62a3be4dae7c7ffd) Bump dependency-check-maven from 5.0.0 to 5.2.1 (#969) 
+   * [view commit](https://github.com/yahoo/elide/commit/1064efa9545e11022eac51630df6a01c7492facb) Bump version.jersey from 2.29 to 2.29.1 (#968) 
+
+## 4.5.2
+**Fixes**
+   * [view commit](https://github.com/yahoo/elide/commit/e6a2ffd8abe950fbe05b6429a3e0a8b13deee3ba) Restore provided on jpa (#932) 
+   * [view commit](https://github.com/yahoo/elide/commit/96bac92e39a258901f1336f638c89e9502f5b438) Bump commons-beanutils from 1.9.3 to 1.9.4 
+   * [view commit](https://github.com/yahoo/elide/commit/083959f218daa94598c599c9cd7090f1aa81e47e) Fix #934: descriptions and example attributes appearing in swagger with empty string value (#935) 
+   * [view commit](https://github.com/yahoo/elide/commit/71b0ce7dd6aadef4b5a949fae922445dade75dea) Refactor IT Tests (ResourceIT and test infrastructure). (#897) 
+   * [view commit](https://github.com/yahoo/elide/commit/4043f9ff55a2bff05bd3953e00c05dd05d8b45b6) Enable test-helper tests (#947) 
+   * [view commit](https://github.com/yahoo/elide/commit/6254f834414fcb73ffa697c1d4eea1e9f8a5567c) Bump version.jetty from 9.4.19.v20190610 to 9.4.20.v20190813 (#922) 
+   * [view commit](https://github.com/yahoo/elide/commit/b0aaf30a83cf218cd01b7f0bc0635c507ea3c581) Update Graphql integration test (#954) 
+   * [view commit](https://github.com/yahoo/elide/commit/00c16b618cdffdc47678bcf21cee95fa5459a636) Bump rxjava from 2.2.0 to 2.2.12 (#936) 
+   * [view commit](https://github.com/yahoo/elide/commit/459c21678fdde2706eed65fb31e6aebaf9a7fdfe) Bump maven-surefire-plugin from 2.22.1 to 2.22.2 (#928) 
+   * [view commit](https://github.com/yahoo/elide/commit/87e260c8cf4a33690c875a0dca50ceca1bcee743) Bump version.jersey from 2.28 to 2.29 (#924) 
+   * [view commit](https://github.com/yahoo/elide/commit/6ec1b7a39270a76bd9c60ad86b8323eca1583551) Bump jersey-container-jetty-servlet from RELEASE to 2.29 (#929) 
+   * [view commit](https://github.com/yahoo/elide/commit/d642f9279f27dfecad436c6cbc59abd9e20d73d1) Bump maven-jar-plugin from 3.0.2 to 3.1.2 (#927) 
+   * [view commit](https://github.com/yahoo/elide/commit/8475b41b7f80849e2bebb1b966ff9c539b6eaf8d) Bump guava from 20.0 to 23.0 (#957) 
+   * [view commit](https://github.com/yahoo/elide/commit/f4dddcb021121625013b5498b79bfd608b5230ff) Bump jersey-container-servlet-core from RELEASE to 2.29 (#962) 
+   * [view commit](https://github.com/yahoo/elide/commit/19f8547d555fe6255844ab09677fbccc548a5624) Bump slf4j-api from 1.7.26 to 1.7.28 (#961) 
+   * [view commit](https://github.com/yahoo/elide/commit/0b026135569856ee84020c249421f172799f1488) Bump build-helper-maven-plugin from 1.12 to 3.0.0 (#960) 
+   * [view commit](https://github.com/yahoo/elide/commit/11000a00c621078b4dc33c52e1aa854188ea9afb) Bump ant from 1.8.2 to 1.10.7 (#959) 
+   * [view commit](https://github.com/yahoo/elide/commit/aae10ce13bba99ddabd12a0475531f34265166a5) Bump junit.version from 5.5.1 to 5.5.2 (#956) 
+   * [view commit](https://github.com/yahoo/elide/commit/1db1a18ab67da8bf18ea5bf54ec47279cee5c7eb) Bump mysql-connector-java from 8.0.16 to 8.0.17 (#955)
+
+## 4.5.1
+**Features**
+ * Issue #851. Added new method `enableSwagger()` in `ElideStandaloneSettings` class which allows an easier way for binding swagger docs to the given endpoint. Override this method returning the `Map<String, Swagger>` object to bind the swagger docs to string endpoint.
+ * Issue #900. Add `@ApiModelProperty` support to `elide-swagger` that makes it possible to customize `description`, `example`, `readOnly` and `required` attributes of object definitions in resulting generates Swagger document.
+
+**Fixes**
+ * [Security] Bump jackson databind from 2.9.9 to 2.9.9.3
+ * Issue #913. Fix deserialization for optional top-level meta object (#913)
+ * Migrated elide-core tests to JUnit 5.
+
+## 4.5.0
+**Features**
+ * Issue #815.  Added the ability to customize the JPQL generation for a filter operator globally or for a specific entity attribute.
+ * Alpha release of a new Elide data store (SearchDataStore) that supports full text search on top of an existing data store.
+ * Issue #871. Add ElideSettings property `encodeErrorResponses`, which when enabled will encode error messages to be safe for HTML. This works for both JSONAPI and GraphQL endpoints, with verbose errors or error object settings enabled/disabled.
+ * HttpStatusException class now supports the following additional functions: `getErrorResponse(boolean encodeResponse)` and `getVerboseErrorResponse(boolean encodeResponse)`
+ * Add `GraphQLErrorSerializer` and `ExecutionResultSerializer` which are added to the `ObjectMapper` provided by the ElideSettings. These are used to parse the GraphQL results, instead of using `ExecutionResult#toSpecification`.
+
+**Fixes**
+ * Run vulnerability check during build.  Updated dependencies to fix CVE-2018-1000632, CVE-2017-15708, CVE-2019-10247
+ * Upgrade to Hibernate 5.4.1
+
+## 4.4.5
+**Fixes**
+ * Issue 801
+ * Switched to Open JDK 8
+ 
+## 4.4.4
+**Fixes**
+ * When requesting an ID field whose name is not 'id', an error happens: `No such association id for type xxx`. When the requested field name equals 'id', Elide has been fixed to look for the field with the annotation @Id rather than looking by field name.
+ * Support RSQL INFIX, POSTFIX, and PREFIX filters on number types: remove '*' before coercing.
+
+**Features**
+* Issue#812 Add support for BigDecimal field in GraphQL. 
+* Elide standalone now includes a Hikari connection pool & Hibernate batch fetching by default
+
+## 4.4.3
+**Features**
+ * When fetching a collection, if there are no filters, sorting, or client specified pagination, the ORM backed data stores will return the proxy object rather than construct a HQL query.  This allows the ORM the opportunity to generate SQL to avoid the N+1 problem.
+
+**Fixes**
+ * Fixes bug where EntityManager creation for ElideStandalone was not thread safe.
+
+## 4.4.2
+**Fixes**
+ * Fix error in lookupEntityClass and add test
+ * Restore Flush mechanism for Hibernate but allow for customization.
+
+## 4.4.1
+**Features**
+ * Switch ElideStandAlone to use JPA DataStore by default
+ * Enable support for JPA @MapsId annotation on relationships so that client doesn't have
+   to provide a dummy ID to make entity creation work.
+
+**Fixes**
+ * Flush once for patch extension
+ * ConstraintViolationExceptions are propagated on flush (JPA Transaction)
+ * Enable support for JPA @MapsId annotation on relationships so that client doesn't have
+   to provide a dummy ID to make entity creation work.
+ * Cache all calls to getEntityBinding
+
+## 4.4.0
+**Features**
+ * Issue#763 Support for filtering & sorting on computed attributes
+ * Added [JPA Data Store](https://github.com/yahoo/elide/pull/747)
+
+**Fixes**
+ * Throw proper exception on invalid PersistentResource where id=null
+ * Issue#744 Elide returns wrong date parsing format in 400 error for non-default DateFormats
+ * Enable RSQL filter dialect by default (in addition to the default filter dialect).
+
+## 4.3.3
+**Fixes**
+ * Issue#744 Better error handling for mismatched method in Lifecycle and additional test
+ * Upgraded puppycrawl.tools (checkstyle) dependency to address CVE-2019-9658
+ * Issue#766 Outdated MySQL driver in elide-standalone and examples
+
+## 4.3.2
+**Fixes**
+ * Issue#754
+
+## 4.3.1
+**Fixes**
+ * Issue#758
+
+**Features**
+ * New method in EntityDictionary to bind a dependency injection injector function.
+
+## 4.3.0
+**Fixes**
+ * Issue#733
+
+**Features**
+ * New elide-example-models package
+ * New elide-test-helpers package
+ * Use SecurityContext as default User object
+
+## 4.2.14
+**Features**
+ * Added [Codahale InstrumentedFilter](https://metrics.dropwizard.io/3.1.0/manual/servlet/) & corresponding metrics, threads, admin servlets as a setting option for Elide Standalone.
+
+**Fixes**
+ * replaced jcabi-mysql-maven-plugin with H2 for testing
+ * Upgrade Failsafe to 2.22.1 in order to run Hibernate 5 tests.  Fixed test failure.
+
+## 4.2.13
+**Features**
+ * Add FilterPredicate sub-classes for each operation type
+
+**Fixes**
+ * Upgrade jackson databind to 2.9.8
+
+## 4.2.12
+**Fixes**
+ * Issue#730
+ * Issue#729
+
+## 4.2.11
+**Features**
+ * Add annotation FilterExpressPath to provide paths for FilterExpressionChecks
+
+## 4.2.10
+**Fixes**
+ * Upgrade Jetty Server library to address security alerts
+ * Issue#703
+ * Fix Import Order
+
+## 4.2.9
+**Fixes**
+ * Fixed IT tests that were not running.
+ * Fixed setting private attributes that are inherited.
+ * Upgrade Jackson databind library to address security alerts
+
+## 4.2.8
+**Fixes**
+ * Issue#696
+ * Issue#707
+
+## 4.2.7
+**Features**
+ * Add support for asterisk life cycle hooks (hooks that invoke for all fields in a model).
+
+**Fixes**
+ * Add support for multiple classloaders when using CoerceUtils ([Issue #689](https://github.com/yahoo/elide/issues/689))
+ * Issue#691
+ * Issue#644
+
+**Features**
+ * Both JPA Field (new) and Property (4.2.6 and earlier) Access are now supported.
+
+## 4.2.6
+**Fixes**
+ * Fix NPE serializing Dates
+
+## 4.2.5
+**Features**
+ * ISO8601 and epoch dates can be toggled in Elide Settings
+
+**Fixes**
+ * Fix NPE in HibernateEntityManagerStore
+ * Performance enhancement for DataSerializer and MapConverter
+
+## 4.2.4
+**Fixes**
+ * Fixed issues when running and building on Windows OS
+
+## 4.2.3
+**Features**
+ * Add `CustomErrorException` and `ErrorObjects` to support custom error objects
+ * Allow user to configure to return error objects
+ * Update `ElideStandalone` to allow users to programmatically manipulate the `ServletContextHandler`.
+
+**Fixes**
+ * Fixed bug in GraphQL when multiple root documents are present in the same payload.  The flush between the documents
+   did not correctly handle newly created/deleted objects.
+ * Fixed broken graphql link in README.md
+ * Fixed elide standalone instructions.
+ * Fixed hashcode and equals for some test models
+
+## 4.2.2
+**Fixes**
+ * Resolve hibernate proxy class for relationship
+
+## 4.2.1
+**Fixes**
+ * Fixed #640
+ * Log runtime exception as error
+
+**Features**
+ * Added "fetch joins" for to-one relationships to improve HQL performance and limit N+1 queries.
+
+## 4.2.0
+**Features**
+ * Upgraded hibernate 5 datastore to latest version (5.2.15)
+
+**Fixes**
+ * Fixed bug where create-time pre-security hooks were running before any values were set.
+
+## 4.1.0
+**Fixes**
+ * Performance enhancements including caching the `Class.getSimpleName`.
+ * Fixed bug where updatePreSecurity lifecycle hook was being called for object creation.  This will no longer be true.  This changes the behavior of life cycle hooks (reason for minor version bump).
+
+**Features**
+ * Added the ability to register functions (outside entity classes) for lifecycle hook callbacks.
+
+## 4.0.2
+**Fixes**
+ * Add support for retrieving values from java `Map` types. These are still modeled as lists of key/value pairs.
+ * Log GraphQL query bodies. Private information or anything which is not intended to be logged should be passed as a variable as variables values are not logged.
+ * Handle the `Transaction not closed` error on aborted response.
+
+## 4.0.1
+**Fixes**
+ * Change `PersistentResourceFetcher` constructor visibility to public in order to allow this class instantiation outside of the elide-graphql.
+
+## 4.0.0
+
+See: 4.0-beta-5
+
+## 4.0-beta-5
+**Fixes**
+ * Ignore non-entity types if present in the hibernate class metadata in the hibernate stores. This can legitimately occur when tools like envers are used.
+
+**Features**
+ * Support GraphQL batch requests.
+
+## 4.0-beta-4
+**Fixes**
+ * Ignore provided-- but null-- operation names and variables in GraphQL requests.
+ * Add additional logging around exception handling.
+ * Don't swallow generic Exception in Elide. Log it and bubble it up to caller.
+ * Fix a bug where null filter expressions were possible if no filter was passed in by the user, but permission filters existed.
+ * Fix support for handling GraphQL variables.
+ * Support java.util.Date types as new built-in primitive. Expects datetime as epoch millis.
+ * Fixed issue with supporting variables in mutations.
+ * Allow for arbitrary in-transaction identifiers for upserts (treated as unique identifier for current tx only).
+ * Ensure GraphQLEndpoint returns GraphQL spec-compliant response.
+
+**Features**
+ * Handle ConstraintViolationException's by extracting the first constraint validation failure.
+ * Include GraphQL in Elide standalone by default with ability to remove it via dependency management.
+ * Upgrade to the latest graphql-java version: 6.0.
+
+## 4.0-beta-3
+**Fixes**
+ * Updated MIT attribution for portions of MutableGraphQLInputObjectType
+ * getRelation (single) call filters in-memory to avoid collision on multiple objects being created in the same transaction.
+
+**Features**
+ * ChangeSpec is now passed to OnUpdate life cycle hooks (allowing the hooks to see the before & after change to a given field).
+
+## 4.0-beta-2
+**Fixes**
+ * Root collection loads now push down security filter predicates.
+ * Avoid throwing exceptions that must be handled by the containing application, instead throw exceptions that will be handled directly within Elide.
+ * Restore OnCreatePreSecurity lifecycle hook to occur after fields are populated.
+
+**Features**
+ * Added UPDATE operation for GraphQL.
+
+## 4.0-beta-1
+**Features**
+ * Elide now supports GraphQL (as well as JSON-API).  This feature is in beta.  Read the [docs](elide.io) for specifics.  Until the artifact moves to stable,
+   we may change the semantics of the GraphQL API through a minor Elide version release.
+ * The semantics of `CreationPermission` have changed and can now apply towards fields as well as entities.  `UpdatePermission` is never
+   checked for newly created objects.
+ * The semantics of `SharePermission` have changed.  `SharePermission` can no longer have an expression defined.  It either denies permission
+   or exactly matches `ReadPermission`.
+ * RSQL queries that compare strings are now case-insensitive. There is not currently a way to make
+   case sensitive RSQL queries, however the RSQL spec does not provide this either.
+   Fixes #387
+
+**Fixes**
+ * Updated PreSecurity lifecycle hooks to run prior to inline checks like they should.
+
+**Misc**
+ * All deprecated functions from Elide 3.0 have been removed.
+ * `FilterPredicates` have been restructure to share a common `Path` with other Elide code.
+
+## 3.2.0
+**Features**
+ * Updated interface to beta standalone application. Plans to finalize this before Elide 4.0 release.
+
+**Fixes**
+ * Rollback relationship handling change.
+ * Handle ForbiddenAccess only for denied Include, instead of filtering to empty set.
+
+## 3.1.4
+**Fixes**
+ * Instead of ForbiddenAccess for denied Include, filter to empty set.
+ * Generate error when parsing permission expression fails.
+
+## 3.1.3
+ * Add support for @Any relationships through a @MappedInterface
+
+## 3.1.2
+**Features**
+ * Add Elide standalone application library
+
+**Fixes**
+ * Fix for issue #508
+ * Fix for issue #521
+ * Fix blog example
+ * Properly handle proxy beans in HQL Builder
+
+## 3.1.1
+**Fixes**
+ * Fix id extraction from multiplex transaction.
+
+## 3.1.0
+**Fixes**
+ * Use Entity name when Include is empty.  Cleanup Predicate.
+
+## 3.0.17
+**Features**
+Adds support for sorting by relationship (to-one) attributes.
+**Misc**
+Cleanup equals code style
+
+## 3.0.16
+**Misc**
+ * Replaced deprecated Hibernate Criteria with JPQL/HQL.
+
+## 3.0.15
+**Fixes**
+ * Use inverse relation type when updating.
+
+## 3.0.14
+**Fixes**
+ * Properly handle incorrect relationship field name in Patch request instead of `Entity is null`
+ * Properly handle invalid filtering input in HQL filtering
+ * Properly handle NOT in filterexpressionchecks
+ * Fix parameter order in commit permission check
+
+## 3.0.13
+**Fixes**
+ * Fixing regression in deferred permissions for updates
+
+## 3.0.12
+**Misc**
+ * Cleanup hibernate stores to not care about multi edit transactions
+ * Removed dead code from hibernate3 transaction
+ * Special read permissions handling of newly created objects in Patch Extension
+
+## 3.0.11
+**Fixes**
+ * Change `UpdateOnCreate` check to be an `OperationCheck`.
+
+## 3.0.10
+**Fixes**
+ * Use IdentityHashMap for ObjectEntityCache
+ * Miscellaneous cleanup.
+
+## 3.0.9
+**Fixes**
+ * Fix exception handler to pass verbose log even with unexpected exceptions.
+ * Fix life cycle hooks to trigger "general" hooks even when specific field acted upon.
+ * Build document list for swagger endpoint at the `/` path.
+
+## 3.0.8
+**Features**
+ * Add support for FieldSetToNull check.
+
+## 3.0.7
+**Features**
+ * Add support for sorting by id values
+ * Implement functionality for Hibernate5 to support `EntityManager`'s.
+
+**Fixes**
+ * Account for inheritance when performing new entity detection during a PATCH Extension request.
+ * Upgrade examples to behave properly with latest jersey release.
+ * Rethrow `WebApplicationException` exceptions from error response handler.
+
+**Misc**
+  * Always setting HQL 'alias' in FilterPredicate Constructor
+
+## 3.0.6
+**Misc**
+* Cleanup of active permission executor
+
+## 3.0.5
+**Fixes**
+* Fixed caching of security checks (performance optimization)
+* Security fix for inline checks being deferred when used in conjunction with commit checks.
+* Security fix to not bypass collection filtering for patch extension requests.
+
+**Features**
+* Added UUID type coercion
+* Move `InMemoryDataStore` to Elide core. The `InMemoryDataStore` from the `elide-datastore-inmemorydb` package has
+    been deprecated and will be removed in Elide 4.0
+
+## 3.0.4
+**Fixes**
+* Do not save deleted objects even if referenced as an inverse from a relationship.
+
+## 3.0.3
+**Fixes**
+* Fix HQL for order by clauses preceded by filters.
+* Remove extra `DELETE` endpoint from `JsonApiEndpoint` since it's not compliant across all JAX-RS implementations.
+* Add support for matching inherited types while type checking.
+* Fix tests to automatically set UTC timestamp.
+* Fix README information and various examples.
+
+## 3.0.2
+**Misc**
+* Clean up Elide request handler.
+
+## 3.0.1
+**Fixes**
+* Updated HQL query aliases for page total calculation in hibernate3 and hibernate5 data stores.
+
+## 3.0.0
+**Features**
+* Promoted `DefaultOpaqueUserFunction` to be a top-level class
+* Promoted `Elide.Builder` to be a top-level class `ElideSettingsBuilder`
+* Revised datastore interface
+    * Removed hibernate-isms
+    * Made key-value persistence easier to support
+* Revised lifecycle hook model
+* Revised audit logger interface
+* Removed all deprecated features, e.g.
+    * SecurityMode
+    * `any` and `all` permission syntax
+    * Required use of `ElideSettingsBuilder`
+    * Removed `PersistenceStore` from Hibernate 5 datastore
+* Made `InMemoryDataStore` the reference datastore implementation
+* Allow filtering on nested to-one relationships
+
+**Fixes**
+* Close transactions properly
+* Updated all dependencies
+* Fixed page totals to honor filter & security permissions evaluated in the DB.
diff --git a/checkstyle-style.xml b/checkstyle-style.xml
index 5881a10553..652f8066cd 100644
--- a/checkstyle-style.xml
+++ b/checkstyle-style.xml
@@ -18,11 +18,25 @@
   <property name="severity" value="warning"/>
   <module name="TreeWalker">
     <module name="AvoidStarImport">
+      <property name="excludes" value="JsonApiDSL"/>
       <metadata name="net.sf.eclipsecs.core.comment" value="Removes wildcard imports."/>
       <property name="allowClassImports" value="false"/>
       <property name="allowStaticMemberImports" value="false"/>
     </module>
-    <module name="FileContentsHolder"/>
+    <module name="CustomImportOrder">
+      <metadata name="net.sf.eclipsecs.core.comment" value="Not enough groups to handle unusual Elide import order.  Used special formatting for thirdPartyPackageRegExp to leave java and javax to the end."/>
+      <property name="severity" value="error"/>
+      <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
+      <property name="specialImportsRegExp" value="^(com\.yahoo)\."/>
+      <property name="standardPackageRegExp" value="^(com|example|org)\."/>
+      <property name="thirdPartyPackageRegExp" value="^([^j]|j[^a]|ja[^v]|java[^x.]).*"/>
+      <property name="sortImportsInGroupAlphabetically" value="true"/>
+      <property name="separateLineBetweenGroups" value="false"/>
+    </module>
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="CustomImportOrder"/>
+      <property name="message" value="^Extra separation in import group before.*"/>
+    </module>
     <module name="ConstantName">
       <metadata name="net.sf.eclipsecs.core.comment" value="Constants (static finals) must be uppercase letters/digits/underscore."/>
       <property name="severity" value="error"/>
@@ -115,12 +129,9 @@
     <module name="JavadocMethod">
       <metadata name="net.sf.eclipsecs.core.comment" value="Checks the Javadoc of a method or constructor."/>
       <property name="severity" value="warning"/>
-      <property name="scope" value="protected"/>
-      <property name="allowUndeclaredRTE" value="true"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
+      <property name="accessModifiers" value="protected"/>
+      <property name="validateThrows" value="true"/>
       <property name="allowMissingParamTags" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowMissingJavadoc" value="true"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
     <module name="JavadocVariable">
@@ -129,20 +140,12 @@
       <property name="scope" value="protected"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    <module name="LineLength">
-      <metadata name="net.sf.eclipsecs.core.comment" value="Line length of 120 characters except for import lines."/>
-      <property name="severity" value="error"/>
-      <property name="ignorePattern" value="^import.*$"/>
-      <property name="max" value="120"/>
-      <property name="tabWidth" value="4"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
     <module name="EqualsHashCode">
       <metadata name="net.sf.eclipsecs.core.comment" value="Verify when Equals is overridden, hashCode is as well."/>
       <property name="severity" value="error"/>
     </module>
     <module name="MethodCount">
-      <property name="severity" value="error"/>
+      <property name="severity" value="warning"/>
     </module>
     <module name="ParameterNumber">
       <property name="severity" value="warning"/>
@@ -183,6 +186,20 @@
       <metadata name="net.sf.eclipsecs.core.comment" value="When a line is broken at a non-assignment operator the break comes before the symbol."/>
       <property name="severity" value="error"/>
     </module>
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+      <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+  </module>
+  <module name="SuppressWithPlainTextCommentFilter"/>
+  <module name="LineLength">
+    <metadata name="net.sf.eclipsecs.core.comment" value="Line length of 120 characters except for import lines."/>
+    <property name="severity" value="error"/>
+    <property name="ignorePattern" value="^import.*$"/>
+    <property name="max" value="120"/>
+    <property name="tabWidth" value="4"/>
+    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
   </module>
   <module name="RegexpSingleline">
     <metadata name="net.sf.eclipsecs.core.comment" value="Don't allow non-ASCII characters."/>
@@ -194,6 +211,7 @@
     <metadata name="net.sf.eclipsecs.core.comment" value="Checks that the file starts with a yahoo/apache copyright block."/>
     <property name="severity" value="error"/>
     <property name="headerFile" value="java.header"/>
+    <property name="multiLines" value="2"/>
     <property name="fileExtensions" value="java,groovy,g4"/>
   </module>
   <module name="RegexpHeader">
@@ -212,11 +230,6 @@
     <property name="severity" value="error"/>
     <property name="lineSeparator" value="lf"/>
   </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-    <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-    <property name="checkFormat" value="$1"/>
-  </module>
   <module name="RegexpMultiline">
     <metadata name="net.sf.eclipsecs.core.comment" value="Excessive white space"/>
     <property name="severity" value="error"/>
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 5083c79ee6..5fdfa84ad4 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -10,7 +10,11 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
 <suppressions>
   <!-- Suppress generated sources -->
-  <suppress files="[/\\]src[/\\]test[/\\]" checks="(JavadocType|LineLength)"/>
+  <suppress files="[/\\]src[/\\]test[/\\]resources[/\\]downloads[/\\]" checks="NewlineAtEndOfFile"/>
+  <suppress files="[/\\]src[/\\]test[/\\]" checks="(JavadocType|LineLength|MethodLength|MethodCount)"/>
   <suppress files="[/\\]src[/\\]main[/\\]webapp[/\\]WEB-INF[/\\]api-docs[/\\]" checks=".*"/>
   <suppress files="[/\\]target[/\\]" checks=".*"/>
+  <suppress files="\.csv" checks=".*"/>
+  <suppress files="\.json" checks="LineLength"/>
+  <suppress files="\.hbs" checks="LineLength"/>
 </suppressions>
diff --git a/elide-annotations/pom.xml b/elide-annotations/pom.xml
deleted file mode 100644
index b9561ae5d8..0000000000
--- a/elide-annotations/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-annotations</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide: Annotations</name>
-    <description>Annotations for Elide</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>Yahoo! Inc.</name>
-        <url>http://www.yahoo.com</url>
-    </organization>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/CreatePermission.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/CreatePermission.java
deleted file mode 100644
index 566f132b02..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/CreatePermission.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import com.yahoo.elide.security.checks.Check;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Assign custom Create permission checks.
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface CreatePermission {
-
-    /**
-     * Any one of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] any() default {};
-
-    /**
-     * All of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] all() default {};
-
-    /**
-     * An expression of checks that will be parsed via ANTLR. For example:
-     * {@code @CreatePermission(expression="Prefab.Role.All")} or
-     * {@code @CreatePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
-     *
-     * All of {@linkplain com.yahoo.elide.security.checks.prefab the built-in checks} are name-spaced as
-     * {@code Prefab.CHECK} without the {@code Check} suffix
-     *
-     * @return the expression string to be parsed
-     */
-    String expression() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/DeletePermission.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/DeletePermission.java
deleted file mode 100644
index 473b876b39..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/DeletePermission.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import com.yahoo.elide.security.checks.InlineCheck;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Assign custom Delete permission checks.
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface DeletePermission {
-
-    /**
-     * Any one of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends InlineCheck>[] any() default {};
-
-    /**
-     * All of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends InlineCheck>[] all() default {};
-
-    /**
-     * An expression of checks that will be parsed via ANTLR. For example:
-     * {@code @DeletePermission(expression="Prefab.Role.All")} or
-     * {@code @DeletePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
-     *
-     * All of {@linkplain com.yahoo.elide.security.checks.prefab the built-in checks} are name-spaced as
-     * {@code Prefab.CHECK} without the {@code Check} suffix
-     *
-     * @return the expression string to be parsed
-     */
-    String expression() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Include.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/Include.java
deleted file mode 100644
index 59462beb63..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Include.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Allows access to given entity.
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface Include {
-
-    /**
-     * (Optional) Whether or not the entity can be accessed at the root URL path (i.e. /company)
-     * @return the boolean
-     */
-    boolean rootLevel() default false;
-
-    /**
-     * The type of the JsonApi object. Defaults to the simple name of the entity class.
-     * @return the string
-     */
-    String type() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCommit.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCommit.java
deleted file mode 100644
index 78a1ef6bed..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCommit.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * On Commit trigger annotation.
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface OnCommit {
-
-    String value() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCreate.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCreate.java
deleted file mode 100644
index 24dd482d7b..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnCreate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * On Create trigger annotation.
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface OnCreate {
-
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnDelete.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnDelete.java
deleted file mode 100644
index 90ad4826b9..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnDelete.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * On Delete trigger annotation.
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface OnDelete {
-
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnUpdate.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnUpdate.java
deleted file mode 100644
index 64e53e3ddb..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/OnUpdate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * On Update trigger annotation.
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface OnUpdate {
-    String value();
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/ReadPermission.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/ReadPermission.java
deleted file mode 100644
index bff1be5890..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/ReadPermission.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import com.yahoo.elide.security.checks.InlineCheck;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Assign custom Read permission checks.
- */
-@Target({METHOD, FIELD, TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface ReadPermission {
-
-    /**
-     * Any one of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends InlineCheck>[] any() default {};
-
-    /**
-     * All of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends InlineCheck>[] all() default {};
-
-    /**
-     * An expression of checks that will be parsed via ANTLR. For example:
-     * {@code @ReadPermission(expression="Prefab.Role.All")} or
-     * {@code @ReadPermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
-     *
-     * All of {@linkplain com.yahoo.elide.security.checks.prefab the built-in checks} are name-spaced as
-     * {@code Prefab.CHECK} without the {@code Check} suffix
-     *
-     * @return the expression string to be parsed
-     */
-    String expression() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/SharePermission.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/SharePermission.java
deleted file mode 100644
index 34426e1b69..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/SharePermission.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import com.yahoo.elide.security.checks.Check;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * A permission that is checked whenever an object is loaded without the context of a lineage and assigned
- * to a relationship or collection.
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface SharePermission {
-
-    /**
-     * Any one of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] any() default {};
-
-    /**
-     * All of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] all() default {};
-
-    /**
-     * An expression of checks that will be parsed via ANTLR. For example:
-     * {@code @SharePermission(expression="Prefab.Role.All")} or
-     * {@code @SharePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
-     *
-     * All of {@linkplain com.yahoo.elide.security.checks.prefab the built-in checks} are name-spaced as
-     * {@code Prefab.CHECK} without the {@code Check} suffix
-     *
-     * @return the expression string to be parsed
-     */
-    String expression() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java b/elide-annotations/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java
deleted file mode 100644
index 0c47b6bf1a..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.annotation;
-
-import com.yahoo.elide.security.checks.Check;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Assign custom Update permission checks.
- */
-@Target({METHOD, FIELD, TYPE, PACKAGE})
-@Retention(RUNTIME)
-@Inherited
-public @interface UpdatePermission {
-
-    /**
-     * Any one of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] any() default {};
-
-    /**
-     * All of these checks must pass.
-     *
-     * @return the array of check classes
-     * @deprecated as of 2.2, use {@link #expression()} instead.
-     */
-    @Deprecated
-    Class<? extends Check>[] all() default {};
-
-    /**
-     * An expression of checks that will be parsed via ANTLR. For example:
-     * {@code @UpdatePermission(expression="Prefab.Role.All")} or
-     * {@code @UpdatePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
-     *
-     * All of {@linkplain com.yahoo.elide.security.checks.prefab the built-in checks} are name-spaced as
-     * {@code Prefab.CHECK} without the {@code Check} suffix
-     *
-     * @return the expression string to be parsed
-     */
-    String expression() default "";
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/ChangeSpec.java b/elide-annotations/src/main/java/com/yahoo/elide/security/ChangeSpec.java
deleted file mode 100644
index d02a76c189..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/ChangeSpec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * ChangeSpec for a particular field.
- */
-@AllArgsConstructor
-public class ChangeSpec {
-    @Getter private final PersistentResource resource;
-    @Getter private final String fieldName;
-    @Getter private final Object original;
-    @Getter private final Object modified;
-
-    @Override
-    public String toString() {
-        return String.format("ChangeSpec { resource=%s, field=%s, original=%s, modified=%s}",
-                resource,
-                fieldName,
-                original,
-                modified);
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/PersistentResource.java b/elide-annotations/src/main/java/com/yahoo/elide/security/PersistentResource.java
deleted file mode 100644
index 644096d6ec..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/PersistentResource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import java.util.Optional;
-
-/**
- * The persistent resource interface passed to change specs.
- * @param <T>
- */
-public interface PersistentResource<T> {
-
-    boolean matchesId(String id);
-
-    Optional<String> getUUID();
-    String getId();
-    String getType();
-
-    T getObject();
-    Class<T> getResourceClass();
-    RequestScope getRequestScope();
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/RequestScope.java b/elide-annotations/src/main/java/com/yahoo/elide/security/RequestScope.java
deleted file mode 100644
index 563fcf15fa..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/RequestScope.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import java.util.Set;
-
-/**
- * The request scope interface passed to checks.
- */
-public interface RequestScope {
-    User getUser();
-    Set<PersistentResource> getNewResources();
-
-    @Deprecated SecurityMode getSecurityMode();
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/SecurityMode.java b/elide-annotations/src/main/java/com/yahoo/elide/security/SecurityMode.java
deleted file mode 100644
index 58f4c30ba6..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/SecurityMode.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-/**
- * Enable or disable security.
- *
- * This functionality is deprecated and will soon be unavailable. At time of writing, SecurityMode's
- * are almost entirely non-functional within Elide with few exceptions that will remain until this enum
- * is removed.
- *
- * @deprecated Since 2.1, instead use the {@code Elide.Builder} with an appropriate {@code PermissionExecutor}
- */
-@Deprecated
-public enum SecurityMode {
-    SECURITY_INACTIVE,
-    SECURITY_ACTIVE_VERBOSE,
-    SECURITY_ACTIVE
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/User.java b/elide-annotations/src/main/java/com/yahoo/elide/security/User.java
deleted file mode 100644
index a1e95414fc..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/User.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import lombok.Getter;
-
-/**
- * Wrapper for opaque user passed in every request.
- */
-public class User {
-    @Getter private final Object opaqueUser;
-
-    public User(Object opaqueUser) {
-        this.opaqueUser = opaqueUser;
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/Check.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/Check.java
deleted file mode 100644
index 6a18e17cb4..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/Check.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.User;
-
-import java.util.Optional;
-
-/**
- * Custom security access that verifies whether a user belongs to a role.
- * Permissions are assigned as a set of checks that grant access to the permission.
- * @param <T> Type of record for Check
- */
-public interface Check<T> {
-
-    /**
-     * Determines whether the user can access the resource.
-     *
-     * @param object Fully modified object
-     * @param requestScope Request scope object
-     * @param changeSpec Summary of modifications
-     * @return true if security check passed
-     */
-    boolean ok(T object, RequestScope requestScope, Optional<ChangeSpec> changeSpec);
-
-    /**
-     * Method reserved for user checks.
-     *
-     * @param user User to check
-     * @return True if user check passes, false otherwise
-     */
-    boolean ok(User user);
-
-    default String checkIdentifier() {
-        return this.getClass().getName();
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CommitCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CommitCheck.java
deleted file mode 100644
index e62d3909aa..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CommitCheck.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-import com.yahoo.elide.security.User;
-
-/**
- * Commit check interface.
- * @see Check
- *
- * Commit checks are run immediately before a transaction is about to commit but after all changes have been made.
- * Objects passed to this check are guaranteed to be in their final state.
- *
- * @param <T> Type parameter
- */
-public abstract class CommitCheck<T> implements Check<T> {
-    /* NOTE: Operation checks and user checks are intended to be _distinct_ */
-    @Override
-    public final boolean ok(User user) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CriterionCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CriterionCheck.java
deleted file mode 100644
index 13884c2105..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/CriterionCheck.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-import com.yahoo.elide.security.RequestScope;
-
-/**
- * Extends Check to support Hibernate Criteria to limit SQL query responses.
- * @param <R> Type of the criterion to return
- * @param <T> Type of the record for the Check
- */
-public interface CriterionCheck<R, T> extends Check<T> {
-    /**
-     * Get criterion for request scope.
-     *
-     * @param requestScope the requestSCope
-     * @return the criterion
-     */
-    R getCriterion(RequestScope requestScope);
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/InlineCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/InlineCheck.java
deleted file mode 100644
index 8f9c38cb3a..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/InlineCheck.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-/**
- * Intermediate check representing the hierarchical structure of checks.
- * For instance, Read/Delete permissions can take any type of InlineCheck
- * while Create/Update permissions can be of any Check type.
- *
- * @param <T> type parameter
- */
-public abstract class InlineCheck<T> implements Check<T> {
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/OperationCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/OperationCheck.java
deleted file mode 100644
index d02472239b..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/OperationCheck.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-import com.yahoo.elide.security.User;
-
-/**
- * Operation check interface.
- * @see Check
- *
- * Operation checks are run in-line (i.e. as soon as objects are first encountered).
- *
- * <b>NOTE:</b> For <em>non-Read</em> operations, the object passed to this interface is not guaranteed to be complete
- *              as it will run _BEFORE_ changes are made to the object.
- *
- * @param <T> Type parameter
- */
-public abstract class OperationCheck<T> extends InlineCheck<T> {
-    /* NOTE: Operation checks and user checks are intended to be _distinct_ */
-    @Override
-    public final boolean ok(User user) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/UserCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/UserCheck.java
deleted file mode 100644
index f44a953060..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/UserCheck.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-
-import java.util.Optional;
-
-/**
- * Custom security access that verifies whether a user belongs to a role.
- * Permissions are assigned as a set of checks that grant access to the permission.
- */
-public abstract class UserCheck extends InlineCheck<Object> {
-    /* NOTE: Operation checks and user checks are intended to be _distinct_ */
-    @Override
-    public final boolean ok(Object object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        return ok(requestScope.getUser());
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/AddToCollectionCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/AddToCollectionCheck.java
deleted file mode 100644
index 6ab8c656ec..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/AddToCollectionCheck.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-
-import java.util.Collection;
-import java.util.Optional;
-
-/**
- * A check designed to look at the changeSpec to determine whether a value was added to a Collection
- *
- * @param <T> type parameter
- * @deprecated As of 2.2, use {@link Collections.RemoveOnly}
- */
-@Deprecated
-public class AddToCollectionCheck<T> extends CommitCheck<T> {
-
-    @Override
-    public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        if (changeSpec.isPresent() && changeSpec.get().getModified() instanceof Collection) {
-            Collection originalCollection = (Collection) changeSpec.get().getOriginal();
-            Collection modifiedCollection = (Collection) changeSpec.get().getModified();
-            return (modifiedCollection.size() > originalCollection.size())
-                    && (modifiedCollection.containsAll(originalCollection));
-        }
-        return false;
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Collections.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Collections.java
deleted file mode 100644
index ebc38020b4..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Collections.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-
-import java.util.Collection;
-import java.util.Optional;
-
-/**
- * Checks to ensure that collections are only modified in a prescribed manner.
- */
-public class Collections {
-
-    /**
-     * Use changeSpec to enforce that values were exclusively added to the collection.
-     *
-     * @param <T> type collection to be validated
-     */
-    public static class AppendOnly<T> extends CommitCheck<T> {
-
-        @Override
-        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (!changeSpecIsCollection(changeSpec)) {
-                return false;
-            }
-
-            Collection originalCollection = (Collection) changeSpec.get().getOriginal();
-            Collection modifiedCollection = (Collection) changeSpec.get().getModified();
-
-            return collectionIsSuperset(originalCollection, modifiedCollection);
-        }
-    }
-
-    /**
-     * Use changeSpec to enforce that values were exclusively removed from the collection.
-     *
-     * @param <T> type parameter
-     */
-    public class RemoveOnly<T> extends CommitCheck<T> {
-
-        @Override
-        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (!changeSpecIsCollection(changeSpec)) {
-                return false;
-            }
-
-            Collection originalCollection = (Collection) changeSpec.get().getOriginal();
-            Collection modifiedCollection = (Collection) changeSpec.get().getModified();
-
-            return collectionIsSuperset(modifiedCollection, originalCollection);
-        }
-
-    }
-
-    private static boolean collectionIsSuperset(Collection baseCollection, Collection potentialSuperset) {
-        return (potentialSuperset.size() >= baseCollection.size())
-                && (potentialSuperset.containsAll(baseCollection));
-    }
-
-    private static boolean changeSpecIsCollection(Optional<ChangeSpec> changeSpec) {
-        return changeSpec.isPresent() && changeSpec.get().getModified() instanceof Collection;
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Common.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Common.java
deleted file mode 100644
index 193f07eb1a..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Common.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-
-import java.util.Optional;
-
-/**
- * Checks that are generally applicable.
- */
-public class Common {
-    /**
-     * A check that enables users to update objects or fields during a create operation. This check allows
-     * users to be able to set values during object creation which are normally unmodifiable.
-     *
-     * @param <T> the type of object that this check guards
-     */
-    public static class UpdateOnCreate<T> extends CommitCheck<T> {
-        @Override
-        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            for (PersistentResource resource : requestScope.getNewResources()) {
-                if (record == resource.getObject()) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/RemoveFromCollectionCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/RemoveFromCollectionCheck.java
deleted file mode 100644
index f5168a7e05..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/RemoveFromCollectionCheck.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-
-import java.util.Collection;
-import java.util.Optional;
-
-/**
- * A check designed to look at the changeSpec to determine whether a value was removed from a Collection
- *
- * @param <T> type parameter
- * @deprecated Since 2.2, use {@link com.yahoo.elide.security.checks.prefab.Collections.RemoveOnly} instead
- */
-@Deprecated
-public class RemoveFromCollectionCheck<T> extends CommitCheck<T> {
-
-    @Override
-    public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        if (changeSpec.isPresent() && changeSpec.get().getModified() instanceof Collection) {
-            Collection originalCollection = (Collection) changeSpec.get().getOriginal();
-            Collection modifiedCollection = (Collection) changeSpec.get().getModified();
-            return (originalCollection.size() > modifiedCollection.size())
-                    && (originalCollection.containsAll(modifiedCollection));
-        }
-        return false;
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Role.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Role.java
deleted file mode 100644
index b9387dd671..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/Role.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.UserCheck;
-
-/**
- * Simple checks to always grant or deny.
- */
-public class Role {
-    /**
-     * Check which always grants.
-     */
-    public static class ALL extends UserCheck {
-        @Override
-        public boolean ok(User user) {
-            return true;
-        }
-    }
-
-    /**
-     * Check which always denies.
-     */
-    public static class NONE extends UserCheck {
-        @Override
-        public boolean ok(User user) {
-            return false;
-        }
-    }
-}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/UpdateOnCreateCheck.java b/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/UpdateOnCreateCheck.java
deleted file mode 100644
index 69a002d779..0000000000
--- a/elide-annotations/src/main/java/com/yahoo/elide/security/checks/prefab/UpdateOnCreateCheck.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.checks.prefab;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-
-import java.util.Optional;
-
-/**
- * A check that enables users to update objects or fields during a create operation. This check allows
- * users to be able to set values during object creation which are normally unmodifiable.
- *
- * @param <T> the type of object that this check guards
- * @deprecated As of 2.2, use {@link com.yahoo.elide.security.checks.prefab.Common.UpdateOnCreate} instead.
- */
-@Deprecated
-public class UpdateOnCreateCheck<T> extends CommitCheck<T> {
-    @Override
-    public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        for (PersistentResource resource : requestScope.getNewResources()) {
-            if (record == resource.getObject()) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/elide-async/pom.xml b/elide-async/pom.xml
new file mode 100644
index 0000000000..0c76b92416
--- /dev/null
+++ b/elide-async/pom.xml
@@ -0,0 +1,190 @@
+<!--
+  ~ Copyright 2020, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-async</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Async</name>
+    <description>Elide Async</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Yahoo! Inc.</name>
+        <url>http://www.yahoo.com</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+        </dependency>
+
+        <!--Jackson CSV generator does not support Object values for properties (nested Objects)-->
+        <dependency>
+            <groupId>com.github.opendevl</groupId>
+            <artifactId>json2flat</artifactId>
+            <version>1.0.3</version>
+            <exclusions>
+                <exclusion>
+                	<groupId>com.fasterxml.jackson.core</groupId>
+                	<artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>${jedis.version}</version>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>com.github.codemonstur</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>${embedded-redis.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- For Export End-Point Test -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>${version.jersey}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- JUnit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- H2 -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Mockito -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.5.Final</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <reuseForks>false</reuseForks>
+                    <forkCount>1</forkCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generateStubs</goal>
+                            <goal>compile</goal>
+                            <goal>generateTestStubs</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/CSVExportFormatter.java b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/CSVExportFormatter.java
new file mode 100644
index 0000000000..3c19433808
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/CSVExportFormatter.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.formatter;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.opendevl.JFlat;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * JSON output format implementation.
+ */
+@Slf4j
+public class CSVExportFormatter implements TableExportFormatter {
+    private static final String COMMA = ",";
+    private static final String DOUBLE_QUOTES = "\"";
+
+    private boolean skipCSVHeader = false;
+    private ObjectMapper mapper;
+
+    public CSVExportFormatter(Elide elide, boolean skipCSVHeader) {
+        this.skipCSVHeader = skipCSVHeader;
+        this.mapper = elide.getMapper().getObjectMapper();
+    }
+
+    @Override
+    public String format(PersistentResource resource, Integer recordNumber) {
+        if (resource == null) {
+            return null;
+        }
+
+        StringBuilder str = new StringBuilder();
+
+        List<Object[]> json2Csv;
+
+        try {
+            String jsonStr = JSONExportFormatter.resourceToJSON(mapper, resource);
+
+            JFlat flat = new JFlat(jsonStr);
+
+            json2Csv = flat.json2Sheet().headerSeparator("_").getJsonAsSheet();
+
+            int index = 0;
+
+            for (Object[] obj : json2Csv) {
+                // convertToCSV is called once for each PersistentResource in the observable.
+                // json2Csv will always have 2 entries.
+                // 0th index is the header so we need to skip the header.
+                if (index++ == 0) {
+                    continue;
+                }
+
+                String objString = Arrays.toString(obj);
+                //The arrays.toString returns o/p with [ and ] at the beginning and end. So need to exclude them.
+                objString = objString.substring(1, objString.length() - 1);
+                str.append(objString);
+            }
+        } catch (Exception e) {
+            log.error("Exception while converting to CSV: {}", e.getMessage());
+            throw new IllegalStateException(e);
+        }
+        return str.toString();
+    }
+
+    /**
+     * Generate CSV Header when Observable is Empty.
+     * @param projection EntityProjection object.
+     * @return returns Header string which is in CSV format.
+     */
+    private String generateCSVHeader(EntityProjection projection) {
+        if (projection.getAttributes() == null) {
+            return "";
+        }
+
+        return projection.getAttributes().stream()
+                .map(this::toHeader)
+                .collect(Collectors.joining(COMMA));
+    }
+
+    @Override
+    public String preFormat(EntityProjection projection, TableExport query) {
+        if (projection == null || skipCSVHeader) {
+            return null;
+        }
+
+        return generateCSVHeader(projection);
+    }
+
+    @Override
+    public String postFormat(EntityProjection projection, TableExport query) {
+        return null;
+    }
+
+    private String toHeader(Attribute attribute) {
+        if (attribute.getArguments() == null || attribute.getArguments().size() == 0) {
+            return quote(attribute.getName());
+        }
+
+        StringBuilder header = new StringBuilder();
+        header.append(attribute.getName());
+        header.append("(");
+
+        header.append(attribute.getArguments().stream()
+                .map((arg) -> arg.getName() + "=" + arg.getValue())
+                .collect(Collectors.joining(" ")));
+
+        header.append(")");
+
+        return quote(header.toString());
+    }
+
+    private String quote(String toQuote) {
+        return "\"" + toQuote + "\"";
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/JSONExportFormatter.java b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/JSONExportFormatter.java
new file mode 100644
index 0000000000..d94cecd080
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/JSONExportFormatter.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.formatter;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.jsonapi.models.Resource;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * JSON output format implementation.
+ */
+@Slf4j
+public class JSONExportFormatter implements TableExportFormatter {
+    private static final String COMMA = ",";
+    private ObjectMapper mapper;
+
+    public JSONExportFormatter(Elide elide) {
+        this.mapper = elide.getMapper().getObjectMapper();
+    }
+
+    @Override
+    public String format(PersistentResource resource, Integer recordNumber) {
+        if (resource == null) {
+            return null;
+        }
+
+        StringBuilder str = new StringBuilder();
+        if (recordNumber > 1) {
+            // Add "," to separate individual json rows within the array
+            str.append(COMMA);
+        }
+
+        str.append(resourceToJSON(mapper, resource));
+        return str.toString();
+    }
+
+    public static String resourceToJSON(ObjectMapper mapper, PersistentResource resource) {
+        if (resource == null || resource.getObject() == null) {
+            return null;
+        }
+
+        StringBuilder str = new StringBuilder();
+        try {
+            Resource jsonResource = resource.toResource(getRelationships(resource), getAttributes(resource));
+
+            str.append(mapper.writeValueAsString(jsonResource.getAttributes()));
+        } catch (JsonProcessingException e) {
+            log.error("Exception when converting to JSON {}", e.getMessage());
+            throw new IllegalStateException(e);
+        }
+        return str.toString();
+    }
+
+    private static Map<String, Object> getAttributes(PersistentResource resource) {
+        final Map<String, Object> attributes = new LinkedHashMap<>();
+        final Set<Attribute> attrFields = resource.getRequestScope().getEntityProjection().getAttributes();
+
+        for (Attribute field : attrFields) {
+            String alias = field.getAlias();
+            String fieldName = StringUtils.isNotEmpty(alias) ? alias : field.getName();
+            attributes.put(fieldName, resource.getAttribute(field));
+        }
+        return attributes;
+    }
+
+    private static Map<String, Object> getRelationships(PersistentResource resource) {
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public String preFormat(EntityProjection projection, TableExport query) {
+        return "[";
+    }
+
+    @Override
+    public String postFormat(EntityProjection projection, TableExport query) {
+        return "]";
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/TableExportFormatter.java b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/TableExportFormatter.java
new file mode 100644
index 0000000000..955041ba72
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/formatter/TableExportFormatter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.formatter;
+
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.request.EntityProjection;
+
+/**
+ * Interface which is used to format PersistentResource to output format.
+ */
+public interface TableExportFormatter {
+
+    /**
+     * Format PersistentResource.
+     * @param resource PersistentResource to format
+     * @param recordNumber Record Number being processed.
+     * @return output string
+     */
+    public String format(PersistentResource resource, Integer recordNumber);
+
+    /**
+     * Pre Format Action.
+     * Example: Generate Header, Metadata etc.
+     * @param projection Entity projection.
+     * @param query TableExport type object.
+     * @return output string
+     */
+    public String preFormat(EntityProjection projection, TableExport query);
+
+    /**
+     * Post Format Action.
+     * Example: Generate Metadata, Stats etc.
+     * @param projection Entity projection.
+     * @param query TableExport type object.
+     * @return output string
+     */
+    public String postFormat(EntityProjection projection, TableExport query);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java
new file mode 100644
index 0000000000..215b54a726
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.validator;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+
+import java.util.Collection;
+
+/**
+ * Validates none of the projections have relationships.
+ */
+public class NoRelationshipsProjectionValidator implements Validator {
+
+    @Override
+    public void validateProjection(Collection<EntityProjection> projections) {
+        for (EntityProjection projection : projections) {
+            if (!projection.getRelationships().isEmpty()) {
+                throw new BadRequestException(
+                                "Export is not supported for Query that requires traversing Relationships.");
+            }
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java
new file mode 100644
index 0000000000..3704284a3f
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.validator;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+
+import java.util.Collection;
+
+/**
+ * Validates each projection in collection have one projection only.
+ */
+public class SingleRootProjectionValidator implements Validator {
+
+    @Override
+    public void validateProjection(Collection<EntityProjection> projections) {
+        if (projections.size() != 1) {
+            throw new BadRequestException("Export is only supported for single Query with one root projection.");
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/Validator.java b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/Validator.java
new file mode 100644
index 0000000000..638ebba215
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/Validator.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.validator;
+
+import com.yahoo.elide.core.request.EntityProjection;
+
+import java.util.Collection;
+
+/**
+ * Utility interface used to validate Entity Projections.
+ */
+public interface Validator {
+
+    /**
+     * Validates the EntityProjection.
+     * @param projections Collection of EntityProjections to validate.
+     */
+    public void validateProjection(Collection<EntityProjection> projections);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncAPIHook.java b/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncAPIHook.java
new file mode 100644
index 0000000000..5b7334ffd0
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncAPIHook.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.hooks;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.RequestScope;
+import lombok.Data;
+
+import java.security.Principal;
+import java.util.concurrent.Callable;
+
+/**
+ * AsyncAPI Base Hook methods.
+ * @param <T> Type of AsyncAPI.
+ */
+@Data
+public abstract class AsyncAPIHook<T extends AsyncAPI> implements LifeCycleHook<T> {
+    private final AsyncExecutorService asyncExecutorService;
+    private final Integer maxAsyncAfterSeconds;
+
+    public AsyncAPIHook(AsyncExecutorService asyncExecutorService, Integer maxAsyncAfterSeconds) {
+        this.asyncExecutorService = asyncExecutorService;
+        this.maxAsyncAfterSeconds = maxAsyncAfterSeconds;
+    }
+
+    /**
+     * Validate the Query Options before executing.
+     * @param query AsyncAPI type object.
+     * @param requestScope RequestScope object.
+     * @throws InvalidValueException InvalidValueException
+     */
+    protected void validateOptions(AsyncAPI query, RequestScope requestScope) {
+        if (query.getAsyncAfterSeconds() > maxAsyncAfterSeconds) {
+            throw new InvalidValueException("Invalid Async After Seconds");
+        }
+    }
+
+    /**
+     * Execute the Hook.
+     * @param query AsyncAPI type object.
+     * @param requestScope RequestScope object.
+     * @param queryWorker Thread to execute.
+     * @throws InvalidOperationException InvalidOperationException
+     */
+    protected void executeHook(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+            AsyncAPI query, RequestScope requestScope, Callable<AsyncAPIResult> queryWorker) {
+        if (operation.equals(CREATE)) {
+            if (phase.equals(PREFLUSH)) {
+                validateOptions(query, requestScope);
+                executeAsync(query, queryWorker);
+                return;
+            }
+            if (phase.equals(POSTCOMMIT)) {
+                completeAsync(query, requestScope);
+                return;
+            }
+            if (phase.equals(PRESECURITY)) {
+                updatePrincipalName(query, requestScope);
+                return;
+            }
+        }
+
+        throw new InvalidOperationException("Invalid LifeCycle Hook Invocation");
+    }
+
+    /**
+     * Call the completeQuery process in AsyncExecutorService.
+     * @param query AsyncAPI object to complete.
+     * @param requestScope RequestScope object.
+     */
+    protected void completeAsync(AsyncAPI query, RequestScope requestScope) {
+        asyncExecutorService.completeQuery(query, requestScope.getUser(), requestScope.getApiVersion());
+    }
+
+    /**
+     * Call the executeQuery process on AsyncExecutorService.
+     * @param query AsyncAPI object to complete.
+     * @param callable CallableThread instance.
+     */
+    protected void executeAsync(AsyncAPI query, Callable<AsyncAPIResult> callable) {
+        if (query.getStatus() == QueryStatus.QUEUED && query.getResult() == null) {
+            asyncExecutorService.executeQuery(query, callable);
+        }
+    }
+
+    /**
+     * Update Principal Name.
+     * @param query AsyncAPI object to complete.
+     * @param requestScope RequestScope object.
+     */
+    protected void updatePrincipalName(AsyncAPI query, RequestScope requestScope) {
+        Principal principal = requestScope.getUser().getPrincipal();
+        if (principal != null) {
+            query.setPrincipalName(principal.getName());
+        }
+    }
+
+    /**
+     * Get Callable operation to submit.
+     * @param query AsyncAPI object to complete.
+     * @param requestScope RequestScope object.
+     * @return Callable initialized.
+     */
+    public abstract Callable<AsyncAPIResult> getOperation(AsyncAPI query, RequestScope requestScope);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncQueryHook.java b/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncQueryHook.java
new file mode 100644
index 0000000000..c54b7269d5
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncQueryHook.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding.Operation;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.operation.GraphQLAsyncQueryOperation;
+import com.yahoo.elide.async.operation.JSONAPIAsyncQueryOperation;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.graphql.QueryRunner;
+
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+/**
+ * LifeCycle Hook for execution of AsyncQuery.
+ */
+public class AsyncQueryHook extends AsyncAPIHook<AsyncQuery> {
+
+    public AsyncQueryHook (AsyncExecutorService asyncExecutorService, Integer maxAsyncAfterSeconds) {
+        super(asyncExecutorService, maxAsyncAfterSeconds);
+    }
+
+    @Override
+    public void execute(Operation operation, TransactionPhase phase, AsyncQuery query, RequestScope requestScope,
+            Optional<ChangeSpec> changes) {
+        Callable<AsyncAPIResult> callable = getOperation(query, requestScope);
+        executeHook(operation, phase, query, requestScope, callable);
+    }
+
+    @Override
+    public void validateOptions(AsyncAPI query, RequestScope requestScope) {
+        super.validateOptions(query, requestScope);
+
+        if (query.getQueryType().equals(QueryType.GRAPHQL_V1_0)) {
+            QueryRunner runner = getAsyncExecutorService().getRunners().get(requestScope.getApiVersion());
+            if (runner == null) {
+                throw new InvalidOperationException("Invalid API Version");
+            }
+        }
+    }
+
+    @Override
+    public Callable<AsyncAPIResult> getOperation(AsyncAPI query, RequestScope requestScope) {
+        Callable<AsyncAPIResult> operation = null;
+        if (query.getQueryType().equals(QueryType.JSONAPI_V1_0)) {
+            operation = new JSONAPIAsyncQueryOperation(getAsyncExecutorService(), query,
+                    (com.yahoo.elide.core.RequestScope) requestScope);
+        } else {
+            operation = new GraphQLAsyncQueryOperation(getAsyncExecutorService(), query,
+                    (com.yahoo.elide.core.RequestScope) requestScope);
+        }
+        return operation;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/hooks/TableExportHook.java b/elide-async/src/main/java/com/yahoo/elide/async/hooks/TableExportHook.java
new file mode 100644
index 0000000000..c87eeb873f
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/hooks/TableExportHook.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding.Operation;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.operation.GraphQLTableExportOperation;
+import com.yahoo.elide.async.operation.JSONAPITableExportOperation;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+/**
+ * LifeCycle Hook for execution of TableExpoer.
+ */
+public class TableExportHook extends AsyncAPIHook<TableExport> {
+    Map<ResultType, TableExportFormatter> supportedFormatters;
+    ResultStorageEngine engine;
+
+    public TableExportHook (AsyncExecutorService asyncExecutorService, Integer maxAsyncAfterSeconds,
+            Map<ResultType, TableExportFormatter> supportedFormatters, ResultStorageEngine engine) {
+        super(asyncExecutorService, maxAsyncAfterSeconds);
+        this.supportedFormatters = supportedFormatters;
+        this.engine = engine;
+    }
+
+    @Override
+    public void execute(Operation operation, TransactionPhase phase, TableExport export, RequestScope requestScope,
+            Optional<ChangeSpec> changes) {
+        Callable<AsyncAPIResult> callable = getOperation(export, requestScope);
+        executeHook(operation, phase, export, requestScope, callable);
+    }
+
+    @Override
+    public void validateOptions(AsyncAPI export, RequestScope requestScope) {
+        super.validateOptions(export, requestScope);
+    }
+
+    @Override
+    public Callable<AsyncAPIResult> getOperation(AsyncAPI export, RequestScope requestScope) {
+        Callable<AsyncAPIResult> operation = null;
+        TableExport exportObj = (TableExport) export;
+        ResultType resultType = exportObj.getResultType();
+        QueryType queryType = exportObj.getQueryType();
+        com.yahoo.elide.core.RequestScope scope = (com.yahoo.elide.core.RequestScope) requestScope;
+
+        TableExportFormatter formatter = supportedFormatters.get(resultType);
+
+        if (formatter == null) {
+            throw new InvalidOperationException("Formatter unavailable for " + resultType);
+        }
+
+        if (queryType.equals(QueryType.GRAPHQL_V1_0)) {
+            operation = new GraphQLTableExportOperation(formatter, getAsyncExecutorService(), export, scope, engine);
+        } else if (queryType.equals(QueryType.JSONAPI_V1_0)) {
+            operation = new JSONAPITableExportOperation(formatter, getAsyncExecutorService(), export, scope, engine);
+        } else {
+            throw new InvalidOperationException(queryType + "is not supported");
+        }
+        return operation;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPI.java b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPI.java
new file mode 100644
index 0000000000..e8d80a416b
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPI.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.UpdatePermission;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.PreUpdate;
+import javax.persistence.Transient;
+import javax.validation.constraints.Pattern;
+
+/**
+ * Base Model Class for Async Query.
+ */
+@MappedSuperclass
+@Data
+public abstract class AsyncAPI implements PrincipalOwned {
+    @Id
+    @Column(columnDefinition = "varchar(36)")
+    @Pattern(regexp = "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+    message = "id not of pattern UUID")
+    private String id = UUID.randomUUID().toString(); //Provided by client or generated if missing on create.
+
+    protected String query;  //JSON-API PATH or GraphQL payload.
+
+    protected QueryType queryType; //GRAPHQL, JSONAPI
+
+    @Exclude
+    @Column(columnDefinition = "varchar(36)")
+    protected String requestId = UUID.randomUUID().toString();
+
+    @CreatePermission(expression = "Prefab.Role.None")
+    private String principalName;
+
+    @UpdatePermission(expression = "(Principal is Admin OR Principal is Owner) AND value is Cancelled")
+    @CreatePermission(expression = "value is Queued")
+    @Enumerated(EnumType.STRING)
+    private QueryStatus status = QueryStatus.QUEUED;
+
+    @CreatePermission(expression = "Prefab.Role.None")
+    @UpdatePermission(expression = "Prefab.Role.None")
+    private Date createdOn = new Date();
+
+    @CreatePermission(expression = "Prefab.Role.None")
+    @UpdatePermission(expression = "Prefab.Role.None")
+    private Date updatedOn = new Date();
+
+    @Transient
+    @ComputedAttribute
+    private Integer asyncAfterSeconds = 10;
+
+    /**
+     * Set Async API Result.
+     * @param result Base Result Object to persist.
+     */
+    public abstract void setResult(AsyncAPIResult result);
+
+    /**
+     * Get Async API Result.
+     * @return AsyncAPIResult object.
+     */
+    public abstract AsyncAPIResult getResult();
+
+    @PreUpdate
+    public void preUpdate() {
+        this.updatedOn = new Date();
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof AsyncAPI && this.getClass() == obj.getClass() && id.equals(((AsyncAPI) obj).id);
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPIResult.java b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPIResult.java
new file mode 100644
index 0000000000..8eb0103fd7
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncAPIResult.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Base Model for Async Query Result.
+ */
+@MappedSuperclass
+@Data
+public abstract class AsyncAPIResult {
+
+    private Integer recordCount;
+
+    private Integer httpStatus; // HTTP Status
+
+    private Date completedOn = new Date();
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQuery.java b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQuery.java
new file mode 100644
index 0000000000..d28332ad59
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQuery.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+
+/**
+ * Model for Async Query.
+ * AsyncQueryHook is binded manually during the elide startup,
+ * after asyncexecutorservice is initialized.
+ */
+@Entity
+@Include(name = "asyncQuery")
+@ReadPermission(expression = "Principal is Owner OR Principal is Admin")
+@UpdatePermission(expression = "Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.None")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AsyncQuery extends AsyncAPI {
+    @Embedded
+    private AsyncQueryResult result;
+
+    @Override
+    public void setResult(AsyncAPIResult result) {
+        this.result = (AsyncQueryResult) result;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQueryResult.java b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQueryResult.java
new file mode 100644
index 0000000000..3be5b3f382
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/AsyncQueryResult.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Lob;
+
+/**
+ * Model for Async Query Result.
+ */
+@Embeddable
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AsyncQueryResult extends AsyncAPIResult {
+    private Integer contentLength;
+
+    @Lob
+    private String responseBody;  //URL or Response body
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/FileExtensionType.java b/elide-async/src/main/java/com/yahoo/elide/async/models/FileExtensionType.java
new file mode 100644
index 0000000000..409d2e7fa6
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/FileExtensionType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.models;
+
+/**
+ * ENUM of supported file extension types.
+ */
+public enum FileExtensionType {
+    JSON(".json"),
+    CSV(".csv"),
+    NONE("");
+
+    private final String extension;
+
+    FileExtensionType(String extension) {
+        this.extension = extension;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/PrincipalOwned.java b/elide-async/src/main/java/com/yahoo/elide/async/models/PrincipalOwned.java
new file mode 100644
index 0000000000..792c56efa6
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/PrincipalOwned.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+/**
+ * Get principal owner name interface.
+ */
+public interface PrincipalOwned {
+    public String getPrincipalName();
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/QueryStatus.java b/elide-async/src/main/java/com/yahoo/elide/async/models/QueryStatus.java
new file mode 100644
index 0000000000..35029f45aa
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/QueryStatus.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+/**
+ * ENUM of possible query statuses.
+ */
+public enum QueryStatus {
+    COMPLETE,
+    QUEUED,
+    PROCESSING,
+    CANCELLED,
+    TIMEDOUT,
+    FAILURE,
+    CANCEL_COMPLETE
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/QueryType.java b/elide-async/src/main/java/com/yahoo/elide/async/models/QueryType.java
new file mode 100644
index 0000000000..d1b5dcd598
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/QueryType.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+/**
+ * ENUM of supported query types.
+ */
+public enum QueryType {
+    GRAPHQL_V1_0,
+    JSONAPI_V1_0
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/ResultType.java b/elide-async/src/main/java/com/yahoo/elide/async/models/ResultType.java
new file mode 100644
index 0000000000..35e7e79904
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/ResultType.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+/**
+ * ENUM of supported result types.
+ */
+public enum ResultType {
+    JSON(FileExtensionType.JSON),
+    CSV(FileExtensionType.CSV);
+
+    private final FileExtensionType fileExtensionType;
+
+    ResultType(FileExtensionType fileExtensionType) {
+        this.fileExtensionType = fileExtensionType;
+    }
+
+    public FileExtensionType getFileExtensionType() {
+        return fileExtensionType;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/TableExport.java b/elide-async/src/main/java/com/yahoo/elide/async/models/TableExport.java
new file mode 100644
index 0000000000..b031e81329
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/TableExport.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Model for Table Export.
+ * TableExportHook is binded manually during the elide startup,
+ * after asyncexecutorservice is initialized.
+ */
+@Entity
+@Include(name = "tableExport")
+@ReadPermission(expression = "Principal is Owner OR Principal is Admin")
+@UpdatePermission(expression = "Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.None")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TableExport extends AsyncAPI {
+
+    @Enumerated(EnumType.STRING)
+    @NotNull
+    private ResultType resultType; //CSV, JSON
+
+    @Embedded
+    private TableExportResult result;
+
+    @Override
+    public void setResult(AsyncAPIResult result) {
+        this.result = (TableExportResult) result;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/TableExportResult.java b/elide-async/src/main/java/com/yahoo/elide/async/models/TableExportResult.java
new file mode 100644
index 0000000000..0a668a66e2
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/TableExportResult.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.net.URL;
+import javax.persistence.Embeddable;
+import javax.persistence.Lob;
+
+/**
+ * Model for Table Export Result.
+ */
+@Embeddable
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TableExportResult extends AsyncAPIResult {
+    private URL url;
+
+    @Lob
+    private String message;
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/models/security/AsyncAPIInlineChecks.java b/elide-async/src/main/java/com/yahoo/elide/async/models/security/AsyncAPIInlineChecks.java
new file mode 100644
index 0000000000..8b6ae7311d
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/models/security/AsyncAPIInlineChecks.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models.security;
+
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Operation Checks on the Async API and Result objects.
+ */
+public class AsyncAPIInlineChecks {
+    private static final String PRINCIPAL_NAME = "principalName";
+
+    static private FilterPredicate getPredicateOfPrincipalName(String principalName, Type entityClass) {
+        Path.PathElement path = new Path.PathElement(entityClass, ClassType.STRING_TYPE, PRINCIPAL_NAME);
+        return new FilterPredicate(path, Operator.IN, Collections.singletonList(principalName));
+    }
+
+    static private FilterPredicate getPredicateOfPrincipalNameNull(Type entityClass) {
+        Path.PathElement path = new Path.PathElement(entityClass, ClassType.STRING_TYPE, PRINCIPAL_NAME);
+        return new FilterPredicate(path, Operator.ISNULL, Collections.emptyList());
+    }
+
+    /**
+     * Filter for principalName == Owner.
+     * @param <T> type parameter
+     */
+    @SecurityCheck(AsyncAPIOwner.PRINCIPAL_IS_OWNER)
+    static public class AsyncAPIOwner<T> extends FilterExpressionCheck<T> {
+        public static final String PRINCIPAL_IS_OWNER = "Principal is Owner";
+        /**
+         * query principalName == owner.
+         */
+        @Override
+        public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
+            Principal principal = requestScope.getUser().getPrincipal();
+            if (principal == null || principal.getName() == null) {
+                 return getPredicateOfPrincipalNameNull(entityClass);
+            }
+            return getPredicateOfPrincipalName(principal.getName(), entityClass);
+        }
+    }
+
+    @SecurityCheck(AsyncAPIAdmin.PRINCIPAL_IS_ADMIN)
+    public static class AsyncAPIAdmin extends UserCheck {
+
+        public static final String PRINCIPAL_IS_ADMIN = "Principal is Admin";
+
+        @Override
+        public boolean ok(User user) {
+            if (user != null && user.getPrincipal() != null) {
+                return user.isInRole("admin");
+            }
+            return false;
+        }
+    }
+
+    @SecurityCheck(AsyncAPIStatusValue.VALUE_IS_CANCELLED)
+    public static class AsyncAPIStatusValue extends OperationCheck<AsyncAPI> {
+
+        public static final String VALUE_IS_CANCELLED = "value is Cancelled";
+
+        @Override
+        public boolean ok(AsyncAPI object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec.get().getModified().toString().equals(QueryStatus.CANCELLED.name());
+        }
+    }
+
+    @SecurityCheck(AsyncAPIStatusQueuedValue.VALUE_IS_QUEUED)
+    public static class AsyncAPIStatusQueuedValue extends OperationCheck<AsyncAPI> {
+        public static final String VALUE_IS_QUEUED = "value is Queued";
+        @Override
+        public boolean ok(AsyncAPI object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec.get().getModified().toString().equals(QueryStatus.QUEUED.name());
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperation.java
new file mode 100644
index 0000000000..dda12591ee
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperation.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.Future;
+
+/**
+ * Runnable Operation for updating AsyncQueryResult.
+ */
+@Slf4j
+@Data
+@AllArgsConstructor
+public class AsyncAPIUpdateOperation implements Runnable {
+
+    private Elide elide;
+    private Future<AsyncAPIResult> task;
+    private AsyncAPI queryObj;
+    private AsyncAPIDAO asyncAPIDao;
+
+    /**
+     * This is the main method which updates the Async API request.
+     */
+    @Override
+    public void run() {
+        try {
+            AsyncAPIResult queryResultObj = task.get();
+            // add queryResult object to query object
+            asyncAPIDao.updateAsyncAPIResult(queryResultObj, queryObj.getId(), queryObj.getClass());
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("InterruptedException: {}", e.toString());
+            asyncAPIDao.updateStatus(queryObj.getId(), QueryStatus.FAILURE, queryObj.getClass());
+        } catch (Exception e) {
+            log.error("Exception: {}", e.toString());
+            asyncAPIDao.updateStatus(queryObj.getId(), QueryStatus.FAILURE, queryObj.getClass());
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncQueryOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncQueryOperation.java
new file mode 100644
index 0000000000..14289aafff
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncQueryOperation.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.AsyncQueryResult;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.RequestScope;
+import com.jayway.jsonpath.JsonPath;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.URISyntaxException;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+/**
+ * AsyncQuery Execute Operation Interface.
+ */
+@Slf4j
+public abstract class AsyncQueryOperation implements Callable<AsyncAPIResult> {
+    @Getter private AsyncExecutorService service;
+    private AsyncQuery queryObj;
+    private RequestScope scope;
+
+    public AsyncQueryOperation(AsyncExecutorService service, AsyncAPI queryObj, RequestScope scope) {
+        this.service = service;
+        this.queryObj = (AsyncQuery) queryObj;
+        this.scope = scope;
+    }
+
+    @Override
+    public AsyncAPIResult call() throws URISyntaxException {
+        ElideResponse response = null;
+        log.debug("AsyncQuery Object from request: {}", queryObj);
+        response = execute(queryObj, scope);
+        nullResponseCheck(response);
+
+        AsyncQueryResult queryResult = new AsyncQueryResult();
+        queryResult.setHttpStatus(response.getResponseCode());
+        queryResult.setCompletedOn(new Date());
+        queryResult.setResponseBody(response.getBody());
+        queryResult.setContentLength(response.getBody().length());
+        if (response.getResponseCode() == 200) {
+            queryResult.setRecordCount(calculateRecordCount(queryObj, response));
+        }
+        return queryResult;
+    }
+
+    /**
+     * Calculate Record Count in the response.
+     * @param queryObj AsyncAPI type object.
+     * @param response ElideResponse object.
+     * @return Integer record count
+     */
+    public abstract Integer calculateRecordCount(AsyncQuery queryObj, ElideResponse response);
+
+    /**
+     * Check if Elide Response is NULL.
+     * @param response ElideResponse object.
+     * @throws IllegalStateException IllegalStateException Exception.
+     */
+    public void nullResponseCheck(ElideResponse response) {
+        if (response == null) {
+            throw new IllegalStateException("No Response for request returned");
+        }
+    }
+
+    /**
+     * Execute the Async Query Request.
+     * @param queryObj AsyncAPI type object.
+     * @param scope RequestScope.
+     * @return response ElideResponse object.
+     * @throws URISyntaxException URISyntaxException Exception.
+     */
+    public abstract ElideResponse execute(AsyncAPI queryObj, RequestScope scope)  throws URISyntaxException;
+
+    /**
+     * Safe method of extracting 'foo.bar.length()' expressions from com.jayway.jsonpath.  This protects
+     * against breaking API changes between 2.4 and beyond.
+     * @param json The json body to extract from.
+     * @param path The json path expression that represents an array.
+     * @return The size of the array.
+     */
+    public static Integer safeJsonPathLength(String json, String path) {
+        Object result = JsonPath.read(json, path);
+
+        if (Integer.class.isAssignableFrom(result.getClass())) {
+            return (Integer) result;
+        }
+
+        if (List.class.isAssignableFrom(result.getClass())) {
+            List resultList = ((List) result);
+
+            result = resultList.isEmpty() ? 0 : resultList.get(0);
+            if (Integer.class.isAssignableFrom(result.getClass())) {
+                return (Integer) result;
+            }
+        }
+
+        throw new IllegalStateException("Incompatible version of JSONPath");
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperation.java
new file mode 100644
index 0000000000..0bd64a3e07
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperation.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.QueryRunner;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.URISyntaxException;
+import java.util.UUID;
+
+/**
+ * GrapqhQL implementation of AsyncQueryOperation for executing the query provided in AsyncQuery.
+ */
+@Slf4j
+public class GraphQLAsyncQueryOperation extends AsyncQueryOperation {
+
+    public GraphQLAsyncQueryOperation(AsyncExecutorService service, AsyncAPI queryObj, RequestScope scope) {
+        super(service, queryObj, scope);
+    }
+
+    @Override
+    public ElideResponse execute(AsyncAPI queryObj, RequestScope scope) throws URISyntaxException {
+        User user = scope.getUser();
+        String apiVersion = scope.getApiVersion();
+        QueryRunner runner = getService().getRunners().get(apiVersion);
+        if (runner == null) {
+            throw new InvalidOperationException("Invalid API Version");
+        }
+        UUID requestUUID = UUID.fromString(queryObj.getRequestId());
+        //TODO - we need to add the baseUrlEndpoint to the queryObject.
+        ElideResponse response = runner.run("", queryObj.getQuery(), user, requestUUID, scope.getRequestHeaders());
+        log.debug("GRAPHQL_V1_0 getResponseCode: {}, GRAPHQL_V1_0 getBody: {}",
+                response.getResponseCode(), response.getBody());
+        return response;
+    }
+
+    @Override
+    public Integer calculateRecordCount(AsyncQuery queryObj, ElideResponse response) {
+        Integer count = 0;
+        if (response.getResponseCode() == 200) {
+            count = safeJsonPathLength(response.getBody(), "$..edges.length()");
+        }
+        return count;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java
new file mode 100644
index 0000000000..5045f9cc50
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.export.validator.NoRelationshipsProjectionValidator;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.GraphQLRequestScope;
+import com.yahoo.elide.graphql.QueryRunner;
+import com.yahoo.elide.graphql.parser.GraphQLEntityProjectionMaker;
+import com.yahoo.elide.graphql.parser.GraphQLProjectionInfo;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * TableExport Execute Operation Interface.
+ */
+@Slf4j
+public class GraphQLTableExportOperation extends TableExportOperation {
+
+    public GraphQLTableExportOperation(TableExportFormatter formatter, AsyncExecutorService service,
+            AsyncAPI export, RequestScope scope, ResultStorageEngine engine) {
+        super(formatter, service, export, scope, engine,
+                        Arrays.asList(new NoRelationshipsProjectionValidator()));
+    }
+
+    @Override
+    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx,
+            Map<String, List<String>> additionalRequestHeaders) {
+        UUID requestId = UUID.fromString(export.getRequestId());
+        User user = scope.getUser();
+        String apiVersion = scope.getApiVersion();
+        return new GraphQLRequestScope("", tx, user, apiVersion, getService().getElide().getElideSettings(),
+                null, requestId, additionalRequestHeaders);
+    }
+
+    @Override
+    public Collection<EntityProjection> getProjections(TableExport export, RequestScope scope) {
+        GraphQLProjectionInfo projectionInfo;
+        try {
+            String graphQLDocument = export.getQuery();
+            Elide elide = getService().getElide();
+            ObjectMapper mapper = elide.getMapper().getObjectMapper();
+
+            JsonNode node = QueryRunner.getTopLevelNode(mapper, graphQLDocument);
+            Map<String, Object> variables = QueryRunner.extractVariables(mapper, node);
+            String queryString = QueryRunner.extractQuery(node);
+
+            projectionInfo = new GraphQLEntityProjectionMaker(elide.getElideSettings(), variables,
+                            scope.getApiVersion()).make(queryString);
+
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+
+        return projectionInfo.getProjections().values();
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperation.java
new file mode 100644
index 0000000000..d46fbb5d5a
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperation.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.security.User;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URIBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.URISyntaxException;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * JSON API implementation of AsyncQueryOperation for executing the query provided in AsyncQuery.
+ */
+@Slf4j
+public class JSONAPIAsyncQueryOperation extends AsyncQueryOperation {
+
+    public JSONAPIAsyncQueryOperation(AsyncExecutorService service, AsyncAPI queryObj, RequestScope scope) {
+        super(service, queryObj, scope);
+    }
+
+    @Override
+    public ElideResponse execute(AsyncAPI queryObj, RequestScope scope)
+            throws URISyntaxException {
+        Elide elide = getService().getElide();
+        User user = scope.getUser();
+        String apiVersion = scope.getApiVersion();
+        UUID requestUUID = UUID.fromString(queryObj.getRequestId());
+        URIBuilder uri = new URIBuilder(queryObj.getQuery());
+        MultivaluedMap<String, String> queryParams = getQueryParams(uri);
+        log.debug("Extracted QueryParams from AsyncQuery Object: {}", queryParams);
+
+        //TODO - we need to add the baseUrlEndpoint to the queryObject.
+        ElideResponse response = elide.get("", getPath(uri), queryParams, scope.getRequestHeaders(), user, apiVersion,
+                requestUUID);
+        log.debug("JSONAPI_V1_0 getResponseCode: {}, JSONAPI_V1_0 getBody: {}",
+                response.getResponseCode(), response.getBody());
+        return response;
+    }
+
+    /**
+     * This method parses the url and gets the query params.
+     * And adds them into a MultivaluedMap to be used by underlying Elide.get method
+     * @param uri URIBuilder instance
+     * @return MultivaluedMap with query parameters
+     */
+    public static MultivaluedMap<String, String> getQueryParams(URIBuilder uri) {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        for (NameValuePair queryParam : uri.getQueryParams()) {
+            queryParams.add(queryParam.getName(), queryParam.getValue());
+        }
+        return queryParams;
+    }
+
+    /**
+     * This method parses the url and gets the query params.
+     * And retrieves path to be used by underlying Elide.get method
+     * @param uri URIBuilder instance
+     * @return Path extracted from URI
+     */
+    public static String getPath(URIBuilder uri) {
+        return uri.getPath();
+    }
+
+    @Override
+    public Integer calculateRecordCount(AsyncQuery queryObj, ElideResponse response) {
+        Integer count = null;
+        if (response.getResponseCode() == 200) {
+            count = safeJsonPathLength(response.getBody(), "$.data.length()");
+        }
+        return count;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java
new file mode 100644
index 0000000000..b8e20f94c9
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.export.validator.NoRelationshipsProjectionValidator;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.EntityProjectionMaker;
+import org.apache.http.client.utils.URIBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * JSONAPI TableExport Execute Operation.
+ */
+@Slf4j
+public class JSONAPITableExportOperation extends TableExportOperation {
+
+    public JSONAPITableExportOperation(TableExportFormatter formatter, AsyncExecutorService service,
+            AsyncAPI export, RequestScope scope, ResultStorageEngine engine) {
+        super(formatter, service, export, scope, engine,
+                        Arrays.asList(new NoRelationshipsProjectionValidator()));
+    }
+
+    @Override
+    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx,
+            Map<String, List<String>> additionalRequestHeaders) {
+        UUID requestId = UUID.fromString(export.getRequestId());
+        User user = scope.getUser();
+        String apiVersion = scope.getApiVersion();
+        URIBuilder uri;
+        try {
+            uri = new URIBuilder(export.getQuery());
+        } catch (URISyntaxException e) {
+            throw new BadRequestException(e.getMessage());
+        }
+
+        MultivaluedMap<String, String> queryParams = JSONAPIAsyncQueryOperation.getQueryParams(uri);
+
+        // Call with additionalHeader alone
+        if (scope.getRequestHeaders().isEmpty()) {
+            return new RequestScope("", JSONAPIAsyncQueryOperation.getPath(uri), apiVersion, null, tx, user,
+                    queryParams, additionalRequestHeaders, requestId, getService().getElide().getElideSettings());
+        }
+
+        // Combine additionalRequestHeaders and existing scope's request headers
+        Map<String, List<String>> finalRequestHeaders = new HashMap<String, List<String>>();
+        scope.getRequestHeaders().forEach((entry, value) -> finalRequestHeaders.put(entry, value));
+
+        //additionalRequestHeaders will override any headers in scope.getRequestHeaders()
+        additionalRequestHeaders.forEach((entry, value) -> finalRequestHeaders.put(entry, value));
+
+        return new RequestScope("", JSONAPIAsyncQueryOperation.getPath(uri), apiVersion, null, tx, user, queryParams,
+                scope.getRequestHeaders(), requestId, getService().getElide().getElideSettings());
+    }
+
+    @Override
+    public Collection<EntityProjection> getProjections(TableExport export, RequestScope scope) {
+        EntityProjection projection = null;
+        try {
+            URIBuilder uri = new URIBuilder(export.getQuery());
+            Elide elide = getService().getElide();
+            projection = new EntityProjectionMaker(elide.getElideSettings().getDictionary(),
+                    scope).parsePath(JSONAPIAsyncQueryOperation.getPath(uri));
+
+        } catch (URISyntaxException e) {
+            throw new BadRequestException(e.getMessage());
+        }
+        return Collections.singletonList(projection);
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java
new file mode 100644
index 0000000000..68ea59e7a3
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.export.validator.SingleRootProjectionValidator;
+import com.yahoo.elide.async.export.validator.Validator;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.FileExtensionType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+import io.reactivex.Observable;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+
+/**
+ * TableExport Execute Operation Interface.
+ */
+@Slf4j
+public abstract class TableExportOperation implements Callable<AsyncAPIResult> {
+    private TableExportFormatter formatter;
+    @Getter private AsyncExecutorService service;
+    private Integer recordNumber = 0;
+    private TableExport exportObj;
+    private RequestScope scope;
+    private ResultStorageEngine engine;
+    private List<Validator> validators = new ArrayList<>(Arrays.asList(new SingleRootProjectionValidator()));
+
+    public TableExportOperation(TableExportFormatter formatter, AsyncExecutorService service,
+            AsyncAPI exportObj, RequestScope scope, ResultStorageEngine engine, List<Validator> validators) {
+        this.formatter = formatter;
+        this.service = service;
+        this.exportObj = (TableExport) exportObj;
+        this.scope = scope;
+        this.engine = engine;
+        this.validators.addAll(validators);
+    }
+
+    @Override
+    public AsyncAPIResult call() {
+        log.debug("TableExport Object from request: {}", exportObj);
+        Elide elide = service.getElide();
+        TableExportResult exportResult = new TableExportResult();
+        UUID requestId = UUID.fromString(exportObj.getRequestId());
+        try (DataStoreTransaction tx = elide.getDataStore().beginTransaction()) {
+            // Do Not Cache Export Results
+            Map<String, List<String>> requestHeaders = new HashMap<String, List<String>>();
+            requestHeaders.put("bypasscache", new ArrayList<String>(Arrays.asList("true")));
+
+            RequestScope requestScope = getRequestScope(exportObj, scope, tx, requestHeaders);
+            Collection<EntityProjection> projections = getProjections(exportObj, requestScope);
+            validateProjections(projections);
+            EntityProjection projection = projections.iterator().next();
+
+            Observable<PersistentResource> observableResults = Observable.empty();
+
+            elide.getTransactionRegistry().addRunningTransaction(requestId, tx);
+
+            //TODO - we need to add the baseUrlEndpoint to the queryObject.
+            //TODO - Can we have projectionInfo as null?
+            requestScope.setEntityProjection(projection);
+
+            if (projection != null) {
+                projection.setPagination(null);
+                observableResults = PersistentResource.loadRecords(projection, Collections.emptyList(), requestScope);
+            }
+
+            Observable<String> results = Observable.empty();
+            String preResult = formatter.preFormat(projection, exportObj);
+            results = observableResults.map(resource -> {
+                this.recordNumber++;
+                return formatter.format(resource, recordNumber);
+            });
+            String postResult = formatter.postFormat(projection, exportObj);
+
+            // Stitch together Pre-Formatted, Formatted, Post-Formatted results of Formatter in single observable.
+            Observable<String> interimResults = concatStringWithObservable(preResult, results, true);
+            Observable<String> finalResults = concatStringWithObservable(postResult, interimResults, false);
+
+            TableExportResult result = storeResults(exportObj, engine, finalResults);
+
+            if (result != null && result.getMessage() != null) {
+                throw new IllegalStateException(result.getMessage());
+            }
+
+            exportResult.setUrl(new URL(generateDownloadURL(exportObj, scope)));
+            exportResult.setRecordCount(recordNumber);
+
+            tx.flush(requestScope);
+            elide.getAuditLogger().commit();
+            tx.commit(requestScope);
+        } catch (BadRequestException e) {
+            exportResult.setMessage(e.getMessage());
+        } catch (MalformedURLException e) {
+            exportResult.setMessage("Download url generation failure.");
+        } catch (IOException e) {
+            log.error("IOException during TableExport", e);
+            exportResult.setMessage(e.getMessage());
+        } catch (Exception e) {
+            exportResult.setMessage(e.getMessage());
+        } finally {
+            // Follows same flow as GraphQL. The query may result in failure but request was successfully processed.
+            exportResult.setHttpStatus(200);
+            exportResult.setCompletedOn(new Date());
+            elide.getTransactionRegistry().removeRunningTransaction(requestId);
+            elide.getAuditLogger().clear();
+        }
+        return exportResult;
+    }
+
+    private Observable<String> concatStringWithObservable(String toConcat, Observable<String> observable,
+            boolean stringFirst) {
+        if (toConcat == null) {
+            return observable;
+        }
+
+        return stringFirst ? Observable.just(toConcat).concatWith(observable)
+                : observable.concatWith(Observable.just(toConcat));
+    }
+
+    /**
+     * Initializes a new RequestScope for the export operation with the submitted query.
+     * @param exportObj TableExport type object.
+     * @param scope RequestScope from the original submission.
+     * @param tx DataStoreTransaction.
+     * @param additionalRequestHeaders Additional Request Headers.
+     * @return RequestScope Type Object
+     */
+    public abstract RequestScope getRequestScope(TableExport exportObj, RequestScope scope, DataStoreTransaction tx,
+            Map<String, List<String>> additionalRequestHeaders);
+
+    /**
+     * Generate Download URL.
+     * @param exportObj TableExport type object.
+     * @param scope RequestScope.
+     * @return URL generated.
+     */
+    public String generateDownloadURL(TableExport exportObj, RequestScope scope) {
+        String downloadPath =  scope.getElideSettings().getExportApiPath();
+        String baseURL = scope.getBaseUrlEndPoint();
+        String extension = this.engine.isExtensionEnabled()
+                ? exportObj.getResultType().getFileExtensionType().getExtension()
+                : FileExtensionType.NONE.getExtension();
+        return baseURL + downloadPath + "/" + exportObj.getId() + extension;
+    }
+
+    /**
+     * Store Export Results using the ResultStorageEngine.
+     * @param exportObj TableExport type object.
+     * @param resultStorageEngine ResultStorageEngine instance.
+     * @param result Observable of String Results to store.
+     * @return TableExportResult object.
+     */
+    protected TableExportResult storeResults(TableExport exportObj, ResultStorageEngine resultStorageEngine,
+            Observable<String> result) {
+        return resultStorageEngine.storeResults(exportObj, result);
+    }
+
+    private void validateProjections(Collection<EntityProjection> projections) {
+        validators.forEach(validator -> validator.validateProjection(projections));
+    }
+
+    /**
+     * Generate Entity Projection from the query.
+     * @param exportObj TableExport type object.
+     * @param requestScope requestScope object.
+     * @return Collection of EntityProjection object.
+     */
+    public abstract Collection<EntityProjection> getProjections(TableExport exportObj, RequestScope requestScope);
+
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/resources/ExportApiEndpoint.java b/elide-async/src/main/java/com/yahoo/elide/async/resources/ExportApiEndpoint.java
new file mode 100644
index 0000000000..8711f6fc00
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/resources/ExportApiEndpoint.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.resources;
+
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import io.reactivex.Observable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.StreamingOutput;
+
+/**
+ * Default endpoint/servlet for using Elide and Async Export.
+ */
+@Slf4j
+@Singleton
+@Path("/")
+public class ExportApiEndpoint {
+    protected final ExportApiProperties exportApiProperties;
+    protected final ResultStorageEngine resultStorageEngine;
+
+    @Data
+    @AllArgsConstructor
+    public static class ExportApiProperties {
+        private ExecutorService executor;
+        private Integer maxDownloadTimeSeconds;
+    }
+
+    @Inject
+    public ExportApiEndpoint(
+            @Named("resultStorageEngine") ResultStorageEngine resultStorageEngine,
+            @Named("exportApiProperties") ExportApiProperties exportApiProperties) {
+        this.resultStorageEngine = resultStorageEngine;
+        this.exportApiProperties = exportApiProperties;
+    }
+
+    /**
+     * Read handler.
+     *
+     * @param asyncQueryId asyncQueryId to download results
+     * @param asyncResponse AsyncResponse object
+     */
+    @GET
+    @Path("/{asyncQueryId}")
+    public void get(@PathParam("asyncQueryId") String asyncQueryId, @Context HttpServletResponse httpServletResponse,
+            @Suspended final AsyncResponse asyncResponse) {
+        asyncResponse.setTimeout(exportApiProperties.getMaxDownloadTimeSeconds(), TimeUnit.SECONDS);
+        asyncResponse.setTimeoutHandler(async -> {
+            ResponseBuilder resp = Response.status(Response.Status.REQUEST_TIMEOUT).entity("Timed out.");
+            async.resume(resp.build());
+        });
+
+        exportApiProperties.getExecutor().submit(() -> {
+            Observable<String> observableResults = resultStorageEngine.getResultsByID(asyncQueryId);
+
+            StreamingOutput streamingOutput = outputStream ->
+                observableResults
+                .subscribe(
+                        resultString -> outputStream.write(resultString.concat(System.lineSeparator()).getBytes()),
+                        error -> {
+                            String message = error.getMessage();
+                            try {
+                                log.debug(message);
+                                if (message != null && message.equals(ResultStorageEngine.RETRIEVE_ERROR)) {
+                                    httpServletResponse.sendError(HttpStatus.SC_NOT_FOUND, asyncQueryId + " Not Found");
+                                } else {
+                                    httpServletResponse.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                                }
+                            } catch (IllegalStateException e) {
+                                // If stream was flushed, Attachment download has already started.
+                                // response.sendError causes java.lang.IllegalStateException:
+                                // Cannot call sendError() after the response has been committed.
+                                // This will return 200 status.
+                                // Add error message in the attachment as a way to signal errors.
+                                outputStream.write(
+                                        "Error Occured...."
+                                        .concat(System.lineSeparator())
+                                        .getBytes()
+                                        );
+                                log.debug(e.getMessage());
+                            } finally {
+                                outputStream.flush();
+                                outputStream.close();
+                            }
+                        },
+                        () -> {
+                            outputStream.flush();
+                            outputStream.close();
+                        }
+                );
+
+            asyncResponse.resume(Response.ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM)
+                    .header("Content-Disposition", "attachment; filename=" + asyncQueryId).build());
+        });
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncCleanerService.java b/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncCleanerService.java
new file mode 100644
index 0000000000..9930f304a4
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncCleanerService.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.thread.AsyncAPICancelRunnable;
+import com.yahoo.elide.async.service.thread.AsyncAPICleanerRunnable;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Random;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import javax.inject.Inject;
+/**
+ * Service to execute Async queries.
+ * It will schedule task to track long running queries and kills them.
+ * It will also schedule task to update orphan queries status
+ * after host/app crash or restart.
+ */
+@Slf4j
+public class AsyncCleanerService {
+
+    private final int defaultCleanupDelayMinutes = 120;
+    private final int maxInitialDelayMinutes = 100;
+    private static AsyncCleanerService asyncCleanerService = null;
+
+    @Inject
+    private AsyncCleanerService(Elide elide, Integer maxRunTimeSeconds, Integer queryCleanupDays,
+            Integer cancelDelaySeconds, AsyncAPIDAO asyncQueryDao) {
+
+        //If query is still running for twice than maxRunTime, then interrupt did not work due to host/app crash.
+        int queryRunTimeThresholdMinutes = (int) TimeUnit.SECONDS.toMinutes(maxRunTimeSeconds * 2 + 30L);
+
+        // Setting up query cleaner that marks long running query as TIMEDOUT.
+        ScheduledExecutorService cleaner = Executors.newSingleThreadScheduledExecutor();
+        AsyncAPICleanerRunnable cleanUpTask = new AsyncAPICleanerRunnable(
+                queryRunTimeThresholdMinutes, elide, queryCleanupDays, asyncQueryDao, new DateUtil());
+
+        // Since there will be multiple hosts running the elide service,
+        // setting up random delays to avoid all of them trying to cleanup at the same time.
+        Random random = new Random();
+        int initialDelayMinutes = random.ints(0, maxInitialDelayMinutes).limit(1).findFirst().getAsInt();
+        log.debug("Initial Delay for cleaner service is {}", initialDelayMinutes);
+
+        //Having a delay of at least DEFAULT_CLEANUP_DELAY between two cleanup attempts.
+        //Or maxRunTimeMinutes * 2 so that this process does not coincides with query
+        //interrupt process.
+
+        cleaner.scheduleWithFixedDelay(cleanUpTask, initialDelayMinutes, Math.max(defaultCleanupDelayMinutes,
+                queryRunTimeThresholdMinutes), TimeUnit.MINUTES);
+
+        //Setting up query cancel service that cancels long running queries based on status or runtime
+        ScheduledExecutorService cancellation = Executors.newSingleThreadScheduledExecutor();
+
+        AsyncAPICancelRunnable cancelTask = new AsyncAPICancelRunnable(maxRunTimeSeconds,
+                elide, asyncQueryDao);
+
+        cancellation.scheduleWithFixedDelay(cancelTask, 0, cancelDelaySeconds, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Initialize the singleton AsyncCleanerService object.
+     * If already initialized earlier, no new object is created.
+     * @param elide Elide Instance
+     * @param maxRunTimeSeconds max run times in seconds
+     * @param queryCleanupDays Async Query Clean up days
+     * @param cancelDelaySeconds Async Query Transaction cancel delay
+     * @param asyncQueryDao DAO Object
+     */
+    public static void init(Elide elide, Integer maxRunTimeSeconds, Integer queryCleanupDays,
+            Integer cancelDelaySeconds, AsyncAPIDAO asyncQueryDao) {
+        if (asyncCleanerService == null) {
+            asyncCleanerService = new AsyncCleanerService(elide, maxRunTimeSeconds, queryCleanupDays,
+                    cancelDelaySeconds, asyncQueryDao);
+        } else {
+            log.debug("asyncCleanerService is already initialized.");
+        }
+    }
+
+    /**
+     * Get instance of AsyncCleanerService.
+     * @return AsyncCleanerService Object
+     */
+    public synchronized static AsyncCleanerService getInstance() {
+        return asyncCleanerService;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncExecutorService.java b/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncExecutorService.java
new file mode 100644
index 0000000000..18227c579f
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncExecutorService.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.operation.AsyncAPIUpdateOperation;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.QueryRunner;
+import lombok.Data;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.inject.Inject;
+
+/**
+ * Service to execute Async queries.
+ * It will schedule task to track long running queries and kills them.
+ * It will also schedule task to update orphan query statuses after
+ * host/app crash or restart.
+ */
+@Getter
+@Slf4j
+public class AsyncExecutorService {
+
+    public static final int DEFAULT_THREAD_POOL_SIZE = 6;
+
+    private Elide elide;
+    private Map<String, QueryRunner> runners;
+    private ExecutorService executor;
+    private ExecutorService updater;
+    private AsyncAPIDAO asyncAPIDao;
+    private ThreadLocal<AsyncAPIResultFuture> asyncResultFutureThreadLocal = new ThreadLocal<>();
+
+    /**
+     * A Future with Synchronous Execution Complete Flag.
+     */
+    @Data
+    private static class AsyncAPIResultFuture {
+        private Future<AsyncAPIResult> asyncFuture;
+        private boolean synchronousTimeout = false;
+    }
+
+    @Inject
+    public AsyncExecutorService(Elide elide, ExecutorService executor, ExecutorService updater,
+                    AsyncAPIDAO asyncAPIDao) {
+        this.elide = elide;
+        runners = new HashMap<>();
+
+        for (String apiVersion : elide.getElideSettings().getDictionary().getApiVersions()) {
+            runners.put(apiVersion, new QueryRunner(elide, apiVersion));
+        }
+
+        this.executor = executor;
+        this.updater = updater;
+        this.asyncAPIDao = asyncAPIDao;
+    }
+
+    /**
+     * Execute Query asynchronously.
+     * @param queryObj Query Object
+     * @param callable A Callabale implementation to execute in background.
+     */
+    public void executeQuery(AsyncAPI queryObj, Callable<AsyncAPIResult> callable) {
+        AsyncAPIResultFuture resultFuture = new AsyncAPIResultFuture();
+        try {
+            Future<AsyncAPIResult> asyncExecuteFuture = executor.submit(callable);
+            resultFuture.setAsyncFuture(asyncExecuteFuture);
+            queryObj.setStatus(QueryStatus.PROCESSING);
+            AsyncAPIResult queryResultObj = asyncExecuteFuture.get(queryObj.getAsyncAfterSeconds(), TimeUnit.SECONDS);
+            queryObj.setResult(queryResultObj);
+            queryObj.setStatus(QueryStatus.COMPLETE);
+            queryObj.setUpdatedOn(new Date());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("InterruptedException: {}", e.toString());
+            queryObj.setStatus(QueryStatus.FAILURE);
+        } catch (ExecutionException e) {
+            log.error("ExecutionException: {}", e.toString());
+            queryObj.setStatus(QueryStatus.FAILURE);
+        } catch (TimeoutException e) {
+            log.error("TimeoutException: {}", e.toString());
+            resultFuture.setSynchronousTimeout(true);
+        } catch (Exception e) {
+            log.error("Exception: {}", e.toString());
+            queryObj.setStatus(QueryStatus.FAILURE);
+        } finally {
+            asyncResultFutureThreadLocal.set(resultFuture);
+        }
+
+    }
+    /**
+     * Complete Query asynchronously.
+     * @param query AsyncQuery
+     * @param user User
+     * @param apiVersion API Version
+     */
+    public void completeQuery(AsyncAPI query, User user, String apiVersion) {
+        AsyncAPIResultFuture asyncAPIResultFuture = asyncResultFutureThreadLocal.get();
+        if (asyncAPIResultFuture.isSynchronousTimeout()) {
+            log.debug("Task has not completed");
+            updater.execute(new AsyncAPIUpdateOperation(elide, asyncAPIResultFuture.getAsyncFuture(), query,
+                    asyncAPIDao));
+            asyncResultFutureThreadLocal.remove();
+        } else {
+            log.debug("Task has completed");
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/DateUtil.java b/elide-async/src/main/java/com/yahoo/elide/async/service/DateUtil.java
new file mode 100644
index 0000000000..e98a05508f
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/DateUtil.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.service;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Utility class which implements a static method calculateFilterDate.
+ */
+@Slf4j
+public class DateUtil {
+
+    /**
+     * Calculated and subtracts the amount based on the calendar unit and amount from current date.
+     * @param calendarUnit Enum such as Calendar.DATE or Calendar.MINUTE
+     * @param amount Amount of days to be subtracted from current time
+     * @return filter date
+     */
+     public Date calculateFilterDate(int calendarUnit, int amount) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(calendarUnit, -(amount));
+        Date filterDate = cal.getTime();
+        log.debug("FilterDateFormatted = {}", filterDate);
+        return filterDate;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/dao/AsyncAPIDAO.java b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/AsyncAPIDAO.java
new file mode 100644
index 0000000000..eb3ba03bbc
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/AsyncAPIDAO.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.dao;
+
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+
+/**
+ * Utility interface which uses the elide datastore to modify and create AsyncAPI and AsyncAPIResult Objects.
+ */
+public interface AsyncAPIDAO {
+
+    /**
+     * This method updates the QueryStatus for AsyncAPI for given QueryStatus.
+     * @param asyncAPIId The AsyncAPI Object to be updated
+     * @param status Status from Enum QueryStatus
+     * @param type AsyncAPI Type Implementation.
+     * @return AsyncAPI Updated AsyncAPI Object
+     */
+    public <T extends AsyncAPI> T updateStatus(String asyncAPIId, QueryStatus status, Class<T> type);
+
+    /**
+     * This method persists the model for AsyncAPIResult, AsyncAPI object and establishes the relationship.
+     * @param asyncAPIResult AsyncAPIResult to be associated with the AsyncAPI object
+     * @param asyncAPIId String
+     * @param type AsyncAPI Type Implementation.
+     * @return AsyncAPI Object
+     */
+    public <T extends AsyncAPI> T updateAsyncAPIResult(AsyncAPIResult asyncAPIResult,
+            String asyncAPIId, Class<T> type);
+
+    /**
+     * This method deletes a Iterable of AsyncAPI and its associated AsyncAPIResult objects from database
+     * based on a filter expression, and returns the objects deleted.
+     * @param filterExpression filter expression to delete AsyncAPI Objects based on
+     * @param type AsyncAPI Type Implementation.
+     * @return query object Iterable deleted
+     */
+    public <T extends AsyncAPI> Iterable<T> deleteAsyncAPIAndResultByFilter(
+            FilterExpression filterExpression, Class<T> type);
+
+    /**
+     * This method updates the status for a Iterable of AsyncAPI objects from database based on a filter expression, and
+     * returns the objects updated.
+     * @param  filterExpression filter expression to update AsyncAPI Objects based on
+     * @param status status to be updated
+     * @param type AsyncAPI Type Implementation.
+     * @return query object Iterable updated
+     */
+    public <T extends AsyncAPI> Iterable<T> updateStatusAsyncAPIByFilter(FilterExpression filterExpression,
+            QueryStatus status, Class<T> type);
+    /**
+     * This method gets a Iterable of AsyncAPI objects from database and
+     * returns the objects.
+     * @param filterExpression filter expression to cancel AsyncAPI Objects based on
+     * @param type AsyncAPI Type Implementation.
+     * @return query object Iterable loaded
+     */
+    public <T extends AsyncAPI> Iterable<T> loadAsyncAPIByFilter(FilterExpression filterExpression,
+            Class<T> type);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAO.java b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAO.java
new file mode 100644
index 0000000000..59f1b52917
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAO.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.dao;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.UUID;
+import javax.inject.Singleton;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Utility class which implements AsyncAPIDAO.
+ */
+@Singleton
+@Slf4j
+@Getter
+public class DefaultAsyncAPIDAO implements AsyncAPIDAO {
+
+    @Setter private ElideSettings elideSettings;
+    @Setter private DataStore dataStore;
+
+    // Default constructor is needed for standalone implementation for override in getAsyncAPIDao
+    public DefaultAsyncAPIDAO() {
+    }
+
+    public DefaultAsyncAPIDAO(ElideSettings elideSettings, DataStore dataStore) {
+        this.elideSettings = elideSettings;
+        this.dataStore = dataStore;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends AsyncAPI> T updateStatus(String asyncAPIId, QueryStatus status, Class<T> type) {
+        T queryObj = (T) executeInTransaction(dataStore, (tx, scope) -> {
+            EntityProjection asyncAPIIterable = EntityProjection.builder()
+                    .type(type)
+                    .build();
+            T query = (T) tx.loadObject(asyncAPIIterable, asyncAPIId, scope);
+            query.setStatus(status);
+            tx.save(query, scope);
+            return query;
+        });
+        return queryObj;
+    }
+
+    @Override
+    public <T extends AsyncAPI> Iterable<T> updateStatusAsyncAPIByFilter(FilterExpression filterExpression,
+            QueryStatus status, Class<T> type) {
+        return updateAsyncAPIIterable(filterExpression, asyncAPI -> asyncAPI.setStatus(status), type);
+    }
+
+    /**
+     * This method updates a Iterable of AsyncAPI objects from database and
+     * returns the objects updated.
+     * @param filterExpression Filter expression to update AsyncAPI Objects based on
+     * @param updateFunction Functional interface for updating AsyncAPI Object
+     * @param type AsyncAPI Type Implementation.
+     * @return query object list updated
+     */
+    @SuppressWarnings("unchecked")
+    private <T extends AsyncAPI> Iterable<T> updateAsyncAPIIterable(FilterExpression filterExpression,
+            UpdateQuery updateFunction, Class<T> type) {
+        log.debug("updateAsyncAPIIterable");
+
+        Iterable<T> asyncAPIList = null;
+        asyncAPIList = (Iterable<T>) executeInTransaction(dataStore,
+                (tx, scope) -> {
+            EntityProjection asyncAPIIterable = EntityProjection.builder()
+                    .type(type)
+                    .filterExpression(filterExpression)
+                    .build();
+
+            Iterable<Object> loaded = tx.loadObjects(asyncAPIIterable, scope);
+            Iterator<Object> itr = loaded.iterator();
+
+            while (itr.hasNext()) {
+                T query = (T) itr.next();
+                updateFunction.update(query);
+                tx.save(query, scope);
+            }
+            return loaded;
+        });
+        return asyncAPIList;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T extends AsyncAPI> Iterable<T> deleteAsyncAPIAndResultByFilter(
+            FilterExpression filterExpression, Class<T> type) {
+        log.debug("deleteAsyncAPIAndResultByFilter");
+        Iterable<T> asyncAPIList = null;
+        asyncAPIList = (Iterable<T>) executeInTransaction(dataStore, (tx, scope) -> {
+            EntityProjection asyncAPIIterable = EntityProjection.builder()
+                    .type(type)
+                    .filterExpression(filterExpression)
+                    .build();
+
+            Iterable<Object> loaded = tx.loadObjects(asyncAPIIterable, scope);
+            Iterator<Object> itr = loaded.iterator();
+
+            while (itr.hasNext()) {
+                T query = (T) itr.next();
+                if (query != null) {
+                    tx.delete(query, scope);
+                }
+            }
+            return loaded;
+        });
+        return asyncAPIList;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends AsyncAPI> T updateAsyncAPIResult(AsyncAPIResult asyncAPIResult,
+            String asyncAPIId, Class<T> type) {
+        log.debug("updateAsyncAPIResult");
+        T queryObj = (T) executeInTransaction(dataStore, (tx, scope) -> {
+            EntityProjection asyncAPIIterable = EntityProjection.builder()
+                    .type(type)
+                    .build();
+            T query = (T) tx.loadObject(asyncAPIIterable, asyncAPIId, scope);
+            query.setResult(asyncAPIResult);
+            if (query.getStatus().equals(QueryStatus.CANCELLED)) {
+                query.setStatus(QueryStatus.CANCEL_COMPLETE);
+            } else if (!(query.getStatus().equals(QueryStatus.CANCEL_COMPLETE))) {
+                query.setStatus(QueryStatus.COMPLETE);
+            }
+            tx.save(query, scope);
+            return query;
+        });
+        return queryObj;
+    }
+
+    /**
+     * This method creates a transaction from the datastore, performs the DB action using
+     * a generic functional interface and closes the transaction.
+     * @param dataStore Elide datastore retrieved from Elide object
+     * @param action Functional interface to perform DB action
+     * @return Object Returns Entity Object (AsyncAPIResult or AsyncResult)
+     */
+    protected Object executeInTransaction(DataStore dataStore, Transactional action) {
+        log.debug("executeInTransaction");
+        Object result = null;
+        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
+            JsonApiDocument jsonApiDoc = new JsonApiDocument();
+            MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+            RequestScope scope = new RequestScope("", "query", NO_VERSION, jsonApiDoc,
+                    tx, null, queryParams, Collections.emptyMap(), UUID.randomUUID(), elideSettings);
+            result = action.execute(tx, scope);
+            tx.flush(scope);
+            tx.commit(scope);
+        } catch (IOException e) {
+            log.error("IOException: {}", e.toString());
+            throw new IllegalStateException(e);
+        }
+        return result;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T extends AsyncAPI> Iterable<T> loadAsyncAPIByFilter(FilterExpression filterExpression,
+            Class<T> type) {
+        Iterable<T> asyncAPIList = null;
+        log.debug("loadAsyncAPIByFilter");
+        try {
+            asyncAPIList = (Iterable<T>) executeInTransaction(dataStore, (tx, scope) -> {
+
+                EntityProjection asyncAPIIterable = EntityProjection.builder()
+                        .type(type)
+                        .filterExpression(filterExpression)
+                        .build();
+                return tx.loadObjects(asyncAPIIterable, scope);
+            });
+        } catch (Exception e) {
+            log.error("Exception: {}", e.toString());
+            throw new IllegalStateException(e);
+        }
+        return asyncAPIList;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/dao/Transactional.java b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/Transactional.java
new file mode 100644
index 0000000000..477eac5d84
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/Transactional.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.dao;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+
+/**
+ * Function which will be invoked for executing elide async transactions.
+ */
+@FunctionalInterface
+public interface Transactional {
+    public Object execute(DataStoreTransaction tx, RequestScope scope);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/dao/UpdateQuery.java b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/UpdateQuery.java
new file mode 100644
index 0000000000..3bd74d7314
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/dao/UpdateQuery.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.dao;
+
+import com.yahoo.elide.async.models.AsyncAPI;
+
+/**
+ * Function which will be invoked for updating elide async query base implementation.
+ * @param <T> AsyncQueryBase Type Implementation.
+ */
+@FunctionalInterface
+public interface UpdateQuery<T extends AsyncAPI> {
+    public void update(T query);
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngine.java b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngine.java
new file mode 100644
index 0000000000..16dc2bbc34
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngine.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.service.storageengine;
+
+import com.yahoo.elide.async.models.FileExtensionType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+
+import io.reactivex.Observable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import javax.inject.Singleton;
+
+/**
+ * Default implementation of ResultStorageEngine that stores results on local filesystem.
+ * It supports Async Module to store results with Table Export query.
+ */
+@Singleton
+@Slf4j
+@Getter
+public class FileResultStorageEngine implements ResultStorageEngine {
+    @Setter private String basePath;
+    @Setter private boolean enableExtension;
+
+    /**
+     * Constructor.
+     * @param basePath basePath for storing the files. Can be absolute or relative.
+     * @param enableExtension Enable file extensions.
+     */
+    public FileResultStorageEngine(String basePath, boolean enableExtension) {
+        this.basePath = basePath;
+        this.enableExtension = enableExtension;
+    }
+
+    @Override
+    public TableExportResult storeResults(TableExport tableExport, Observable<String> result) {
+        log.debug("store TableExportResults for Download");
+        String extension = this.isExtensionEnabled()
+                ? tableExport.getResultType().getFileExtensionType().getExtension()
+                : FileExtensionType.NONE.getExtension();
+
+       TableExportResult exportResult = new TableExportResult();
+        try (BufferedWriter writer = getWriter(tableExport.getId(), extension)) {
+            result
+                .map(record -> record.concat(System.lineSeparator()))
+                .subscribe(
+                        recordCharArray -> {
+                            writer.write(recordCharArray);
+                            writer.flush();
+                        },
+                        throwable -> {
+                            StringBuilder message = new StringBuilder();
+                            message.append(throwable.getClass().getCanonicalName()).append(" : ");
+                            message.append(throwable.getMessage());
+                            exportResult.setMessage(message.toString());
+
+                            throw new IllegalStateException(STORE_ERROR, throwable);
+                        },
+                        writer::flush
+                );
+        } catch (IOException e) {
+            throw new IllegalStateException(STORE_ERROR, e);
+        }
+
+        return exportResult;
+    }
+
+    @Override
+    public Observable<String> getResultsByID(String tableExportID) {
+        log.debug("getTableExportResultsByID");
+
+        return Observable.using(
+                () -> getReader(tableExportID),
+                reader -> Observable.fromIterable(() -> new Iterator<String>() {
+                    private String record = null;
+
+                    @Override
+                    public boolean hasNext() {
+                        try {
+                            record = reader.readLine();
+                            return record != null;
+                        } catch (IOException e) {
+                            throw new IllegalStateException(RETRIEVE_ERROR, e);
+                        }
+                    }
+
+                    @Override
+                    public String next() {
+                        if (record != null) {
+                            return record;
+                        }
+                        throw new IllegalStateException("null line found.");
+                    }
+                }),
+                BufferedReader::close);
+    }
+
+    private BufferedReader getReader(String tableExportID) {
+        try {
+            return Files.newBufferedReader(Paths.get(basePath + File.separator + tableExportID));
+        } catch (IOException e) {
+            log.debug(e.getMessage());
+            throw new IllegalStateException(RETRIEVE_ERROR, e);
+        }
+    }
+
+    private BufferedWriter getWriter(String tableExportID, String extension) {
+        try {
+            return Files.newBufferedWriter(Paths.get(basePath + File.separator + tableExportID + extension));
+        } catch (IOException e) {
+            log.debug(e.getMessage());
+            throw new IllegalStateException(STORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public boolean isExtensionEnabled() {
+        return this.enableExtension;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngine.java b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngine.java
new file mode 100644
index 0000000000..9ffa242c7e
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngine.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.service.storageengine;
+
+import com.yahoo.elide.async.models.FileExtensionType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+
+import io.reactivex.Observable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import redis.clients.jedis.UnifiedJedis;
+
+import java.util.Iterator;
+
+import javax.inject.Singleton;
+
+/**
+ * Implementation of ResultStorageEngine that stores results on Redis Cluster.
+ * It supports Async Module to store results with Table Export query.
+ */
+@Singleton
+@Slf4j
+@Getter
+public class RedisResultStorageEngine implements ResultStorageEngine {
+    @Setter private UnifiedJedis jedis;
+    @Setter private boolean enableExtension;
+    @Setter private long expirationSeconds;
+    @Setter private long batchSize;
+
+    /**
+     * Constructor.
+     * @param jedis Jedis Connection Pool to Redis clusteer.
+     * @param enableExtension Enable file extensions.
+     * @param expirationSeconds Expiration Time for results on Redis.
+     * @param batchSize Batch Size for retrieving from Redis.
+     */
+    public RedisResultStorageEngine(UnifiedJedis jedis, boolean enableExtension, long expirationSeconds,
+            long batchSize) {
+        this.jedis = jedis;
+        this.enableExtension = enableExtension;
+        this.expirationSeconds = expirationSeconds;
+        this.batchSize = batchSize;
+    }
+
+    @Override
+    public TableExportResult storeResults(TableExport tableExport, Observable<String> result) {
+        log.debug("store TableExportResults for Download");
+        String extension = this.isExtensionEnabled()
+                ? tableExport.getResultType().getFileExtensionType().getExtension()
+                : FileExtensionType.NONE.getExtension();
+
+        TableExportResult exportResult = new TableExportResult();
+        String key = tableExport.getId() + extension;
+
+        result
+            .map(record -> record)
+            .subscribe(
+                    recordCharArray -> {
+                        jedis.rpush(key, recordCharArray);
+                    },
+                    throwable -> {
+                        StringBuilder message = new StringBuilder();
+                        message.append(throwable.getClass().getCanonicalName()).append(" : ");
+                        message.append(throwable.getMessage());
+                        exportResult.setMessage(message.toString());
+
+                        throw new IllegalStateException(STORE_ERROR, throwable);
+                    }
+            );
+        jedis.expire(key, expirationSeconds);
+
+        return exportResult;
+    }
+
+    @Override
+    public Observable<String> getResultsByID(String tableExportID) {
+        log.debug("getTableExportResultsByID");
+
+        long recordCount = jedis.llen(tableExportID);
+
+        if (recordCount == 0) {
+            throw new IllegalStateException(RETRIEVE_ERROR);
+        } else {
+            // Workaround for Local variable defined in an enclosing scope must be final or effectively final;
+            // use Array.
+            long[] recordRead = {0}; // index to start.
+            return Observable.fromIterable(() -> new Iterator<String>() {
+                @Override
+                public boolean hasNext() {
+                        return recordRead[0] < recordCount;
+                }
+                @Override
+                public String next() {
+                    StringBuilder record = new StringBuilder();
+                    long end = recordRead[0] + batchSize - 1; // index of last element.
+
+                    if (end >= recordCount) {
+                        end = recordCount - 1;
+                    }
+
+                    Iterator<String> itr = jedis.lrange(tableExportID, recordRead[0], end).iterator();
+
+                    // Combine the list into a single string.
+                    while (itr.hasNext()) {
+                        String str = itr.next();
+                        record.append(str).append(System.lineSeparator());
+                    }
+                    recordRead[0] = end + 1; //index for next element to be read
+
+                    // Removing the last line separator because ExportEndPoint will add 1 more.
+                    return record.substring(0, record.length() - System.lineSeparator().length());
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean isExtensionEnabled() {
+        return this.enableExtension;
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/ResultStorageEngine.java b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/ResultStorageEngine.java
new file mode 100644
index 0000000000..8e1eccd502
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/storageengine/ResultStorageEngine.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.service.storageengine;
+
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+
+import io.reactivex.Observable;
+
+/**
+ * Utility interface used for storing the results of AsyncQuery for downloads.
+ */
+public interface ResultStorageEngine {
+    public static final String RETRIEVE_ERROR = "Unable to retrieve results.";
+    public static final String STORE_ERROR = "Unable to store results.";
+
+    /**
+     * Stores the result of the query.
+     * @param tableExport TableExport object
+     * @param result is the observable result obtained by running the query
+     * @return TableExportResult.
+     */
+    public TableExportResult storeResults(TableExport tableExport, Observable<String> result);
+
+    /**
+     * Searches for the async query results by ID and returns the record.
+     * @param tableExportID is the ID of the TableExport. It may include extension too if enabled.
+     * @return returns the result associated with the tableExportID
+     */
+    public Observable<String> getResultsByID(String tableExportID);
+
+    /**
+     * Whether the result storage engine has enabled extensions for attachments.
+     * @return returns whether the file extensions are enabled
+     */
+    public boolean isExtensionEnabled();
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnable.java b/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnable.java
new file mode 100644
index 0000000000..0dd7086fae
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnable.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.thread;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.google.common.collect.Sets;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Runnable for cancelling AsyncAPI transactions
+ * beyond the max run time or if it has status CANCELLED.
+ */
+@Slf4j
+@Data
+@AllArgsConstructor
+public class AsyncAPICancelRunnable implements Runnable {
+
+    private int maxRunTimeSeconds;
+    private Elide elide;
+    private AsyncAPIDAO asyncAPIDao;
+
+    @Override
+    public void run() {
+        cancelAsyncAPI(AsyncQuery.class);
+    }
+
+    /**
+     * This method cancels queries based on threshold.
+     * @param type AsyncAPI Type Implementation.
+     */
+    protected <T extends AsyncAPI> void cancelAsyncAPI(Class<T> type) {
+
+        try {
+            TransactionRegistry transactionRegistry = elide.getTransactionRegistry();
+
+            Map<UUID, DataStoreTransaction> runningTransactionMap = transactionRegistry.getRunningTransactions();
+
+            //Running transaction UUIDs
+            Set<UUID> runningTransactionUUIDs = runningTransactionMap.keySet();
+
+            //Construct filter expression
+            PathElement statusPathElement = new PathElement(type, QueryStatus.class, "status");
+            FilterExpression fltStatusExpression =
+                    new InPredicate(statusPathElement, QueryStatus.CANCELLED, QueryStatus.PROCESSING,
+                            QueryStatus.QUEUED);
+
+            Iterable<T> asyncAPIIterable =
+                    asyncAPIDao.loadAsyncAPIByFilter(fltStatusExpression, type);
+
+            //Active AsyncAPI UUIDs
+            Set<UUID> asyncTransactionUUIDs = StreamSupport.stream(asyncAPIIterable.spliterator(), false)
+                    .filter(query -> query.getStatus() == QueryStatus.CANCELLED
+                    || TimeUnit.SECONDS.convert(Math.abs(new Date(System.currentTimeMillis()).getTime()
+                            - query.getCreatedOn().getTime()), TimeUnit.MILLISECONDS) > maxRunTimeSeconds)
+                    .map(query -> UUID.fromString(query.getRequestId()))
+            .collect(Collectors.toSet());
+
+            //AsyncAPI UUIDs that have active transactions
+            Set<UUID> queryUUIDsToCancel = Sets.intersection(runningTransactionUUIDs, asyncTransactionUUIDs);
+
+            //AsyncAPI IDs that need to be cancelled
+            Set<String> queryIDsToCancel = queryUUIDsToCancel.stream()
+            .map(uuid -> StreamSupport
+                .stream(asyncAPIIterable.spliterator(), false)
+                .filter(query -> query.getRequestId().equals(uuid.toString()))
+                .map(T::getId)
+                .findFirst().orElseThrow(IllegalStateException::new))
+            .collect(Collectors.toSet());
+
+            //Cancel Transactions
+            queryUUIDsToCancel.stream()
+               .forEach((uuid) -> {
+                   DataStoreTransaction runningTransaction = transactionRegistry.getRunningTransaction(uuid);
+                   if (runningTransaction != null) {
+                       JsonApiDocument jsonApiDoc = new JsonApiDocument();
+                       MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+                       RequestScope scope = new RequestScope("", "query", NO_VERSION, jsonApiDoc,
+                               runningTransaction, null, queryParams, Collections.emptyMap(),
+                               uuid, elide.getElideSettings());
+                       runningTransaction.cancel(scope);
+                   }
+               });
+
+            //Change queryStatus for cancelled queries
+            if (!queryIDsToCancel.isEmpty()) {
+                PathElement idPathElement = new PathElement(type, String.class, "id");
+                FilterExpression fltIdExpression =
+                        new InPredicate(idPathElement, queryIDsToCancel);
+                asyncAPIDao.updateStatusAsyncAPIByFilter(fltIdExpression, QueryStatus.CANCEL_COMPLETE,
+                        type);
+            }
+        } catch (Exception e) {
+            log.error("Exception in scheduled cancellation: {}", e.toString());
+        }
+    }
+}
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnable.java b/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnable.java
new file mode 100644
index 0000000000..e91a25f882
--- /dev/null
+++ b/elide-async/src/main/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnable.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.thread;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.DateUtil;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.predicates.LEPredicate;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Runnable for updating AsyncAPIThread status.
+ * beyond the max run time and if not terminated by interrupt process
+ * due to app/host crash or restart.
+ */
+@Slf4j
+@Data
+@AllArgsConstructor
+public class AsyncAPICleanerRunnable implements Runnable {
+
+    private int maxRunTimeMinutes;
+    private Elide elide;
+    private int queryCleanupDays;
+    private AsyncAPIDAO asyncAPIDao;
+    private DateUtil dateUtil = new DateUtil();
+
+    @Override
+    public void run() {
+        deleteAsyncAPI(AsyncQuery.class);
+        timeoutAsyncAPI(AsyncQuery.class);
+    }
+
+    /**
+     * This method deletes the historical queries based on threshold.
+     * @param type AsyncAPI Type Implementation.
+     */
+    protected <T extends AsyncAPI> void deleteAsyncAPI(Class<T> type) {
+
+        try {
+            Date cleanupDate = dateUtil.calculateFilterDate(Calendar.DATE, queryCleanupDays);
+            PathElement createdOnPathElement = new PathElement(type, Long.class, "createdOn");
+            FilterExpression fltDeleteExp = new LEPredicate(createdOnPathElement, cleanupDate);
+            asyncAPIDao.deleteAsyncAPIAndResultByFilter(fltDeleteExp, type);
+        } catch (Exception e) {
+            log.error("Exception in scheduled cleanup: {}", e.toString());
+        }
+    }
+
+    /**
+     * This method updates the status of long running async query which
+     * were interrupted due to host crash/app shutdown to TIMEDOUT.
+     * @param type AsyncAPI Type Implementation.
+     */
+    protected <T extends AsyncAPI> void timeoutAsyncAPI(Class<T> type) {
+
+        try {
+            Date filterDate = dateUtil.calculateFilterDate(Calendar.MINUTE, maxRunTimeMinutes);
+            PathElement createdOnPathElement = new PathElement(type, Long.class, "createdOn");
+            PathElement statusPathElement = new PathElement(type, String.class, "status");
+            FilterPredicate inPredicate = new InPredicate(statusPathElement, QueryStatus.PROCESSING,
+                    QueryStatus.QUEUED);
+            FilterPredicate lePredicate = new LEPredicate(createdOnPathElement, filterDate);
+            AndFilterExpression fltTimeoutExp = new AndFilterExpression(inPredicate, lePredicate);
+            asyncAPIDao.updateStatusAsyncAPIByFilter(fltTimeoutExp, QueryStatus.TIMEDOUT, type);
+        } catch (Exception e) {
+            log.error("Exception in scheduled cleanup: {}", e.toString());
+        }
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/CSVExportFormatterTest.java b/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/CSVExportFormatterTest.java
new file mode 100644
index 0000000000..da68751433
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/CSVExportFormatterTest.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.formatter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.jsonapi.models.Resource;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+public class CSVExportFormatterTest {
+    public static final String FORMAT = "yyyy-MM-dd'T'HH:mm'Z'";
+    private static final FastDateFormat FORMATTER = FastDateFormat.getInstance(FORMAT, TimeZone.getTimeZone("GMT"));
+    private HashMapDataStore dataStore;
+    private Elide elide;
+    private RequestScope scope;
+
+    @BeforeEach
+    public void setupMocks(@TempDir Path tempDir) {
+        dataStore = new HashMapDataStore(DefaultClassScanner.getInstance(), TableExport.class.getPackage());
+        Map<String, Class<? extends Check>> map = new HashMap<>();
+        elide = new Elide(
+                    new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(map).build())
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                        .build());
+        elide.doScans();
+        scope = mock(RequestScope.class);
+    }
+
+    @Test
+    public void testResourceToCSV() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType createdOn} } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        String row = "\"{ tableExport { edges { node { query queryType createdOn} } } }\", \"GRAPHQL_V1_0\""
+                + ", \"" + FORMATTER.format(queryObj.getCreatedOn());
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("query").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("createdOn").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        Map<String, Object> resourceAttributes = new LinkedHashMap<>();
+        resourceAttributes.put("query", query);
+        resourceAttributes.put("queryType", queryObj.getQueryType());
+        resourceAttributes.put("createdOn", queryObj.getCreatedOn());
+
+        Resource resource = new Resource("tableExport", "0", resourceAttributes, null, null, null);
+
+        PersistentResource persistentResource = mock(PersistentResource.class);
+        when(persistentResource.getObject()).thenReturn(queryObj);
+        when(persistentResource.getRequestScope()).thenReturn(scope);
+        when(persistentResource.toResource(any(), any())).thenReturn(resource);
+        when(scope.getEntityProjection()).thenReturn(projection);
+
+        String output = formatter.format(persistentResource, 1);
+        assertTrue(output.contains(row));
+    }
+
+    @Test
+    public void testNullResourceToCSV() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+        PersistentResource persistentResource = null;
+
+        String output = formatter.format(persistentResource, 1);
+        assertNull(output);
+    }
+
+    @Test
+    public void testNullProjectionHeader() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+
+        // Prepare EntityProjection
+        EntityProjection projection = null;
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertNull(output);
+    }
+
+    @Test
+    public void testProjectionWithEmptyAttributeSetHeader() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertEquals("", output);
+    }
+
+    @Test
+    public void testProjectionWithNullAttributesHeader() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = null;
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertEquals("", output);
+    }
+
+    @Test
+    public void testHeader() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType } } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("query").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertEquals("\"query\",\"queryType\"", output);
+    }
+
+    @Test
+    public void testHeaderWithNonmatchingAlias() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType } } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("foo").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertEquals("\"query\",\"queryType\"", output);
+    }
+
+    @Test
+    public void testHeaderWithArguments() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, false);
+
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType } } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder()
+                .type(TableExport.class)
+                .name("query")
+                .argument(Argument.builder().name("foo").value("bar").build())
+                .alias("query").build());
+
+        attributes.add(Attribute.builder()
+                .type(TableExport.class)
+                .argument(Argument.builder().name("foo").value("bar").build())
+                .argument(Argument.builder().name("baz").value("boo").build())
+                .name("queryType")
+                .build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertEquals("\"query(foo=bar)\",\"queryType(foo=bar baz=boo)\"", output);
+    }
+
+    @Test
+    public void testHeaderSkip() {
+        CSVExportFormatter formatter = new CSVExportFormatter(elide, true);
+
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType } } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("query").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        String output = formatter.preFormat(projection, queryObj);
+        assertNull(output);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/JSONExportFormatterTest.java b/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/JSONExportFormatterTest.java
new file mode 100644
index 0000000000..a329fc6d8e
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/export/formatter/JSONExportFormatterTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.export.formatter;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.jsonapi.models.Resource;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+public class JSONExportFormatterTest {
+    public static final String FORMAT = "yyyy-MM-dd'T'HH:mm'Z'";
+    private static final FastDateFormat FORMATTER = FastDateFormat.getInstance(FORMAT, TimeZone.getTimeZone("GMT"));
+    private HashMapDataStore dataStore;
+    private Elide elide;
+    private RequestScope scope;
+
+    @BeforeEach
+    public void setupMocks(@TempDir Path tempDir) {
+        dataStore = new HashMapDataStore(DefaultClassScanner.getInstance(), TableExport.class.getPackage());
+        Map<String, Class<? extends Check>> map = new HashMap<>();
+        elide = new Elide(
+                new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(map).build())
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                        .build());
+        elide.doScans();
+        scope = mock(RequestScope.class);
+    }
+
+    @Test
+    public void testFormat() {
+        JSONExportFormatter formatter = new JSONExportFormatter(elide);
+        TableExport queryObj = new TableExport();
+        String query = "{ tableExport { edges { node { query queryType createdOn} } } }";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        String start = "{\"query\":\"{ tableExport { edges { node { query queryType createdOn} } } }\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"createdOn\":\"" + FORMATTER.format(queryObj.getCreatedOn()) + "\"}";
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("query").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("createdOn").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        Map<String, Object> resourceAttributes = new LinkedHashMap<>();
+        resourceAttributes.put("query", query);
+        resourceAttributes.put("queryType", queryObj.getQueryType());
+        resourceAttributes.put("createdOn", queryObj.getCreatedOn());
+
+        Resource resource = new Resource("tableExport", "0", resourceAttributes, null, null, null);
+        PersistentResource persistentResource = mock(PersistentResource.class);
+        when(persistentResource.getObject()).thenReturn(queryObj);
+        when(persistentResource.getRequestScope()).thenReturn(scope);
+        when(persistentResource.toResource(any(), any())).thenReturn(resource);
+        when(scope.getEntityProjection()).thenReturn(projection);
+
+        String output = formatter.format(persistentResource, 1);
+        assertTrue(output.contains(start));
+    }
+
+    @Test
+    public void testResourceToJSON() {
+        JSONExportFormatter formatter = new JSONExportFormatter(elide);
+        TableExport queryObj = new TableExport();
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+
+        String start = "{\"query\":\"{ tableExport { edges { node { query queryType} } } }\","
+                + "\"queryType\":\"GRAPHQL_V1_0\"}";
+
+        // Prepare EntityProjection
+        Set<Attribute> attributes = new LinkedHashSet<>();
+        attributes.add(Attribute.builder().type(TableExport.class).name("query").alias("query").build());
+        attributes.add(Attribute.builder().type(TableExport.class).name("queryType").build());
+        EntityProjection projection = EntityProjection.builder().type(TableExport.class).attributes(attributes).build();
+
+        Map<String, Object> resourceAttributes = new LinkedHashMap<>();
+        resourceAttributes.put("query", "{ tableExport { edges { node { query queryType} } } }");
+        resourceAttributes.put("queryType", QueryType.GRAPHQL_V1_0);
+
+        Resource resource = new Resource("tableExport", "0", resourceAttributes, null, null, null);
+        PersistentResource persistentResource = mock(PersistentResource.class);
+        when(persistentResource.getObject()).thenReturn(queryObj);
+        when(persistentResource.getRequestScope()).thenReturn(scope);
+        when(persistentResource.toResource(any(), any())).thenReturn(resource);
+        when(scope.getEntityProjection()).thenReturn(projection);
+
+        String output = formatter.resourceToJSON(elide.getMapper().getObjectMapper(), persistentResource);
+        assertTrue(output.contains(start));
+    }
+
+    @Test
+    public void testNullResourceToJSON() {
+        JSONExportFormatter formatter = new JSONExportFormatter(elide);
+        PersistentResource persistentResource = null;
+
+        String output = formatter.format(persistentResource, 1);
+        assertNull(output);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactGroup.java b/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactGroup.java
new file mode 100644
index 0000000000..d36dbe229a
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactGroup.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Include(rootLevel = true, name = "group")
+@Entity
+public class ArtifactGroup {
+    @Id
+    private String name = "";
+
+    @OneToMany(mappedBy = "group")
+    private List<ArtifactProduct> products = new ArrayList<>();
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactProduct.java b/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactProduct.java
new file mode 100644
index 0000000000..90e77a9398
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/models/ArtifactProduct.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, Yahoo.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Include(name = "product")
+@Entity
+public class ArtifactProduct {
+    @Id
+    private String name = "";
+
+    @ManyToOne
+    private ArtifactGroup group = null;
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/models/AsyncQueryTest.java b/elide-async/src/test/java/com/yahoo/elide/async/models/AsyncQueryTest.java
new file mode 100644
index 0000000000..21eff10f20
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/models/AsyncQueryTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.models;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AsyncQueryTest {
+
+    private static Validator validator;
+
+    @BeforeAll
+    public void setupMocks() {
+        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+        validator = factory.getValidator();
+    }
+
+    @Test
+    public void testUUIDGeneration() {
+        AsyncQuery queryObj = new AsyncQuery();
+        assertNotNull(queryObj.getId());
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperationTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperationTest.java
new file mode 100644
index 0000000000..99d29e1c59
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/AsyncAPIUpdateOperationTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.Future;
+
+public class AsyncAPIUpdateOperationTest {
+
+    private AsyncAPIUpdateOperation updateThread;
+    private Elide elide;
+    private AsyncAPI queryObj;
+    private AsyncAPIResult queryResultObj;
+    private AsyncAPIDAO asyncAPIDao;
+    private Future<AsyncAPIResult> task;
+
+    @BeforeEach
+    public void setupMocks() {
+        elide = mock(Elide.class);
+        queryObj = mock(AsyncAPI.class);
+        queryResultObj = mock(AsyncAPIResult.class);
+        updateThread = new AsyncAPIUpdateOperation(elide, task, queryObj, asyncAPIDao);
+    }
+
+    @Test
+    public void testAsyncAPIUpdateRunnableSet() {
+        assertEquals(elide, updateThread.getElide());
+        assertEquals(task, updateThread.getTask());
+        assertEquals(queryObj, updateThread.getQueryObj());
+        assertEquals(asyncAPIDao, updateThread.getAsyncAPIDao());
+    }
+
+    public void testUpdateQuery() {
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        when(queryObj.getId()).thenReturn(id);
+        updateThread.run();
+        verify(asyncAPIDao, times(1)).updateAsyncAPIResult(queryResultObj, queryObj.getId(), queryObj.getClass());
+
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperationTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperationTest.java
new file mode 100644
index 0000000000..35c21d5de3
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLAsyncQueryOperationTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.AsyncQueryResult;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.QueryRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GraphQLAsyncQueryOperationTest {
+
+    private User user;
+    private Elide elide;
+    private RequestScope requestScope;
+    private Map<String, QueryRunner> runners = new HashMap<>();
+    private QueryRunner runner;
+    private AsyncExecutorService asyncExecutorService;
+
+    @BeforeEach
+    public void setupMocks() {
+        user = mock(User.class);
+        elide = mock(Elide.class);
+        requestScope = mock(RequestScope.class);
+        runner = mock(QueryRunner.class);
+        runners.put("v1", runner);
+        asyncExecutorService = mock(AsyncExecutorService.class);
+        when(asyncExecutorService.getElide()).thenReturn(elide);
+        when(asyncExecutorService.getRunners()).thenReturn(runners);
+        when(requestScope.getApiVersion()).thenReturn("v1");
+    }
+
+    @Test
+    public void testProcessQueryGraphQl() throws URISyntaxException  {
+        AsyncQuery queryObj = new AsyncQuery();
+        String responseBody = "{\"data\":{\"book\":{\"edges\":[{\"node\":{\"id\":\"1\",\"title\":\"Ender's Game\"}},"
+                + "{\"node\":{\"id\":\"2\",\"title\":\"Song of Ice and Fire\"}},"
+                + "{\"node\":{\"id\":\"3\",\"title\":\"For Whom the Bell Tolls\"}}]}}}";
+        ElideResponse response = new ElideResponse(200, responseBody);
+        String query = "{\"query\":\"{ group { edges { node { name commonName description } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+
+        when(runner.run(any(), any(), any(), any(), any())).thenReturn(response);
+        GraphQLAsyncQueryOperation graphQLOperation = new GraphQLAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        AsyncQueryResult queryResultObj = (AsyncQueryResult) graphQLOperation.call();
+        assertEquals(responseBody, queryResultObj.getResponseBody());
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals(3, queryResultObj.getRecordCount());
+    }
+
+    @Test
+    public void testProcessQueryGraphQlInvalidResponse() throws URISyntaxException {
+        AsyncQuery queryObj = new AsyncQuery();
+        String responseBody = "ResponseBody";
+        ElideResponse response = new ElideResponse(200, responseBody);
+        String query = "{\"query\":\"{ group { edges { node { name commonName description } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+
+        when(runner.run(any(), any(), any(), any(), any())).thenReturn(response);
+        GraphQLAsyncQueryOperation graphQLOperation = new GraphQLAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        AsyncQueryResult queryResultObj = (AsyncQueryResult) graphQLOperation.call();
+        assertEquals(responseBody, queryResultObj.getResponseBody());
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals(0, queryResultObj.getRecordCount());
+    }
+
+    @Test
+    public void testProcessQueryGraphQlRunnerException() {
+        AsyncQuery queryObj = new AsyncQuery();
+        String query = "{\"query\":\"{ group { edges { node { name commonName description } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+
+        when(runner.run(any(), any(), any(), any())).thenThrow(RuntimeException.class);
+        GraphQLAsyncQueryOperation graphQLOperation = new GraphQLAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        assertThrows(RuntimeException.class, () -> graphQLOperation.call());
+    }
+
+    @Test
+    public void testProcessQueryGraphQlApiVersionNotSupported() {
+        AsyncQuery queryObj = new AsyncQuery();
+        String query = "{\"query\":\"{ group { edges { node { name commonName description } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+
+        when(requestScope.getApiVersion()).thenReturn("v2");
+        GraphQLAsyncQueryOperation graphQLOperation = new GraphQLAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        assertThrows(InvalidOperationException.class, () -> graphQLOperation.call());
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLTableExportOperationTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLTableExportOperationTest.java
new file mode 100644
index 0000000000..6719632b06
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/GraphQLTableExportOperationTest.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.export.formatter.JSONExportFormatter;
+import com.yahoo.elide.async.models.ArtifactGroup;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+import com.yahoo.elide.async.models.security.AsyncAPIInlineChecks;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+
+public class GraphQLTableExportOperationTest {
+
+    private HashMapDataStore dataStore;
+    private User user;
+    private Elide elide;
+    private RequestScope requestScope;
+    private AsyncExecutorService asyncExecutorService;
+    private ResultStorageEngine engine;
+
+    @BeforeEach
+    public void setupMocks(@TempDir Path tempDir) {
+        dataStore = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                        new HashSet<>(Arrays.asList(TableExport.class.getPackage(), ArtifactGroup.class.getPackage())));
+        Map<String, Class<? extends Check>> map = new HashMap<>();
+        map.put(AsyncAPIInlineChecks.AsyncAPIOwner.PRINCIPAL_IS_OWNER,
+                AsyncAPIInlineChecks.AsyncAPIOwner.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIAdmin.PRINCIPAL_IS_ADMIN,
+                AsyncAPIInlineChecks.AsyncAPIAdmin.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusValue.VALUE_IS_CANCELLED,
+                AsyncAPIInlineChecks.AsyncAPIStatusValue.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.VALUE_IS_QUEUED,
+                AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.class);
+        elide = new Elide(
+                    new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(map).build())
+                        .withAuditLogger(new Slf4jLogger())
+                        .withExportApiPath("/export")
+                        .build());
+        elide.doScans();
+        user = mock(User.class);
+        requestScope = mock(RequestScope.class);
+        asyncExecutorService = mock(AsyncExecutorService.class);
+        engine = new FileResultStorageEngine(tempDir.toString(), false);
+        when(asyncExecutorService.getElide()).thenReturn(elide);
+        when(requestScope.getApiVersion()).thenReturn(NO_VERSION);
+        when(requestScope.getUser()).thenReturn(user);
+        when(requestScope.getElideSettings()).thenReturn(elide.getElideSettings());
+        when(requestScope.getBaseUrlEndPoint()).thenReturn("https://elide.io");
+    }
+
+    @Test
+    public void testProcessQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ tableExport { edges { node { id principalName} } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("https://elide.io/export/edc4a871-dff2-4054-804e-d80075cf827d", queryResultObj.getUrl().toString());
+        assertEquals(1, queryResultObj.getRecordCount());
+    }
+
+    @Test
+    public void testProcessBadEntityQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ tableExportInvalid { edges { node { id principalName} } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Bad Request Body'Unknown entity {tableExportInvalid}.'", queryResultObj.getMessage());
+    }
+
+    @Test
+    public void testProcessBadQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ tableExport { edges { node { id principalName}  } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Bad Request Body'Can't parse query: { tableExport { edges { node { id principalName}  } }'", queryResultObj.getMessage());
+    }
+
+    @Test
+    public void testProcessQueryWithRelationship() {
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ group { edges { node { name products {edges { node { name } } } } } } }\", \"variables\":null}";
+        String id = "edc4a871-dff2-4194-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide),
+                        asyncExecutorService, queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Export is not supported for Query that requires traversing Relationships.",
+                        queryResultObj.getMessage());
+        assertNull(queryResultObj.getRecordCount());
+        assertNull(queryResultObj.getUrl());
+    }
+
+    @Test
+    public void testProcessQueryWithMultipleProjection() {
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ tableExport { edges { node { principalName } } } asyncQuery { edges { node { principalName } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4094-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide),
+                        asyncExecutorService, queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Export is only supported for single Query with one root projection.",
+                        queryResultObj.getMessage());
+        assertNull(queryResultObj.getRecordCount());
+        assertNull(queryResultObj.getUrl());
+    }
+
+    @Test
+    public void testProcessMultipleQuery() {
+        TableExport queryObj = new TableExport();
+        String query = "{\"query\":\"{ tableExport { edges { node { principalName } } } } { asyncQuery { edges { node { principalName } } } }\",\"variables\":null}";
+        String id = "edc4a871-dff2-4094-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.GRAPHQL_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        GraphQLTableExportOperation graphQLOperation = new GraphQLTableExportOperation(new JSONExportFormatter(elide),
+                        asyncExecutorService, queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) graphQLOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Export is only supported for single Query with one root projection.",
+                        queryResultObj.getMessage());
+        assertNull(queryResultObj.getRecordCount());
+        assertNull(queryResultObj.getUrl());
+    }
+
+    /**
+     * Prepping and Storing an TableExport entry to be queried later on.
+     * @throws IOException  IOException
+     */
+    private void dataPrep() throws IOException {
+        TableExport temp = new TableExport();
+        DataStoreTransaction tx = dataStore.beginTransaction();
+        RequestScope scope = new RequestScope(null, null, NO_VERSION, null, tx, user, null, Collections.emptyMap(),
+                UUID.randomUUID(), elide.getElideSettings());
+        tx.save(temp, scope);
+        tx.commit(scope);
+        tx.close();
+    }
+
+    @AfterEach
+    public void clearDataStore() {
+        dataStore.cleanseTestData();
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperationTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperationTest.java
new file mode 100644
index 0000000000..22afc751b3
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/JSONAPIAsyncQueryOperationTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.AsyncQueryResult;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.security.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URISyntaxException;
+
+public class JSONAPIAsyncQueryOperationTest {
+
+    private User user;
+    private Elide elide;
+    private RequestScope requestScope;
+    private AsyncExecutorService asyncExecutorService;
+
+    @BeforeEach
+    public void setupMocks() {
+        user = mock(User.class);
+        elide = mock(Elide.class);
+        requestScope = mock(RequestScope.class);
+        asyncExecutorService = mock(AsyncExecutorService.class);
+        when(asyncExecutorService.getElide()).thenReturn(elide);
+    }
+
+    @Test
+    public void testProcessQueryJsonApi() throws URISyntaxException {
+        AsyncQuery queryObj = new AsyncQuery();
+        String responseBody = "{\"data\":"
+                + "[{\"type\":\"book\",\"id\":\"3\",\"attributes\":{\"title\":\"For Whom the Bell Tolls\"}}"
+                + ",{\"type\":\"book\",\"id\":\"2\",\"attributes\":{\"title\":\"Song of Ice and Fire\"}},"
+                + "{\"type\":\"book\",\"id\":\"1\",\"attributes\":{\"title\":\"Ender's Game\"}}]}";
+        ElideResponse response = new ElideResponse(200, responseBody);
+        String query = "/group?sort=commonName&fields%5Bgroup%5D=commonName,description";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+
+        when(elide.get(any(), any(), any(), any(), any(), any(), any())).thenReturn(response);
+        JSONAPIAsyncQueryOperation jsonOperation = new JSONAPIAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        AsyncQueryResult queryResultObj = (AsyncQueryResult) jsonOperation.call();
+        assertEquals(responseBody, queryResultObj.getResponseBody());
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals(3, queryResultObj.getRecordCount());
+    }
+
+    @Test
+    public void testProcessQueryNonSuccessResponse() throws URISyntaxException {
+        AsyncQuery queryObj = new AsyncQuery();
+        String responseBody = "ResponseBody";
+        ElideResponse response = new ElideResponse(201, responseBody);
+        String query = "/group?sort=commonName&fields%5Bgroup%5D=commonName,description";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+
+        when(elide.get(any(), any(), any(), any(), any(), any(), any())).thenReturn(response);
+        JSONAPIAsyncQueryOperation jsonOperation = new JSONAPIAsyncQueryOperation(asyncExecutorService, queryObj, requestScope);
+        AsyncQueryResult queryResultObj = (AsyncQueryResult) jsonOperation.call();
+        assertEquals(responseBody, queryResultObj.getResponseBody());
+        assertEquals(201, queryResultObj.getHttpStatus());
+        assertNull(queryResultObj.getRecordCount());
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/JsonAPITableExportOperationTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/JsonAPITableExportOperationTest.java
new file mode 100644
index 0000000000..037ad5ca3c
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/JsonAPITableExportOperationTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.export.formatter.JSONExportFormatter;
+import com.yahoo.elide.async.models.ArtifactGroup;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.TableExportResult;
+import com.yahoo.elide.async.models.security.AsyncAPIInlineChecks;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+
+public class JsonAPITableExportOperationTest {
+
+    private HashMapDataStore dataStore;
+    private User user;
+    private RequestScope requestScope;
+    private Elide elide;
+    private AsyncExecutorService asyncExecutorService;
+    private ResultStorageEngine engine;
+
+    @BeforeEach
+    public void setupMocks(@TempDir Path tempDir) {
+        dataStore = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                        new HashSet<>(Arrays.asList(TableExport.class.getPackage(), ArtifactGroup.class.getPackage())));
+        Map<String, Class<? extends Check>> map = new HashMap<>();
+        map.put(AsyncAPIInlineChecks.AsyncAPIOwner.PRINCIPAL_IS_OWNER,
+                AsyncAPIInlineChecks.AsyncAPIOwner.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIAdmin.PRINCIPAL_IS_ADMIN,
+                AsyncAPIInlineChecks.AsyncAPIAdmin.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusValue.VALUE_IS_CANCELLED,
+                AsyncAPIInlineChecks.AsyncAPIStatusValue.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.VALUE_IS_QUEUED,
+                AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.class);
+
+        elide = new Elide(
+                    new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(map).build())
+                        .withAuditLogger(new Slf4jLogger())
+                        .withExportApiPath("/export")
+                        .build());
+        elide.doScans();
+        user = mock(User.class);
+        requestScope = mock(RequestScope.class);
+        asyncExecutorService = mock(AsyncExecutorService.class);
+        engine = new FileResultStorageEngine(tempDir.toString(), true);
+        when(asyncExecutorService.getElide()).thenReturn(elide);
+        when(requestScope.getApiVersion()).thenReturn(NO_VERSION);
+        when(requestScope.getUser()).thenReturn(user);
+        when(requestScope.getElideSettings()).thenReturn(elide.getElideSettings());
+        when(requestScope.getBaseUrlEndPoint()).thenReturn("https://elide.io");
+    }
+
+    @Test
+    public void testProcessQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "/tableExport?sort=principalName&fields=principalName";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        JSONAPITableExportOperation jsonAPIOperation = new JSONAPITableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) jsonAPIOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("https://elide.io/export/edc4a871-dff2-4054-804e-d80075cf827d.csv", queryResultObj.getUrl().toString());
+        assertEquals(1, queryResultObj.getRecordCount());
+        assertNull(queryResultObj.getMessage());
+    }
+
+    @Test
+    public void testProcessBadEntityQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "/tableExportInvalid?sort=principalName&fields=principalName";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        JSONAPITableExportOperation jsonAPIOperation = new JSONAPITableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) jsonAPIOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Unknown collection tableExportInvalid", queryResultObj.getMessage());
+    }
+
+    @Test
+    public void testProcessBadQuery() throws IOException  {
+        dataPrep();
+        TableExport queryObj = new TableExport();
+        String query = "tableExport/^IllegalCharacter^";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        JSONAPITableExportOperation jsonAPIOperation = new JSONAPITableExportOperation(new JSONExportFormatter(elide), asyncExecutorService,
+                queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) jsonAPIOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Illegal character in path at index 12: tableExport/^IllegalCharacter^",
+                        queryResultObj.getMessage());
+    }
+
+    @Test
+    public void testProcessQueryWithRelationship() {
+        TableExport queryObj = new TableExport();
+        String query = "/group?fields[group]=products";
+        String id = "edc4a871-dff2-4194-804e-d80075cf827d";
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setResultType(ResultType.CSV);
+
+        JSONAPITableExportOperation jsonAPIOperation = new JSONAPITableExportOperation(new JSONExportFormatter(elide),
+                        asyncExecutorService, queryObj, requestScope, engine);
+        TableExportResult queryResultObj = (TableExportResult) jsonAPIOperation.call();
+
+        assertEquals(200, queryResultObj.getHttpStatus());
+        assertEquals("Export is not supported for Query that requires traversing Relationships.",
+                        queryResultObj.getMessage());
+        assertNull(queryResultObj.getRecordCount());
+        assertNull(queryResultObj.getUrl());
+    }
+
+    /**
+     * Prepping and Storing an TableExport entry to be queried later on.
+     * @throws IOException  IOException
+     */
+    private void dataPrep() throws IOException {
+        TableExport temp = new TableExport();
+        DataStoreTransaction tx = dataStore.beginTransaction();
+        RequestScope scope = new RequestScope(null, null, NO_VERSION, null, tx, user, null, Collections.emptyMap(),
+                UUID.randomUUID(), elide.getElideSettings());
+        tx.save(temp, scope);
+        tx.commit(scope);
+        tx.close();
+    }
+
+    @AfterEach
+    public void clearDataStore() {
+        dataStore.cleanseTestData();
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/operation/SafeJsonPathTest.java b/elide-async/src/test/java/com/yahoo/elide/async/operation/SafeJsonPathTest.java
new file mode 100644
index 0000000000..d837c79997
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/operation/SafeJsonPathTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.operation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests out different JSONPath parsing results.
+ */
+public class SafeJsonPathTest {
+
+    @Test
+    public void testIntegerResult() {
+        Integer count = AsyncQueryOperation.safeJsonPathLength("{ \"data\": [1,2,3] }", "data.length()");
+
+        assertEquals(3, count);
+    }
+
+    @Test
+    public void testArrayResult() {
+        Integer count = AsyncQueryOperation.safeJsonPathLength("{ \"data\": [10] }", "data");
+
+        assertEquals(10, count);
+    }
+
+    @Test
+    public void testEmptyArrayResult() {
+        Integer count = AsyncQueryOperation.safeJsonPathLength("{ \"data\": [] }", "data");
+
+        assertEquals(0, count);
+    }
+
+    @Test
+    public void testInvalidREsult() {
+        assertThrows(IllegalStateException.class, () ->
+                AsyncQueryOperation.safeJsonPathLength("{ \"data\": \"foo\" }", "data"));
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/resources/ExportApiEndpointTest.java b/elide-async/src/test/java/com/yahoo/elide/async/resources/ExportApiEndpointTest.java
new file mode 100644
index 0000000000..50bfec9762
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/resources/ExportApiEndpointTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.resources;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.async.resources.ExportApiEndpoint.ExportApiProperties;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.mockito.ArgumentCaptor;
+import io.reactivex.Observable;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.core.Response;
+
+/**
+ * ExportAPiEndpoint Test.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ExportApiEndpointTest {
+
+    private ExportApiEndpoint endpoint;
+    private ResultStorageEngine engine;
+    private AsyncResponse asyncResponse;
+    private HttpServletResponse response;
+    private ExportApiProperties exportApiProperties;
+    private ArgumentCaptor<Response> responseCaptor = ArgumentCaptor.forClass(Response.class);
+
+    @BeforeEach
+    public void setup() {
+        engine = mock(FileResultStorageEngine.class);
+        asyncResponse = mock(AsyncResponse.class);
+        response = mock(HttpServletResponse.class);
+    }
+
+    @Test
+    public void testGet() {
+        String queryId = "1";
+        int maxDownloadTimeSeconds = 1;
+        int maxDownloadTimeMilliSeconds = (int) TimeUnit.SECONDS.toMillis(maxDownloadTimeSeconds);
+        when(engine.getResultsByID(queryId)).thenReturn(Observable.just("result"));
+
+        exportApiProperties = new ExportApiProperties(Executors.newFixedThreadPool(1), maxDownloadTimeSeconds);
+        endpoint = new ExportApiEndpoint(engine, exportApiProperties);
+        endpoint.get(queryId, response, asyncResponse);
+
+        // Timeout(int) succeeds as soon as the function to be verified is called.
+        // It waits maximum upto value of "int" for function to be called.
+        verify(engine, timeout(maxDownloadTimeMilliSeconds)).getResultsByID(queryId);
+        verify(asyncResponse, timeout(maxDownloadTimeMilliSeconds)).resume(responseCaptor.capture());
+        final Response res = responseCaptor.getValue();
+
+        assertEquals(res.getStatus(), 200);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncCleanerServiceTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncCleanerServiceTest.java
new file mode 100644
index 0000000000..b6bcfc8a05
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncCleanerServiceTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AsyncCleanerServiceTest {
+
+    private AsyncCleanerService service;
+
+    @BeforeAll
+    public void setupMocks() {
+        Elide elide = mock(Elide.class);
+        AsyncAPIDAO dao = mock(DefaultAsyncAPIDAO.class);
+        AsyncCleanerService.init(elide, 5, 60, 300, dao);
+        service = AsyncCleanerService.getInstance();
+    }
+
+    @Test
+    public void testCleanerSet() {
+        assertNotNull(service);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java
new file mode 100644
index 0000000000..4168677083
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.AsyncAPIResult;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.operation.JSONAPIAsyncQueryOperation;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import org.apache.http.NoHttpResponseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AsyncExecutorServiceTest {
+
+    private AsyncExecutorService service;
+    private Elide elide;
+    private AsyncAPIDAO asyncAPIDao;
+    private User testUser;
+    private RequestScope scope;
+    private ResultStorageEngine resultStorageEngine;
+
+    @BeforeAll
+    public void setupMockElide() {
+        HashMapDataStore inMemoryStore = new HashMapDataStore(
+                DefaultClassScanner.getInstance(),
+                AsyncQuery.class.getPackage()
+        );
+        Map<String, Class<? extends Check>> checkMappings = new HashMap<>();
+        elide = new Elide(
+                new ElideSettingsBuilder(inMemoryStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(checkMappings).build())
+                        .build());
+        asyncAPIDao = mock(DefaultAsyncAPIDAO.class);
+        testUser = mock(User.class);
+        scope = mock(RequestScope.class);
+        resultStorageEngine = mock(FileResultStorageEngine.class);
+        service = new AsyncExecutorService(elide, Executors.newFixedThreadPool(5), Executors.newFixedThreadPool(5),
+                        asyncAPIDao);
+
+    }
+
+    @Test
+    public void testAsyncExecutorServiceSet() {
+        assertEquals(elide, service.getElide());
+        assertNotNull(service.getRunners());
+        assertNotNull(service.getExecutor());
+        assertNotNull(service.getUpdater());
+        assertEquals(asyncAPIDao, service.getAsyncAPIDao());
+        assertEquals(resultStorageEngine, resultStorageEngine);
+    }
+
+    //Test for executor hook execution
+    @Test
+    public void testExecuteQueryFail() throws Exception {
+       AsyncQuery queryObj = mock(AsyncQuery.class);
+       when(queryObj.getAsyncAfterSeconds()).thenReturn(10);
+
+       Callable<AsyncAPIResult> mockCallable = mock(Callable.class);
+       when(mockCallable.call()).thenThrow(new NoHttpResponseException(""));
+
+       service.executeQuery(queryObj, mockCallable);
+       verify(queryObj, times(1)).setStatus(QueryStatus.PROCESSING);
+       verify(queryObj, times(1)).setStatus(QueryStatus.FAILURE);
+    }
+
+    //Test for executor hook execution
+    @Test
+    public void testExecuteQueryComplete() {
+
+        AsyncQuery queryObj = mock(AsyncQuery.class);
+        String query = "/group?sort=commonName&fields%5Bgroup%5D=commonName,description";
+        String id = "edc4a871-dff2-4054-804e-d80075cf827d";
+        when(queryObj.getQuery()).thenReturn(query);
+        when(queryObj.getId()).thenReturn(id);
+        when(queryObj.getRequestId()).thenReturn(id);
+        when(queryObj.getQueryType()).thenReturn(QueryType.JSONAPI_V1_0);
+        when(queryObj.getAsyncAfterSeconds()).thenReturn(10);
+        when(scope.getApiVersion()).thenReturn(NO_VERSION);
+        when(scope.getUser()).thenReturn(testUser);
+        JSONAPIAsyncQueryOperation jsonOperation = new JSONAPIAsyncQueryOperation(service, queryObj, scope);
+        service.executeQuery(queryObj, jsonOperation);
+        verify(queryObj, times(1)).setStatus(QueryStatus.PROCESSING);
+        verify(queryObj, times(1)).setStatus(QueryStatus.COMPLETE);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAOTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAOTest.java
new file mode 100644
index 0000000000..caa983ef2a
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/dao/DefaultAsyncAPIDAOTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.dao;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.AsyncQueryResult;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.checks.Check;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+public class DefaultAsyncAPIDAOTest {
+
+    private DefaultAsyncAPIDAO asyncAPIDAO;
+    private Elide elide;
+    private DataStore dataStore;
+    private AsyncQuery asyncQuery;
+    private AsyncQueryResult asyncQueryResult;
+    private DataStoreTransaction tx;
+    private FilterExpression filter;
+
+    @BeforeEach
+    public void setupMocks() {
+        dataStore = mock(DataStore.class);
+        asyncQuery = mock(AsyncQuery.class);
+        asyncQueryResult = mock(AsyncQueryResult.class);
+        filter = mock(FilterExpression.class);
+        tx = mock(DataStoreTransaction.class);
+
+        Map<String, Class<? extends Check>> checkMappings = new HashMap<>();
+
+        EntityDictionary dictionary = EntityDictionary.builder().checks(checkMappings).build();
+        dictionary.bindEntity(AsyncQuery.class);
+        dictionary.bindEntity(AsyncQueryResult.class);
+
+        ElideSettings elideSettings = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .build();
+
+        elide = new Elide(elideSettings);
+        when(dataStore.beginTransaction()).thenReturn(tx);
+        asyncAPIDAO = new DefaultAsyncAPIDAO(elide.getElideSettings(), dataStore);
+    }
+
+    @Test
+    public void testAsyncQueryCleanerThreadSet() {
+        assertEquals(elide.getElideSettings(), asyncAPIDAO.getElideSettings());
+        assertEquals(dataStore, asyncAPIDAO.getDataStore());
+    }
+
+    @Test
+    public void testUpdateStatus() {
+        when(tx.loadObject(any(), any(), any())).thenReturn(asyncQuery);
+        asyncAPIDAO.updateStatus("1234", QueryStatus.PROCESSING, asyncQuery.getClass());
+        verify(dataStore, times(1)).beginTransaction();
+        verify(tx, times(1)).save(any(AsyncQuery.class), any(RequestScope.class));
+        verify(asyncQuery, times(1)).setStatus(QueryStatus.PROCESSING);
+    }
+
+   @Test
+   public void testUpdateStatusAsyncQueryCollection() {
+       Iterable<Object> loaded = Arrays.asList(asyncQuery, asyncQuery);
+       when(tx.loadObjects(any(), any())).thenReturn(new DataStoreIterableBuilder(loaded).build());
+       asyncAPIDAO.updateStatusAsyncAPIByFilter(filter, QueryStatus.TIMEDOUT, asyncQuery.getClass());
+       verify(tx, times(2)).save(any(AsyncQuery.class), any(RequestScope.class));
+       verify(asyncQuery, times(2)).setStatus(QueryStatus.TIMEDOUT);
+   }
+
+    @Test
+    public void testDeleteAsyncQueryAndResultCollection() {
+        Iterable<Object> loaded = Arrays.asList(asyncQuery, asyncQuery, asyncQuery);
+        when(tx.loadObjects(any(), any())).thenReturn(new DataStoreIterableBuilder(loaded).build());
+        asyncAPIDAO.deleteAsyncAPIAndResultByFilter(filter, asyncQuery.getClass());
+        verify(dataStore, times(1)).beginTransaction();
+        verify(tx, times(1)).loadObjects(any(), any());
+        verify(tx, times(3)).delete(any(AsyncQuery.class), any(RequestScope.class));
+    }
+
+    @Test
+    public void testUpdateAsyncQueryResult() {
+        when(tx.loadObject(any(), any(), any())).thenReturn(asyncQuery);
+        when(asyncQuery.getStatus()).thenReturn(QueryStatus.PROCESSING);
+        asyncAPIDAO.updateAsyncAPIResult(asyncQueryResult, asyncQuery.getId(), asyncQuery.getClass());
+        verify(dataStore, times(1)).beginTransaction();
+        verify(tx, times(1)).save(any(AsyncQuery.class), any(RequestScope.class));
+        verify(asyncQuery, times(1)).setResult(asyncQueryResult);
+        verify(asyncQuery, times(1)).setStatus(QueryStatus.COMPLETE);
+
+    }
+
+    @Test
+    public void testLoadAsyncQueryCollection() {
+        Iterable<Object> loaded = Arrays.asList(asyncQuery, asyncQuery, asyncQuery);
+        when(tx.loadObjects(any(), any())).thenReturn(new DataStoreIterableBuilder(loaded).build());
+        asyncAPIDAO.loadAsyncAPIByFilter(filter, asyncQuery.getClass());
+        verify(dataStore, times(1)).beginTransaction();
+        verify(tx, times(1)).loadObjects(any(), any());
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngineTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngineTest.java
new file mode 100644
index 0000000000..4f0fb2a45c
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/FileResultStorageEngineTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.storageengine;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.async.models.TableExport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import io.reactivex.Observable;
+
+import java.io.File;
+import java.nio.file.Path;
+
+/**
+ * Test cases for FileResultStorageEngine.
+ */
+public class FileResultStorageEngineTest {
+    private static final String BASE_PATH = "src/test/resources/downloads/";
+
+    @Test
+    public void testRead() {
+        String finalResult = readResultsFile(BASE_PATH, "non_empty_results");
+        assertEquals(finalResult, "test");
+    }
+
+    @Test
+    public void testReadEmptyFile() {
+        String finalResult = readResultsFile(BASE_PATH, "empty_results");
+        assertEquals(finalResult, "");
+    }
+
+    @Test
+    public void testReadNonExistentFile() {
+        assertThrows(IllegalStateException.class, () ->
+                readResultsFile(BASE_PATH , "nonexisting_results")
+        );
+    }
+
+    @Test
+    public void testStoreResults(@TempDir Path tempDir) {
+        String queryId = "store_results_success";
+        String validOutput = "hi\nhello";
+        String[] input = validOutput.split("\n");
+
+        storeResultsFile(tempDir.toString(), queryId, Observable.fromArray(input));
+
+        File file = new File(tempDir.toString() + File.separator + queryId);
+        assertTrue(file.exists());
+
+        // verify contents of stored files are readable and match original
+        String finalResult = readResultsFile(tempDir.toString(), queryId);
+        assertEquals(finalResult, validOutput);
+    }
+
+    // O/P Directory does not exist.
+    @Test
+    public void testStoreResultsFail(@TempDir File tempDir) {
+        assertThrows(IllegalStateException.class, () ->
+                storeResultsFile(tempDir.toString() + "invalid", "store_results_fail",
+                        Observable.fromArray(new String[]{"hi", "hello"}))
+        );
+    }
+
+    private String readResultsFile(String path, String queryId) {
+        FileResultStorageEngine engine = new FileResultStorageEngine(path, false);
+
+        return engine.getResultsByID(queryId).collect(() -> new StringBuilder(),
+                (resultBuilder, tempResult) -> {
+                    if (resultBuilder.length() > 0) {
+                        resultBuilder.append(System.lineSeparator());
+                    }
+                    resultBuilder.append(tempResult);
+                }
+            ).map(StringBuilder::toString).blockingGet();
+    }
+
+    private void storeResultsFile(String path, String queryId, Observable<String> storable) {
+        FileResultStorageEngine engine = new FileResultStorageEngine(path, false);
+        TableExport query = new TableExport();
+        query.setId(queryId);
+
+        engine.storeResults(query, storable);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngineTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngineTest.java
new file mode 100644
index 0000000000..3634e25f20
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/storageengine/RedisResultStorageEngineTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.storageengine;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.yahoo.elide.async.models.TableExport;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import io.reactivex.Observable;
+import io.reactivex.observers.TestObserver;
+import redis.clients.jedis.JedisPooled;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.embedded.RedisServer;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Test cases for RedisResultStorageEngine.
+ */
+public class RedisResultStorageEngineTest {
+    private static final String HOST = "localhost";
+    private static final int PORT = 6379;
+    private static final int EXPIRATION_SECONDS = 120;
+    private static final int BATCH_SIZE = 2;
+    private static final boolean EXTENSION_SUPPORT = false;
+    private JedisPooled jedisPool;
+    private RedisServer redisServer;
+    RedisResultStorageEngine engine;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        redisServer = new RedisServer(PORT);
+        redisServer.start();
+        jedisPool = new JedisPooled(HOST, PORT);
+        engine = new RedisResultStorageEngine(jedisPool, EXTENSION_SUPPORT, EXPIRATION_SECONDS, BATCH_SIZE);
+    }
+
+    @AfterEach
+    public void destroy() throws IOException {
+        redisServer.stop();
+    }
+
+    @Test
+    public void testReadNonExistent() {
+        assertThrows(IllegalStateException.class, () ->
+                verifyResults("nonexisting_results", Arrays.asList(""))
+        );
+    }
+
+    @Test
+    public void testStoreEmptyResults() {
+        String queryId = "store_empty_results_success";
+        String validOutput = "";
+        String[] input = validOutput.split("\n");
+
+        storeResults(queryId, Observable.fromArray(input));
+
+        // verify contents of stored files are readable and match original
+        verifyResults("store_empty_results_success", Arrays.asList(validOutput));
+    }
+
+    @Test
+    public void testStoreResults() {
+        String queryId = "store_results_success";
+        String validOutput = "hi\nhello";
+        String[] input = validOutput.split("\n");
+
+        storeResults(queryId, Observable.fromArray(input));
+
+        // verify contents of stored files are readable and match original
+        verifyResults("store_results_success", Arrays.asList(validOutput));
+    }
+
+    // Redis server does not exist.
+    @Test
+    public void testStoreResultsFail() throws IOException {
+        destroy();
+        assertThrows(JedisConnectionException.class, () ->
+                storeResults("store_results_fail",
+                        Observable.fromArray(new String[]{"hi", "hello"}))
+        );
+    }
+
+    @Test
+    public void testReadResultsBatch() {
+        String queryId = "store_results_batch_success";
+        // 3 records > batchSize i.e 2
+        String validOutput = "hi\nhello\nbye";
+        String[] input = validOutput.split("\n");
+
+        storeResults(queryId, Observable.fromArray(input));
+
+        // 2 onnext calls will be returned.
+        // 1st call will have 2 records combined together as one. hi and hello.
+        // 2nd call will have 1 record only. bye.
+        verifyResults("store_results_batch_success", Arrays.asList("hi\nhello", "bye"));
+    }
+
+    private void verifyResults(String queryId, List<String> expected) {
+        TestObserver<String> subscriber = new TestObserver<>();
+
+        Observable<String> observable = engine.getResultsByID(queryId);
+
+        observable.subscribe(subscriber);
+        subscriber.assertComplete();
+        assertEquals(subscriber.getEvents().iterator().next(), expected);
+    }
+
+    private void storeResults(String queryId, Observable<String> storable) {
+        TableExport query = new TableExport();
+        query.setId(queryId);
+
+        engine.storeResults(query, storable);
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnableTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnableTest.java
new file mode 100644
index 0000000000..c79afa6163
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICancelRunnableTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.thread;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
+
+public class AsyncAPICancelRunnableTest {
+
+    private AsyncAPICancelRunnable cancelThread;
+    private Elide elide;
+    private AsyncAPIDAO asyncAPIDao;
+    private TransactionRegistry transactionRegistry;
+
+    @BeforeEach
+    public void setupMocks() {
+        HashMapDataStore inMemoryStore = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                AsyncQuery.class.getPackage());
+        Map<String, Class<? extends Check>> checkMappings = new HashMap<>();
+
+        elide = new Elide(
+                new ElideSettingsBuilder(inMemoryStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(checkMappings).build())
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                        .build());
+
+        asyncAPIDao = mock(DefaultAsyncAPIDAO.class);
+        cancelThread = new AsyncAPICancelRunnable(7, elide, asyncAPIDao);
+        transactionRegistry = elide.getTransactionRegistry();
+
+    }
+
+    @Test
+    public void testAsyncQueryCancelThreadSet() {
+        assertEquals(elide, cancelThread.getElide());
+        assertEquals(asyncAPIDao, cancelThread.getAsyncAPIDao());
+        assertEquals(7, cancelThread.getMaxRunTimeSeconds());
+    }
+
+    @Test
+    public void testActiveTransactionCancellation() {
+        DataStoreTransaction dtx = elide.getDataStore().beginTransaction();
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"), dtx);
+        AsyncQuery asyncQuery1 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf828d",
+                1577883600000L, QueryStatus.QUEUED);
+        AsyncQuery asyncQuery2 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf827d",
+                1577883600000L, QueryStatus.QUEUED);
+        Collection<AsyncAPI> asyncCollection = new ArrayList<>();
+        asyncCollection.add(asyncQuery1);
+        asyncCollection.add(asyncQuery2);
+        when(cancelThread.getAsyncAPIDao().loadAsyncAPIByFilter(any(), any())).thenReturn(asyncCollection);
+        cancelThread.cancelAsyncAPI(AsyncQuery.class);
+        ArgumentCaptor<FilterExpression> filterCaptor = ArgumentCaptor.forClass(FilterExpression.class);
+        ArgumentCaptor<QueryStatus> statusCaptor = ArgumentCaptor.forClass(QueryStatus.class);
+        verify(asyncAPIDao, times(1)).loadAsyncAPIByFilter(any(), any());
+        verify(asyncAPIDao, times(1)).updateStatusAsyncAPIByFilter(filterCaptor.capture(), statusCaptor.capture(), any());
+        assertEquals("asyncQuery.id IN [[edc4a871-dff2-4054-804e-d80075cf828d]]", filterCaptor.getValue().toString());
+        assertEquals("CANCEL_COMPLETE", statusCaptor.getValue().toString());
+    }
+
+    @Test
+    public void testStatusBasedFilter() {
+        DataStoreTransaction dtx = elide.getDataStore().beginTransaction();
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"), dtx);
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf827d"), dtx);
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf826d"), dtx);
+        AsyncQuery asyncQuery1 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf828d",
+                1577883600000L, QueryStatus.CANCEL_COMPLETE);
+        AsyncQuery asyncQuery2 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf827d",
+                1577883600000L, QueryStatus.CANCELLED);
+        AsyncQuery asyncQuery3 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf826d",
+                1577883600000L, QueryStatus.PROCESSING);
+        Collection<AsyncAPI> asyncCollection = new ArrayList<>();
+        asyncCollection.add(asyncQuery1);
+        asyncCollection.add(asyncQuery2);
+        asyncCollection.add(asyncQuery3);
+        when(cancelThread.getAsyncAPIDao().loadAsyncAPIByFilter(any(), any())).thenReturn(asyncCollection);
+        cancelThread.cancelAsyncAPI(AsyncQuery.class);
+        ArgumentCaptor<FilterExpression> fltStatusCaptor = ArgumentCaptor.forClass(FilterExpression.class);
+        verify(asyncAPIDao, times(1)).loadAsyncAPIByFilter(fltStatusCaptor.capture(), any());
+        assertEquals("asyncQuery.status IN [CANCELLED, PROCESSING, QUEUED]", fltStatusCaptor.getValue().toString());
+        verify(asyncAPIDao, times(1)).updateStatusAsyncAPIByFilter(any(), any(), any());
+
+    }
+
+    @Test
+    public void testTimeBasedCancellation() {
+        DataStoreTransaction dtx = elide.getDataStore().beginTransaction();
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"), dtx);
+        transactionRegistry.addRunningTransaction(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf827d"), dtx);
+        AsyncQuery asyncQuery1 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf828d",
+                System.currentTimeMillis(), QueryStatus.QUEUED);
+        AsyncQuery asyncQuery2 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf827d",
+                1577883600000L, QueryStatus.QUEUED);
+        AsyncQuery asyncQuery3 = createAsyncQueryTestObject("edc4a871-dff2-4054-804e-d80075cf826d",
+                1577883600000L, QueryStatus.QUEUED);
+        Collection<AsyncAPI> asyncCollection = new ArrayList<>();
+        asyncCollection.add(asyncQuery1);
+        asyncCollection.add(asyncQuery2);
+        asyncCollection.add(asyncQuery3);
+        when(cancelThread.getAsyncAPIDao().loadAsyncAPIByFilter(any(), any())).thenReturn(asyncCollection);
+        cancelThread.cancelAsyncAPI(AsyncQuery.class);
+        ArgumentCaptor<FilterExpression> filterCaptor = ArgumentCaptor.forClass(FilterExpression.class);
+        ArgumentCaptor<QueryStatus> statusCaptor = ArgumentCaptor.forClass(QueryStatus.class);
+        verify(asyncAPIDao, times(1)).updateStatusAsyncAPIByFilter(filterCaptor.capture(), statusCaptor.capture(), any());
+        assertEquals("asyncQuery.id IN [[edc4a871-dff2-4054-804e-d80075cf827d]]", filterCaptor.getValue().toString());
+        assertEquals("CANCEL_COMPLETE", statusCaptor.getValue().toString());
+
+    }
+
+    public AsyncQuery createAsyncQueryTestObject(String id, Long createdOn, QueryStatus status) {
+        AsyncQuery asyncQuery = new AsyncQuery();
+        asyncQuery.setId(id);
+        asyncQuery.setRequestId(id);
+        asyncQuery.setCreatedOn(new Date(createdOn));
+        asyncQuery.setStatus(status);
+        return asyncQuery;
+    }
+}
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnableTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnableTest.java
new file mode 100644
index 0000000000..b5b8057b9c
--- /dev/null
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/thread/AsyncAPICleanerRunnableTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.service.thread;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.QueryStatus;
+import com.yahoo.elide.async.service.DateUtil;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+public class AsyncAPICleanerRunnableTest {
+
+    private AsyncAPICleanerRunnable cleanerThread;
+    private Elide elide;
+    private AsyncAPIDAO asyncAPIDao;
+    private DateUtil dateUtil;
+    private Date testDate = new Date(1577883661000L);
+
+    @BeforeEach
+    public void setupMocks() {
+        HashMapDataStore inMemoryStore = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                AsyncQuery.class.getPackage());
+        Map<String, Class<? extends Check>> checkMappings = new HashMap<>();
+
+        elide = new Elide(
+                new ElideSettingsBuilder(inMemoryStore)
+                        .withEntityDictionary(EntityDictionary.builder().checks(checkMappings).build())
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                        .build());
+        asyncAPIDao = mock(DefaultAsyncAPIDAO.class);
+        dateUtil = mock(DateUtil.class);
+        cleanerThread = new AsyncAPICleanerRunnable(7, elide, 7, asyncAPIDao, dateUtil);
+    }
+
+    @Test
+    public void testAsyncQueryCleanerThreadSet() {
+        assertEquals(elide, cleanerThread.getElide());
+        assertEquals(asyncAPIDao, cleanerThread.getAsyncAPIDao());
+        assertEquals(7, cleanerThread.getMaxRunTimeMinutes());
+        assertEquals(7, cleanerThread.getQueryCleanupDays());
+    }
+
+    @Test
+    public void testDeleteAsyncQuery() {
+        when(dateUtil.calculateFilterDate(Calendar.DATE, cleanerThread.getQueryCleanupDays())).thenReturn(testDate);
+        ArgumentCaptor<FilterExpression> filterCaptor = ArgumentCaptor.forClass(FilterExpression.class);
+        cleanerThread.deleteAsyncAPI(AsyncQuery.class);
+        verify(asyncAPIDao, times(1)).deleteAsyncAPIAndResultByFilter(filterCaptor.capture(), any());
+        assertEquals("asyncQuery.createdOn LE [" + testDate + "]", filterCaptor.getValue().toString());
+    }
+
+    @Test
+    public void testTimeoutAsyncQuery() {
+        when(dateUtil.calculateFilterDate(Calendar.MINUTE, cleanerThread.getMaxRunTimeMinutes())).thenReturn(testDate);
+        ArgumentCaptor<FilterExpression> filterCaptor = ArgumentCaptor.forClass(FilterExpression.class);
+        cleanerThread.timeoutAsyncAPI(AsyncQuery.class);
+        verify(asyncAPIDao, times(1)).updateStatusAsyncAPIByFilter(filterCaptor.capture(), any(QueryStatus.class), any());
+        assertEquals("(asyncQuery.status IN [PROCESSING, QUEUED] AND asyncQuery.createdOn LE [" + testDate + "])", filterCaptor.getValue().toString());
+    }
+}
diff --git a/elide-async/src/test/resources/downloads/empty_results b/elide-async/src/test/resources/downloads/empty_results
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/elide-async/src/test/resources/downloads/non_empty_results b/elide-async/src/test/resources/downloads/non_empty_results
new file mode 100644
index 0000000000..9daeafb986
--- /dev/null
+++ b/elide-async/src/test/resources/downloads/non_empty_results
@@ -0,0 +1 @@
+test
diff --git a/elide-contrib/dropwizard-elide/README.md b/elide-contrib/dropwizard-elide/README.md
deleted file mode 100644
index 5b6a119042..0000000000
--- a/elide-contrib/dropwizard-elide/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Dropwizard-Elide
-
-A [Dropwizard Bundle](http://www.dropwizard.io/0.9.2/docs/manual/core.html#bundles) that allows you to integrate Elide in a [Dropwizard](http://www.dropwizard.io) application. 
-
-# Getting Started
-
-To integrate Elide into your Dropwizard project, include dropwizard-elide into your project's pom.xml:
-
-```xml
-<dependency>
-    <groupId>com.yahoo.elide</groupId>
-    <artifactId>dropwizard-elide</artifactId>
-</dependency>
-```
-
-# Example
-
-Inside of the Application class, install the bundle:
-
-```
-private final ElideBundle<DropwizardElideConfiguration> elideBundle = new ElideBundle<DropwizardElideConfiguration>(
-        Author.class,
-        Book.class
-) {
-    @Override
-    public DataSourceFactory getDataSourceFactory(DropwizardElideConfiguration configuration) {
-        return configuration.getDataSourceFactory();
-    }
-};
-
-@Override
-public void initialize(Bootstrap<DropwizardElideConfiguration> bootstrap) {
-    bootstrap.addBundle(elideBundle);
-}
-
-@Override
-public void run(DropwizardElideConfiguration config, Environment environment) {
-    environment.jersey().register(JsonApiEndpoint.class);
-}
-```
-Find more at https://github.com/yahoo/elide/tree/master/elide-example/dropwizard-elide-example
diff --git a/elide-contrib/dropwizard-elide/pom.xml b/elide-contrib/dropwizard-elide/pom.xml
deleted file mode 100644
index b08d21e2cf..0000000000
--- a/elide-contrib/dropwizard-elide/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dropwizard-elide</artifactId>
-    <packaging>jar</packaging>
-    <name>Dropwizard Elide</name>
-    <description>Elide Bundle for Dropwizard</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <artifactId>elide-contrib-parent-pom</artifactId>
-        <groupId>com.yahoo.elide</groupId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <dropwizard.version>0.9.2</dropwizard.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-core</artifactId>
-            <version>${dropwizard.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-db</artifactId>
-            <version>${dropwizard.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate5</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.0.2.Final</version>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.jcabi</groupId>
-                <artifactId>jcabi-mysql-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundle.java b/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundle.java
deleted file mode 100644
index 4d6a8c405a..0000000000
--- a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundle.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.google.common.collect.ImmutableList;
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.datastores.hibernate5.HibernateStore;
-import com.yahoo.elide.jsonapi.JsonApiMapper;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import com.yahoo.elide.security.PermissionExecutor;
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
-import io.dropwizard.db.DatabaseConfiguration;
-import io.dropwizard.db.PooledDataSourceFactory;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.server.internal.scanning.AnnotationAcceptingListener;
-import org.glassfish.jersey.server.internal.scanning.PackageNamesScanner;
-import org.hibernate.SessionFactory;
-
-import javax.persistence.Entity;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.function.Function;
-
-/**
- * Elide Bundle
- *
- * @param <T> Dropwizard Configuration
- */
-public abstract class ElideBundle<T extends Configuration>
-        implements ConfiguredBundle<T>, DatabaseConfiguration<T>, ElideConfiguration<T> {
-
-    public static final String DEFAULT_NAME = "elide-bundle";
-
-    private final ImmutableList<Class<?>> entities;
-    private final SessionFactoryFactory sessionFactoryFactory;
-
-    /**
-     * @param pckg string with package containing Hibernate entities (classes annotated with Hibernate {@code @Entity}
-     *             annotation) e. g. {@code com.codahale.fake.db.directory.entities}
-     */
-    protected ElideBundle(String pckg) {
-        this(pckg, new SessionFactoryFactory());
-    }
-
-    protected ElideBundle(String pckg, SessionFactoryFactory sessionFactoryFactory) {
-        this(new String[] { pckg }, sessionFactoryFactory);
-    }
-
-    protected ElideBundle(String[] pckgs, SessionFactoryFactory sessionFactoryFactory) {
-        this(findEntityClassesFromDirectory(pckgs), sessionFactoryFactory);
-    }
-
-    public ElideBundle(Class<?> entity, Class<?>... entities) {
-        this(ImmutableList.<Class<?>>builder().add(entity).add(entities).build(),
-                new SessionFactoryFactory());
-    }
-
-    public ElideBundle(ImmutableList<Class<?>> entities,
-                       SessionFactoryFactory sessionFactoryFactory) {
-        this.entities = entities;
-        this.sessionFactoryFactory = sessionFactoryFactory;
-    }
-
-    protected String name() {
-        return DEFAULT_NAME;
-    }
-
-    @Override
-    public void initialize(Bootstrap<?> bootstrap) {
-    }
-
-    @Override
-    public void run(T configuration, Environment environment) throws Exception {
-        final DataStore dataStore = getDataStore(configuration, environment);
-        final AuditLogger auditLogger = getAuditLogger(configuration, environment);
-        final EntityDictionary entityDictionary = getEntityDictionary(configuration, environment);
-        final JsonApiMapper jsonApiMapper = getJsonApiMapper(configuration, environment);
-        final Function<RequestScope, PermissionExecutor> permissionExecutor
-                = getPermissionExecutor(configuration, environment);
-
-        final JsonApiEndpoint.DefaultOpaqueUserFunction getUserFn = getUserFn(configuration, environment);
-
-        environment.jersey().register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                Elide.Builder builder = new Elide.Builder(dataStore);
-                if (auditLogger != null) {
-                    builder = builder.withAuditLogger(auditLogger);
-                }
-
-                if (entityDictionary != null) {
-                    builder = builder.withEntityDictionary(entityDictionary);
-                }
-
-                if (jsonApiMapper != null) {
-                    builder = builder.withJsonApiMapper(jsonApiMapper);
-                }
-
-                if (permissionExecutor != null) {
-                    builder = builder.withPermissionExecutor(permissionExecutor);
-                }
-                bind(builder.build()).to(Elide.class).named("elide");
-
-                bind(getUserFn)
-                        .to(JsonApiEndpoint.DefaultOpaqueUserFunction.class)
-                        .named("elideUserExtractionFunction");
-            }
-        });
-    }
-
-    protected void configure(org.hibernate.cfg.Configuration configuration) {
-    }
-
-    /**
-     * By default created a HibernateStore
-     *
-     * @param configuration Dropwizard configuration
-     * @param environment Dropwizard environment
-     * @return a HibernateStore
-     */
-    @Override
-    public DataStore getDataStore(T configuration, Environment environment) {
-        final PooledDataSourceFactory dbConfig = getDataSourceFactory(configuration);
-        SessionFactory sessionFactory = sessionFactoryFactory.build(this, environment, dbConfig, entities, name());
-
-        return new HibernateStore(sessionFactory);
-    }
-
-    public ImmutableList<Class<?>> getEntities() {
-        return entities;
-    }
-
-    public SessionFactoryFactory getSessionFactoryFactory() {
-        return sessionFactoryFactory;
-    }
-
-    /**
-     * Method scanning given directory for classes containing Hibernate @Entity annotation
-     *
-     * @param pckgs string array with packages containing Hibernate entities (classes annotated with @Entity annotation)
-     *             e.g. com.codahale.fake.db.directory.entities
-     * @return ImmutableList with classes from given directory annotated with Hibernate @Entity annotation
-     */
-    public static ImmutableList<Class<?>> findEntityClassesFromDirectory(String[] pckgs) {
-        @SuppressWarnings("unchecked")
-        final AnnotationAcceptingListener asl = new AnnotationAcceptingListener(Entity.class);
-        final PackageNamesScanner scanner = new PackageNamesScanner(pckgs, true);
-
-        while (scanner.hasNext()) {
-            final String next = scanner.next();
-            if (asl.accept(next)) {
-                try (final InputStream in = scanner.open()) {
-                    asl.process(next, in);
-                } catch (IOException e) {
-                    throw new RuntimeException("AnnotationAcceptingListener failed to process scanned resource: "
-                            + next);
-                }
-            }
-        }
-
-        final ImmutableList.Builder<Class<?>> builder = ImmutableList.builder();
-        asl.getAnnotatedClasses().forEach(builder::add);
-
-        return builder.build();
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideConfiguration.java b/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideConfiguration.java
deleted file mode 100644
index 7ac9441da6..0000000000
--- a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/ElideConfiguration.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.jsonapi.JsonApiMapper;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import com.yahoo.elide.security.PermissionExecutor;
-import io.dropwizard.Configuration;
-import io.dropwizard.setup.Environment;
-
-import java.util.function.Function;
-
-/**
- * Elide Configuration
- *
- * @param <T> Dropwizard Configuration
- */
-public interface ElideConfiguration<T extends Configuration> {
-    /**
-     * Get the AuditLogger for Elide
-     *
-     * Override this method to plug in your own AuditLogger
-     *
-     * @param configuration Dropwizard configuration
-     * @param environment Dropwizard environment
-     * @return auditLogger to be used in Elide
-     */
-    default AuditLogger getAuditLogger(T configuration, Environment environment) {
-        return null;
-    }
-
-    /**
-     * Get the DefaultOpaqueUserFunction for Elide
-     *
-     * Override this method to plug in your own DefaultOpaqueUserFunction
-     *
-     * @param configuration Dropwizard configuration
-     * @param environment Dropwizard environment
-     * @return defaultOpaqueUserFunction to be used in Elide
-     */
-    default JsonApiEndpoint.DefaultOpaqueUserFunction getUserFn(T configuration, Environment environment) {
-        return v -> null;
-    }
-
-    /**
-     * Get the DataStore for Elide
-     *
-     * Override this method to plug in your own DataStore
-     *
-     * @param configuration Dropwizard configuration
-     * @param environment Dropwizard environment
-     * @return dataStore to be used in Elide
-     */
-    DataStore getDataStore(T configuration, Environment environment);
-
-    /**
-     * Get the EntityDictionary for Elide
-     *
-     * Override this method to plug in your own EntityDictionary
-     *
-     * @param configuration Dropwizard Configuration
-     * @param environment Dropwizard Environment
-     * @return entityDictionary to be used in Elide
-     */
-    default EntityDictionary getEntityDictionary(T configuration, Environment environment) {
-        return null;
-    }
-
-    /**
-     *
-     * @param configuration Dropwizard Configuration
-     * @param environment Dropwizard Environment
-     * @return jsonApiMapper to be used in Elide
-     */
-    default JsonApiMapper getJsonApiMapper(T configuration, Environment environment) {
-        return null;
-    }
-
-    /**
-     *
-     * @param configuration Dropwizard Configuration
-     * @param environment Dropwizard Environment
-     * @return permissionExecutor function to be used in Elide
-     */
-    default Function<RequestScope, PermissionExecutor> getPermissionExecutor(T configuration, Environment environment) {
-        return null;
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryFactory.java b/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryFactory.java
deleted file mode 100644
index e3945bdb66..0000000000
--- a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryFactory.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import io.dropwizard.db.ManagedDataSource;
-import io.dropwizard.db.PooledDataSourceFactory;
-import io.dropwizard.setup.Environment;
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
-import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.ServiceRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * Factory for SessionFactory
- *
- * Similar to the SessionFactoryFactory in dropwizard-hibernate
- */
-public class SessionFactoryFactory {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SessionFactoryFactory.class);
-    private static final String DEFAULT_NAME = "hibernate";
-
-    public SessionFactory build(ElideBundle<?> bundle,
-                                Environment environment,
-                                PooledDataSourceFactory dbConfig,
-                                List<Class<?>> entities) {
-        return build(bundle, environment, dbConfig, entities, DEFAULT_NAME);
-    }
-
-    public SessionFactory build(ElideBundle<?> bundle,
-                                Environment environment,
-                                PooledDataSourceFactory dbConfig,
-                                List<Class<?>> entities,
-                                String name) {
-        final ManagedDataSource dataSource = dbConfig.build(environment.metrics(), name);
-        return build(bundle, environment, dbConfig, dataSource, entities);
-    }
-
-    public SessionFactory build(ElideBundle<?> bundle,
-                                Environment environment,
-                                PooledDataSourceFactory dbConfig,
-                                ManagedDataSource dataSource,
-                                List<Class<?>> entities) {
-        final ConnectionProvider provider = buildConnectionProvider(dataSource,
-                                                                    dbConfig.getProperties());
-        final SessionFactory factory = buildSessionFactory(bundle,
-                                                           dbConfig,
-                                                           provider,
-                                                           dbConfig.getProperties(),
-                                                           entities);
-        final SessionFactoryManager managedFactory = new SessionFactoryManager(factory, dataSource);
-        environment.lifecycle().manage(managedFactory);
-        return factory;
-    }
-
-    private ConnectionProvider buildConnectionProvider(DataSource dataSource,
-                                                       Map<String, String> properties) {
-        final DatasourceConnectionProviderImpl connectionProvider = new DatasourceConnectionProviderImpl();
-        connectionProvider.setDataSource(dataSource);
-        connectionProvider.configure(properties);
-        return connectionProvider;
-    }
-
-    private SessionFactory buildSessionFactory(ElideBundle<?> bundle,
-                                               PooledDataSourceFactory dbConfig,
-                                               ConnectionProvider connectionProvider,
-                                               Map<String, String> properties,
-                                               List<Class<?>> entities) {
-        final Configuration configuration = new Configuration();
-        configuration.setProperty(AvailableSettings.CURRENT_SESSION_CONTEXT_CLASS, "managed");
-        configuration.setProperty(AvailableSettings.USE_SQL_COMMENTS,
-                Boolean.toString(dbConfig.isAutoCommentsEnabled()));
-        configuration.setProperty(AvailableSettings.USE_GET_GENERATED_KEYS, "true");
-        configuration.setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
-        configuration.setProperty(AvailableSettings.USE_REFLECTION_OPTIMIZER, "true");
-        configuration.setProperty(AvailableSettings.ORDER_UPDATES, "true");
-        configuration.setProperty(AvailableSettings.ORDER_INSERTS, "true");
-        configuration.setProperty(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true");
-        configuration.setProperty("jadira.usertype.autoRegisterUserTypes", "true");
-        for (Map.Entry<String, String> property : properties.entrySet()) {
-            configuration.setProperty(property.getKey(), property.getValue());
-        }
-
-        addAnnotatedClasses(configuration, entities);
-        bundle.configure(configuration);
-
-        final ServiceRegistry registry = new StandardServiceRegistryBuilder()
-                .addService(ConnectionProvider.class, connectionProvider)
-                .applySettings(configuration.getProperties())
-                .build();
-
-        configure(configuration, registry);
-
-        return configuration.buildSessionFactory(registry);
-    }
-
-    protected void configure(Configuration configuration, ServiceRegistry registry) {
-    }
-
-    private void addAnnotatedClasses(Configuration configuration,
-                                     Iterable<Class<?>> entities) {
-        final SortedSet<String> entityClasses = new TreeSet<>();
-        for (Class<?> klass : entities) {
-            configuration.addAnnotatedClass(klass);
-            entityClasses.add(klass.getCanonicalName());
-        }
-        LOGGER.info("Entity classes: {}", entityClasses);
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryManager.java b/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryManager.java
deleted file mode 100644
index 74818d09aa..0000000000
--- a/elide-contrib/dropwizard-elide/src/main/java/com/yahoo/elide/contrib/dropwizard/elide/SessionFactoryManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.dropwizard.db.ManagedDataSource;
-import io.dropwizard.lifecycle.Managed;
-import org.hibernate.SessionFactory;
-
-/**
- * Managed SessionFactory
- *
- * Same as the SessionFactoryManager in dropwizard-hibernate
- */
-public class SessionFactoryManager implements Managed {
-    private final SessionFactory factory;
-    private final ManagedDataSource dataSource;
-
-    public SessionFactoryManager(SessionFactory factory, ManagedDataSource dataSource) {
-        this.factory = factory;
-        this.dataSource = dataSource;
-    }
-
-    @VisibleForTesting
-    ManagedDataSource getDataSource() {
-        return dataSource;
-    }
-
-    @Override
-    public void start() throws Exception {
-        dataSource.start();
-    }
-
-    @Override
-    public void stop() throws Exception {
-        factory.close();
-        dataSource.stop();
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Author.java b/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Author.java
deleted file mode 100644
index a9cc839ce5..0000000000
--- a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Author.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for authors
- */
-@Entity
-@SharePermission(any = {Role.ALL.class})
-@Table(name = "author")
-@Include(rootLevel = true)
-public class Author {
-    private long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ManyToMany(mappedBy = "authors")
-    public Collection<Book> getBooks() {
-        return books;
-    }
-
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Book.java b/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Book.java
deleted file mode 100644
index 56a56e7779..0000000000
--- a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/Book.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for books
- */
-@Entity
-@Table(name = "book")
-@Include(rootLevel = true)
-public class Book {
-    private long id;
-    private String title;
-    private String genre;
-    private String language;
-    private Collection<Author> authors = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    @ManyToMany
-    public Collection<Author> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(Collection<Author> authors) {
-        this.authors = authors;
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundleTest.java b/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundleTest.java
deleted file mode 100644
index d43294bd95..0000000000
--- a/elide-contrib/dropwizard-elide/src/test/java/com/yahoo/elide/contrib/dropwizard/elide/ElideBundleTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.contrib.dropwizard.elide;
-
-import com.codahale.metrics.health.HealthCheckRegistry;
-import com.google.common.collect.ImmutableList;
-import com.yahoo.elide.datastores.hibernate5.HibernateStore;
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.jersey.DropwizardResourceConfig;
-import io.dropwizard.jersey.setup.JerseyEnvironment;
-import io.dropwizard.setup.Environment;
-import org.hibernate.SessionFactory;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.SecurityContext;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
-
-public class ElideBundleTest {
-    private final DataSourceFactory dbConfig = new DataSourceFactory();
-    private final ImmutableList<Class<?>> entities = ImmutableList.of(Author.class, Book.class);
-    private final SessionFactoryFactory factory = mock(SessionFactoryFactory.class);
-    private final SessionFactory sessionFactory = mock(SessionFactory.class);
-    private final Configuration configuration = mock(Configuration.class);
-    private final HealthCheckRegistry healthChecks = mock(HealthCheckRegistry.class);
-    private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class);
-    private final Environment environment = mock(Environment.class);
-    private final ElideBundle<Configuration> bundle = new ElideBundle<Configuration>(entities, factory) {
-        @Override
-        public DataSourceFactory getDataSourceFactory(Configuration configuration) {
-            return dbConfig;
-        }
-    };
-
-    @BeforeTest
-    @SuppressWarnings("unchecked")
-    public void setUp() throws Exception {
-        when(environment.healthChecks()).thenReturn(healthChecks);
-        when(environment.jersey()).thenReturn(jerseyEnvironment);
-        when(jerseyEnvironment.getResourceConfig()).thenReturn(new DropwizardResourceConfig());
-
-        when(factory.build(eq(bundle),
-                any(Environment.class),
-                any(DataSourceFactory.class),
-                anyList(),
-                eq("hibernate"))).thenReturn(sessionFactory);
-    }
-
-    @Test
-    public void buildsASessionFactory() throws Exception {
-        bundle.run(configuration, environment);
-
-        verify(factory).build(bundle, environment, dbConfig, entities, "elide-bundle");
-    }
-
-    @Test
-    public void defaultGetUserFnDidNothing() throws Exception {
-        Assert.assertNull(bundle.getUserFn(configuration, environment).apply(mock(SecurityContext.class)));
-    }
-
-    @Test
-    public void hasADataStore() throws Exception {
-        Assert.assertTrue(bundle.getDataStore(configuration, environment) instanceof HibernateStore);
-    }
-}
diff --git a/elide-contrib/dropwizard-elide/testng.xml b/elide-contrib/dropwizard-elide/testng.xml
deleted file mode 100644
index 7e4e7122bc..0000000000
--- a/elide-contrib/dropwizard-elide/testng.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Suite">
-    <test name="com.yahoo.elide.contrib.dropwizard.elide.ElideBundleTest">
-        <classes>
-            <class name="com.yahoo.elide.contrib.dropwizard.elide.ElideBundleTest" />
-        </classes>
-    </test> <!-- Test -->
-</suite> <!-- Suite -->
diff --git a/elide-contrib/pom.xml b/elide-contrib/pom.xml
deleted file mode 100644
index 5b6d4bf428..0000000000
--- a/elide-contrib/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-contrib-parent-pom</artifactId>
-    <packaging>pom</packaging>
-    <name>Elide Contrib: Parent Pom</name>
-    <description>Parent pom for contrib packages</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <artifactId>elide-parent-pom</artifactId>
-        <groupId>com.yahoo.elide</groupId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
-        <mysql.data.directory>${project.build.directory}/mysql-data</mysql.data.directory>
-    </properties>
-
-    <modules>
-        <module>dropwizard-elide</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.yahoo.elide</groupId>
-                <artifactId>elide-core</artifactId>
-                <version>2.3.14-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.10</version>
-                    <executions>
-                        <execution>
-                            <id>add-source-generate-sources</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>target/generated-sources/antlr4</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>reserve-network-port-pre-integration-test</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>reserve-network-port</goal>
-                            </goals>
-                            <configuration>
-                                <portNames>
-                                    <portName>mysql.port</portName>
-                                </portNames>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>reserve-network-port-process-test-classes</id>
-                            <phase>process-test-classes</phase>
-                            <goals>
-                                <goal>reserve-network-port</goal>
-                            </goals>
-                            <configuration>
-                                <portNames>
-                                    <portName>restassured.port</portName>
-                                </portNames>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>
-                    <executions>
-                        <execution>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>unpack</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <artifactItem>
-                                        <groupId>com.jcabi</groupId>
-                                        <artifactId>mysql-dist</artifactId>
-                                        <version>5.6.14</version>
-                                        <classifier>${mysql.classifier}</classifier>
-                                        <type>zip</type>
-                                        <overWrite>false</overWrite>
-                                        <outputDirectory>${project.build.directory}/mysql-dist</outputDirectory>
-                                    </artifactItem>
-                                </artifactItems>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.jcabi</groupId>
-                    <artifactId>jcabi-mysql-maven-plugin</artifactId>
-                    <version>0.9</version>
-                    <executions>
-                        <execution>
-                            <id>mysql-test</id>
-                            <goals>
-                                <goal>classify</goal>
-                                <goal>start</goal>
-                                <goal>stop</goal>
-                            </goals>
-                            <configuration>
-                                <port>${mysql.port}</port>
-                                <data>${mysql.data.directory}</data>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.19</version>
-                    <configuration>
-                        <systemPropertyVariables>
-                            <mysql.port>${mysql.port}</mysql.port>
-                            <restassured.port>${restassured.port}</restassured.port>
-                            <dataStoreSupplier>${dataStoreSupplier}</dataStoreSupplier>
-                        </systemPropertyVariables>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.basedir}/../testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>integration-test</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>verify</id>
-                            <goals>
-                                <goal>verify</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/elide-core/README.md b/elide-core/README.md
index 043acfd6fb..e23efa5284 100644
--- a/elide-core/README.md
+++ b/elide-core/README.md
@@ -1,4 +1,3 @@
 elide-core
 ==========
 
-[![Dependency Status](https://www.versioneye.com/user/projects/5621503e36d0ab0016000a41/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5621503e36d0ab0016000a41)
diff --git a/elide-core/pom.xml b/elide-core/pom.xml
index 624f914f34..a13feeb0d6 100644
--- a/elide-core/pom.xml
+++ b/elide-core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
+        <version>6.1.4-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -44,10 +44,6 @@
     </scm>
 
     <dependencies>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-annotations</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -59,17 +55,16 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.5.1-1</version>
+            <version>${version.antlr4}</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0.2</version>
+            <artifactId>javax.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -83,7 +78,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.2</version>
+            <version>1.9.4</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
@@ -92,7 +87,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -100,6 +94,18 @@
             <artifactId>rsql-parser</artifactId>
             <version>2.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>2.2.21</version>
+        </dependency>
+
+        <!-- JSR 303 Validation -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
 
         <!-- Logging -->
         <dependency>
@@ -120,23 +126,61 @@
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>1.12</version>
+            <version>2.4.0</version>
         </dependency>
 
-        <!-- Test -->
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>io.github.classgraph</groupId>
+            <artifactId>classgraph</artifactId>
+            <version>4.8.139</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.owasp.encoder</groupId>
+            <artifactId>encoder</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+        <!--
+            ============================
+            Test dependencies
+            ============================
+        -->
+
+        <!-- JUnit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
+            <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -147,6 +191,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
+            <version>${version.jetty}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,11 +199,6 @@
             <artifactId>jersey-container-servlet</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -166,7 +206,7 @@
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.5.1-1</version>
+                <version>${version.antlr4}</version>
                 <configuration>
                     <visitor>true</visitor>
                 </configuration>
@@ -179,6 +219,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.2</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doclint>all,-missing</doclint>
+                    <source>${source.jdk.version}</source>
+                    <sourcepath>${delombok.output}</sourcepath>
+                    <sourcepath>${project.basedir}/target/generated-sources/antlr4</sourcepath>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Core.g4 b/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Core.g4
index ecab5a80f1..5d72bc06f6 100644
--- a/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Core.g4
+++ b/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Core.g4
@@ -1,17 +1,7 @@
 /*
- * Copyright (c) 2015 Yahoo! Inc. All Rights Reserved.
- *
- * 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. See accompanying LICENSE file.
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
  */
 
 grammar Core;
@@ -40,30 +30,39 @@ relationship: RELATIONSHIPS '/' term;
 
 query: ; // Visitor performs query and outputs result
 
+id: IDSTR | PATHSTR;
 term: PATHSTR;
-id: PATHSTR;
 
 RELATIONSHIPS: 'relationships';
 
-PATHSTR: UNRESERVED+;
+PATHSTR: ALPHA ( ALPHANUM | UNDERSCORE | HYPHEN )+;
+IDSTR: UNRESERVED+;
 
 UNRESERVED
     : ALPHANUM
     | MARK
+    | UNDERSCORE
+    | HYPHEN
     ;
 
 MARK
-    : '-'
-    | '_'
-    | '.'
+    : '.'
     | '!'
     | '~'
+    | ':'
+    | ' '
+    | '&'
+    | '='  //For BASE64 IDs
+    | '%'  //For URL encoded IDs
     | '*'
     | '\''
     | '('
     | ')'
     ;
 
+UNDERSCORE : '_';
+HYPHEN : '-';
+
 ALPHANUM
       : ALPHA
       | DIGIT
diff --git a/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Expression.g4 b/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Expression.g4
index bec8257904..b38c893b7c 100644
--- a/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Expression.g4
+++ b/elide-core/src/main/antlr4/com/yahoo/elide/generated/parsers/Expression.g4
@@ -1,17 +1,7 @@
 /*
- * Copyright (c) 2016 Yahoo! Inc. All Rights Reserved.
- *
- * 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. See accompanying LICENSE file.
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
  */
 
 grammar Expression;
diff --git a/elide-core/src/main/java/com/yahoo/elide/Elide.java b/elide-core/src/main/java/com/yahoo/elide/Elide.java
index e2435f0bae..005b91457c 100644
--- a/elide-core/src/main/java/com/yahoo/elide/Elide.java
+++ b/elide-core/src/main/java/com/yahoo/elide/Elide.java
@@ -1,68 +1,70 @@
 /*
- * Copyright 2016, Yahoo Inc.
+ * Copyright 2018, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide;
 
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.audit.Slf4jLogger;
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.HttpStatus;
 import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.InMemoryDataStore;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.CustomErrorException;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.exceptions.ErrorObjects;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.exceptions.HttpStatus;
 import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.core.exceptions.InternalServerErrorException;
 import com.yahoo.elide.core.exceptions.InvalidURLException;
 import com.yahoo.elide.core.exceptions.JsonPatchExtensionException;
 import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.core.filter.dialect.DefaultFilterDialect;
-import com.yahoo.elide.core.filter.dialect.JoinFilterDialect;
-import com.yahoo.elide.core.filter.dialect.MultipleFilterDialect;
-import com.yahoo.elide.core.filter.dialect.SubqueryFilterDialect;
-import com.yahoo.elide.extensions.JsonApiPatch;
-import com.yahoo.elide.extensions.PatchRequestScope;
-import com.yahoo.elide.generated.parsers.CoreLexer;
-import com.yahoo.elide.generated.parsers.CoreParser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.jsonapi.EntityProjectionMaker;
 import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.extensions.JsonApiPatch;
+import com.yahoo.elide.jsonapi.extensions.PatchRequestScope;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.parsers.DeleteVisitor;
-import com.yahoo.elide.parsers.GetVisitor;
-import com.yahoo.elide.parsers.PatchVisitor;
-import com.yahoo.elide.parsers.PostVisitor;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.SecurityMode;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.executors.ActivePermissionExecutor;
-
+import com.yahoo.elide.jsonapi.parser.BaseVisitor;
+import com.yahoo.elide.jsonapi.parser.DeleteVisitor;
+import com.yahoo.elide.jsonapi.parser.GetVisitor;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+import com.yahoo.elide.jsonapi.parser.PatchVisitor;
+import com.yahoo.elide.jsonapi.parser.PostVisitor;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Function;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.function.Supplier;
-
+import java.util.stream.Collectors;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MultivaluedMap;
 
 /**
@@ -70,604 +72,569 @@
  */
 @Slf4j
 public class Elide {
-
-
-    private final AuditLogger auditLogger;
-    private final DataStore dataStore;
-    private final EntityDictionary dictionary;
-    private final JsonApiMapper mapper;
-    private final Function<RequestScope, PermissionExecutor> permissionExecutor;
-    private final List<JoinFilterDialect> joinFilterDialects;
-    private final List<SubqueryFilterDialect> subqueryFilterDialects;
-    private final boolean useFilterExpressions;
-
-    /**
-     * Instantiates a new Elide.
-     *
-     * @param auditLogger the audit logger
-     * @param dataStore the dataStore
-     * @param dictionary the dictionary
-     * @deprecated Since 2.1, use the {@link Elide.Builder} instead
-     */
-    @Deprecated
-    public Elide(AuditLogger auditLogger, DataStore dataStore, EntityDictionary dictionary) {
-        this(auditLogger, dataStore, dictionary, new JsonApiMapper(dictionary));
-    }
-
-    /**
-     * Instantiates a new Elide.
-     *
-     * @param auditLogger the audit logger
-     * @param dataStore the dataStore
-     * @deprecated Since 2.1, use the {@link Elide.Builder} instead
-     */
-    @Deprecated
-    public Elide(AuditLogger auditLogger, DataStore dataStore) {
-        this(auditLogger, dataStore, new EntityDictionary(new HashMap<>()));
-    }
+    public static final String JSONAPI_CONTENT_TYPE = "application/vnd.api+json";
+    public static final String JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION =
+            "application/vnd.api+json; ext=jsonpatch";
+
+    @Getter private final ElideSettings elideSettings;
+    @Getter private final AuditLogger auditLogger;
+    @Getter private final DataStore dataStore;
+    @Getter private final JsonApiMapper mapper;
+    @Getter private final ErrorMapper errorMapper;
+    @Getter private final TransactionRegistry transactionRegistry;
+    @Getter private final ClassScanner scanner;
+    private boolean initialized = false;
 
     /**
-     * Instantiates a new Elide.
+     * Instantiates a new Elide instance.
      *
-     * @param auditLogger the audit logger
-     * @param dataStore the dataStore
-     * @param dictionary the dictionary
-     * @param mapper Serializer/Deserializer for JSON API
-     * @deprecated Since 2.1, use the {@link Elide.Builder} instead
+     * @param elideSettings Elide settings object.
      */
-    @Deprecated
-    public Elide(AuditLogger auditLogger, DataStore dataStore, EntityDictionary dictionary, JsonApiMapper mapper) {
-        this(
-                auditLogger,
-                dataStore,
-                dictionary,
-                mapper,
-                ActivePermissionExecutor::new,
-                Collections.singletonList(new DefaultFilterDialect(dictionary)),
-                Collections.singletonList(new DefaultFilterDialect(dictionary)),
-                false
-        );
+    public Elide(
+            ElideSettings elideSettings
+    ) {
+        this(elideSettings, new TransactionRegistry(), elideSettings.getDictionary().getScanner(), false);
     }
 
     /**
-     * Instantiates a new Elide.
+     * Instantiates a new Elide instance.
      *
-     * @param auditLogger the audit logger
-     * @param dataStore the dataStore
-     * @param dictionary the dictionary
-     * @param mapper Serializer/Deserializer for JSON API
-     * @param permissionExecutor Custom permission executor implementation
+     * @param elideSettings Elide settings object.
+     * @param transactionRegistry Global transaction state.
      */
-    protected Elide(AuditLogger auditLogger,
-                  DataStore dataStore,
-                  EntityDictionary dictionary,
-                  JsonApiMapper mapper,
-                  Function<RequestScope, PermissionExecutor> permissionExecutor) {
-        this(
-            auditLogger,
-            dataStore,
-            dictionary,
-            mapper,
-            ActivePermissionExecutor::new,
-            Collections.singletonList(new DefaultFilterDialect(dictionary)),
-            Collections.singletonList(new DefaultFilterDialect(dictionary)),
-            false
-        );
+    public Elide(
+            ElideSettings elideSettings,
+            TransactionRegistry transactionRegistry
+    ) {
+        this(elideSettings, transactionRegistry, elideSettings.getDictionary().getScanner(), false);
     }
 
     /**
-     * Instantiates a new Elide.
+     * Instantiates a new Elide instance.
      *
-     * @param auditLogger the audit logger
-     * @param dataStore the dataStore
-     * @param dictionary the dictionary
-     * @param mapper Serializer/Deserializer for JSON API
-     * @param permissionExecutor Custom permission executor implementation
-     * @param joinFilterDialects A list of filter parsers to use for filtering across types
-     * @param subqueryFilterDialects A list of filter parsers to use for filtering by type
-     * @param useFilterExpressions Whether or not to use Elide 3.0 filter expressions for DataStore interactions
+     * @param elideSettings Elide settings object.
+     * @param transactionRegistry Global transaction state.
+     * @param scanner Scans classes for Elide annotations.
+     * @param doScans Perform scans now.
      */
-    protected Elide(AuditLogger auditLogger,
-                  DataStore dataStore,
-                  EntityDictionary dictionary,
-                  JsonApiMapper mapper,
-                  Function<RequestScope, PermissionExecutor> permissionExecutor,
-                  List<JoinFilterDialect> joinFilterDialects,
-                  List<SubqueryFilterDialect> subqueryFilterDialects,
-                  boolean useFilterExpressions) {
-        this.auditLogger = auditLogger;
-        this.dataStore = dataStore;
-        this.dictionary = dictionary;
-        dataStore.populateEntityDictionary(dictionary);
-        this.mapper = mapper;
-        this.permissionExecutor = permissionExecutor;
-        this.joinFilterDialects = joinFilterDialects;
-        this.subqueryFilterDialects = subqueryFilterDialects;
-        this.useFilterExpressions = useFilterExpressions;
+    public Elide(
+            ElideSettings elideSettings,
+            TransactionRegistry transactionRegistry,
+            ClassScanner scanner,
+            boolean doScans
+    ) {
+        this.elideSettings = elideSettings;
+        this.scanner = scanner;
+        this.auditLogger = elideSettings.getAuditLogger();
+        this.dataStore = new InMemoryDataStore(elideSettings.getDataStore());
+        this.mapper = elideSettings.getMapper();
+        this.errorMapper = elideSettings.getErrorMapper();
+        this.transactionRegistry = transactionRegistry;
+
+        if (doScans) {
+            doScans();
+        }
     }
 
     /**
-     * Elide Builder for constructing an Elide instance.
+     * Scans & binds Elide models, scans for security check definitions, serde definitions, life cycle hooks
+     * and more.  Any dependency injection required by objects found from scans must be performed prior to this call.
      */
-    public static class Builder {
-        private final DataStore dataStore;
-        private AuditLogger auditLogger;
-        private JsonApiMapper jsonApiMapper;
-        private EntityDictionary entityDictionary = new EntityDictionary(new HashMap<>());
-        private Function<RequestScope, PermissionExecutor> permissionExecutorFunction = ActivePermissionExecutor::new;
-        private List<JoinFilterDialect> joinFilterDialects;
-        private List<SubqueryFilterDialect> subqueryFilterDialects;
-        private boolean useFilterExpressions;
-
-        /**
-         * A new builder used to generate Elide instances. Instantiates an {@link EntityDictionary} without
-         * providing a mapping of security checks.
-         *
-         * @param auditLogger the logger to use for audit annotations
-         * @param dataStore the datastore used to communicate with the persistence layer
-         * @deprecated 2.3 use {@link #Builder(DataStore)}
-         */
-        public Builder(AuditLogger auditLogger, DataStore dataStore) {
-            this.auditLogger = auditLogger;
-            this.dataStore = dataStore;
-            this.jsonApiMapper = new JsonApiMapper(entityDictionary);
-            this.joinFilterDialects = new ArrayList<>();
-            this.subqueryFilterDialects = new ArrayList<>();
+    public void doScans() {
+        if (! initialized) {
+            elideSettings.getSerdes().forEach((type, serde) -> registerCustomSerde(type, serde, type.getSimpleName()));
+            registerCustomSerde();
 
-        }
+            //Scan for security checks prior to populating data stores in case they need them.
+            elideSettings.getDictionary().scanForSecurityChecks();
 
-        /**
-         * A new builder used to generate Elide instances. Instantiates an {@link EntityDictionary} without
-         * providing a mapping of security checks and uses the provided {@link Slf4jLogger} for audit.
-         *
-         * @param dataStore the datastore used to communicate with the persistence layer
-         */
-        public Builder(DataStore dataStore) {
-            this.dataStore = dataStore;
-            this.auditLogger = new Slf4jLogger();
-            this.jsonApiMapper = new JsonApiMapper(entityDictionary);
-            this.joinFilterDialects = new ArrayList<>();
-            this.subqueryFilterDialects = new ArrayList<>();
+            this.dataStore.populateEntityDictionary(elideSettings.getDictionary());
+            initialized = true;
         }
+    }
 
-        public Elide build() {
-            if (joinFilterDialects.isEmpty()) {
-                joinFilterDialects.add(new DefaultFilterDialect(entityDictionary));
-            }
+    protected void registerCustomSerde() {
+        Injector injector = elideSettings.getDictionary().getInjector();
+        Set<Class<?>> classes = registerCustomSerdeScan();
 
-            if (subqueryFilterDialects.isEmpty()) {
-                subqueryFilterDialects.add(new DefaultFilterDialect(entityDictionary));
+        for (Class<?> clazz : classes) {
+            if (!Serde.class.isAssignableFrom(clazz)) {
+                log.warn("Skipping Serde registration (not a Serde!): {}", clazz);
+                continue;
             }
+            Serde serde = (Serde) injector.instantiate(clazz);
+            injector.inject(serde);
 
-            return new Elide(
-                    auditLogger,
-                    dataStore,
-                    entityDictionary,
-                    jsonApiMapper,
-                    permissionExecutorFunction,
-                    joinFilterDialects,
-                    subqueryFilterDialects,
-                    useFilterExpressions);
-        }
-
-        @Deprecated
-        public Builder auditLogger(final AuditLogger auditLogger) {
-            return withAuditLogger(auditLogger);
-        }
-
-        @Deprecated
-        public Builder entityDictionary(final EntityDictionary entityDictionary) {
-            return withEntityDictionary(entityDictionary);
-        }
-
-        @Deprecated
-        public Builder jsonApiMapper(final JsonApiMapper jsonApiMapper) {
-            return withJsonApiMapper(jsonApiMapper);
-        }
-
-        @Deprecated
-        public Builder permissionExecutor(final Function<RequestScope, PermissionExecutor> permissionExecutorFunction) {
-            return withPermissionExecutor(permissionExecutorFunction);
-        }
-
-        @Deprecated
-        public Builder permissionExecutor(final Class<? extends PermissionExecutor> permissionExecutorClass) {
-            return withPermissionExecutor(permissionExecutorClass);
-        }
+            ElideTypeConverter converter = clazz.getAnnotation(ElideTypeConverter.class);
+            Class baseType = converter.type();
+            registerCustomSerde(baseType, serde, converter.name());
 
-        public Builder withAuditLogger(AuditLogger auditLogger) {
-            this.auditLogger = auditLogger;
-            return this;
-        }
-
-        public Builder withEntityDictionary(EntityDictionary entityDictionary) {
-            this.entityDictionary = entityDictionary;
-            return this;
-        }
-
-        public Builder withJsonApiMapper(JsonApiMapper jsonApiMapper) {
-            this.jsonApiMapper = jsonApiMapper;
-            return this;
+            for (Class type : converter.subTypes()) {
+                if (!baseType.isAssignableFrom(type)) {
+                    throw new IllegalArgumentException("Mentioned type " + type
+                            + " not subtype of " + baseType);
+                }
+                registerCustomSerde(type, serde, converter.name());
+            }
         }
+    }
 
-        public Builder withPermissionExecutor(Function<RequestScope, PermissionExecutor> permissionExecutorFunction) {
-            this.permissionExecutorFunction = permissionExecutorFunction;
-            return this;
-        }
+    protected void registerCustomSerde(Class<?> type, Serde serde, String name) {
+        log.info("Registering serde for type : {}", type);
+        CoerceUtil.register(type, serde);
+        registerCustomSerdeInObjectMapper(type, serde, name);
+    }
 
-        public Builder withPermissionExecutor(Class<? extends PermissionExecutor> permissionExecutorClass) {
-            permissionExecutorFunction = (requestScope) -> {
-                try {
-                    try {
-                        // Try to find a constructor with request scope
-                        Constructor<? extends PermissionExecutor> ctor =
-                                permissionExecutorClass.getDeclaredConstructor(RequestScope.class);
-                        return ctor.newInstance(requestScope);
-                    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException
-                            | InstantiationException e) {
-                        // If that fails, try blank constructor
-                        return permissionExecutorClass.newInstance();
+    protected void registerCustomSerdeInObjectMapper(Class<?> type, Serde serde, String name) {
+        ObjectMapper objectMapper = mapper.getObjectMapper();
+        objectMapper.registerModule(new SimpleModule(name)
+                .addSerializer(type, new JsonSerializer<Object>() {
+                    @Override
+                    public void serialize(Object obj, JsonGenerator jsonGenerator,
+                                          SerializerProvider serializerProvider)
+                            throws IOException, JsonProcessingException {
+                        jsonGenerator.writeObject(serde.serialize(obj));
                     }
-                } catch (IllegalAccessException | InstantiationException e) {
-                    // Everything failed. Throw hands up, not sure how to proceed.
-                    throw new RuntimeException(e);
-                }
-            };
-            return this;
-        }
+                }));
+    }
 
-        public Builder withJoinFilterDialect(JoinFilterDialect dialect) {
-            useFilterExpressions = true;
-            joinFilterDialects.add(dialect);
-            return this;
-        }
+    protected Set<Class<?>> registerCustomSerdeScan() {
+        return scanner.getAnnotatedClasses(ElideTypeConverter.class);
+    }
 
-        public Builder withSubqueryFilterDialect(SubqueryFilterDialect dialect) {
-            useFilterExpressions = true;
-            subqueryFilterDialects.add(dialect);
-            return this;
-        }
+    /**
+     * Handle GET.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param path the path
+     * @param queryParams the query params
+     * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @return Elide response object
+     */
+    public ElideResponse get(String baseUrlEndPoint, String path, MultivaluedMap<String, String> queryParams,
+                             User opaqueUser, String apiVersion) {
+        return get(baseUrlEndPoint, path, queryParams, opaqueUser, apiVersion, UUID.randomUUID());
     }
 
     /**
      * Handle GET.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the path
      * @param queryParams the query params
      * @param opaqueUser the opaque user
-     * @param securityMode only for test mode
+     * @param apiVersion the API version
+     * @param requestId the request ID
      * @return Elide response object
-     * @deprecated Since 2.1, instead use the {@link Elide.Builder} with an appropriate {@link PermissionExecutor}
      */
-    @Deprecated
-    public ElideResponse get(
-            String path,
-            MultivaluedMap<String, String> queryParams,
-            Object opaqueUser,
-            SecurityMode securityMode) {
-
-        RequestScope requestScope = null;
-        boolean isVerbose = false;
-        try (DataStoreTransaction transaction = dataStore.beginReadTransaction()) {
-            final User user = transaction.accessUser(opaqueUser);
-            requestScope = new RequestScope(
-                    path,
-                    new JsonApiDocument(),
-                    transaction,
-                    user,
-                    dictionary,
-                    mapper,
-                    auditLogger,
-                    queryParams,
-                    securityMode,
-                    permissionExecutor,
-                    new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects),
-                    useFilterExpressions);
+    public ElideResponse get(String baseUrlEndPoint, String path, MultivaluedMap<String, String> queryParams,
+                             User opaqueUser, String apiVersion, UUID requestId) {
+        return get(baseUrlEndPoint, path, queryParams, Collections.emptyMap(), opaqueUser, apiVersion, requestId);
+    }
 
-            isVerbose = requestScope.getPermissionExecutor().isVerbose();
-            GetVisitor visitor = new GetVisitor(requestScope);
-            Supplier<Pair<Integer, JsonNode>> responder = visitor.visit(parse(path));
-            transaction.preCommit();
-            requestScope.getPermissionExecutor().executeCommitChecks();
-            transaction.flush();
-            ElideResponse response = buildResponse(responder.get());
-            auditLogger.commit();
-            transaction.commit();
-            requestScope.runCommitTriggers();
-            if (log.isTraceEnabled()) {
-                requestScope.getPermissionExecutor().printCheckStats();
+    /**
+     * Handle GET.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param path the path
+     * @param queryParams the query params
+     * @param requestHeaders the request headers
+     * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @param requestId the request ID
+     * @return Elide response object
+     */
+    public ElideResponse get(String baseUrlEndPoint, String path, MultivaluedMap<String, String> queryParams,
+                             Map<String, List<String>> requestHeaders, User opaqueUser, String apiVersion,
+                             UUID requestId) {
+        if (elideSettings.isStrictQueryParams()) {
+            try {
+                verifyQueryParams(queryParams);
+            } catch (BadRequestException e) {
+                return buildErrorResponse(e, false);
             }
-            return response;
-        } catch (ForbiddenAccessException e) {
-            log.debug("{}", e.getLoggedMessage());
-            return buildErrorResponse(e, isVerbose);
-        } catch (HttpStatusException e) {
-            return buildErrorResponse(e, isVerbose);
-        } catch (IOException e) {
-            return buildErrorResponse(new TransactionException(e), isVerbose);
-        } catch (ParseCancellationException e) {
-            return buildErrorResponse(new InvalidURLException(e), isVerbose);
-        } finally {
-            auditLogger.clear();
         }
+        return handleRequest(true, opaqueUser, dataStore::beginReadTransaction, requestId, (tx, user) -> {
+            JsonApiDocument jsonApiDoc = new JsonApiDocument();
+            RequestScope requestScope = new RequestScope(baseUrlEndPoint, path, apiVersion, jsonApiDoc,
+                    tx, user, queryParams, requestHeaders, requestId, elideSettings);
+            requestScope.setEntityProjection(new EntityProjectionMaker(elideSettings.getDictionary(),
+                    requestScope).parsePath(path));
+            BaseVisitor visitor = new GetVisitor(requestScope);
+            return visit(path, requestScope, visitor);
+        });
     }
 
     /**
-     * Handle GET.
+     * Handle POST.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the path
-     * @param queryParams the query params
+     * @param jsonApiDocument the json api document
      * @param opaqueUser the opaque user
+     * @param apiVersion the API version
      * @return Elide response object
      */
-    public ElideResponse get(
-            String path,
-            MultivaluedMap<String, String> queryParams,
-            Object opaqueUser) {
-        return this.get(path, queryParams, opaqueUser, SecurityMode.SECURITY_ACTIVE);
+    public ElideResponse post(String baseUrlEndPoint, String path, String jsonApiDocument,
+                              User opaqueUser, String apiVersion) {
+        return post(baseUrlEndPoint, path, jsonApiDocument, null, opaqueUser, apiVersion, UUID.randomUUID());
     }
 
     /**
      * Handle POST.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the path
      * @param jsonApiDocument the json api document
+     * @param queryParams the query params
      * @param opaqueUser the opaque user
-     * @param securityMode only for test mode
+     * @param apiVersion the API version
+     * @param requestId the request ID
      * @return Elide response object
-     * @deprecated Since 2.1, instead use the {@link Elide.Builder} with an appropriate {@link PermissionExecutor}
      */
-    @Deprecated
-    public ElideResponse post(
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser,
-            SecurityMode securityMode) {
-        RequestScope requestScope = null;
-        boolean isVerbose = false;
-        try (DataStoreTransaction transaction = dataStore.beginTransaction()) {
-            User user = transaction.accessUser(opaqueUser);
-            JsonApiDocument doc = mapper.readJsonApiDocument(jsonApiDocument);
-            requestScope = new RequestScope(path, doc,
-                    transaction,
-                    user,
-                    dictionary,
-                    mapper,
-                    auditLogger,
-                    securityMode,
-                    permissionExecutor);
-            isVerbose = requestScope.getPermissionExecutor().isVerbose();
-            PostVisitor visitor = new PostVisitor(requestScope);
-            Supplier<Pair<Integer, JsonNode>> responder = visitor.visit(parse(path));
-            transaction.preCommit();
-            requestScope.getPermissionExecutor().executeCommitChecks();
-            requestScope.saveObjects();
-            transaction.flush();
-            ElideResponse response = buildResponse(responder.get());
-            auditLogger.commit();
-            transaction.commit();
-            requestScope.runCommitTriggers();
-            if (log.isTraceEnabled()) {
-                requestScope.getPermissionExecutor().printCheckStats();
-            }
-            return response;
-        } catch (ForbiddenAccessException e) {
-            log.debug("{}", e.getLoggedMessage());
-            return buildErrorResponse(e, isVerbose);
-        } catch (HttpStatusException e) {
-            return buildErrorResponse(e, isVerbose);
-        } catch (IOException e) {
-            return buildErrorResponse(new TransactionException(e), isVerbose);
-        } catch (ParseCancellationException e) {
-            return buildErrorResponse(new InvalidURLException(e), isVerbose);
-        } finally {
-            auditLogger.clear();
-        }
+    public ElideResponse post(String baseUrlEndPoint, String path, String jsonApiDocument,
+                              MultivaluedMap<String, String> queryParams,
+                              User opaqueUser, String apiVersion, UUID requestId) {
+        return post(baseUrlEndPoint, path, jsonApiDocument, queryParams, Collections.emptyMap(),
+                    opaqueUser, apiVersion, requestId);
     }
 
     /**
      * Handle POST.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the path
      * @param jsonApiDocument the json api document
+     * @param queryParams the query params
+     * @param requestHeaders the request headers
      * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @param requestId the request ID
      * @return Elide response object
      */
-    public ElideResponse post(
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser) {
-        return this.post(path, jsonApiDocument, opaqueUser, SecurityMode.SECURITY_ACTIVE);
+    public ElideResponse post(String baseUrlEndPoint, String path, String jsonApiDocument,
+                              MultivaluedMap<String, String> queryParams, Map<String, List<String>> requestHeaders,
+                              User opaqueUser, String apiVersion, UUID requestId) {
+        return handleRequest(false, opaqueUser, dataStore::beginTransaction, requestId, (tx, user) -> {
+            JsonApiDocument jsonApiDoc = mapper.readJsonApiDocument(jsonApiDocument);
+            RequestScope requestScope = new RequestScope(baseUrlEndPoint, path, apiVersion,
+                    jsonApiDoc, tx, user, queryParams, requestHeaders, requestId, elideSettings);
+            requestScope.setEntityProjection(new EntityProjectionMaker(elideSettings.getDictionary(),
+                    requestScope).parsePath(path));
+            BaseVisitor visitor = new PostVisitor(requestScope);
+            return visit(path, requestScope, visitor);
+        });
     }
 
     /**
      * Handle PATCH.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param contentType the content type
      * @param accept the accept
      * @param path the path
      * @param jsonApiDocument the json api document
      * @param opaqueUser the opaque user
-     * @param securityMode only for test mode
+     * @param apiVersion the API version
      * @return Elide response object
-     * @deprecated Since 2.1, instead use the {@link Elide.Builder} with an appropriate {@link PermissionExecutor}
      */
-    @Deprecated
-    public ElideResponse patch(
-            String contentType,
-            String accept,
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser,
-            SecurityMode securityMode) {
-        RequestScope requestScope = null;
-        boolean isVerbose = false;
-        try (DataStoreTransaction transaction = dataStore.beginTransaction()) {
-            User user = transaction.accessUser(opaqueUser);
-
-            Supplier<Pair<Integer, JsonNode>> responder;
-            if (JsonApiPatch.isPatchExtension(contentType) && JsonApiPatch.isPatchExtension(accept)) {
-                // build Outer RequestScope to be used for each action
-                PatchRequestScope patchRequestScope = new PatchRequestScope(path,
-                        transaction, user, dictionary, mapper, auditLogger, permissionExecutor);
-                requestScope = patchRequestScope;
-                isVerbose = requestScope.getPermissionExecutor().isVerbose();
-                responder = JsonApiPatch.processJsonPatch(dataStore, path, jsonApiDocument, patchRequestScope);
-            } else {
-                JsonApiDocument doc = mapper.readJsonApiDocument(jsonApiDocument);
-                requestScope = new RequestScope(path, doc, transaction, user, dictionary, mapper, auditLogger,
-                        securityMode, permissionExecutor);
-                isVerbose = requestScope.getPermissionExecutor().isVerbose();
-                PatchVisitor visitor = new PatchVisitor(requestScope);
-                responder = visitor.visit(parse(path));
-            }
-            transaction.preCommit();
-            requestScope.getPermissionExecutor().executeCommitChecks();
-            requestScope.saveObjects();
-            transaction.flush();
-            ElideResponse response = buildResponse(responder.get());
-            auditLogger.commit();
-            transaction.commit();
-            requestScope.runCommitTriggers();
-            if (log.isTraceEnabled()) {
-                requestScope.getPermissionExecutor().printCheckStats();
-            }
-            return response;
-        } catch (ForbiddenAccessException e) {
-            log.debug("{}", e.getLoggedMessage());
-            return buildErrorResponse(e, isVerbose);
-        } catch (JsonPatchExtensionException e) {
-            return buildResponse(e.getResponse());
-        } catch (HttpStatusException e) {
-            return buildErrorResponse(e, isVerbose);
-        } catch (ParseCancellationException e) {
-            return buildErrorResponse(new InvalidURLException(e), isVerbose);
-        } catch (IOException e) {
-            return buildErrorResponse(new TransactionException(e), isVerbose);
-        } finally {
-            auditLogger.clear();
-        }
+    public ElideResponse patch(String baseUrlEndPoint, String contentType, String accept,
+                               String path, String jsonApiDocument,
+                               User opaqueUser, String apiVersion) {
+        return patch(baseUrlEndPoint, contentType, accept, path, jsonApiDocument,
+                     null, opaqueUser, apiVersion, UUID.randomUUID());
     }
 
     /**
      * Handle PATCH.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param contentType the content type
      * @param accept the accept
      * @param path the path
      * @param jsonApiDocument the json api document
+     * @param queryParams the query params
      * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @param requestId the request ID
      * @return Elide response object
      */
-    public ElideResponse patch(
-            String contentType,
-            String accept,
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser) {
-        return this.patch(contentType, accept, path, jsonApiDocument, opaqueUser, SecurityMode.SECURITY_ACTIVE);
+    public ElideResponse patch(String baseUrlEndPoint, String contentType, String accept,
+                               String path, String jsonApiDocument, MultivaluedMap<String, String> queryParams,
+                               User opaqueUser, String apiVersion, UUID requestId) {
+
+        return patch(baseUrlEndPoint, contentType, accept, path, jsonApiDocument, queryParams,
+                null, opaqueUser, apiVersion, requestId);
+    }
+
+    /**
+     * Handle PATCH.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param contentType the content type
+     * @param accept the accept
+     * @param path the path
+     * @param jsonApiDocument the json api document
+     * @param queryParams the query params
+     * @param requestHeaders the request headers
+     * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @param requestId the request ID
+     * @return Elide response object
+     */
+    public ElideResponse patch(String baseUrlEndPoint, String contentType, String accept,
+                               String path, String jsonApiDocument, MultivaluedMap<String, String> queryParams,
+                               Map<String, List<String>> requestHeaders, User opaqueUser,
+                               String apiVersion, UUID requestId) {
+
+        Handler<DataStoreTransaction, User, HandlerResult> handler;
+        if (JsonApiPatch.isPatchExtension(contentType) && JsonApiPatch.isPatchExtension(accept)) {
+            handler = (tx, user) -> {
+                PatchRequestScope requestScope = new PatchRequestScope(baseUrlEndPoint, path, apiVersion, tx,
+                        user, requestId, queryParams, requestHeaders, elideSettings);
+                try {
+                    Supplier<Pair<Integer, JsonNode>> responder =
+                            JsonApiPatch.processJsonPatch(dataStore, path, jsonApiDocument, requestScope);
+                    return new HandlerResult(requestScope, responder);
+                } catch (RuntimeException e) {
+                    return new HandlerResult(requestScope, e);
+                }
+            };
+        } else {
+            handler = (tx, user) -> {
+                JsonApiDocument jsonApiDoc = mapper.readJsonApiDocument(jsonApiDocument);
+
+                RequestScope requestScope = new RequestScope(baseUrlEndPoint, path, apiVersion, jsonApiDoc,
+                        tx, user, queryParams, requestHeaders, requestId, elideSettings);
+                requestScope.setEntityProjection(new EntityProjectionMaker(elideSettings.getDictionary(),
+                        requestScope).parsePath(path));
+                BaseVisitor visitor = new PatchVisitor(requestScope);
+                return visit(path, requestScope, visitor);
+            };
+        }
+
+        return handleRequest(false, opaqueUser, dataStore::beginTransaction, requestId, handler);
+    }
+
+    /**
+     * Handle DELETE.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param path the path
+     * @param jsonApiDocument the json api document
+     * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @return Elide response object
+     */
+    public ElideResponse delete(String baseUrlEndPoint, String path, String jsonApiDocument,
+                                User opaqueUser, String apiVersion) {
+        return delete(baseUrlEndPoint, path, jsonApiDocument, null, opaqueUser, apiVersion, UUID.randomUUID());
+    }
+
+    /**
+     * Handle DELETE.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param path the path
+     * @param jsonApiDocument the json api document
+     * @param queryParams the query params
+     * @param opaqueUser the opaque user
+     * @param apiVersion the API version
+     * @param requestId the request ID
+     * @return Elide response object
+     */
+    public ElideResponse delete(String baseUrlEndPoint, String path, String jsonApiDocument,
+                                MultivaluedMap<String, String> queryParams,
+                                User opaqueUser, String apiVersion, UUID requestId) {
+        return delete(baseUrlEndPoint, path, jsonApiDocument, queryParams, Collections.emptyMap(),
+                      opaqueUser, apiVersion, requestId);
     }
 
     /**
      * Handle DELETE.
      *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the path
      * @param jsonApiDocument the json api document
+     * @param queryParams the query params
+     * @param requestHeaders the request headers
      * @param opaqueUser the opaque user
-     * @param securityMode only for test mode
+     * @param apiVersion the API version
+     * @param requestId the request ID
      * @return Elide response object
-     * @deprecated Since 2.1, instead use the {@link Elide.Builder} with an appropriate {@link PermissionExecutor}
      */
-    @Deprecated
-    public ElideResponse delete(
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser,
-            SecurityMode securityMode) {
-        JsonApiDocument doc;
-        RequestScope requestScope = null;
+    public ElideResponse delete(String baseUrlEndPoint, String path, String jsonApiDocument,
+                                MultivaluedMap<String, String> queryParams,
+                                Map<String, List<String>> requestHeaders,
+                                User opaqueUser, String apiVersion, UUID requestId) {
+        return handleRequest(false, opaqueUser, dataStore::beginTransaction, requestId, (tx, user) -> {
+            JsonApiDocument jsonApiDoc = StringUtils.isEmpty(jsonApiDocument)
+                    ? new JsonApiDocument()
+                    : mapper.readJsonApiDocument(jsonApiDocument);
+            RequestScope requestScope = new RequestScope(baseUrlEndPoint, path, apiVersion, jsonApiDoc,
+                    tx, user, queryParams, requestHeaders, requestId, elideSettings);
+            requestScope.setEntityProjection(new EntityProjectionMaker(elideSettings.getDictionary(),
+                    requestScope).parsePath(path));
+            BaseVisitor visitor = new DeleteVisitor(requestScope);
+            return visit(path, requestScope, visitor);
+        });
+    }
+
+    public HandlerResult visit(String path, RequestScope requestScope, BaseVisitor visitor) {
+        try {
+            Supplier<Pair<Integer, JsonNode>> responder = visitor.visit(JsonApiParser.parse(path));
+            return new HandlerResult(requestScope, responder);
+        } catch (RuntimeException e) {
+            return new HandlerResult(requestScope, e);
+        }
+    }
+
+    /**
+     * Handle JSON API requests.
+     *
+     * @param isReadOnly if the transaction is read only
+     * @param user the user object from the container
+     * @param transaction a transaction supplier
+     * @param requestId the Request ID
+     * @param handler a function that creates the request scope and request handler
+     * @return the response
+     */
+    protected ElideResponse handleRequest(boolean isReadOnly, User user,
+                                          Supplier<DataStoreTransaction> transaction, UUID requestId,
+                                          Handler<DataStoreTransaction, User, HandlerResult> handler) {
         boolean isVerbose = false;
-        try (DataStoreTransaction transaction = dataStore.beginTransaction()) {
-            User user = transaction.accessUser(opaqueUser);
-            if (jsonApiDocument != null && !jsonApiDocument.equals("")) {
-                doc = mapper.readJsonApiDocument(jsonApiDocument);
-            } else {
-                doc = new JsonApiDocument();
-            }
-            requestScope = new RequestScope(
-                    path, doc, transaction, user, dictionary, mapper, auditLogger, securityMode, permissionExecutor);
+        try (DataStoreTransaction tx = transaction.get()) {
+            transactionRegistry.addRunningTransaction(requestId, tx);
+            HandlerResult result = handler.handle(tx, user);
+            RequestScope requestScope = result.getRequestScope();
             isVerbose = requestScope.getPermissionExecutor().isVerbose();
-            DeleteVisitor visitor = new DeleteVisitor(requestScope);
-            Supplier<Pair<Integer, JsonNode>> responder = visitor.visit(parse(path));
-            transaction.preCommit();
+            Supplier<Pair<Integer, JsonNode>> responder = result.getResponder();
+            tx.preCommit(requestScope);
+            requestScope.runQueuedPreSecurityTriggers();
             requestScope.getPermissionExecutor().executeCommitChecks();
-            requestScope.saveObjects();
-            transaction.flush();
+            requestScope.runQueuedPreFlushTriggers();
+            if (!isReadOnly) {
+                requestScope.saveOrCreateObjects();
+            }
+            tx.flush(requestScope);
+
+            requestScope.runQueuedPreCommitTriggers();
+
             ElideResponse response = buildResponse(responder.get());
+
             auditLogger.commit();
-            transaction.commit();
-            requestScope.runCommitTriggers();
+            tx.commit(requestScope);
+            requestScope.runQueuedPostCommitTriggers();
+
             if (log.isTraceEnabled()) {
-                requestScope.getPermissionExecutor().printCheckStats();
+                requestScope.getPermissionExecutor().logCheckStats();
             }
+
             return response;
-        } catch (ForbiddenAccessException e) {
-            log.debug("{}", e.getLoggedMessage());
-            return buildErrorResponse(e, isVerbose);
-        } catch (HttpStatusException e) {
-            return buildErrorResponse(e, isVerbose);
+        } catch (JacksonException e) {
+            String message = (e.getLocation() != null && e.getLocation().getSourceRef() != null)
+                    ? e.getMessage() //This will leak Java class info if the location isn't known.
+                    : e.getOriginalMessage();
+
+            return buildErrorResponse(new BadRequestException(message), isVerbose);
         } catch (IOException e) {
+            log.error("IO Exception uncaught by Elide", e);
             return buildErrorResponse(new TransactionException(e), isVerbose);
-        } catch (ParseCancellationException e) {
-            return buildErrorResponse(new InvalidURLException(e), isVerbose);
+        } catch (RuntimeException e) {
+            return handleRuntimeException(e, isVerbose);
         } finally {
+            transactionRegistry.removeRunningTransaction(requestId);
             auditLogger.clear();
         }
     }
 
-    /**
-     * Handle DELETE.
-     *
-     * @param path the path
-     * @param jsonApiDocument the json api document
-     * @param opaqueUser the opaque user
-     * @return Elide response object
-     */
-    public ElideResponse delete(
-            String path,
-            String jsonApiDocument,
-            Object opaqueUser) {
-        return this.delete(path, jsonApiDocument, opaqueUser, SecurityMode.SECURITY_ACTIVE);
+    protected ElideResponse buildErrorResponse(HttpStatusException error, boolean isVerbose) {
+        if (error instanceof InternalServerErrorException) {
+            log.error("Internal Server Error", error);
+        }
+
+        return buildResponse(isVerbose ? error.getVerboseErrorResponse()
+                : error.getErrorResponse());
     }
 
-    /**
-     * Compile request to AST.
-     *
-     * @param path request
-     * @return AST parse tree
-     */
-    public static ParseTree parse(String path) {
-        path = Paths.get(path).normalize().toString().replace(File.separatorChar, '/');
-        if (path.startsWith("/")) {
-            path = path.substring(1);
+    private ElideResponse handleRuntimeException(RuntimeException error, boolean isVerbose) {
+        CustomErrorException mappedException = mapError(error);
+
+        if (mappedException != null) {
+            return buildErrorResponse(mappedException, isVerbose);
+        }
+
+        if (error instanceof WebApplicationException) {
+            throw error;
         }
-        ANTLRInputStream is = new ANTLRInputStream(path);
-        CoreLexer lexer = new CoreLexer(is);
-        lexer.removeErrorListeners();
-        lexer.addErrorListener(new BaseErrorListener() {
-            @Override
-            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
-                    int charPositionInLine, String msg, RecognitionException e) {
-                throw new ParseCancellationException(msg, e);
+
+        if (error instanceof ForbiddenAccessException) {
+            ForbiddenAccessException e = (ForbiddenAccessException) error;
+            if (log.isDebugEnabled()) {
+                log.debug("{}", e.getLoggedMessage());
             }
-        });
-        CoreParser parser = new CoreParser(new CommonTokenStream(lexer));
-        parser.setErrorHandler(new BailErrorStrategy());
-        return parser.start();
+            return buildErrorResponse(e, isVerbose);
+        }
+
+        if (error instanceof JsonPatchExtensionException) {
+            JsonPatchExtensionException e = (JsonPatchExtensionException) error;
+            log.debug("JSON patch extension exception caught", e);
+            return buildErrorResponse(e, isVerbose);
+        }
+
+        if (error instanceof HttpStatusException) {
+            HttpStatusException e = (HttpStatusException) error;
+            log.debug("Caught HTTP status exception", e);
+            return buildErrorResponse(e, isVerbose);
+        }
+
+        if (error instanceof ParseCancellationException) {
+            ParseCancellationException e = (ParseCancellationException) error;
+            log.debug("Parse cancellation exception uncaught by Elide (i.e. invalid URL)", e);
+            return buildErrorResponse(new InvalidURLException(e), isVerbose);
+        }
+
+        if (error instanceof ConstraintViolationException) {
+            ConstraintViolationException e = (ConstraintViolationException) error;
+            log.debug("Constraint violation exception caught", e);
+            String message = "Constraint violation";
+            final ErrorObjects.ErrorObjectsBuilder errorObjectsBuilder = ErrorObjects.builder();
+            for (ConstraintViolation<?> constraintViolation : e.getConstraintViolations()) {
+                errorObjectsBuilder.addError()
+                        .withDetail(constraintViolation.getMessage());
+                final String propertyPathString = constraintViolation.getPropertyPath().toString();
+                if (!propertyPathString.isEmpty()) {
+                    Map<String, Object> source = new HashMap<>(1);
+                    source.put("property", propertyPathString);
+                    errorObjectsBuilder.with("source", source);
+                }
+            }
+            return buildErrorResponse(
+                    new CustomErrorException(HttpStatus.SC_BAD_REQUEST, message, errorObjectsBuilder.build()),
+                    isVerbose
+            );
+        }
+
+        log.error("Error or exception uncaught by Elide", error);
+        throw new RuntimeException(error);
     }
 
-    protected ElideResponse buildErrorResponse(HttpStatusException error, boolean isVerbose) {
-        return buildResponse(isVerbose ? error.getVerboseErrorResponse() : error.getErrorResponse());
+    public CustomErrorException mapError(RuntimeException error) {
+        if (errorMapper != null) {
+            log.trace("Attempting to map unknown exception of type {}", error.getClass());
+            CustomErrorException customizedError = errorMapper.map(error);
+
+            if (customizedError != null) {
+                log.debug("Successfully mapped exception from type {} to {}",
+                        error.getClass(), customizedError.getClass());
+                return customizedError;
+            } else {
+                log.debug("No error mapping present for {}", error.getClass());
+            }
+        }
+
+        return null;
     }
 
     protected ElideResponse buildResponse(Pair<Integer, JsonNode> response) {
@@ -680,4 +647,66 @@ protected ElideResponse buildResponse(Pair<Integer, JsonNode> response) {
             return new ElideResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.toString());
         }
     }
+
+    private void verifyQueryParams(MultivaluedMap<String, String> queryParams) {
+        String undefinedKeys = queryParams.keySet()
+                        .stream()
+                        .filter(Elide::notAValidKey)
+                        .collect(Collectors.joining(", "));
+
+        if (!undefinedKeys.isEmpty()) {
+            throw new BadRequestException("Found undefined keys in request: " + undefinedKeys);
+        }
+    }
+
+    private static boolean notAValidKey(String key) {
+        boolean validKey = key.equals("sort")
+                        || key.startsWith("filter")
+                        || (key.startsWith("fields[") && key.endsWith("]"))
+                        || key.startsWith("page[")
+                        || key.equals(EntityProjectionMaker.INCLUDE);
+        return !validKey;
+    }
+
+    /**
+     * A function that sets up the request handling objects.
+     *
+     * @param <DataStoreTransaction> the request's transaction
+     * @param <User> the request's user
+     * @param <HandlerResult> the request handling objects
+     */
+    @FunctionalInterface
+    public interface Handler<DataStoreTransaction, User, HandlerResult> {
+        HandlerResult handle(DataStoreTransaction a, User b) throws IOException;
+    }
+
+    /**
+     * A wrapper to return multiple values, less verbose than Pair.
+     */
+    protected static class HandlerResult {
+        protected RequestScope requestScope;
+        protected Supplier<Pair<Integer, JsonNode>> result;
+        protected RuntimeException cause;
+
+        protected HandlerResult(RequestScope requestScope, Supplier<Pair<Integer, JsonNode>> result) {
+            this.requestScope = requestScope;
+            this.result = result;
+        }
+
+        public HandlerResult(RequestScope requestScope, RuntimeException cause) {
+            this.requestScope = requestScope;
+            this.cause = cause;
+        }
+
+        public Supplier<Pair<Integer, JsonNode>> getResponder() {
+            if (cause != null) {
+                throw cause;
+            }
+            return result;
+        }
+
+        public RequestScope getRequestScope() {
+            return requestScope;
+        }
+    }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/ElideResponse.java b/elide-core/src/main/java/com/yahoo/elide/ElideResponse.java
index 2ff96c1449..795b1c1f32 100644
--- a/elide-core/src/main/java/com/yahoo/elide/ElideResponse.java
+++ b/elide-core/src/main/java/com/yahoo/elide/ElideResponse.java
@@ -5,11 +5,13 @@
  */
 package com.yahoo.elide;
 
+import lombok.Builder;
 import lombok.Getter;
 
 /**
  * Elide response object.
  */
+@Builder
 public class ElideResponse {
     @Getter private final int responseCode;
     @Getter private final String body;
diff --git a/elide-core/src/main/java/com/yahoo/elide/ElideSettings.java b/elide-core/src/main/java/com/yahoo/elide/ElideSettings.java
new file mode 100644
index 0000000000..b9d4c0b11b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/ElideSettings.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.filter.dialect.graphql.FilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.JoinFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.SubqueryFilterDialect;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.links.JSONApiLinks;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * Object containing general Elide settings passed to RequestScope.
+ */
+@AllArgsConstructor
+public class ElideSettings {
+    @Getter private final AuditLogger auditLogger;
+    @Getter private final DataStore dataStore;
+    @Getter private final EntityDictionary dictionary;
+    @Getter private final JsonApiMapper mapper;
+    @Getter private final ErrorMapper errorMapper;
+    @Getter private final Function<RequestScope, PermissionExecutor> permissionExecutor;
+    @Getter private final List<JoinFilterDialect> joinFilterDialects;
+    @Getter private final List<SubqueryFilterDialect> subqueryFilterDialects;
+    @Getter private final FilterDialect graphqlDialect;
+    @Getter private final JSONApiLinks jsonApiLinks;
+    @Getter private final int defaultMaxPageSize;
+    @Getter private final int defaultPageSize;
+    @Getter private final int updateStatusCode;
+    @Getter private final Map<Class, Serde> serdes;
+    @Getter private final boolean enableJsonLinks;
+    @Getter private final boolean strictQueryParams;
+    @Getter private final String baseUrl;
+    @Getter private final String jsonApiPath;
+    @Getter private final String graphQLApiPath;
+    @Getter private final String exportApiPath;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/ElideSettingsBuilder.java b/elide-core/src/main/java/com/yahoo/elide/ElideSettingsBuilder.java
new file mode 100644
index 0000000000..a436f043a7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/ElideSettingsBuilder.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.graphql.FilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.JoinFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.SubqueryFilterDialect;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.executors.ActivePermissionExecutor;
+import com.yahoo.elide.core.security.executors.VerbosePermissionExecutor;
+import com.yahoo.elide.core.utils.coerce.converters.EpochToDateConverter;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.core.utils.coerce.converters.InstantSerde;
+import com.yahoo.elide.core.utils.coerce.converters.OffsetDateTimeSerde;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.core.utils.coerce.converters.TimeZoneSerde;
+import com.yahoo.elide.core.utils.coerce.converters.URLSerde;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.links.JSONApiLinks;
+
+import java.net.URL;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.function.Function;
+
+/**
+ * Builder for ElideSettings.
+ */
+public class ElideSettingsBuilder {
+    private final DataStore dataStore;
+    private AuditLogger auditLogger;
+    private JsonApiMapper jsonApiMapper;
+    private ErrorMapper errorMapper;
+    private EntityDictionary entityDictionary;
+    private Function<RequestScope, PermissionExecutor> permissionExecutorFunction = ActivePermissionExecutor::new;
+    private List<JoinFilterDialect> joinFilterDialects;
+    private List<SubqueryFilterDialect> subqueryFilterDialects;
+    private FilterDialect graphqlFilterDialect;
+    private JSONApiLinks jsonApiLinks;
+    private Map<Class, Serde> serdes;
+    private int defaultMaxPageSize = PaginationImpl.MAX_PAGE_LIMIT;
+    private int defaultPageSize = PaginationImpl.DEFAULT_PAGE_LIMIT;
+    private int updateStatusCode;
+    private boolean enableJsonLinks;
+    private boolean strictQueryParams = true;
+    private String baseUrl = "";
+    private String jsonApiPath;
+    private String graphQLApiPath;
+    private String exportApiPath;
+
+    /**
+     * A new builder used to generate Elide instances. Instantiates an {@link EntityDictionary} without
+     * providing a mapping of security checks and uses the provided {@link Slf4jLogger} for audit.
+     *
+     * @param dataStore the datastore used to communicate with the persistence layer
+     */
+    public ElideSettingsBuilder(DataStore dataStore) {
+        this.dataStore = dataStore;
+        this.auditLogger = new Slf4jLogger();
+        this.jsonApiMapper = new JsonApiMapper();
+        this.joinFilterDialects = new ArrayList<>();
+        this.subqueryFilterDialects = new ArrayList<>();
+        updateStatusCode = HttpStatus.SC_NO_CONTENT;
+        this.serdes = new LinkedHashMap<>();
+        this.enableJsonLinks = false;
+
+        //By default, Elide supports epoch based dates.
+        this.withEpochDates();
+        this.withDefaultSerdes();
+    }
+
+    public ElideSettings build() {
+        if (joinFilterDialects.isEmpty()) {
+            joinFilterDialects.add(new DefaultFilterDialect(entityDictionary));
+            joinFilterDialects.add(RSQLFilterDialect.builder().dictionary(entityDictionary).build());
+        }
+
+        if (subqueryFilterDialects.isEmpty()) {
+            subqueryFilterDialects.add(new DefaultFilterDialect(entityDictionary));
+            subqueryFilterDialects.add(RSQLFilterDialect.builder().dictionary(entityDictionary).build());
+        }
+
+        if (graphqlFilterDialect == null) {
+            graphqlFilterDialect = RSQLFilterDialect.builder().dictionary(entityDictionary).build();
+        }
+
+        if (entityDictionary == null) {
+            throw new IllegalStateException("EntityDictionary must be set in ElideSettings.");
+        }
+
+        return new ElideSettings(
+                auditLogger,
+                dataStore,
+                entityDictionary,
+                jsonApiMapper,
+                errorMapper,
+                permissionExecutorFunction,
+                joinFilterDialects,
+                subqueryFilterDialects,
+                graphqlFilterDialect,
+                jsonApiLinks,
+                defaultMaxPageSize,
+                defaultPageSize,
+                updateStatusCode,
+                serdes,
+                enableJsonLinks,
+                strictQueryParams,
+                baseUrl,
+                jsonApiPath,
+                graphQLApiPath,
+                exportApiPath);
+    }
+
+    public ElideSettingsBuilder withAuditLogger(AuditLogger auditLogger) {
+        this.auditLogger = auditLogger;
+        return this;
+    }
+
+    public ElideSettingsBuilder withEntityDictionary(EntityDictionary entityDictionary) {
+        this.entityDictionary = entityDictionary;
+        return this;
+    }
+
+    public ElideSettingsBuilder withJsonApiMapper(JsonApiMapper jsonApiMapper) {
+        this.jsonApiMapper = jsonApiMapper;
+        return this;
+    }
+
+
+    public ElideSettingsBuilder withErrorMapper(ErrorMapper errorMapper) {
+        this.errorMapper = errorMapper;
+        return this;
+    }
+
+    public ElideSettingsBuilder withJoinFilterDialect(JoinFilterDialect dialect) {
+        joinFilterDialects.add(dialect);
+        return this;
+    }
+
+    public ElideSettingsBuilder withSubqueryFilterDialect(SubqueryFilterDialect dialect) {
+        subqueryFilterDialects.add(dialect);
+        return this;
+    }
+
+    public ElideSettingsBuilder withDefaultMaxPageSize(int maxPageSize) {
+        defaultMaxPageSize = maxPageSize;
+        return this;
+    }
+
+    public ElideSettingsBuilder withDefaultPageSize(int pageSize) {
+        defaultPageSize = pageSize;
+        return this;
+    }
+
+    public ElideSettingsBuilder withUpdate200Status() {
+        updateStatusCode = HttpStatus.SC_OK;
+        return this;
+    }
+
+    public ElideSettingsBuilder withUpdate204Status() {
+        updateStatusCode = HttpStatus.SC_NO_CONTENT;
+        return this;
+    }
+
+    /**
+     * Sets the base URL that will be returned in URLs generated by Elide.
+     * @param baseUrl The base URL that clients use in queries.
+     * @return the settings builder.
+     */
+    public ElideSettingsBuilder withBaseUrl(String baseUrl) {
+        this.baseUrl = baseUrl;
+        return this;
+    }
+
+    public ElideSettingsBuilder withGraphQLDialect(FilterDialect dialect) {
+        graphqlFilterDialect = dialect;
+        return this;
+    }
+
+    public ElideSettingsBuilder withVerboseErrors() {
+        permissionExecutorFunction = VerbosePermissionExecutor::new;
+        return this;
+    }
+
+    public ElideSettingsBuilder withISO8601Dates(String dateFormat, TimeZone tz) {
+        serdes.put(Date.class, new ISO8601DateSerde(dateFormat, tz));
+        serdes.put(java.sql.Date.class, new ISO8601DateSerde(dateFormat, tz, java.sql.Date.class));
+        serdes.put(java.sql.Time.class, new ISO8601DateSerde(dateFormat, tz, java.sql.Time.class));
+        serdes.put(java.sql.Timestamp.class, new ISO8601DateSerde(dateFormat, tz, java.sql.Timestamp.class));
+        return this;
+    }
+
+    public ElideSettingsBuilder withEpochDates() {
+        serdes.put(Date.class, new EpochToDateConverter<>(Date.class));
+        serdes.put(java.sql.Date.class, new EpochToDateConverter<>(java.sql.Date.class));
+        serdes.put(java.sql.Time.class, new EpochToDateConverter<>(java.sql.Time.class));
+        serdes.put(java.sql.Timestamp.class, new EpochToDateConverter<>(java.sql.Timestamp.class));
+        return this;
+    }
+
+    public ElideSettingsBuilder withDefaultSerdes() {
+        serdes.put(Instant.class, new InstantSerde());
+        serdes.put(OffsetDateTime.class, new OffsetDateTimeSerde());
+        serdes.put(TimeZone.class, new TimeZoneSerde());
+        serdes.put(URL.class, new URLSerde());
+        return this;
+    }
+
+    public ElideSettingsBuilder withJSONApiLinks(JSONApiLinks links) {
+        this.enableJsonLinks = true;
+        this.jsonApiLinks = links;
+        return this;
+    }
+
+    public ElideSettingsBuilder withJsonApiPath(String jsonApiPath) {
+        this.jsonApiPath = jsonApiPath;
+        return this;
+    }
+
+    public ElideSettingsBuilder withGraphQLApiPath(String graphQLApiPath) {
+        this.graphQLApiPath = graphQLApiPath;
+        return this;
+    }
+
+    public ElideSettingsBuilder withExportApiPath(String exportApiPath) {
+        this.exportApiPath = exportApiPath;
+        return this;
+    }
+
+    public ElideSettingsBuilder withStrictQueryParams(boolean enabled) {
+        this.strictQueryParams = enabled;
+        return this;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/RefreshableElide.java b/elide-core/src/main/java/com/yahoo/elide/RefreshableElide.java
new file mode 100644
index 0000000000..0b164acf2f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/RefreshableElide.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide;
+
+import lombok.Getter;
+
+/**
+ * Wraps an Elide instance that can be hot reloaded at runtime.  This class is restricted to
+ * a single access method (getElide) to eliminate state issues across reloads.
+ */
+public class RefreshableElide {
+    @Getter
+    private Elide elide;
+
+    public RefreshableElide(Elide elide) {
+        this.elide = elide;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/ApiVersion.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ApiVersion.java
new file mode 100644
index 0000000000..99f04a7f9a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/ApiVersion.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Versions API Models.
+ */
+@Target({PACKAGE})
+@Retention(RUNTIME)
+public @interface ApiVersion {
+
+    /**
+     * Models in this package are tied to this API version.
+     * @return the string (default = "")
+     */
+    String version() default "";
+}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Audit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/Audit.java
similarity index 87%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/Audit.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/Audit.java
index 0cba01cafd..9c832c32dd 100644
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Audit.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/Audit.java
@@ -5,17 +5,17 @@
  */
 package com.yahoo.elide.annotation;
 
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Audit configuration annotation.
  */
@@ -50,13 +50,6 @@ enum Action {
      */
     Action[] action() default {Action.CREATE, Action.UPDATE, Action.DELETE};
 
-    /**
-     * Regular expression applied to the path segments of the URI.  The audit only occurs if the expression
-     * is empty or it matches the request URI
-     * @return the string (default = "")
-     */
-    String path() default "";
-
     /**
      * Operation code.
      *
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Audits.java b/elide-core/src/main/java/com/yahoo/elide/annotation/Audits.java
similarity index 99%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/Audits.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/Audits.java
index fe0a443838..cce73ca16b 100644
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Audits.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/Audits.java
@@ -5,16 +5,15 @@
  */
 package com.yahoo.elide.annotation;
 
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Audit configuration annotation repeatable.
  */
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java
similarity index 100%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java
index c12fba04aa..95be8043c4 100644
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/ComputedAttribute.java
@@ -5,13 +5,13 @@
  */
 package com.yahoo.elide.annotation;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Marks a method or field as a computed attribute that should be exposed via Elide regardless of whether or
  * not it is marked as Transient.
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/ComputedRelationship.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ComputedRelationship.java
similarity index 100%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/ComputedRelationship.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/ComputedRelationship.java
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/CreatePermission.java b/elide-core/src/main/java/com/yahoo/elide/annotation/CreatePermission.java
new file mode 100644
index 0000000000..7416900261
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/CreatePermission.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Assign custom Create permission checks.
+ */
+@Target({TYPE, PACKAGE, METHOD, FIELD})
+@Retention(RUNTIME)
+@Inherited
+public @interface CreatePermission {
+
+    /**
+     * An expression of checks that will be parsed via ANTLR. For example:
+     * {@code @CreatePermission(expression="Prefab.Role.All")} or
+     * {@code @CreatePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
+     *
+     * All of {@linkplain com.yahoo.elide.core.security.checks.prefab the built-in checks} are name-spaced as
+     * {@code Prefab.CHECK} without the {@code Check} suffix
+     *
+     * @return the expression string to be parsed
+     */
+    String expression() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/DeletePermission.java b/elide-core/src/main/java/com/yahoo/elide/annotation/DeletePermission.java
new file mode 100644
index 0000000000..2fcbbb8e7f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/DeletePermission.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Assign custom Delete permission checks.
+ */
+@Target({TYPE, PACKAGE})
+@Retention(RUNTIME)
+@Inherited
+public @interface DeletePermission {
+
+    /**
+     * An expression of checks that will be parsed via ANTLR. For example:
+     * {@code @DeletePermission(expression="Prefab.Role.All")} or
+     * {@code @DeletePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
+     *
+     * All of {@linkplain com.yahoo.elide.core.security.checks.prefab the built-in checks} are name-spaced as
+     * {@code Prefab.CHECK} without the {@code Check} suffix
+     *
+     * @return the expression string to be parsed
+     */
+    String expression() default "";
+}
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Exclude.java b/elide-core/src/main/java/com/yahoo/elide/annotation/Exclude.java
similarity index 93%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/Exclude.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/Exclude.java
index 8e4ea3bbc2..60dcce6e1e 100644
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Exclude.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/Exclude.java
@@ -5,21 +5,19 @@
  */
 package com.yahoo.elide.annotation;
 
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Restricts access to given entity or entity attribute/relationship.
  */
 @Target({METHOD, FIELD, TYPE, PACKAGE})
 @Retention(RUNTIME)
-@Inherited
 public @interface Exclude {
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/FilterExpressionPath.java b/elide-core/src/main/java/com/yahoo/elide/annotation/FilterExpressionPath.java
new file mode 100644
index 0000000000..6f924071ec
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/FilterExpressionPath.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Builds multi-bean properties path for FilterExpressionCheck.
+ * <pre>
+ * <code>
+ *  &#64;Transient
+ *  &#64;ComputedRelationship
+ *  &#64;OneToOne
+ *  &#64;FilterExpressionPath("publisher.editor")
+ *  &#64;ReadPermission(expression = "Field path editor check")
+ *  public Author getEditor() {
+ *    return getPublisher().getEditor();
+ *  }
+ * </code>
+ * </pre>
+ */
+@Target({ METHOD, FIELD })
+@Retention(RUNTIME)
+public @interface FilterExpressionPath {
+    String value();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/Include.java b/elide-core/src/main/java/com/yahoo/elide/annotation/Include.java
new file mode 100644
index 0000000000..2910271f69
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/Include.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Allows access to given entity.
+ */
+@Target({TYPE, PACKAGE})
+@Retention(RUNTIME)
+public @interface Include {
+
+    /**
+     * (Optional) Whether or not the entity can be accessed at the root URL path (i.e. /company).
+     * @return the boolean
+     */
+    boolean rootLevel() default true;
+
+    /**
+     * When annotating a type, the name of the model.  When unset, the model name defaults to the
+     * simple name of the entity class.
+     *
+     * When annotation a package, the prefix to apply (prefix_modelName) to apply to each model in the package.
+     * @return the string
+     */
+    String name() default "";
+
+    /**
+     * The model or package description.
+     * @return the string
+     */
+    String description() default "";
+
+    /**
+     * The model or package friendly name (for display).
+     * @return the string
+     */
+    String friendlyName() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBinding.java b/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBinding.java
new file mode 100644
index 0000000000..b1e0931131
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBinding.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Executes arbitrary logic (a lifecycle hook) when an Elide model is read or written.
+ */
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(LifeCycleHookBindings.class)
+public @interface LifeCycleHookBinding {
+
+    Operation [] ALL_OPERATIONS = {
+            Operation.CREATE,
+            Operation.UPDATE,
+            Operation.DELETE
+    };
+
+    enum Operation {
+        CREATE,
+        UPDATE,
+        DELETE
+    };
+
+    enum TransactionPhase {
+        PRESECURITY,
+        PREFLUSH,
+        PRECOMMIT,
+        POSTCOMMIT
+    }
+
+    /**
+     * The function to invoke when this life cycle triggers.
+     * @return the function class.
+     */
+    Class<? extends LifeCycleHook> hook();
+
+    /**
+     * Which CRUD operation to trigger on.
+     * @return CREATE, READ, UPDATE, or DELETE
+     */
+    Operation operation();
+
+    /**
+     * Which transaction phase to trigger on.
+     * @return PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     */
+    TransactionPhase phase() default TransactionPhase.PRECOMMIT;
+
+    /**
+     * Controls how often the hook is invoked:
+     * A hook is invoked once per class per request (when bound to the model).
+     * A hook is invoked once per field per request (when bound to a model field or method).
+     * A hook is invoked one or more times per class per request (when bound to a model and oncePerRequest is false).
+     * @return true or false.
+     */
+    boolean oncePerRequest() default true;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBindings.java b/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBindings.java
new file mode 100644
index 0000000000..5a030a0b0b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBindings.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A group of repeatable LifeCycleHookBinding annotations.
+ */
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LifeCycleHookBindings {
+    LifeCycleHookBinding[] value();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/MappedInterface.java b/elide-core/src/main/java/com/yahoo/elide/annotation/MappedInterface.java
new file mode 100644
index 0000000000..a136a53e5a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/MappedInterface.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Used to annotate interfaces that represent mapped entities.
+ * Used for returning non related entities, for examaple from HQL or @Any mapped methods.
+ */
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface MappedInterface {
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/NonTransferable.java b/elide-core/src/main/java/com/yahoo/elide/annotation/NonTransferable.java
new file mode 100644
index 0000000000..55d72065d7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/NonTransferable.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks that the given entity cannot be added to another collection after creation of the entity.
+ */
+@Target({TYPE, PACKAGE})
+@Retention(RUNTIME)
+@Inherited
+public @interface NonTransferable {
+
+    /**
+     * If NonTransferable is used at the package level, it can be disabled for individual entities by setting
+     * this flag to false.
+     * @return true if enabled.
+     */
+    boolean enabled() default true;
+
+    /**
+     * Non-strict allows nested object hierarchies of non-transferables that are created in more than one
+     * client request.  A non-transferable, A, can have a relationship updated post creation IF:
+     *  - Another non-transferable, B, is being added to it.
+     *  - A is the request lineage of B.  For example, /A/1/B is the request path.
+     */
+    boolean strict() default false;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePostCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePostCommit.java
new file mode 100644
index 0000000000..cfb3aa00f0
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePostCommit.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Post-create hook. This annotation marks a callback that is triggered when a user performs a "create" action.
+ * This hook will be triggered <em>after</em> all security checks have been run and <em>after</em> the datastore
+ * has been committed.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnCreatePostCommit {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is created.
+     * If value is "*", then this method will be triggered once for each field that
+     * the user sent in the creation request.
+     *
+     * @return the field name that triggers the method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreCommit.java
new file mode 100644
index 0000000000..193116d2a7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreCommit.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Pre-create hook. This annotation marks a callback that is triggered when a user performs a "create" action.
+ * This hook will be triggered <em>after</em> all security checks have been run, but <em>before</em> the datastore
+ * has been committed.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnCreatePreCommit {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is created.
+     * If value is "*", then this method will be triggered once for each field that
+     * the user sent in the creation request.
+     *
+     * @return the field name that triggers the method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreSecurity.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreSecurity.java
new file mode 100644
index 0000000000..64b53128dd
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnCreatePreSecurity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * On Create trigger annotation.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnCreatePreSecurity {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is created.
+     * If value is "*", then this method will be triggered once for each field that
+     * the user sent in the creation request.
+     *
+     * @return the field name that triggers the method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePostCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePostCommit.java
new file mode 100644
index 0000000000..e807561682
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePostCommit.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Post-delete hook. This annotation marks a callback that is triggered when a user performs a "delete" action.
+ * This hook will be triggered <em>after</em> all security checks have been run and <em>after</em> the datastore
+ * has been committed.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnDeletePostCommit {
+
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreCommit.java
new file mode 100644
index 0000000000..e47f92fb36
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreCommit.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Pre-delete hook. This annotation marks a callback that is triggered when a user performs a "delete" action.
+ * This hook will be triggered <em>after</em> all security checks have been run, but <em>before</em> the datastore
+ * has been committed.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnDeletePreCommit {
+
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreSecurity.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreSecurity.java
new file mode 100644
index 0000000000..983a3fd5af
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnDeletePreSecurity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * On Delete trigger annotation.
+ *
+ * The invoked function takes a RequestScope as parameter.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnDeletePreSecurity {
+
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePostCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePostCommit.java
new file mode 100644
index 0000000000..b19051b187
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePostCommit.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Post-update hook. This annotation marks a callback that is triggered when a user performs a "update" action.
+ * This hook will be triggered <em>after</em> all security checks have been run and <em>after</em> the datastore
+ * has been committed.
+ * <p>
+ * The invoked function takes a RequestScope as parameter.
+ *
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnUpdatePostCommit {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is updated.
+     * If value is "*", then trigger for all field modifications.
+     *
+     * @return the field name that triggers this method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreCommit.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreCommit.java
new file mode 100644
index 0000000000..ebb521a76e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreCommit.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Pre-update hook. This annotation marks a callback that is triggered when a user performs a "update" action.
+ * This hook will be triggered <em>after</em> all security checks have been run, but <em>before</em> the datastore
+ * has been committed.
+ * <p>
+ * The invoked function takes a RequestScope as parameter.
+ *
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnUpdatePreCommit {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is updated.
+     * If value is "*", then trigger for all field modifications.
+     *
+     * @return the field name that triggers the method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreSecurity.java b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreSecurity.java
new file mode 100644
index 0000000000..9c1b1d4f0a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/OnUpdatePreSecurity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * On Update trigger annotation.
+ * <p>
+ * The invoked function takes a RequestScope as parameter.
+ *
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
+public @interface OnUpdatePreSecurity {
+    /**
+     * Field name on which the annotated method is only triggered if that field is modified.
+     * If value is empty string, then trigger once when the object is updated.
+     * If value is "*", then trigger for all field modifications.
+     *
+     * @return the field name that triggers the method
+     */
+    String value() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/PATCH.java b/elide-core/src/main/java/com/yahoo/elide/annotation/PATCH.java
index c8469dc3db..6c14470923 100644
--- a/elide-core/src/main/java/com/yahoo/elide/annotation/PATCH.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/PATCH.java
@@ -5,14 +5,13 @@
  */
 package com.yahoo.elide.annotation;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-
 import javax.ws.rs.HttpMethod;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 /**
  * Indicates that the annotated method responds to HTTP PATCH requests.
  */
diff --git a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Paginate.java b/elide-core/src/main/java/com/yahoo/elide/annotation/Paginate.java
similarity index 94%
rename from elide-annotations/src/main/java/com/yahoo/elide/annotation/Paginate.java
rename to elide-core/src/main/java/com/yahoo/elide/annotation/Paginate.java
index 0551211f03..6c2bfe8c70 100644
--- a/elide-annotations/src/main/java/com/yahoo/elide/annotation/Paginate.java
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/Paginate.java
@@ -5,15 +5,15 @@
  */
 package com.yahoo.elide.annotation;
 
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 /**
- * Allows pagination options to be set with querying of an entity
+ * Allows pagination options to be set with querying of an entity.
  */
 @Target({TYPE})
 @Retention(RUNTIME)
@@ -21,7 +21,7 @@
 public @interface Paginate {
 
     /**
-     * Whether or not page totals can be requested
+     * Whether or not page totals can be requested.
      * @return the boolean
      */
     boolean countable() default true;
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/ReadPermission.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ReadPermission.java
new file mode 100644
index 0000000000..9cdde29a1d
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/ReadPermission.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Assign custom Read permission checks.
+ */
+@Target({METHOD, FIELD, TYPE, PACKAGE})
+@Retention(RUNTIME)
+@Inherited
+public @interface ReadPermission {
+
+    /**
+     * An expression of checks that will be parsed via ANTLR. For example:
+     * {@code @ReadPermission(expression="Prefab.Role.All")} or
+     * {@code @ReadPermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
+     *
+     * All of {@linkplain com.yahoo.elide.core.security.checks.prefab the built-in checks} are name-spaced as
+     * {@code Prefab.CHECK} without the {@code Check} suffix
+     *
+     * @return the expression string to be parsed
+     */
+    String expression() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/SecurityCheck.java b/elide-core/src/main/java/com/yahoo/elide/annotation/SecurityCheck.java
new file mode 100644
index 0000000000..0285877b91
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/SecurityCheck.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018, the original author or authors.
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A convenience annotation that help you register elide check.
+ * <br><br>
+ * Example: <br>
+ * <pre>
+ * <code>@SecurityCheck("i am an expression")</code>
+ * public static class{@literal Inline<Post>} extends{@literal OperationCheck<Post>} {
+ *   <code>@Override</code>
+ *   public boolean ok(Post object, RequestScope requestScope,
+ *       {@literal Optional<ChangeSpec>} changeSpec) {
+ *     return false;
+ *   }
+ * }
+ * </pre>
+ *
+ * <b>NOTE: </b> The class you annotated must be a {@link com.yahoo.elide.core.security.checks.Check},
+ * otherwise a RuntimeException is thrown.
+ *
+ * @author olOwOlo
+ *
+ * This class is based on https://github.com/illyasviel/elide-spring-boot/blob/master
+ * /elide-spring-boot-autoconfigure/src/main/java/org/illyasviel/elide/spring/boot/annotation/ElideCheck.java
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+public @interface SecurityCheck {
+
+    /**
+     * The expression which will be used for
+     * {@link com.yahoo.elide.annotation.ReadPermission#expression()},
+     * {@link com.yahoo.elide.annotation.UpdatePermission#expression()},
+     * {@link com.yahoo.elide.annotation.CreatePermission#expression()},
+     * {@link com.yahoo.elide.annotation.DeletePermission#expression()}.
+     * @return The expression you want to defined.
+     */
+    String value();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/ToMany.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ToMany.java
new file mode 100644
index 0000000000..9eee221754
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/ToMany.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a method or field as a relationship that should be exposed via Elide Despite JPA bindings.
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface ToMany {
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/ToOne.java b/elide-core/src/main/java/com/yahoo/elide/annotation/ToOne.java
new file mode 100644
index 0000000000..06513a358a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/ToOne.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a method or field as a relationship that should be exposed via Elide Despite JPA bindings.
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface ToOne {
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java b/elide-core/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java
new file mode 100644
index 0000000000..e3db68499c
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/annotation/UpdatePermission.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Assign custom Update permission checks.
+ */
+@Target({METHOD, FIELD, TYPE, PACKAGE})
+@Retention(RUNTIME)
+@Inherited
+public @interface UpdatePermission {
+
+    /**
+     * An expression of checks that will be parsed via ANTLR. For example:
+     * {@code @UpdatePermission(expression="Prefab.Role.All")} or
+     * {@code @UpdatePermission(expression="Prefab.Role.All and Prefab.Role.UpdateOnCreate")}
+     *
+     * All of {@linkplain com.yahoo.elide.core.security.checks.prefab the built-in checks} are name-spaced as
+     * {@code Prefab.CHECK} without the {@code Check} suffix
+     *
+     * @return the expression string to be parsed
+     */
+    String expression() default "";
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/AuditLogger.java b/elide-core/src/main/java/com/yahoo/elide/audit/AuditLogger.java
deleted file mode 100644
index 13f52e3cbc..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/audit/AuditLogger.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.audit;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Base Audit Logger
- * <p>
- * This class uses ThreadLocal list to be thread safe.
- */
-public abstract class AuditLogger {
-    protected final ThreadLocal<List<LogMessage>> messages;
-
-    public AuditLogger() {
-        messages = ThreadLocal.withInitial(() -> { return new ArrayList<>(); });
-    }
-
-    public void log(LogMessage message) {
-        messages.get().add(message);
-    }
-
-    public abstract void commit() throws IOException;
-
-    public void clear() {
-        List<LogMessage> remainingMessages = messages.get();
-        if (remainingMessages != null) {
-            remainingMessages.clear();
-        }
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/LogMessage.java b/elide-core/src/main/java/com/yahoo/elide/audit/LogMessage.java
deleted file mode 100644
index 14f9d479e9..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/audit/LogMessage.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.audit;
-
-import com.yahoo.elide.annotation.Audit;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.ResourceLineage;
-import com.yahoo.elide.security.ChangeSpec;
-import de.odysseus.el.ExpressionFactoryImpl;
-import de.odysseus.el.util.SimpleContext;
-
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.PropertyNotFoundException;
-import javax.el.ValueExpression;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.stream.Collectors;
-
-/**
- * An audit log message that can be logged to a logger.
- */
-public class LogMessage {
-    //Supposedly this is thread safe.
-    private static final ExpressionFactory EXPRESSION_FACTORY = new ExpressionFactoryImpl();
-    private static final String CACHE_SIZE = "5000";
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
-    static {
-        Properties properties = new Properties();
-        properties.put("javax.el.cacheSize", CACHE_SIZE);
-    }
-
-    private final String template;
-    private final PersistentResource record;
-    private final String[] expressions;
-    private final int operationCode;
-    private final Optional<ChangeSpec> changeSpec;
-
-    /**
-     * Construct a log message that does not involve any templating.
-     * @param template - The unsubstituted text that will be logged.
-     * @param code - The operation code of the auditable action.
-     */
-    public LogMessage(String template, int code) {
-        this(template, null, EMPTY_STRING_ARRAY, code, Optional.empty());
-    }
-
-    /**
-     * Construct a log message from an Audit annotation and the record that was updated in some way.
-     * @param audit - The annotation containing the type of operation (UPDATE, DELETE, CREATE)
-     * @param record - The modified record
-     * @param changeSpec - Change spec of modified elements (if logging object change). empty otherwise
-     * @throws InvalidSyntaxException if the Audit annotation has invalid syntax.
-     */
-    public LogMessage(Audit audit, PersistentResource record, Optional<ChangeSpec> changeSpec)
-            throws InvalidSyntaxException {
-        this(audit.logStatement(), record, audit.logExpressions(), audit.operation(), changeSpec);
-    }
-
-    /**
-     * Construct a log message.
-     * @param template - The log message template that requires variable substitution.
-     * @param record - The record which will serve as the data to substitute.
-     * @param expressions - A set of UEL expressions that reference record.
-     * @param code - The operation code of the auditable action.
-     * @throws InvalidSyntaxException the invalid syntax exception
-     */
-    public LogMessage(String template,
-            PersistentResource record,
-            String[] expressions,
-            int code,
-            Optional<ChangeSpec> changeSpec) throws InvalidSyntaxException {
-        this.template = template;
-        this.record = record;
-        this.expressions = expressions;
-        this.operationCode = code;
-        this.changeSpec = changeSpec;
-    }
-
-    /**
-     * Gets operation code.
-     *
-     * @return the operation code
-     */
-    public int getOperationCode() {
-        return operationCode;
-    }
-
-    /**
-     * Gets message.
-     *
-     * @return the message
-     */
-    public String getMessage() {
-        final SimpleContext ctx = new SimpleContext();
-        final SimpleContext singleElementContext = new SimpleContext();
-
-        if (record != null) {
-            /* Create a new lineage which includes the passed in record */
-            ResourceLineage lineage = new ResourceLineage(record.getLineage(), record);
-
-            for (String name : lineage.getKeys()) {
-                List<PersistentResource> values = lineage.getRecord(name);
-
-                final ValueExpression expression;
-                final ValueExpression singleElementExpression;
-                if (values.size() == 1) {
-                    expression = EXPRESSION_FACTORY.createValueExpression(values.get(0).getObject(), Object.class);
-                    singleElementExpression = expression;
-                } else {
-                    List<Object> objects = values.stream().map(PersistentResource::getObject)
-                            .collect(Collectors.toList());
-                    expression = EXPRESSION_FACTORY.createValueExpression(objects, List.class);
-                    singleElementExpression = EXPRESSION_FACTORY.createValueExpression(values.get(values.size() - 1)
-                            .getObject(), Object.class);
-                }
-                ctx.setVariable(name, expression);
-                singleElementContext.setVariable(name, singleElementExpression);
-            }
-        }
-
-        Object[] results = new Object[expressions.length];
-        for (int idx = 0; idx < results.length; idx++) {
-            String expressionText = expressions[idx];
-
-            final ValueExpression expression;
-            final ValueExpression singleElementExpression;
-            try {
-                expression = EXPRESSION_FACTORY.createValueExpression(ctx, expressionText, Object.class);
-                singleElementExpression =
-                        EXPRESSION_FACTORY.createValueExpression(singleElementContext, expressionText, Object.class);
-            } catch (ELException e) {
-                throw new InvalidSyntaxException(e);
-            }
-
-            Object result;
-            try {
-                // Single element expressions are intended to allow for access to ${entityType.field} when there are
-                // multiple "entityType" types listed in the lineage. Without this, any access to an entityType
-                // without an explicit list index would otherwise result in a 500. Similarly, since we already
-                // supported lists (i.e. the ${entityType[idx].field} syntax), this also continues to support that.
-                // It should be noted, however, that list indexing is somewhat brittle unless properly accounted for
-                // from all possible paths.
-                result = singleElementExpression.getValue(singleElementContext);
-            } catch (PropertyNotFoundException e) {
-                // Try list syntax if not single element
-                result = expression.getValue(ctx);
-            }
-            results[idx] = result;
-        }
-
-        try {
-            return MessageFormat.format(template, results);
-        } catch (IllegalArgumentException e) {
-            throw new InvalidSyntaxException(e);
-        }
-    }
-
-    public RequestScope getRequestScope() {
-        if (record != null) {
-            return record.getRequestScope();
-        }
-        return null;
-    }
-
-    public Optional<ChangeSpec> getChangeSpec() {
-        return changeSpec;
-    }
-
-    @Override
-    public String toString() {
-        return "LogMessage{"
-                + "message='" + getMessage() + '\''
-                + ", operationCode=" + getOperationCode()
-                + '}';
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/CheckInstantiator.java b/elide-core/src/main/java/com/yahoo/elide/core/CheckInstantiator.java
deleted file mode 100644
index d5fac500fb..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/CheckInstantiator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.security.checks.Check;
-
-/**
- * Get new instances of a check from a check identifier in an expression.
- */
-public interface CheckInstantiator {
-    /**
-     * Gets a check instance by first checking the entity dictionary for a mapping on the provided identifier.
-     * In the event that no such mapping is found the identifier is used as a canonical name.
-     * @param dictionary the entity dictionary to search for a mapping
-     * @param checkName the identifier of the check to instantiate
-     * @return the check instance
-     * @throws IllegalArgumentException if there is no mapping for {@code checkName} and {@code checkName} is not
-     *         a canonical identifier
-     */
-    default Check getCheck(EntityDictionary dictionary, String checkName) {
-        Class<? extends Check> checkCls = dictionary.getCheck(checkName);
-        return instantiateCheck(checkCls);
-    }
-
-    /**
-     * Instantiates a new instance of a check.
-     * @param checkCls the check class to instantiate
-     * @return the instance of the check
-     * @throws IllegalArgumentException if the check class cannot be instantiated with a zero argument constructor
-     */
-    default Check instantiateCheck(Class<? extends Check> checkCls) {
-        try {
-            return checkCls.newInstance();
-        } catch (InstantiationException | IllegalAccessException | NullPointerException e) {
-            String checkName = (checkCls != null) ? checkCls.getName() : "null";
-            throw new IllegalArgumentException("Could not instantiate specified check '" + checkName + "'.", e);
-        }
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/DataStoreTransaction.java b/elide-core/src/main/java/com/yahoo/elide/core/DataStoreTransaction.java
deleted file mode 100644
index 529eb8cb79..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/DataStoreTransaction.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import com.yahoo.elide.security.User;
-
-import java.io.Closeable;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Wraps the Database Transaction type.
- */
-public interface DataStoreTransaction extends Closeable {
-
-    /**
-     * Wrap the opaque user.
-     *
-     * @param opaqueUser the opaque user
-     * @return wrapped user context
-     */
-    default User accessUser(Object opaqueUser) {
-        return new User(opaqueUser);
-    }
-
-    /**
-     * Save entity to database table.  Save is called after commit checks have evaluated but before the final
-     * transaction commit.
-     *
-     * @param entity record to save
-     */
-    void save(Object entity);
-
-    /**
-     * Delete entity from database table.
-     *
-     * @param entity record to delete
-     */
-    void delete(Object entity);
-
-    /**
-     * Write any outstanding entities before processing response.
-     */
-    default void flush() {
-    }
-
-    /**
-     * End the current transaction.
-     */
-    void commit();
-
-    /**
-     * Called before commit checks are evaluated and before save, flush, and commit are called.
-     * The sequence goes:
-     * 1. transaction.preCommit();
-     * 2. Invoke security checks evaluated at commit time
-     * 3. transaction.save(...); - Invoked for every object which changed in the transaction.
-     * 4. transaction.flush();
-     * 5. transaction.commit();
-     */
-    default void preCommit() {
-
-    }
-
-    /**
-     * Create new entity record.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @return new record
-     */
-    <T> T createObject(Class<T> entityClass);
-
-    /**
-     * Read entity record from database table.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @param id          ID of object
-     * @return record t
-     */
-    <T> T loadObject(Class<T> entityClass, Serializable id);
-
-    default <T> T loadObject(Class<T> entityClass, Serializable id, Optional<FilterExpression> filterExpression) {
-        return loadObject(entityClass, id);
-    }
-
-    /**
-     * Read entity records from database table.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @return records iterable
-     */
-    @Deprecated
-    <T> Iterable<T> loadObjects(Class<T> entityClass);
-
-    /**
-     * Read entity records from database table with applied criteria.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @param filterScope scope for filter processing
-     * @return records iterable
-     */
-    default <T> Iterable<T> loadObjects(Class<T> entityClass, FilterScope filterScope) {
-        // default to ignoring criteria
-        return loadObjects(entityClass);
-    }
-
-
-    /**
-     * Read entity records from database table with applied criteria.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @param filterScope scope for filter processing
-     * @return records iterable
-     */
-    default <T> Iterable<T> loadObjectsWithSortingAndPagination(Class<T> entityClass, FilterScope filterScope) {
-        return loadObjects(entityClass, filterScope);
-    }
-
-    /**
-     * Get total count of entity records satisfying the given filter.
-     *
-     * @param <T>         the type parameter
-     * @param entityClass the entity class
-     * @return total matching entities
-     */
-    default <T> Long getTotalRecords(Class<T> entityClass) {
-        // default to no records
-        return 0L;
-    }
-
-
-    /**
-     * Filter a collection by the Predicates in filterScope.
-     *
-     * @param <T>         the type parameter
-     * @param collection  the collection to filter
-     * @param entityClass the class of the entities in the collection
-     * @param predicates  the set of Predicate's to filter by
-     * @return the filtered collection
-     * @deprecated Since 2.4, instead implement the filtering logic in detail methods in implementations
-     */
-    @Deprecated
-    default <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
-        return collection;
-    }
-
-   /**
-     * Filter Sort and Paginate a collection in filterScope or requestScope.
-     * @param collection The collection
-     * @param dictionary The entity dictionary
-     * @param entityClass The class of the entities in the collection
-     * @param filters The optional set of Predicate's to filter by
-     * @param sorting The optional Sorting object
-     * @param pagination The optional Pagination object
-     * @param <T> The type parameter
-     * @return The optionally filtered, sorted and paginated collection
-     * @deprecated Since 2.4, instead implement the filtering logic in detail methods in implementations
-     */
-    @Deprecated
-    default <T> Collection filterCollectionWithSortingAndPagination(Collection collection, Class<T> entityClass,
-                                                          EntityDictionary dictionary, Optional<Set<Predicate>> filters,
-                                                          Optional<Sorting> sorting, Optional<Pagination> pagination) {
-        return collection;
-    }
-
-    @Deprecated
-    default <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters
-    ) {
-        Object val = PersistentResource.getValue(entity, relationName, dictionary);
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-
-            if (!filters.isEmpty()) {
-                filteredVal = filterCollection(filteredVal, relationClass, filters);
-            }
-            return filteredVal;
-        }
-
-        return val;
-    }
-
-    default <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Optional<FilterExpression> filterExpression,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        return PersistentResource.getValue(entity, relationName, dictionary);
-    }
-
-
-    @Deprecated
-    default <T> Object getRelationWithSortingAndPagination(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        Object val = PersistentResource.getValue(entity, relationName, dictionary);
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-            Optional<Sorting> sortingRules = Optional.ofNullable(sorting);
-            Optional<Pagination> paginationRules = Optional.ofNullable(pagination);
-            filteredVal = filterCollectionWithSortingAndPagination(filteredVal, relationClass, dictionary,
-                    Optional.of(filters), sortingRules, paginationRules);
-            return filteredVal;
-        }
-        return val;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/EntityBinding.java b/elide-core/src/main/java/com/yahoo/elide/core/EntityBinding.java
deleted file mode 100644
index 5d783de9b9..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/EntityBinding.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.ComputedAttribute;
-import com.yahoo.elide.annotation.ComputedRelationship;
-import com.yahoo.elide.annotation.Exclude;
-import com.yahoo.elide.annotation.OnCommit;
-import com.yahoo.elide.annotation.OnCreate;
-import com.yahoo.elide.annotation.OnDelete;
-import com.yahoo.elide.annotation.OnUpdate;
-import com.yahoo.elide.core.exceptions.DuplicateMappingException;
-
-import org.apache.commons.collections4.MultiValuedMap;
-import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
-import org.apache.commons.lang3.text.WordUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Transient;
-
-/**
- * Entity Dictionary maps JSON API Entity beans to/from Entity type names.
- *
- * @see com.yahoo.elide.annotation.Include#type
- */
-class EntityBinding {
-
-    private static final List<Method> OBJ_METHODS = Arrays.asList(Object.class.getMethods());
-
-    public final Class<?> entityClass;
-    public final String jsonApiType;
-    @Getter private AccessibleObject idField;
-    @Getter private String idFieldName;
-    @Getter private Class<?> idType;
-    @Getter @Setter private Initializer initializer;
-
-    public final EntityPermissions entityPermissions;
-    public final List<String> attributes;
-    public final List<String> relationships;
-    public final ConcurrentLinkedDeque<String> attributesDeque = new ConcurrentLinkedDeque<>();
-    public final ConcurrentLinkedDeque<String> relationshipsDeque = new ConcurrentLinkedDeque<>();
-
-    public final ConcurrentHashMap<String, RelationshipType> relationshipTypes = new ConcurrentHashMap<>();
-    public final ConcurrentHashMap<String, String> relationshipToInverse = new ConcurrentHashMap<>();
-    public final ConcurrentHashMap<String, AccessibleObject> fieldsToValues = new ConcurrentHashMap<>();
-    public final MultiValuedMap<Pair<Class, String>, Method> fieldsToTriggers = new HashSetValuedHashMap<>();
-    public final ConcurrentHashMap<String, Class<?>> fieldsToTypes = new ConcurrentHashMap<>();
-    public final ConcurrentHashMap<String, String> aliasesToFields = new ConcurrentHashMap<>();
-
-    public final ConcurrentHashMap<Class<? extends Annotation>, Annotation> annotations = new ConcurrentHashMap<>();
-
-    public static final EntityBinding EMPTY_BINDING = new EntityBinding();
-
-    /* empty binding constructor */
-    private EntityBinding() {
-        jsonApiType = null;
-        idField = null;
-        idType = null;
-        attributes = null;
-        relationships = null;
-        entityClass = null;
-        entityPermissions = EntityPermissions.EMPTY_PERMISSIONS;
-    }
-
-    public EntityBinding(EntityDictionary dictionary, Class<?> cls, String type) {
-        entityClass = cls;
-        jsonApiType = type;
-
-        // Map id's, attributes, and relationships
-        List<AccessibleObject> fieldOrMethodList = new ArrayList<>();
-        fieldOrMethodList.addAll(Arrays.asList(cls.getFields()));
-        fieldOrMethodList.addAll(Arrays.asList(cls.getMethods()));
-
-        bindEntityFields(cls, type, fieldOrMethodList);
-
-        attributes = dequeToList(attributesDeque);
-        relationships = dequeToList(relationshipsDeque);
-        entityPermissions = new EntityPermissions(dictionary, cls, fieldOrMethodList);
-    }
-
-    /**
-     * Bind fields of an entity including the Id field, attributes, and relationships.
-     *
-     * @param cls Class type to bind fields
-     * @param type JSON API type identifier
-     * @param fieldOrMethodList List of fields and methods on entity
-     */
-    private void bindEntityFields(Class<?> cls, String type, Collection<AccessibleObject> fieldOrMethodList) {
-        for (AccessibleObject fieldOrMethod : fieldOrMethodList) {
-            bindTriggerIfPresent(OnCreate.class, fieldOrMethod);
-            bindTriggerIfPresent(OnDelete.class, fieldOrMethod);
-            bindTriggerIfPresent(OnUpdate.class, fieldOrMethod);
-            bindTriggerIfPresent(OnCommit.class, fieldOrMethod);
-
-            if (fieldOrMethod.isAnnotationPresent(Id.class)) {
-                bindEntityId(cls, type, fieldOrMethod);
-            } else if (fieldOrMethod.isAnnotationPresent(Transient.class)
-                    && !fieldOrMethod.isAnnotationPresent(ComputedAttribute.class)
-                    && !fieldOrMethod.isAnnotationPresent(ComputedRelationship.class)) {
-                continue; // Transient. Don't serialize
-            } else if (!fieldOrMethod.isAnnotationPresent(Exclude.class)) {
-                if (fieldOrMethod instanceof Field && Modifier.isTransient(((Field) fieldOrMethod).getModifiers())) {
-                    continue; // Transient. Don't serialize
-                }
-                if (fieldOrMethod instanceof Method && Modifier.isTransient(((Method) fieldOrMethod).getModifiers())) {
-                    continue; // Transient. Don't serialize
-                }
-                if (fieldOrMethod instanceof Field
-                        && !fieldOrMethod.isAnnotationPresent(Column.class)
-                        && Modifier.isStatic(((Field) fieldOrMethod).getModifiers())) {
-                    continue; // Field must have Column annotation?
-                }
-                bindAttrOrRelation(cls, fieldOrMethod);
-            }
-        }
-    }
-
-    /**
-     * Bind an id field to an entity.
-     *
-     * @param cls Class type to bind fields
-     * @param type JSON API type identifier
-     * @param fieldOrMethod Field or method to bind
-     */
-    private void bindEntityId(Class<?> cls, String type, AccessibleObject fieldOrMethod) {
-        String fieldName = getFieldName(fieldOrMethod);
-        Class<?> fieldType = getFieldType(fieldOrMethod);
-
-        //Add id field to type map for the entity
-        fieldsToTypes.put(fieldName, fieldType);
-
-        //Set id field, type, and name
-        idField = fieldOrMethod;
-        idType = fieldType;
-        idFieldName = fieldName;
-
-        fieldsToValues.put(fieldName, fieldOrMethod);
-
-        if (idField != null && !fieldOrMethod.equals(idField)) {
-            throw new DuplicateMappingException(type + " " + cls.getName() + ":" + fieldName);
-        }
-    }
-
-    /**
-     * Convert a deque to a list.
-     *
-     * @param deque Deque to convert
-     * @return Deque as a list
-     */
-    private static List<String> dequeToList(final Deque<String> deque) {
-        ArrayList<String> result = new ArrayList<>();
-        deque.stream().forEachOrdered(result::add);
-        result.sort(String.CASE_INSENSITIVE_ORDER);
-        return Collections.unmodifiableList(result);
-    }
-
-    /**
-     * Bind an attribute or relationship.
-     *
-     * @param cls Class type to bind fields
-     * @param fieldOrMethod Field or method to bind
-     */
-    private void bindAttrOrRelation(Class<?> cls, AccessibleObject fieldOrMethod) {
-        boolean manyToMany = fieldOrMethod.isAnnotationPresent(ManyToMany.class);
-        boolean manyToOne = fieldOrMethod.isAnnotationPresent(ManyToOne.class);
-        boolean oneToMany = fieldOrMethod.isAnnotationPresent(OneToMany.class);
-        boolean oneToOne = fieldOrMethod.isAnnotationPresent(OneToOne.class);
-        boolean computedRelationship = fieldOrMethod.isAnnotationPresent(ComputedRelationship.class);
-        boolean isRelation = manyToMany || manyToOne || oneToMany || oneToOne;
-
-        String fieldName = getFieldName(fieldOrMethod);
-
-        if (fieldName == null || fieldName.equals("id")
-                || fieldName.equals("class") || OBJ_METHODS.contains(fieldOrMethod)) {
-            return; // Reserved. Not attributes.
-        }
-
-        Class<?> fieldType = getFieldType(fieldOrMethod);
-
-        ConcurrentLinkedDeque<String> fieldList;
-        if (isRelation) {
-            fieldList = relationshipsDeque;
-            RelationshipType type;
-            String mappedBy;
-            if (oneToMany) {
-                type = computedRelationship ? RelationshipType.COMPUTED_ONE_TO_MANY : RelationshipType.ONE_TO_MANY;
-                mappedBy = fieldOrMethod.getAnnotation(OneToMany.class).mappedBy();
-            } else if (oneToOne) {
-                type = computedRelationship ? RelationshipType.COMPUTED_ONE_TO_ONE : RelationshipType.ONE_TO_ONE;
-                mappedBy = fieldOrMethod.getAnnotation(OneToOne.class).mappedBy();
-            } else if (manyToMany) {
-                type = computedRelationship ? RelationshipType.COMPUTED_MANY_TO_MANY : RelationshipType.MANY_TO_MANY;
-                mappedBy = fieldOrMethod.getAnnotation(ManyToMany.class).mappedBy();
-            } else if (manyToOne) {
-                type = computedRelationship ? RelationshipType.COMPUTED_MANY_TO_ONE : RelationshipType.MANY_TO_ONE;
-                mappedBy = "";
-            } else {
-                type = computedRelationship ? RelationshipType.COMPUTED_NONE : RelationshipType.NONE;
-                mappedBy = "";
-            }
-            relationshipTypes.put(fieldName, type);
-            relationshipToInverse.put(fieldName, mappedBy);
-        } else {
-            fieldList = attributesDeque;
-        }
-
-        fieldList.push(fieldName);
-        fieldsToValues.put(fieldName, fieldOrMethod);
-        fieldsToTypes.put(fieldName, fieldType);
-    }
-
-    /**
-     * Returns name of field whether public member or method.
-     *
-     * @param fieldOrMethod field or method
-     * @return field or method name
-     */
-    public static String getFieldName(AccessibleObject fieldOrMethod) {
-        if (fieldOrMethod instanceof Field) {
-            return ((Field) fieldOrMethod).getName();
-        } else {
-            Method method = (Method) fieldOrMethod;
-            String name = method.getName();
-
-            if (name.startsWith("get") && method.getParameterCount() == 0) {
-                name = WordUtils.uncapitalize(name.substring("get".length()));
-            } else if (name.startsWith("is") && method.getParameterCount() == 0) {
-                name = WordUtils.uncapitalize(name.substring("is".length()));
-            } else {
-                return null;
-            }
-            return name;
-        }
-    }
-
-    /**
-     * Returns type of field whether public member or method.
-     *
-     * @param fieldOrMethod field or method
-     * @return field type
-     */
-    private static Class<?> getFieldType(AccessibleObject fieldOrMethod) {
-        if (fieldOrMethod instanceof Field) {
-            return ((Field) fieldOrMethod).getType();
-        } else {
-            return ((Method) fieldOrMethod).getReturnType();
-        }
-    }
-
-    private void bindTriggerIfPresent(Class<? extends Annotation> annotationClass, AccessibleObject fieldOrMethod) {
-        if (fieldOrMethod instanceof Method && fieldOrMethod.isAnnotationPresent(annotationClass)) {
-            Annotation trigger = fieldOrMethod.getAnnotation(annotationClass);
-            String value;
-            try {
-                value = (String) annotationClass.getMethod("value").invoke(trigger);
-            } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
-                value = "";
-            }
-            fieldsToTriggers.put(Pair.of(annotationClass, value), (Method) fieldOrMethod);
-        }
-    }
-
-    public <A extends Annotation> Collection<Method> getTriggers(Class<A> annotationClass, String fieldName) {
-        Collection<Method> methods = fieldsToTriggers.get(Pair.of(annotationClass, fieldName));
-        return methods == null ? Collections.emptyList() : methods;
-    }
-
-    /**
-     * Cache placeholder for no annotation.
-     */
-    private static final Annotation NO_ANNOTATION = new Annotation() {
-        @Override
-        public Class<? extends Annotation> annotationType() {
-            return null;
-        }
-    };
-
-    /**
-     * Return annotation from class, parents or package.
-     *
-     * @param annotationClass the annotation class
-     * @param <A> annotation type
-     * @return the annotation
-     */
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        Annotation annotation = annotations.get(annotationClass);
-        if (annotation == null) {
-            annotation = EntityDictionary.getFirstAnnotation(entityClass, Collections.singletonList(annotationClass));
-            if (annotation == null) {
-                annotation = NO_ANNOTATION;
-            }
-            annotations.putIfAbsent(annotationClass, annotation);
-        }
-        return annotation == NO_ANNOTATION ? null : (A) annotation;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/EntityDictionary.java b/elide-core/src/main/java/com/yahoo/elide/core/EntityDictionary.java
deleted file mode 100644
index 785d0a2134..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/EntityDictionary.java
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.ComputedAttribute;
-import com.yahoo.elide.annotation.ComputedRelationship;
-import com.yahoo.elide.annotation.Exclude;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.core.exceptions.DuplicateMappingException;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.prefab.Collections.AppendOnly;
-import com.yahoo.elide.security.checks.prefab.Collections.RemoveOnly;
-import com.yahoo.elide.security.checks.prefab.Common;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Maps;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.commons.lang3.text.WordUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
-/**
- * Entity Dictionary maps JSON API Entity beans to/from Entity type names.
- *
- * @see Include#type
- */
-@Slf4j
-@SuppressWarnings("static-method")
-public class EntityDictionary {
-
-    protected final ConcurrentHashMap<String, Class<?>> bindJsonApiToEntity = new ConcurrentHashMap<>();
-    protected final ConcurrentHashMap<Class<?>, EntityBinding> entityBindings = new ConcurrentHashMap<>();
-    protected final CopyOnWriteArrayList<Class<?>> bindEntityRoots = new CopyOnWriteArrayList<>();
-    protected final BiMap<String, Class<? extends Check>> checkNames;
-
-    /**
-     * Instantiates a new Entity dictionary.
-     * @deprecated As of 2.2, {@link #EntityDictionary(Map)} is preferred.
-     */
-    @Deprecated
-    public EntityDictionary() {
-        this(new ConcurrentHashMap<>());
-    }
-
-    /**
-     * Instantiate a new EntityDictionary with the provided set of checks. In addition all of the checks
-     * in {@link com.yahoo.elide.security.checks.prefab} are mapped to {@code Prefab.CONTAINER.CHECK}
-     * (e.g. {@code @ReadPermission(expression="Prefab.Role.All")}
-     * or {@code @ReadPermission(expression="Prefab.Common.UpdateOnCreate")})
-     * @param checks a map that links the identifiers used in the permission expression strings
-     *               to their implementing classes
-     */
-    public EntityDictionary(Map<String, Class<? extends Check>> checks) {
-        checkNames = Maps.synchronizedBiMap(HashBiMap.create(checks));
-
-        addPrefabCheck("Prefab.Role.All", Role.ALL.class);
-        addPrefabCheck("Prefab.Role.None", Role.NONE.class);
-        addPrefabCheck("Prefab.Collections.AppendOnly", AppendOnly.class);
-        addPrefabCheck("Prefab.Collections.RemoveOnly", RemoveOnly.class);
-        addPrefabCheck("Prefab.Common.UpdateOnCreate", Common.UpdateOnCreate.class);
-    }
-
-    private void addPrefabCheck(String alias, Class<? extends Check> checkClass) {
-        if (checkNames.containsKey(alias) || checkNames.inverse().containsKey(checkClass)) {
-            return;
-        }
-
-        checkNames.put(alias, checkClass);
-    }
-
-    private static Package getParentPackage(Package pkg) {
-        String name = pkg.getName();
-        int idx = name.lastIndexOf('.');
-        return idx == -1 ? null : Package.getPackage(name.substring(0, idx));
-    }
-
-    /**
-     * Find an arbitrary method.
-     *
-     * @param entityClass the entity class
-     * @param name        the name
-     * @param paramClass  the param class
-     * @return method method
-     * @throws NoSuchMethodException the no such method exception
-     */
-    public static Method findMethod(Class<?> entityClass, String name, Class<?>... paramClass)
-            throws NoSuchMethodException {
-        Method m = entityClass.getMethod(name, paramClass);
-        int modifiers = m.getModifiers();
-        if (Modifier.isAbstract(modifiers)
-                || m.isAnnotationPresent(Transient.class)
-                && !m.isAnnotationPresent(ComputedAttribute.class)
-                && !m.isAnnotationPresent(ComputedRelationship.class)) {
-            throw new NoSuchMethodException(name);
-        }
-        return m;
-    }
-
-    protected EntityBinding getEntityBinding(Class<?> entityClass) {
-        return entityBindings.getOrDefault(lookupEntityClass(entityClass), EntityBinding.EMPTY_BINDING);
-    }
-
-    /**
-     * Returns the binding class for a given entity name.
-     *
-     * @param entityName entity name
-     * @return binding class
-     */
-    public Class<?> getEntityClass(String entityName) {
-        return bindJsonApiToEntity.get(entityName);
-    }
-
-    /**
-     * Returns the entity name for a given binding class.
-     *
-     * @param entityClass the entity class
-     * @return binding class
-     */
-    public String getJsonAliasFor(Class<?> entityClass) {
-        return getEntityBinding(entityClass).jsonApiType;
-    }
-
-    /**
-     * Determine if a given (entity class, permission) pair have any permissions defined.
-     *
-     * @param resourceClass the entity class
-     * @param annotationClass the permission annotation
-     * @return {@code true} if that permission is defined anywhere within the class
-     */
-    public boolean entityHasChecksForPermission(Class<?> resourceClass, Class<? extends Annotation> annotationClass) {
-        EntityBinding binding = getEntityBinding(resourceClass);
-        return binding.entityPermissions.hasChecksForPermission(annotationClass);
-    }
-
-    /**
-     * Gets the specified permission definition (if any) at the class level.
-     *
-     * @param resourceClass the entity to check
-     * @param annotationClass the permission to look for
-     * @return a {@code ParseTree} expressing the permissions, if one exists
-     *         or {@code null} if the permission is not specified at a class level
-     */
-    public ParseTree getPermissionsForClass(Class<?> resourceClass,
-                                                       Class<? extends Annotation> annotationClass) {
-        EntityBinding binding = getEntityBinding(resourceClass);
-        return binding.entityPermissions.getClassChecksForPermission(annotationClass);
-    }
-
-    /**
-     * Gets the specified permission definition (if any) at the class level.
-     *
-     * @param resourceClass the entity to check
-     * @param field the field to inspect
-     * @param annotationClass the permission to look for
-     * @return a {@code ParseTree} expressing the permissions, if one exists
-     *         or {@code null} if the permission is not specified on that field
-     */
-    public ParseTree getPermissionsForField(Class<?> resourceClass,
-                                                       String field,
-                                                       Class<? extends Annotation> annotationClass) {
-        EntityBinding binding = getEntityBinding(resourceClass);
-        return binding.entityPermissions.getFieldChecksForPermission(field, annotationClass);
-    }
-
-    /**
-     * Returns the check mapped to a particular identifier.
-     *
-     * @param checkIdentifier the name from the expression string
-     * @return the {@link Check} mapped to the identifier or {@code null} if the given identifer is unmapped
-     */
-    public Class<? extends Check> getCheck(String checkIdentifier) {
-        Class<? extends Check> checkCls = checkNames.get(checkIdentifier);
-
-        if (checkCls == null) {
-            try {
-                checkCls = (Class<? extends Check>) Class.forName(checkIdentifier);
-                try {
-                    checkNames.putIfAbsent(checkIdentifier, checkCls);
-                } catch (IllegalArgumentException e) {
-                    log.error("HELP! {} {} {}", checkIdentifier, checkCls, checkNames.inverse().get(checkCls));
-                    throw e;
-                }
-            } catch (ClassNotFoundException | ClassCastException e) {
-                throw new IllegalArgumentException(
-                        "Could not instantiate specified check '" + checkIdentifier + "'.", e);
-            }
-        }
-
-        return checkCls;
-    }
-
-    /**
-     * Returns the friendly named mapped to this given check.
-     * @param checkClass The class to lookup
-     * @return the friendly name of the check.
-     */
-    public String getCheckIdentifier(Class<? extends Check> checkClass) {
-        String identifier = checkNames.inverse().get(checkClass);
-
-        if (identifier == null) {
-            return checkClass.getName();
-        }
-        return identifier;
-    }
-
-    /**
-     * Returns the name of the id field.
-     *
-     * @param entityClass Entity class
-     * @return id field name
-     */
-    public String getIdFieldName(Class<?> entityClass) {
-        return getEntityBinding(entityClass).getIdFieldName();
-    }
-
-    /**
-     * Get all bindings.
-     *
-     * @return the bindings
-     */
-    public Set<Class<?>> getBindings() {
-        return entityBindings.keySet();
-    }
-
-    /**
-     * Get the check mappings.
-     * @return a map of check mappings this dictionary knows about
-     */
-    public Map<String, Class<? extends Check>> getCheckMappings() {
-        return checkNames;
-    }
-
-    /**
-     * Get the list of attribute names for an entity.
-     *
-     * @param entityClass entity name
-     * @return List of attribute names for entity
-     */
-    public List<String> getAttributes(Class<?> entityClass) {
-        return getEntityBinding(entityClass).attributes;
-    }
-
-    /**
-     * Get the list of attribute names for an entity.
-     *
-     * @param entity entity instance
-     * @return List of attribute names for entity
-     */
-    public List<String> getAttributes(Object entity) {
-        return getAttributes(entity.getClass());
-    }
-
-    /**
-     * Get the list of relationship names for an entity.
-     *
-     * @param entityClass entity name
-     * @return List of relationship names for entity
-     */
-    public List<String> getRelationships(Class<?> entityClass) {
-        return getEntityBinding(entityClass).relationships;
-    }
-
-    /**
-     * Get the list of relationship names for an entity.
-     *
-     * @param entity entity instance
-     * @return List of relationship names for entity
-     */
-    public List<String> getRelationships(Object entity) {
-        return getRelationships(entity.getClass());
-    }
-
-    /**
-     * Get a list of all fields including both relationships and attributes.
-     *
-     * @param entityClass entity name
-     * @return List of all fields.
-     */
-    public List<String> getAllFields(Class<?> entityClass) {
-        List<String> fields = new ArrayList<>();
-
-        List<String> attrs = getAttributes(entityClass);
-        List<String> rels = getRelationships(entityClass);
-
-        if (attrs != null) {
-            fields.addAll(attrs);
-        }
-
-        if (rels != null) {
-            fields.addAll(rels);
-        }
-
-        return fields;
-    }
-
-    /**
-     * Get a list of all fields including both relationships and attributes.
-     *
-     * @param entity entity
-     * @return List of all fields.
-     */
-    public List<String> getAllFields(Object entity) {
-        return getAllFields(entity.getClass());
-    }
-
-    /**
-     * Get the type of relationship from a relation.
-     *
-     * @param cls      Entity class
-     * @param relation Name of relationship field
-     * @return Relationship type. RelationshipType.NONE if is none found.
-     */
-    public RelationshipType getRelationshipType(Class<?> cls, String relation) {
-        final ConcurrentHashMap<String, RelationshipType> types = getEntityBinding(cls).relationshipTypes;
-        if (types == null) {
-            return RelationshipType.NONE;
-        }
-        final RelationshipType type = types.get(relation);
-        return (type == null) ? RelationshipType.NONE : type;
-    }
-
-    /**
-     * If a relationship is bidirectional, returns the name of the peer relationship in the peer entity.
-     *
-     * @param cls      the cls
-     * @param relation the relation
-     * @return relation inverse
-     */
-    public String getRelationInverse(Class<?> cls, String relation) {
-        final EntityBinding clsBinding = getEntityBinding(cls);
-        final ConcurrentHashMap<String, String> mappings = clsBinding.relationshipToInverse;
-        if (mappings != null) {
-            final String mapping = mappings.get(relation);
-
-            if (mapping != null && !mapping.equals("")) {
-                return mapping;
-            }
-        }
-
-        /*
-         * This could be the owning side of the relation.  Let's see if the entity referenced in the relation
-         * has a bidirectional reference that is mapped to the given relation.
-         */
-        final Class<?> inverseType = getParameterizedType(cls, relation);
-        final ConcurrentHashMap<String, String> inverseMappings =
-                getEntityBinding(inverseType).relationshipToInverse;
-
-        for (Map.Entry<String, String> inverseMapping : inverseMappings.entrySet()) {
-            String inverseRelationName = inverseMapping.getKey();
-            String inverseMappedBy = inverseMapping.getValue();
-
-            if (relation.equals(inverseMappedBy)
-                    && getParameterizedType(inverseType, inverseRelationName).equals(clsBinding.entityClass)) {
-                return inverseRelationName;
-            }
-
-        }
-        return "";
-    }
-
-    /**
-     * Get the type of relationship from a relation.
-     *
-     * @param entity   Entity instance
-     * @param relation Name of relationship field
-     * @return Relationship type. RelationshipType.NONE if is none found.
-     */
-    public RelationshipType getRelationshipType(Object entity, String relation) {
-        return getRelationshipType(entity.getClass(), relation);
-    }
-
-    /**
-     * Get a type for a field on an entity.
-     *
-     * @param entityClass Entity class
-     * @param identifier  Field to lookup type
-     * @return Type of entity
-     */
-    public Class<?> getType(Class<?> entityClass, String identifier) {
-        ConcurrentHashMap<String, Class<?>> fieldTypes = getEntityBinding(entityClass).fieldsToTypes;
-        return fieldTypes == null ? null : fieldTypes.get(identifier);
-    }
-
-    /**
-     * Get a type for a field on an entity.
-     *
-     * @param entity     Entity instance
-     * @param identifier Field to lookup type
-     * @return Type of entity
-     */
-    public Class<?> getType(Object entity, String identifier) {
-        return getType(entity.getClass(), identifier);
-    }
-
-    /**
-     * Retrieve the parameterized type for the given field.
-     *
-     * @param entityClass the entity class
-     * @param identifier  the identifier
-     * @return Entity type for field otherwise null.
-     */
-    public Class<?> getParameterizedType(Class<?> entityClass, String identifier) {
-        return getParameterizedType(entityClass, identifier, 0);
-    }
-
-    /**
-     * Retrieve the parameterized type for the given field.
-     *
-     * @param entityClass the entity class
-     * @param identifier  the identifier
-     * @param paramIndex  the index of the parameterization
-     * @return Entity type for field otherwise null.
-     */
-    public Class<?> getParameterizedType(Class<?> entityClass, String identifier, int paramIndex) {
-        ConcurrentHashMap<String, AccessibleObject> fieldOrMethods = getEntityBinding(entityClass).fieldsToValues;
-        if (fieldOrMethods == null) {
-            return null;
-        }
-        AccessibleObject fieldOrMethod = fieldOrMethods.get(identifier);
-        if (fieldOrMethod == null) {
-            return null;
-        }
-
-        Type type;
-
-        if (fieldOrMethod instanceof Method) {
-            type = ((Method) fieldOrMethod).getGenericReturnType();
-        } else {
-            type = ((Field) fieldOrMethod).getGenericType();
-        }
-
-        if (type instanceof ParameterizedType) {
-            return (Class<?>) ((ParameterizedType) type).getActualTypeArguments()[paramIndex];
-        }
-
-        return getType(entityClass, identifier);
-    }
-
-    /**
-     * Retrieve the parameterized type for the given field.
-     *
-     * @param entity     Entity instance
-     * @param identifier Field to lookup
-     * @return Entity type for field otherwise null.
-     */
-    public Class<?> getParameterizedType(Object entity, String identifier) {
-        return getParameterizedType(entity.getClass(), identifier);
-    }
-
-    /**
-     * Retrieve the parameterized type for the given field.
-     *
-     * @param entity     Entity instance
-     * @param identifier Field to lookup
-     * @param paramIndex the index of the parameterization
-     * @return Entity type for field otherwise null.
-     */
-    public Class<?> getParameterizedType(Object entity, String identifier, int paramIndex) {
-        return getParameterizedType(entity.getClass(), identifier, paramIndex);
-    }
-
-    /**
-     * Get the true field/method name from an alias.
-     *
-     * @param entityClass Entity name
-     * @param alias       Alias to convert
-     * @return Real field/method name as a string. null if not found.
-     */
-    public String getNameFromAlias(Class<?> entityClass, String alias) {
-        ConcurrentHashMap<String, String> map = getEntityBinding(entityClass).aliasesToFields;
-        if (map != null) {
-            return map.get(alias);
-        }
-        return null;
-    }
-
-    /**
-     * Get the true field/method name from an alias.
-     *
-     * @param entity Entity instance
-     * @param alias  Alias to convert
-     * @return Real field/method name as a string. null if not found.
-     */
-    public String getNameFromAlias(Object entity, String alias) {
-        return getNameFromAlias(entity.getClass(), alias);
-    }
-
-    /**
-     * Initialize an entity.
-     *
-     * @param <T>    the type parameter
-     * @param entity Entity to initialize
-     */
-    public <T> void initializeEntity(T entity) {
-        if (entity != null) {
-            @SuppressWarnings("unchecked")
-            Initializer<T> initializer = getEntityBinding(entity.getClass()).getInitializer();
-            if (initializer != null) {
-                initializer.initialize(entity);
-            }
-        }
-    }
-
-    /**
-     * Bind a particular initializer to a class.
-     *
-     * @param <T>         the type parameter
-     * @param initializer Initializer to use for class
-     * @param cls         Class to bind initialization
-     */
-    public <T> void bindInitializer(Initializer<T> initializer, Class<T> cls) {
-        getEntityBinding(cls).setInitializer(initializer);
-    }
-
-    /**
-     * Returns whether or not an entity is shareable.
-     *
-     * @param entityClass the entity type to check for the shareable permissions
-     * @return true if entityClass is shareable.  False otherwise.
-     */
-    public boolean isShareable(Class<?> entityClass) {
-        return getAnnotation(entityClass, SharePermission.class) != null;
-    }
-
-    /**
-     * Add given Entity bean to dictionary.
-     *
-     * @param cls Entity bean class
-     */
-    public void bindEntity(Class<?> cls) {
-        Annotation annotation = getFirstAnnotation(cls, Arrays.asList(Include.class, Exclude.class));
-        Include include = annotation instanceof Include ? (Include) annotation : null;
-        Exclude exclude = annotation instanceof Exclude ? (Exclude) annotation : null;
-
-        if (exclude != null) {
-            log.trace("Exclude {}", cls.getName());
-            return;
-        }
-
-        if (include == null) {
-            log.trace("Missing include {}", cls.getName());
-            return;
-        }
-
-        String type;
-        if ("".equals(include.type())) {
-            type = WordUtils.uncapitalize(cls.getSimpleName());
-        } else {
-            type = include.type();
-        }
-
-        Class<?> duplicate = bindJsonApiToEntity.put(type, cls);
-        if (duplicate != null && !duplicate.equals(cls)) {
-            log.error("Duplicate binding {} for {}, {}", type, cls, duplicate);
-            throw new DuplicateMappingException(type + " " + cls.getName() + ":" + duplicate.getName());
-        }
-
-        entityBindings.putIfAbsent(lookupEntityClass(cls), new EntityBinding(this, cls, type));
-        if (include.rootLevel()) {
-            bindEntityRoots.add(cls);
-        }
-    }
-
-    /**
-     * Return annotation from class, parents or package.
-     *
-     * @param record          the record
-     * @param annotationClass the annotation class
-     * @param <A>             genericClass
-     * @return the annotation
-     */
-    public <A extends Annotation> A getAnnotation(PersistentResource record, Class<A> annotationClass) {
-        return getAnnotation(record.getResourceClass(), annotationClass);
-    }
-
-    /**
-     * Return annotation from class, parents or package.
-     *
-     * @param recordClass     the record class
-     * @param annotationClass the annotation class
-     * @param <A>             genericClass
-     * @return the annotation
-     */
-    public <A extends Annotation> A getAnnotation(Class<?> recordClass, Class<A> annotationClass) {
-        return getEntityBinding(recordClass).getAnnotation(annotationClass);
-    }
-
-    public <A extends Annotation> Collection<Method> getTriggers(Class<?> cls,
-                                                                 Class<A> annotationClass,
-                                                                 String fieldName) {
-        return getEntityBinding(cls).getTriggers(annotationClass, fieldName);
-    }
-
-    /**
-     * Return a single annotation from field or accessor method.
-     *
-     * @param entityClass     the entity class
-     * @param annotationClass given annotation type
-     * @param identifier      the identifier
-     * @param <A>             genericClass
-     * @return annotation found
-     */
-    public <A extends Annotation> A getAttributeOrRelationAnnotation(Class<?> entityClass,
-                                                                     Class<A> annotationClass,
-                                                                     String identifier) {
-        AccessibleObject fieldOrMethod = getEntityBinding(entityClass).fieldsToValues.get(identifier);
-        if (fieldOrMethod == null) {
-            return null;
-        }
-        return fieldOrMethod.getAnnotation(annotationClass);
-    }
-
-    /**
-     * Return multiple annotations from field or accessor method.
-     *
-     * @param <A>             the type parameter
-     * @param entityClass     the entity class
-     * @param annotationClass given annotation type
-     * @param identifier      the identifier
-     * @return annotation found or null if none found
-     */
-    public <A extends Annotation> A[] getAttributeOrRelationAnnotations(Class<?> entityClass,
-                                                                        Class<A> annotationClass,
-                                                                        String identifier) {
-        AccessibleObject fieldOrMethod = getEntityBinding(entityClass).fieldsToValues.get(identifier);
-        if (fieldOrMethod == null) {
-            return null;
-        }
-        return fieldOrMethod.getAnnotationsByType(annotationClass);
-    }
-
-    /**
-     * Return first matching annotation from class, parents or package.
-     *
-     * @param entityClass         Entity class type
-     * @param annotationClassList List of sought annotations
-     * @return annotation found
-     */
-    public static Annotation getFirstAnnotation(Class<?> entityClass,
-                                                List<Class<? extends Annotation>> annotationClassList) {
-        Annotation annotation = null;
-        for (Class<?> cls = entityClass; annotation == null && cls != null; cls = cls.getSuperclass()) {
-            for (Class<? extends Annotation> annotationClass : annotationClassList) {
-                annotation = cls.getAnnotation(annotationClass);
-                if (annotation != null) {
-                    break;
-                }
-            }
-        }
-        // no class annotation, try packages
-        for (Package pkg = entityClass.getPackage(); annotation == null && pkg != null; pkg = getParentPackage(pkg)) {
-            for (Class<? extends Annotation> annotationClass : annotationClassList) {
-                annotation = pkg.getAnnotation(annotationClass);
-                if (annotation != null) {
-                    break;
-                }
-            }
-        }
-        return annotation;
-    }
-
-    /**
-     * Is root.
-     *
-     * @param entityClass the entity class
-     * @return the boolean
-     */
-    public boolean isRoot(Class<?> entityClass) {
-        return bindEntityRoots.contains(entityClass);
-    }
-
-    /**
-     * Gets id.
-     *
-     * @param value the value
-     * @return the id
-     */
-    public String getId(Object value) {
-        if (value == null) {
-            return null;
-        }
-        try {
-            AccessibleObject idField = null;
-            for (Class<?> cls = value.getClass(); idField == null && cls != null; cls = cls.getSuperclass()) {
-                idField = getEntityBinding(cls).getIdField();
-            }
-            if (idField instanceof Field) {
-                return String.valueOf(((Field) idField).get(value));
-            }
-            if (idField instanceof Method) {
-                return String.valueOf(((Method) idField).invoke(value, (Object[]) null));
-            }
-            return null;
-        } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns type of id field.
-     *
-     * @param entityClass the entity class
-     * @return ID type
-     */
-    public Class<?> getIdType(Class<?> entityClass) {
-        return getEntityBinding(entityClass).getIdType();
-    }
-
-    /**
-     * Returns annotations applied to the ID field.
-     *
-     * @param value the value
-     * @return Collection of Annotations
-     */
-    public Collection<Annotation> getIdAnnotations(Object value) {
-        if (value == null) {
-            return null;
-        }
-
-        AccessibleObject idField = getEntityBinding(value.getClass()).getIdField();
-        if (idField != null) {
-            return Arrays.asList(idField.getDeclaredAnnotations());
-        }
-
-        return Collections.emptyList();
-    }
-
-    /**
-     * Follow for this class or super-class for Entity annotation.
-     *
-     * @param objClass provided class
-     * @return class with Entity annotation
-     */
-    public Class<?> lookupEntityClass(Class<?> objClass) {
-        for (Class<?> cls = objClass; cls != null; cls = cls.getSuperclass()) {
-            if (entityBindings.containsKey(cls) || cls.isAnnotationPresent(Entity.class)) {
-                return cls;
-            }
-        }
-        throw new IllegalArgumentException("Unknown Entity " + objClass);
-    }
-
-    /**
-     * Retrieve the accessible object for a field from a target object.
-     *
-     * @param target    the object to get
-     * @param fieldName the field name to get or invoke equivalent get method
-     * @return the value
-     */
-    public AccessibleObject getAccessibleObject(Object target, String fieldName) {
-        return getAccessibleObject(target.getClass(), fieldName);
-    }
-
-    /**
-     * Retrieve the accessible object for a field.
-     *
-     * @param targetClass the object to get
-     * @param fieldName   the field name to get or invoke equivalent get method
-     * @return the value
-     */
-    public AccessibleObject getAccessibleObject(Class<?> targetClass, String fieldName) {
-        return getEntityBinding(targetClass).fieldsToValues.get(fieldName);
-    }
-
-    /**
-     * Retrieve fields from an object containing a particular type.
-     *
-     * @param targetClass Class to search for fields
-     * @param targetType Type of fields to find
-     * @return Set containing field names
-     */
-    public Set<String> getFieldsOfType(Class<?> targetClass, Class<?> targetType) {
-        HashSet<String> fields = new HashSet<>();
-        for (String field : getAllFields(targetClass)) {
-            if (getParameterizedType(targetClass, field).equals(targetType)) {
-                fields.add(field);
-            }
-        }
-        return fields;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/EntityPermissions.java b/elide-core/src/main/java/com/yahoo/elide/core/EntityPermissions.java
deleted file mode 100644
index b48c57453d..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/EntityPermissions.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.generated.parsers.ExpressionLexer;
-import com.yahoo.elide.generated.parsers.ExpressionParser;
-import com.yahoo.elide.security.checks.Check;
-import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Extract permissions related annotation data for a model.
- */
-@Slf4j
-public class EntityPermissions implements CheckInstantiator {
-    private EntityDictionary dictionary;
-    private static final List<Class<? extends Annotation>> PERMISSION_ANNOTATIONS = Arrays.asList(
-            ReadPermission.class,
-            CreatePermission.class,
-            DeletePermission.class,
-            SharePermission.class,
-            UpdatePermission.class
-    );
-
-    public static final EntityPermissions EMPTY_PERMISSIONS = new EntityPermissions();
-
-    private static final AnnotationBinding EMPTY_BINDING = new AnnotationBinding(null, Collections.emptyMap());
-    private final HashMap<Class<? extends Annotation>, AnnotationBinding> bindings = new HashMap<>();
-
-    private static class AnnotationBinding {
-        final ParseTree classPermission;
-        final Map<String, ParseTree> fieldPermissions;
-
-        public AnnotationBinding(ParseTree classPermission, Map<String, ParseTree> fieldPermissions) {
-            this.classPermission = classPermission;
-            this.fieldPermissions = fieldPermissions.isEmpty() ? Collections.emptyMap() : fieldPermissions;
-        }
-    }
-
-
-    private EntityPermissions() {
-    }
-
-    /**
-     * Create bindings for entity class to its permission checks.
-     * @param cls entity class
-     * @param fieldOrMethodList list of fields/methods
-     */
-    public EntityPermissions(EntityDictionary dictionary,
-                             Class<?> cls,
-                             Collection<AccessibleObject> fieldOrMethodList)  {
-        this.dictionary = dictionary;
-        for (Class<? extends Annotation> annotationClass : PERMISSION_ANNOTATIONS) {
-            ParseTree classPermission = bindClassPermissions(cls, annotationClass);
-            final Map<String, ParseTree> fieldPermissions = new HashMap<>();
-            fieldOrMethodList.stream()
-                    .forEach(member -> bindMemberPermissions(fieldPermissions, member, annotationClass));
-            if (classPermission != null || !fieldPermissions.isEmpty()) {
-                bindings.put(annotationClass, new AnnotationBinding(classPermission, fieldPermissions));
-            }
-        }
-    }
-
-    private ParseTree bindClassPermissions(Class<?> cls, Class<? extends Annotation> annotationClass) {
-        Annotation annotation = EntityDictionary.getFirstAnnotation(cls, Arrays.asList(annotationClass));
-        return (annotation == null) ? null : getPermissionExpressionTree(annotationClass, annotation);
-    }
-
-    private void bindMemberPermissions(Map<String, ParseTree> fieldPermissions,
-            AccessibleObject field, Class<? extends Annotation> annotationClass) {
-        Annotation annotation = field.getAnnotation(annotationClass);
-        if (annotation != null) {
-            ParseTree permissions = getPermissionExpressionTree(annotationClass, annotation);
-            fieldPermissions.put(EntityBinding.getFieldName(field), permissions);
-        }
-    }
-
-    private ParseTree getPermissionExpressionTree(Class<? extends Annotation> annotationClass, Annotation annotation) {
-        try {
-            String expression = (String) annotationClass.getMethod("expression").invoke(annotation);
-            Class<? extends Check>[] allChecks = (Class<? extends Check>[]) annotationClass.getMethod("all")
-                                                                                           .invoke(annotation);
-            Class<? extends Check>[] anyChecks = (Class<? extends Check>[]) annotationClass.getMethod("any")
-                                                                                           .invoke(annotation);
-
-            boolean hasAnyChecks = anyChecks.length > 0;
-            boolean hasAllChecks = allChecks.length > 0;
-            boolean hasExpression = !expression.isEmpty();
-
-            boolean hasConfiguredChecks = hasAnyChecks || hasAllChecks || hasExpression;
-            boolean hasConfiguredOneChecks = hasAnyChecks ^ hasAllChecks ^ hasExpression;
-
-            if (!hasConfiguredChecks || !hasConfiguredOneChecks) {
-                log.warn("Poorly configured permission: {} {}", annotationClass.getName(),
-                         hasConfiguredChecks ? "more than one set of checks specified" : "no checks specified.");
-                throw new IllegalArgumentException("Poorly configured permission '" + annotationClass.getName() + "'");
-            }
-
-            if (allChecks.length > 0) {
-                expression = listToExpression(allChecks, " and ");
-            } else if (anyChecks.length > 0) {
-                expression = listToExpression(anyChecks, " or ");
-            }
-
-            return parseExpression(expression);
-        } catch (ReflectiveOperationException e) {
-            log.warn("Unknown permission: {}, {}", annotationClass.getName(), e);
-            throw new IllegalArgumentException("Unknown permission '" + annotationClass.getName() + "'", e);
-        }
-    }
-
-    private String listToExpression(Class<? extends Check>[] allChecks, String conjunction) {
-        String expression;
-        expression = Arrays.asList(allChecks)
-                           .stream()
-                           .map(this::instantiateCheck)
-                           .map(check -> dictionary.getCheckIdentifier((Class<? extends Check>) check.getClass()))
-                           .reduce("",
-                                   (current, next) -> current.isEmpty()
-                                           ? next
-                                           : current + conjunction + next
-                           );
-        return expression;
-    }
-
-    private ParseTree parseExpression(String expression) {
-        ANTLRInputStream is = new ANTLRInputStream(expression);
-        ExpressionLexer lexer = new ExpressionLexer(is);
-        lexer.removeErrorListeners();
-        lexer.addErrorListener(new BaseErrorListener() {
-            @Override
-            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
-                                    int charPositionInLine, String msg, RecognitionException e) {
-                throw new ParseCancellationException(msg, e);
-            }
-        });
-        ExpressionParser parser = new ExpressionParser(new CommonTokenStream(lexer));
-        lexer.reset();
-        return parser.start();
-    }
-
-    /**
-     * Does this permission check annotation exist for this entity or any field?
-     * @param annotationClass permission class
-     * @return true if annotation exists
-     */
-    public boolean hasChecksForPermission(Class<? extends Annotation> annotationClass) {
-        return bindings.containsKey(annotationClass);
-    }
-
-    /**
-     * Get entity permission ParseTree.
-     * @param annotationClass permission class
-     * @return entity permission ParseTree or null if none
-     */
-    public ParseTree getClassChecksForPermission(Class<? extends Annotation> annotationClass) {
-        return bindings.getOrDefault(annotationClass, EMPTY_BINDING).classPermission;
-    }
-
-    /**
-     * Get field permission ParseTree for provided name.
-     * @param field provided field name
-     * @param annotationClass permission class
-     * @return entity permission ParseTree or null if none
-     */
-    public ParseTree getFieldChecksForPermission(String field, Class<? extends Annotation> annotationClass) {
-        return bindings.getOrDefault(annotationClass, EMPTY_BINDING).fieldPermissions.get(field);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/FilterScope.java b/elide-core/src/main/java/com/yahoo/elide/core/FilterScope.java
deleted file mode 100644
index d216605504..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/FilterScope.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.ReadPermission;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * Scope for filter processing.  Contains requestScope and checks.
- */
-@Slf4j
-public class FilterScope {
-
-    @Getter private final RequestScope requestScope;
-    @Getter private final ParseTree permissions;
-
-    public FilterScope(RequestScope requestScope, Class<?> resourceClass) {
-        this.requestScope = requestScope;
-        this.permissions = requestScope.getDictionary().getPermissionsForClass(resourceClass, ReadPermission.class);
-    }
-
-    public <T> T getCriterion(Function<T, T> criterionNegater,
-                              BiFunction<T, T, T> andCriterionJoiner,
-                              BiFunction<T, T, T> orCriterionJoiner) {
-        return requestScope.getPermissionExecutor().getCriterion(
-                permissions,
-                criterionNegater,
-                andCriterionJoiner,
-                orCriterionJoiner);
-    }
-
-    /**
-     * Returns true if pagination limits were added to this query.
-     *
-     * NOTE: This method is often used in GET transaction implementations
-     *
-     * @return true if there is pagination filtering
-     */
-    public boolean hasSortingRules() {
-        return !requestScope.getSorting().isDefaultInstance();
-    }
-
-    /**
-     * Returns true if pagination limits were added to this query.
-     *
-     * NOTE: This method is often used in GET transaction implementations
-     *
-     * @return true if there is pagination filtering
-     */
-    public boolean hasPagination() {
-        return requestScope.getPagination() != null;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/Initializer.java b/elide-core/src/main/java/com/yahoo/elide/core/Initializer.java
deleted file mode 100644
index 71edd365d2..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/Initializer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-/**
- * Used to perform any additional initialization required on entity beans which is not
- * possible at time of construction.
- * @param <T> bean type
- */
-public interface Initializer<T> {
-
-    /**
-     * Initialize an entity bean.
-     *
-     * @param entity Entity bean to initialize
-     */
-    void initialize(T entity);
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/ObjectEntityCache.java b/elide-core/src/main/java/com/yahoo/elide/core/ObjectEntityCache.java
index 4bde823512..eb2e56322f 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/ObjectEntityCache.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/ObjectEntityCache.java
@@ -5,6 +5,7 @@
  */
 package com.yahoo.elide.core;
 
+import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -20,7 +21,7 @@ public class ObjectEntityCache {
      */
     public ObjectEntityCache() {
         resourceCache = new LinkedHashMap<>();
-        uuidReverseMap = new LinkedHashMap<>();
+        uuidReverseMap = new IdentityHashMap<>();
     }
 
     /**
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/Path.java b/elide-core/src/main/java/com/yahoo/elide/core/Path.java
new file mode 100644
index 0000000000..970d78eabc
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/Path.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.getSimpleName;
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.CollectionUtils;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Represents a path in the entity relationship graph.
+ */
+@EqualsAndHashCode
+public class Path {
+    private static final String PERIOD = ".";
+
+    @Getter protected List<PathElement> pathElements;
+    /**
+     * The path taken through data model associations to reference a given field.
+     * eg. author.books.publisher.name
+     */
+    @AllArgsConstructor
+    @ToString
+    @EqualsAndHashCode
+    public static class PathElement {
+        @Getter private Type type;
+        @Getter private Type fieldType;
+        @Getter private String fieldName;
+        @Getter private String alias;
+        @Getter private Set<Argument> arguments;
+
+        public PathElement(Class<?> type, Class<?> fieldType, String fieldName) {
+            this(ClassType.of(type), ClassType.of(fieldType), fieldName);
+        }
+
+        public PathElement(Type type, Type fieldType, String fieldName) {
+            this.type = type;
+            this.fieldType = fieldType;
+            this.fieldName = fieldName;
+            this.alias = fieldName;
+            this.arguments = Collections.emptySet();
+        }
+    }
+
+    protected Path() {
+    }
+
+    public Path(Path copy) {
+        this(copy.pathElements);
+    }
+
+    public Path(List<PathElement> pathElements) {
+        this.pathElements = ImmutableList.copyOf(pathElements);
+    }
+
+    public Path(Class<?> entityClass, EntityDictionary dictionary, String dotSeparatedPath) {
+        this(ClassType.of(entityClass), dictionary, dotSeparatedPath);
+    }
+
+    public Path(Type<?> entityClass, EntityDictionary dictionary, String dotSeparatedPath) {
+        pathElements = resolvePathElements(entityClass, dictionary, dotSeparatedPath);
+    }
+
+    public Path(Class<?> entityClass, EntityDictionary dictionary, String fieldName,
+                String alias, Set<Argument> arguments) {
+        this(ClassType.of(entityClass), dictionary, fieldName, alias, arguments);
+    }
+
+    public Path(Type<?> entityClass, EntityDictionary dictionary, String fieldName,
+                String alias, Set<Argument> arguments) {
+        pathElements = Lists.newArrayList(resolvePathAttribute(entityClass, fieldName, alias, arguments, dictionary));
+    }
+
+    public boolean isComputed(EntityDictionary dictionary) {
+        for (Path.PathElement pathElement : getPathElements()) {
+            Type<?> entityClass = pathElement.getType();
+            String fieldName = pathElement.getFieldName();
+
+            if (dictionary.isComputed(entityClass, fieldName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Resolve a dot separated path into list of path elements.
+     *
+     * @param entityClass root class e.g. "foo"
+     * @param dictionary dictionary
+     * @param dotSeparatedPath path e.g. "bar.baz"
+     * @return list of path elements e.g. ["foo.bar", "bar.baz"]
+     */
+    protected List<PathElement> resolvePathElements(Type<?> entityClass,
+                                                    EntityDictionary dictionary,
+                                                    String dotSeparatedPath) {
+        List<PathElement> elements = new ArrayList<>();
+        String[] fieldNames = dotSeparatedPath.split("\\.");
+
+        Type<?> currentClass = entityClass;
+        for (String fieldName : fieldNames) {
+            if (needNavigation(currentClass, fieldName, dictionary)) {
+                Type<?> joinClass = dictionary.getParameterizedType(currentClass, fieldName);
+                elements.add(new PathElement(currentClass, joinClass, fieldName));
+                currentClass = joinClass;
+            } else {
+                elements.add(resolvePathAttribute(currentClass, fieldName,
+                        fieldName, Collections.emptySet(), dictionary));
+            }
+        }
+
+        return ImmutableList.copyOf(elements);
+    }
+
+    protected PathElement resolvePathAttribute(Type<?> entityClass,
+                                               String fieldName,
+                                               String alias,
+                                               Set<Argument> arguments,
+                                               EntityDictionary dictionary) {
+        if (dictionary.isAttribute(entityClass, fieldName)
+                || fieldName.equals(dictionary.getIdFieldName(entityClass))) {
+            Type<?> attributeClass = dictionary.getType(entityClass, fieldName);
+            return new PathElement(entityClass, attributeClass, fieldName, alias, arguments);
+        }
+        if ("this".equals(fieldName)) {
+            return new PathElement(entityClass, null, fieldName);
+        }
+        String entityAlias = dictionary.getJsonAliasFor(entityClass);
+        throw new InvalidValueException(entityAlias + " does not contain the field " + fieldName);
+    }
+
+    /**
+     * Check whether a field need navigation to another entity.
+     *
+     * @param entityClass entity class
+     * @param fieldName field name
+     * @param dictionary dictionary
+     * @return True if the field requires navigation.
+     */
+    protected boolean needNavigation(Type<?> entityClass, String fieldName, EntityDictionary dictionary) {
+        return dictionary.isRelation(entityClass, fieldName) || dictionary.isComplexAttribute(entityClass, fieldName);
+    }
+
+    public Optional<PathElement> lastElement() {
+        return pathElements.isEmpty() ? Optional.empty() : Optional.of(pathElements.get(pathElements.size() - 1));
+    }
+
+    public String getFieldPath() {
+        return pathElements.stream()
+                .map(PathElement::getFieldName)
+                .collect(Collectors.joining(PERIOD));
+    }
+
+    /**
+     * Returns an alias that uniquely identifies the last collection of entities in the path.
+     * @return An alias for the path.
+     */
+    public String getAlias() {
+        if (pathElements.size() < 2) {
+            return lastElement()
+                    .map(e -> getTypeAlias(e.getType()))
+                    .orElse(null);
+        }
+
+        PathElement previous = pathElements.get(pathElements.size() - 2);
+        return appendAlias(getTypeAlias(previous.getType()), previous.getFieldName());
+    }
+
+    @Override
+    public String toString() {
+        return CollectionUtils.isEmpty(pathElements) ? "EMPTY"
+                : pathElements.stream()
+                        .map(e -> '[' + getSimpleName(e.getType()) + ']' + PERIOD + e.getFieldName())
+                .collect(Collectors.joining("/"));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/PersistentResource.java b/elide-core/src/main/java/com/yahoo/elide/core/PersistentResource.java
index 738634bc19..5457dcf2e3 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/PersistentResource.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/PersistentResource.java
@@ -1,66 +1,77 @@
 /*
- * Copyright 2016, Yahoo Inc.
+ * Copyright 2018, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core;
 
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.DELETE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.core.dictionary.EntityBinding.EMPTY_BINDING;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.getType;
+import static com.yahoo.elide.core.type.ClassType.COLLECTION_TYPE;
+
 import com.yahoo.elide.annotation.Audit;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.OnCreate;
-import com.yahoo.elide.annotation.OnDelete;
-import com.yahoo.elide.annotation.OnUpdate;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.NonTransferable;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.audit.InvalidSyntaxException;
-import com.yahoo.elide.audit.LogMessage;
+import com.yahoo.elide.core.audit.InvalidSyntaxException;
+import com.yahoo.elide.core.audit.LogMessage;
+import com.yahoo.elide.core.audit.LogMessageImpl;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.exceptions.BadRequestException;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
 import com.yahoo.elide.core.exceptions.InternalServerErrorException;
 import com.yahoo.elide.core.exceptions.InvalidAttributeException;
 import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
 import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
 import com.yahoo.elide.core.filter.expression.AndFilterExpression;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
-import com.yahoo.elide.extensions.PatchRequestScope;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.visitors.VerifyFieldAccessFilterExpressionVisitor;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.visitors.CanPaginateVisitor;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
 import com.yahoo.elide.jsonapi.models.Data;
 import com.yahoo.elide.jsonapi.models.Relationship;
 import com.yahoo.elide.jsonapi.models.Resource;
 import com.yahoo.elide.jsonapi.models.ResourceIdentifier;
-import com.yahoo.elide.jsonapi.models.SingleElementSet;
-import com.yahoo.elide.parsers.expression.CanPaginateVisitor;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.utils.coerce.CoerceUtil;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Sets;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.collections4.IterableUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import io.reactivex.Observable;
 import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -73,329 +84,605 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import javax.persistence.GeneratedValue;
-
 /**
  * Resource wrapper around Entity bean.
  *
  * @param <T> type of resource
  */
-@Slf4j
-public class PersistentResource<T> implements com.yahoo.elide.security.PersistentResource<T> {
-    private final String type;
-    protected T obj;
-    private final ResourceLineage lineage;
-    private final Optional<String> uuid;
-    private final User user;
-    private final ObjectEntityCache entityCache;
-
-    @Override
-    public String toString() {
-        String id = (uuid.isPresent()) ? uuid.get() : getId();
-        return String.format("PersistentResource { type=%s, id=%s }", type, id);
-    }
-
-    private final DataStoreTransaction transaction;
-    @NonNull private final RequestScope requestScope;
-    private final Optional<PersistentResource<?>> parent;
-    private int hashCode = 0;
-
+public class PersistentResource<T> implements com.yahoo.elide.core.security.PersistentResource<T> {
+    public static final Set<String> ALL_FIELDS = null;
+    public static final String CLASS_NO_FIELD = "";
     /**
      * The Dictionary.
      */
     protected final EntityDictionary dictionary;
-
+    private final Type type;
+    private final String typeName;
+    private final ResourceLineage lineage;
+    private final Optional<String> uuid;
+    private final DataStoreTransaction transaction;
+    private final RequestScope requestScope;
     /* Sort strings first by length then contents */
-    private final Comparator<String> comparator = (string1, string2) -> {
+    private final Comparator<String> lengthFirstComparator = (string1, string2) -> {
         int diff = string1.length() - string2.length();
         return diff == 0 ? string1.compareTo(string2) : diff;
     };
+    protected T obj;
+    private int hashCode = 0;
 
     /**
-     * Create a resource in the database.
-     * @param parent - The immediate ancestor in the lineage or null if this is a root.
-     * @param entityClass the entity class
-     * @param requestScope the request scope
-     * @param uuid the uuid
-     * @param <T> object type
-     * @return persistent resource
-     */
-    @SuppressWarnings("resource")
-    public static <T> PersistentResource<T> createObject(
-            PersistentResource<?> parent,
-            Class<T> entityClass,
-            RequestScope requestScope,
-            String uuid) {
-        DataStoreTransaction tx = requestScope.getTransaction();
-
-        T obj = tx.createObject(entityClass);
-        PersistentResource<T> newResource = new PersistentResource<>(obj, parent, uuid, requestScope);
-        checkPermission(CreatePermission.class, newResource);
-        newResource.auditClass(Audit.Action.CREATE, new ChangeSpec(newResource, null, null, newResource.getObject()));
-        newResource.runTriggers(OnCreate.class);
-        requestScope.queueCommitTrigger(newResource);
-
-        String type = newResource.getType();
-        requestScope.getObjectEntityCache().put(type, uuid, newResource.getObject());
-
-        // Initialize null ToMany collections
-        requestScope.getDictionary().getRelationships(entityClass).stream()
-                .filter(relationName -> {
-                    return newResource.getRelationshipType(relationName).isToMany()
-                            && newResource.getValueUnchecked(relationName) == null;
-                })
-                .forEach(relationName -> newResource.setValue(relationName, new LinkedHashSet<>()));
-
-        // Keep track of new resources for non shareable resources
-        requestScope.getNewPersistentResources().add(newResource);
-        newResource.markDirty();
-        return newResource;
-    }
-
-    /**
-     * Create a resource in the database.
-     * @param entityClass the entity class
-     * @param requestScope the request scope
-     * @param uuid the uuid
-     * @param <T> type of resource
-     * @return persistent resource
-     */
-    public static <T> PersistentResource<T> createObject(Class<T> entityClass, RequestScope requestScope, String uuid) {
-        return createObject(null, entityClass, requestScope, uuid);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param parent the parent
-     * @param obj the obj
-     * @param requestScope the request scope
-     */
-    public PersistentResource(PersistentResource<?> parent, T obj, RequestScope requestScope) {
-        this(obj, parent, requestScope);
-    }
-
-    /**
-     * Constructor.
+     * Construct a new resource from the ID provided.
      *
-     * @param obj the obj
-     * @param requestScope the request scope
-     */
-    public PersistentResource(T obj, RequestScope requestScope) {
-        this(obj, null, requestScope);
+     * @param obj                the obj
+     * @param parent             the parent
+     * @param id                 the id
+     * @param parentRelationship The parent relationship traversed to this resource.
+     * @param scope              the request scope
+     */
+    public PersistentResource(
+            @NonNull T obj,
+            PersistentResource parent,
+            String parentRelationship,
+            String id,
+            @NonNull RequestScope scope
+    ) {
+        this.obj = obj;
+        this.type = getType(obj);
+        this.uuid = Optional.ofNullable(id);
+        this.lineage = parent != null
+                ? new ResourceLineage(parent.lineage, parent, parentRelationship)
+                : new ResourceLineage();
+        this.dictionary = scope.getDictionary();
+        this.typeName = dictionary.getJsonAliasFor(type);
+        this.transaction = scope.getTransaction();
+        this.requestScope = scope;
+        dictionary.initializeEntity(obj);
     }
 
     /**
      * Construct a new resource from the ID provided.
      *
-     * @param obj the obj
-     * @param parent the parent
-     * @param id the id
-     * @param requestScope the request scope
+     * @param obj   the obj
+     * @param id    the id
+     * @param scope the request scope
      */
-    protected PersistentResource(@NonNull T obj, PersistentResource<?> parent, String id, RequestScope requestScope) {
-        this.obj = obj;
-        this.uuid = Optional.ofNullable(id);
-        // TODO Use Bind annotation
-        this.parent = Optional.ofNullable(parent);
-        this.lineage = this.parent.isPresent() ? new ResourceLineage(parent.lineage, parent) : new ResourceLineage();
-        this.dictionary = requestScope.getDictionary();
-        this.type = dictionary.getJsonAliasFor(obj.getClass());
-        this.user = requestScope.getUser();
-        this.entityCache = requestScope.getObjectEntityCache();
-        this.transaction = requestScope.getTransaction();
-        this.requestScope = requestScope;
-        dictionary.initializeEntity(obj);
+    public PersistentResource(
+            @NonNull T obj,
+            String id,
+            @NonNull RequestScope scope
+    ) {
+        this(obj, null, null, id, scope);
     }
 
     /**
-     * Constructor for testing.
+     * Create a resource in the database.
      *
-     * @param obj the obj
-     * @param parent the parent
+     * @param entityClass  the entity class
      * @param requestScope the request scope
+     * @param uuid         the (optional) uuid
+     * @param <T>          object type
+     * @return persistent resource
      */
-    protected PersistentResource(T obj, PersistentResource<?> parent, RequestScope requestScope) {
-        this(obj, parent, requestScope.getObjectEntityCache().getUUID(obj), requestScope);
+    public static <T> PersistentResource<T> createObject(
+            Type<T> entityClass,
+            RequestScope requestScope,
+            Optional<String> uuid) {
+        return createObject(null, null, entityClass, requestScope, uuid);
     }
 
     /**
-     * Check whether an id matches for this persistent resource.
+     * Create a resource in the database.
      *
-     * @param checkId the check id
-     * @return True if matches false otherwise
+     * @param parent             - The immediate ancestor in the lineage or null if this is a root.
+     * @param parentRelationship - The name of the parent relationship traversed to create this object.
+     * @param entityClass        the entity class
+     * @param requestScope       the request scope
+     * @param uuid               the (optional) uuid
+     * @param <T>                object type
+     * @return persistent resource
      */
-    public boolean matchesId(String checkId) {
-        if (checkId == null) {
-            return false;
-        } else if (uuid.isPresent() && checkId.equals(uuid.get())) {
-            return true;
-        }
-        String id = getId();
-        return !id.equals("0") && checkId.equals(id);
+    public static <T> PersistentResource<T> createObject(
+            PersistentResource<?> parent,
+            String parentRelationship,
+            Type<T> entityClass,
+            RequestScope requestScope,
+            Optional<String> uuid) {
+
+        T obj = requestScope.getTransaction().createNewObject(entityClass, requestScope);
+
+        String id = uuid.orElse(null);
+
+        PersistentResource<T> newResource = new PersistentResource<>(obj, parent, parentRelationship, id, requestScope);
+
+        //The ID must be assigned before we add it to the new resources set.  Persistent resource
+        //hashcode and equals are only based on the ID/UUID & type.
+        assignId(newResource, id);
+
+        // Keep track of new resources for non-transferable resources
+        requestScope.getNewPersistentResources().add(newResource);
+        checkPermission(CreatePermission.class, newResource);
+
+        newResource.auditClass(Audit.Action.CREATE, new ChangeSpec(newResource, null, null, newResource.getObject()));
+
+        requestScope.publishLifecycleEvent(newResource, CREATE);
+
+        requestScope.setUUIDForObject(newResource.type, id, newResource.getObject());
+
+        // Initialize null ToMany collections
+        requestScope.getDictionary().getRelationships(entityClass).stream()
+                .filter(relationName -> newResource.getRelationshipType(relationName).isToMany()
+                        && newResource.getValueUnchecked(relationName) == null)
+                .forEach(relationName -> newResource.setValue(relationName, new LinkedHashSet<>()));
+
+        newResource.markDirty();
+        return newResource;
     }
 
     /**
      * Load an single entity from the DB.
      *
-     * @param loadClass resource type
-     * @param id the id
+     * @param projection   What to load from the DB.
+     * @param id           the id
      * @param requestScope the request scope
-     * @param <T> type of resource
+     * @param <T>          type of resource
      * @return resource persistent resource
      * @throws InvalidObjectIdentifierException the invalid object identifier exception
      */
     @SuppressWarnings("resource")
-    @NonNull public static <T> PersistentResource<T> loadRecord(
-            Class<T> loadClass, String id, RequestScope requestScope)
-            throws InvalidObjectIdentifierException {
-        Preconditions.checkNotNull(loadClass);
+    @NonNull
+    public static <T> PersistentResource<T> loadRecord(
+            EntityProjection projection,
+            String id,
+            RequestScope requestScope
+    ) throws InvalidObjectIdentifierException {
+        Preconditions.checkNotNull(projection);
         Preconditions.checkNotNull(id);
         Preconditions.checkNotNull(requestScope);
 
         DataStoreTransaction tx = requestScope.getTransaction();
         EntityDictionary dictionary = requestScope.getDictionary();
-        ObjectEntityCache cache = requestScope.getObjectEntityCache();
+        Type<?> loadClass = projection.getType();
 
         // Check the resource cache if exists
-        @SuppressWarnings("unchecked")
-        T obj = (T) cache.get(dictionary.getJsonAliasFor(loadClass), id);
+        Object obj = requestScope.getObjectById(loadClass, id);
         if (obj == null) {
             // try to load object
             Optional<FilterExpression> permissionFilter = getPermissionFilterExpression(loadClass,
-                    requestScope);
-            Class<?> idType = dictionary.getIdType(loadClass);
-            obj = tx.loadObject(loadClass, (Serializable) CoerceUtil.coerce(id, idType), permissionFilter);
+                    requestScope, projection.getRequestedFields());
+            Type<?> idType = dictionary.getIdType(loadClass);
+
+            projection = projection
+                    .copyOf()
+                    .filterExpression(permissionFilter.orElse(null))
+                    .build();
+
+            obj = tx.loadObject(projection, (Serializable) CoerceUtil.coerce(id, idType), requestScope);
             if (obj == null) {
-                throw new InvalidObjectIdentifierException(id, loadClass.getSimpleName());
+                throw new InvalidObjectIdentifierException(id, dictionary.getJsonAliasFor(loadClass));
             }
         }
 
-        PersistentResource<T> resource = new PersistentResource<>(obj, requestScope);
+        PersistentResource<T> resource = new PersistentResource<>(
+                (T) obj,
+                requestScope.getUUIDFor(obj),
+                requestScope);
+
         // No need to have read access for a newly created object
         if (!requestScope.getNewResources().contains(resource)) {
-            resource.checkFieldAwarePermissions(ReadPermission.class);
+            resource.checkFieldAwarePermissions(ReadPermission.class, projection.getRequestedFields());
         }
-        requestScope.queueCommitTrigger(resource);
 
         return resource;
     }
 
+    /**
+     * Get a FilterExpression parsed from FilterExpressionCheck.
+     *
+     * @param <T>             the type parameter
+     * @param loadClass       the load class
+     * @param requestScope    the request scope
+     * @param requestedFields The set of requested fields
+     * @return a FilterExpression defined by FilterExpressionCheck.
+     */
+    private static <T> Optional<FilterExpression> getPermissionFilterExpression(Type<T> loadClass,
+                                                                                RequestScope requestScope,
+                                                                                Set<String> requestedFields) {
+        try {
+            return requestScope.getPermissionExecutor().getReadPermissionFilter(loadClass, requestedFields);
+        } catch (ForbiddenAccessException e) {
+            return Optional.empty();
+        }
+    }
+
     /**
      * Load a collection from the datastore.
      *
-     * @param <T> the type parameter
-     * @param loadClass the load class
+     * @param projection   the projection to load
      * @param requestScope the request scope
+     * @param ids          a list of object identifiers to optionally load.  Can be empty.
      * @return a filtered collection of resources loaded from the datastore.
      */
-    @NonNull public static <T> Set<PersistentResource<T>> loadRecords(Class<T> loadClass, RequestScope requestScope) {
+    public static Observable<PersistentResource> loadRecords(
+            EntityProjection projection,
+            List<String> ids,
+            RequestScope requestScope) {
+
+        Type<?> loadClass = projection.getType();
+        Pagination pagination = projection.getPagination();
+        Sorting sorting = projection.getSorting();
+
+        FilterExpression filterExpression = projection.getFilterExpression();
+
+        EntityDictionary dictionary = requestScope.getDictionary();
+
         DataStoreTransaction tx = requestScope.getTransaction();
 
-        if (shouldSkipCollection(loadClass, ReadPermission.class, requestScope)) {
-            return Collections.emptySet();
+        if (shouldSkipCollection(loadClass, ReadPermission.class, requestScope, projection.getRequestedFields())) {
+            if (ids.isEmpty()) {
+                return Observable.empty();
+            }
+            throw new InvalidObjectIdentifierException(ids.toString(), dictionary.getJsonAliasFor(loadClass));
         }
 
-        Iterable<T> list;
-        FilterScope filterScope = new FilterScope(requestScope, loadClass);
-        list = tx.loadObjects(loadClass, filterScope);
-        Set<PersistentResource<T>> resources = new PersistentResourceSet(list, requestScope);
-        resources = filter(ReadPermission.class, resources);
-        for (PersistentResource<T> resource : resources) {
-            requestScope.queueCommitTrigger(resource);
+        Set<String> requestedFields = projection.getRequestedFields();
+
+        if (pagination != null && !pagination.isDefaultInstance()
+                && !CanPaginateVisitor.canPaginate(loadClass, dictionary, requestScope, requestedFields)) {
+            throw new BadRequestException(String.format("Cannot paginate %s",
+                    dictionary.getJsonAliasFor(loadClass)));
         }
-        return resources;
+
+        Set<PersistentResource> newResources = new LinkedHashSet<>();
+
+        if (!ids.isEmpty()) {
+            String typeAlias = dictionary.getJsonAliasFor(loadClass);
+            newResources = requestScope.getNewPersistentResources().stream()
+                    .filter(resource -> typeAlias.equals(resource.getTypeName())
+                            && ids.contains(resource.getUUID().orElse("")))
+                    .collect(Collectors.toSet());
+            FilterExpression idExpression = buildIdFilterExpression(ids, loadClass, dictionary, requestScope);
+
+            // Combine filters if necessary
+            filterExpression = Optional.ofNullable(filterExpression)
+                    .map(fe -> (FilterExpression) new AndFilterExpression(idExpression, fe))
+                    .orElse(idExpression);
+        }
+
+        Optional<FilterExpression> permissionFilter = getPermissionFilterExpression(loadClass, requestScope,
+                requestedFields);
+        if (permissionFilter.isPresent()) {
+            if (filterExpression != null) {
+                filterExpression = new AndFilterExpression(filterExpression, permissionFilter.get());
+            } else {
+                filterExpression = permissionFilter.get();
+            }
+        }
+
+        EntityProjection modifiedProjection = projection
+                .copyOf()
+                .filterExpression(filterExpression)
+                .sorting(sorting)
+                .pagination(pagination)
+                .build();
+
+        Observable<PersistentResource> existingResources = filter(
+                ReadPermission.class,
+                Optional.ofNullable(modifiedProjection.getFilterExpression()),
+                projection.getRequestedFields(),
+                Observable.fromIterable(
+                        new PersistentResourceSet(tx.loadObjects(modifiedProjection, requestScope), requestScope))
+        );
+
+        // TODO: Sort again in memory now that two sets are glommed together?
+        Observable<PersistentResource> allResources =
+                Observable.fromIterable(newResources).mergeWith(existingResources);
+
+        Set<String> foundIds = new HashSet<>();
+
+        allResources = allResources.doOnNext((resource) -> {
+            String id = (String) resource.getUUID().orElseGet(resource::getId);
+            if (ids.contains(id)) {
+                foundIds.add(id);
+            }
+        });
+
+        allResources = allResources.doOnComplete(() -> {
+            Set<String> missedIds = Sets.difference(new HashSet<>(ids), foundIds);
+            if (!missedIds.isEmpty()) {
+                throw new InvalidObjectIdentifierException(missedIds.toString(), dictionary.getJsonAliasFor(loadClass));
+            }
+        });
+
+        return allResources;
     }
 
     /**
-     * Get a FilterExpression parsed from FilterExpressionCheck.
+     * Build an id filter expression for a particular entity type.
      *
-     * @param <T> the type parameter
-     * @param loadClass the load class
-     * @param requestScope the request scope
-     * @return a FilterExpression defined by FilterExpressionCheck.
+     * @param ids        Ids to include in the filter expression
+     * @param entityType Type of entity
+     * @return Filter expression for given ids and type.
+     */
+    private static FilterExpression buildIdFilterExpression(List<String> ids,
+                                                            Type<?> entityType,
+                                                            EntityDictionary dictionary,
+                                                            RequestScope scope) {
+        Type<?> idType = dictionary.getIdType(entityType);
+        String idField = dictionary.getIdFieldName(entityType);
+
+        List<Object> coercedIds = ids.stream()
+                .filter(id -> scope.getObjectById(entityType, id) == null) // these don't exist yet
+                .map(id -> CoerceUtil.coerce(id, idType))
+                .collect(Collectors.toList());
+
+        /* construct a new SQL like filter expression, eg: book.id IN [1,2] */
+        FilterExpression idFilter = new InPredicate(
+                new Path.PathElement(
+                        entityType,
+                        idType,
+                        idField),
+                coercedIds);
+
+        return idFilter;
+    }
+
+    /**
+     * Determine whether or not to skip loading a collection.
+     *
+     * @param resourceClass   Resource class
+     * @param annotationClass Annotation class
+     * @param requestedFields The set of requested fields
+     * @param requestScope    Request scope
+     * @return True if collection should be skipped (i.e. denied access), false otherwise
      */
-    private static <T> Optional<FilterExpression> getPermissionFilterExpression(Class<T> loadClass,
-                                                                      RequestScope requestScope) {
+    private static boolean shouldSkipCollection(Type<?> resourceClass, Class<? extends Annotation> annotationClass,
+                                                RequestScope requestScope, Set<String> requestedFields) {
         try {
-            return requestScope.getPermissionExecutor().getReadPermissionFilter(loadClass);
+            requestScope.getPermissionExecutor().checkUserPermissions(resourceClass, annotationClass, requestedFields);
+            return false;
         } catch (ForbiddenAccessException e) {
-            return Optional.empty();
+            return true;
         }
     }
 
     /**
-     * Load a collection from the datastore.
+     * Invoke the get[fieldName] method on the target object OR get the field with the corresponding name.
      *
-     * @param <T> the type parameter
-     * @param loadClass the load class
+     * @param target       the object to get
+     * @param fieldName    the field name to get or invoke equivalent get method
      * @param requestScope the request scope
-     * @return a filtered collection of resources loaded from the datastore.
+     * @return the value
      */
-    @NonNull public static <T> Set<PersistentResource<T>> loadRecordsWithSortingAndPagination(
-            Class<T> loadClass, RequestScope requestScope) {
-        DataStoreTransaction tx = requestScope.getTransaction();
+    public static Object getValue(Object target, String fieldName, RequestScope requestScope) {
+        return requestScope.getDictionary().getValue(target, fieldName, requestScope);
+    }
 
-        if (shouldSkipCollection(loadClass, ReadPermission.class, requestScope)) {
-            return Collections.emptySet();
-        }
+    /**
+     * Filter a set of PersistentResources.
+     * Verify fields have ReadPermission on filter join.
+     *
+     * @param permission the permission
+     * @param resources  the resources
+     * @return Filtered set of resources
+     */
+    protected static Observable<PersistentResource> filter(Class<? extends Annotation> permission,
+                                                           Optional<FilterExpression> filter,
+                                                           Set<String> requestedFields,
+                                                           Observable<PersistentResource> resources) {
 
-        EntityDictionary dictionary = requestScope.getDictionary();
-        if (! requestScope.getPagination().isDefaultInstance()
-                && !CanPaginateVisitor.canPaginate(loadClass, dictionary, requestScope)) {
-            throw new InvalidPredicateException(String.format("Cannot paginate %s",
-                    dictionary.getJsonAliasFor(loadClass)));
-        }
+        return resources.filter(resource -> {
+            try {
+                // NOTE: This is for avoiding filtering on _newly created_ objects within this transaction.
+                // Namely-- in a JSONPATCH request or GraphQL request-- we need to read all newly created
+                // resources /regardless/ of whether or not we actually have permission to do so; this is to
+                // retrieve the object id to return to the caller. If no fields on the object are readable by the caller
+                // then they will be filtered out and only the id is returned. Similarly, all future requests to this
+                // object will behave as expected.
+                if (!resource.getRequestScope().getNewResources().contains(resource)) {
+                    resource.checkFieldAwarePermissions(permission, requestedFields);
+                    // Verify fields have ReadPermission on filter join
+                    return !filter.isPresent()
+                            || filter.get().accept(new VerifyFieldAccessFilterExpressionVisitor(resource));
+                }
+                return true;
+            } catch (ForbiddenAccessException e) {
+                return false;
+            }
+        });
+    }
+
+    private static <A extends Annotation> ExpressionResult checkPermission(
+            Class<A> annotationClass, PersistentResource resource) {
+        return resource.requestScope.getPermissionExecutor().checkPermission(annotationClass, resource);
+    }
 
-        Iterable<T> list;
-        FilterScope filterScope = new FilterScope(requestScope, loadClass);
-        list = tx.loadObjectsWithSortingAndPagination(loadClass, filterScope);
-        Set<PersistentResource<T>> resources = new PersistentResourceSet(list, requestScope);
-        resources = filter(ReadPermission.class, resources);
-        for (PersistentResource<T> resource : resources) {
-            requestScope.queueCommitTrigger(resource);
+    private static <A extends Annotation> ExpressionResult checkUserPermission(
+            Class<A> annotationClass, Object obj, RequestScope requestScope, Set<String> requestedFields) {
+        return requestScope.getPermissionExecutor()
+                .checkUserPermissions(getType(obj), annotationClass, requestedFields);
+    }
+
+    protected static boolean checkIncludeSparseField(Map<String, Set<String>> sparseFields, String type,
+                                                     String fieldName) {
+        if (!sparseFields.isEmpty()) {
+            if (!sparseFields.containsKey(type)) {
+                return false;
+            }
+
+            return sparseFields.get(type).contains(fieldName);
         }
-        return resources;
+
+        return true;
     }
 
     /**
-     * Gets the total number of records that could be loaded from the data store ignoring any pagination limits
+     * Assign provided id if id field is not generated.
      *
-     * @param <T> the type parameter
-     * @param loadClass the load class
-     * @param requestScope the request scope
-     * @return total number of records that could be loaded
+     * @param persistentResource resource
+     * @param id                 resource id
      */
-    public static <T> Long getTotalRecords(Class<T> loadClass, RequestScope requestScope) {
-        DataStoreTransaction tx = requestScope.getTransaction();
+    private static void assignId(PersistentResource persistentResource, String id) {
 
-        if (shouldSkipCollection(loadClass, ReadPermission.class, requestScope)) {
-            return 0L;
+        //If id field is not a `@GeneratedValue` or mapped via a `@MapsId` attribute
+        //then persist the provided id
+        if (!persistentResource.isIdGenerated()) {
+            if (StringUtils.isNotEmpty(id)) {
+                persistentResource.setId(id);
+            } else {
+                //If expecting id to persist and id is not present, throw exception
+                throw new BadRequestException(
+                        "No id provided, cannot persist " + persistentResource.getTypeName());
+            }
         }
+    }
+
+    private static <T> T firstOrNullIfEmpty(final Collection<T> coll) {
+        return CollectionUtils.isEmpty(coll) ? null : IterableUtils.first(coll);
+    }
+
+    public static <T> T firstOrNullIfEmpty(final Observable<T> coll) {
+        return firstOrNullIfEmpty(coll.toList().blockingGet());
+    }
+
+    @Override
+    public String toString() {
+        return String.format("PersistentResource{type=%s, id=%s}", typeName, uuid.orElseGet(this::getId));
+    }
 
-        return tx.getTotalRecords(loadClass);
+    /**
+     * Check whether an id matches for this persistent resource.
+     *
+     * @param checkId the check id
+     * @return True if matches false otherwise
+     */
+    @Override
+    public boolean matchesId(String checkId) {
+        if (checkId == null) {
+            return false;
+        }
+        return uuid
+                .map(checkId::equals)
+                .orElseGet(() -> {
+                    String id = getId();
+                    return !"0".equals(id) && !"null".equals(id) && checkId.equals(id);
+                });
     }
 
     /**
      * Update attribute in existing resource.
      *
      * @param fieldName the field name
-     * @param newVal the new val
+     * @param newVal    the new val
      * @return true if object updated, false otherwise
      */
     public boolean updateAttribute(String fieldName, Object newVal) {
-        Class<?> fieldClass = dictionary.getType(getResourceClass(), fieldName);
-        newVal =  coerce(newVal, fieldName, fieldClass);
+        Type<?> fieldClass = dictionary.getType(getResourceType(), fieldName);
+        final Object coercedNewValue = dictionary.coerce(obj, newVal, fieldName, fieldClass);
         Object val = getValueUnchecked(fieldName);
-        checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, newVal, val);
-        if (val != newVal && (val == null || !val.equals(newVal))) {
-            this.setValueChecked(fieldName, newVal);
+        checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, coercedNewValue, val);
+        if (!Objects.equals(val, coercedNewValue)) {
+            if (val == null
+                    || coercedNewValue == null
+                    || !dictionary.isComplexAttribute(getType(obj), fieldName)) {
+                this.setValueChecked(fieldName, coercedNewValue);
+            } else {
+                if (newVal instanceof Map) {
+
+                    //We perform a copy here for two reasons:
+                    //1. We want the original so we can dispatch update life cycle hooks.
+                    //2. Some stores (Hibernate) won't notice changes to an attribute if the attribute
+                    //has a @TypeDef annotation unless we modify the reference in the parent object.  This rules
+                    //out an update in place strategy.
+                    Object copy = copyComplexAttribute(val);
+
+                    //Update the copy.
+                    this.updateComplexAttribute(dictionary, (Map<String, Object>) newVal, copy, requestScope);
+
+                    //Set the copy.
+                    dictionary.setValue(obj, fieldName, copy);
+                    triggerUpdate(fieldName, val, copy);
+                } else {
+                    this.setValueChecked(fieldName, coercedNewValue);
+                }
+            }
             this.markDirty();
+            //Hooks for customize logic for setAttribute/Relation
+            if (dictionary.isAttribute(getType(obj), fieldName)) {
+                transaction.setAttribute(obj, Attribute.builder()
+                        .name(fieldName)
+                        .type(fieldClass)
+                        .argument(Argument.builder()
+                                .name("_UNUSED_")
+                                .value(newVal).build())
+                        .build(), requestScope);
+            }
             return true;
         }
         return false;
     }
 
+    private void updateComplexAttribute(EntityDictionary dictionary,
+                                        Map<String, Object> updateValue,
+                                        Object currentValue,
+                                        RequestScope scope) {
+        for (String field : updateValue.keySet()) {
+            final Object newValue = updateValue.get(field);
+            final Object coercedNewValue =
+                    dictionary.coerce(currentValue, newValue, field, dictionary.getType(currentValue, field));
+            final Object newOriginal = dictionary.getValue(currentValue, field, scope);
+            if (!Objects.equals(newOriginal, coercedNewValue)) {
+                if (newOriginal == null
+                        || coercedNewValue == null
+                        || !dictionary.isComplexAttribute(ClassType.of(currentValue.getClass()), field)) {
+                    dictionary.setValue(currentValue, field, coercedNewValue);
+                } else {
+                    if (newValue instanceof Map) {
+                        this.updateComplexAttribute(dictionary, (Map<String, Object>) newValue, newOriginal, scope);
+                    } else {
+                        dictionary.setValue(currentValue, field, coercedNewValue);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Copies a complex attribute.  If the attribute fields are complex, recurses to perform a deep copy.
+     * @param object The attribute to copy.
+     * @return The copy.
+     */
+    private Object copyComplexAttribute(Object object) {
+        if (object == null) {
+            return null;
+        }
+
+        Type<?> type = getType(object);
+        EntityBinding binding = dictionary.getEntityBinding(type);
+
+        Preconditions.checkState(! binding.equals(EMPTY_BINDING), "Model not found.");
+        Preconditions.checkState(binding.apiRelationships.isEmpty(), "Deep copy of relationships not supported");
+
+        Object copy;
+        try {
+            copy = type.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new IllegalStateException("Cannot perform deep copy of " + type.getName(), e);
+        }
+
+        binding.apiAttributes.forEach(attribute -> {
+            Object newValue;
+            Object oldValue = dictionary.getValue(object, attribute, requestScope);
+            if (! dictionary.isComplexAttribute(type, attribute)) {
+                newValue = oldValue;
+            } else {
+                newValue = copyComplexAttribute(oldValue);
+            }
+            dictionary.setValue(copy, attribute, newValue);
+        });
+
+        return copy;
+    }
+
     /**
      * Perform a full replacement on relationships.
      * Here is an example:
@@ -412,41 +699,49 @@ public boolean updateAttribute(String fieldName, Object newVal) {
      * updated = (requested UNION mine) - (requested INTERSECT mine)
      * deleted = (mine - requested)
      * final = (notMine) UNION requested
-     * @param fieldName the field name
+     *
+     * @param fieldName           the field name
      * @param resourceIdentifiers the resource identifiers
      * @return True if object updated, false otherwise
      */
     public boolean updateRelation(String fieldName, Set<PersistentResource> resourceIdentifiers) {
         RelationshipType type = getRelationshipType(fieldName);
+
         Set<PersistentResource> resources = filter(
                 ReadPermission.class,
-                (Set) getRelationUncheckedUnfiltered(fieldName)
-        );
+                Optional.empty(),
+                ALL_FIELDS,
+                getRelationUncheckedUnfiltered(fieldName)).toList(LinkedHashSet::new).blockingGet();
+
+        boolean isUpdated;
         if (type.isToMany()) {
+            List<Object> modifiedResources = CollectionUtils.isEmpty(resourceIdentifiers)
+                    ? Collections.emptyList()
+                    : resourceIdentifiers.stream().map(PersistentResource::getObject).collect(Collectors.toList());
             checkFieldAwareDeferPermissions(
                     UpdatePermission.class,
                     fieldName,
-                    resourceIdentifiers.stream().map(PersistentResource::getObject).collect(Collectors.toList()),
+                    modifiedResources,
                     resources.stream().map(PersistentResource::getObject).collect(Collectors.toList())
             );
-            return updateToManyRelation(fieldName, resourceIdentifiers, resources);
+            isUpdated = updateToManyRelation(fieldName, resourceIdentifiers, resources);
         } else { // To One Relationship
-            PersistentResource resource = (resources.isEmpty()) ? null : resources.iterator().next();
+            PersistentResource resource = firstOrNullIfEmpty(resources);
             Object original = (resource == null) ? null : resource.getObject();
-            PersistentResource modifiedResource =
-                    (resourceIdentifiers == null || resourceIdentifiers.isEmpty()) ? null
-                            : resourceIdentifiers.iterator().next();
+            PersistentResource modifiedResource = firstOrNullIfEmpty(resourceIdentifiers);
             Object modified = (modifiedResource == null) ? null : modifiedResource.getObject();
             checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, modified, original);
-            return updateToOneRelation(fieldName, resourceIdentifiers, resources);
+            isUpdated = updateToOneRelation(fieldName, resourceIdentifiers, resources);
         }
+        return isUpdated;
     }
 
     /**
      * Updates a to-many relationship.
-     * @param fieldName the field name
+     *
+     * @param fieldName           the field name
      * @param resourceIdentifiers the resource identifiers
-     * @param mine Existing, filtered relationships for field name
+     * @param mine                Existing, filtered relationships for field name
      * @return true if updated. false otherwise
      */
     protected boolean updateToManyRelation(String fieldName,
@@ -480,42 +775,43 @@ protected boolean updateToManyRelation(String fieldName,
 
         added = Sets.difference(updated, deleted);
 
-        checkSharePermission(added);
+        checkTransferablePermission(added);
 
-        Collection collection = (Collection) this.getValueUnchecked(fieldName);
-
-        if (collection == null) {
-            this.setValue(fieldName, mine);
-        }
+        Set<Object> newRelationships = new LinkedHashSet<>();
+        Set<Object> deletedRelationships = new LinkedHashSet<>();
 
         deleted
                 .stream()
                 .forEach(toDelete -> {
-                    delFromCollection(collection, fieldName, toDelete, false);
-                    deleteInverseRelation(fieldName, toDelete.getObject());
+                    deletedRelationships.add(toDelete.getObject());
                 });
 
         added
                 .stream()
                 .forEach(toAdd -> {
-                    addToCollection(collection, fieldName, toAdd);
-                    addInverseRelation(fieldName, toAdd.getObject());
+                    newRelationships.add(toAdd.getObject());
                 });
 
+        Collection collection = (Collection) this.getValueUnchecked(fieldName);
+        modifyCollection(collection, fieldName, newRelationships, deletedRelationships, true);
 
         if (!updated.isEmpty()) {
             this.markDirty();
         }
 
+        //hook for updateRelation
+        transaction.updateToManyRelation(transaction, obj, fieldName,
+                newRelationships, deletedRelationships, requestScope);
+
         return !updated.isEmpty();
     }
 
     /**
      * Update a 2-one relationship.
      *
-     * @param fieldName the field name
+     * @param fieldName           the field name
      * @param resourceIdentifiers the resource identifiers
-     * @param mine Existing, filtered relationships for field name
+     * @param mine                Existing, filtered relationships for field name
      * @return true if updated. false otherwise
      */
     protected boolean updateToOneRelation(String fieldName,
@@ -523,29 +819,29 @@ protected boolean updateToOneRelation(String fieldName,
                                           Set<PersistentResource> mine) {
         Object newValue = null;
         PersistentResource newResource = null;
-        if (resourceIdentifiers != null && !resourceIdentifiers.isEmpty()) {
-            newResource = resourceIdentifiers.iterator().next();
+        if (CollectionUtils.isNotEmpty(resourceIdentifiers)) {
+            newResource = IterableUtils.first(resourceIdentifiers);
             newValue = newResource.getObject();
         }
 
-        PersistentResource oldResource = !mine.isEmpty() ? mine.iterator().next() : null;
+        PersistentResource oldResource = firstOrNullIfEmpty(mine);
 
         if (oldResource == null) {
             if (newValue == null) {
                 return false;
             }
-            checkSharePermission(resourceIdentifiers);
+            checkTransferablePermission(resourceIdentifiers);
         } else if (oldResource.getObject().equals(newValue)) {
             return false;
         } else {
-            checkSharePermission(resourceIdentifiers);
+            checkTransferablePermission(resourceIdentifiers);
             if (hasInverseRelation(fieldName)) {
                 deleteInverseRelation(fieldName, oldResource.getObject());
                 oldResource.markDirty();
             }
         }
 
-        if (newValue != null) {
+        if (newResource != null) {
             if (hasInverseRelation(fieldName)) {
                 addInverseRelation(fieldName, newValue);
                 newResource.markDirty();
@@ -553,6 +849,8 @@ protected boolean updateToOneRelation(String fieldName,
         }
 
         this.setValueChecked(fieldName, newValue);
+        //hook for updateToOneRelation
+        transaction.updateToOneRelation(transaction, obj, fieldName, newValue, requestScope);
 
         this.markDirty();
         return true;
@@ -565,8 +863,11 @@ protected boolean updateToOneRelation(String fieldName,
      * @return True if object updated, false otherwise
      */
     public boolean clearRelation(String relationName) {
-        Set<PersistentResource> mine = filter(ReadPermission.class, (Set) getRelationUncheckedUnfiltered(relationName));
-        checkFieldAwarePermissions(UpdatePermission.class, relationName, Collections.emptySet(),
+        Set<PersistentResource> mine = filter(ReadPermission.class, Optional.empty(),
+                ALL_FIELDS,
+                getRelationUncheckedUnfiltered(relationName)).toList(LinkedHashSet::new).blockingGet();
+
+        checkFieldAwareDeferPermissions(UpdatePermission.class, relationName, Collections.emptySet(),
                 mine.stream().map(PersistentResource::getObject).collect(Collectors.toSet()));
 
         if (mine.isEmpty()) {
@@ -575,42 +876,39 @@ public boolean clearRelation(String relationName) {
 
         RelationshipType type = getRelationshipType(relationName);
 
-        mine.stream()
-                .forEach(toDelete -> {
-                    if (hasInverseRelation(relationName)) {
-                        deleteInverseRelation(relationName, toDelete.getObject());
-                        toDelete.markDirty();
-                    }
-                });
-
         if (type.isToOne()) {
-            PersistentResource oldValue = mine.iterator().next();
+            PersistentResource oldValue = IterableUtils.first(mine);
             if (oldValue != null && oldValue.getObject() != null) {
                 this.nullValue(relationName, oldValue);
                 oldValue.markDirty();
                 this.markDirty();
+                //hook for updateToOneRelation
+                transaction.updateToOneRelation(transaction, obj, relationName, null, requestScope);
+
             }
         } else {
             Collection collection = (Collection) getValueUnchecked(relationName);
-            if (collection != null && !collection.isEmpty()) {
+            if (CollectionUtils.isNotEmpty(collection)) {
+                Set<Object> deletedRelationships = new LinkedHashSet<>();
                 mine.stream()
                         .forEach(toDelete -> {
-                            delFromCollection(collection, relationName, toDelete, false);
-                            if (hasInverseRelation(relationName)) {
-                                toDelete.markDirty();
-                            }
+                            deletedRelationships.add(toDelete.getObject());
                         });
+                modifyCollection(collection, relationName, Collections.emptySet(), deletedRelationships, true);
                 this.markDirty();
+                //hook for updateToManyRelation
+                transaction.updateToManyRelation(transaction, obj, relationName,
+                        new LinkedHashSet<>(), deletedRelationships, requestScope);
+
             }
         }
-
         return true;
     }
 
     /**
      * Remove a relationship.
      *
-     * @param fieldName the field name
+     * @param fieldName      the field name
      * @param removeResource the remove resource
      */
     public void removeRelation(String fieldName, PersistentResource removeResource) {
@@ -629,53 +927,69 @@ public void removeRelation(String fieldName, PersistentResource removeResource)
             );
         }
 
-        checkFieldAwarePermissions(UpdatePermission.class, fieldName, modified, original);
+        checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, modified, original);
 
         if (relation instanceof Collection) {
-            if (!((Collection) relation).contains(removeResource.getObject())) {
+            if (removeResource == null || !((Collection) relation).contains(removeResource.getObject())) {
 
                 //Nothing to do
                 return;
             }
-            delFromCollection((Collection) relation, fieldName, removeResource, false);
+            modifyCollection((Collection) relation, fieldName, Collections.emptySet(),
+                    Set.of(removeResource.getObject()), true);
         } else {
-            if (relation == null || !relation.equals(removeResource.getObject())) {
+            if (relation == null || removeResource == null || !relation.equals(removeResource.getObject())) {
                 //Nothing to do
                 return;
             }
             this.nullValue(fieldName, removeResource);
-        }
 
-        if (hasInverseRelation(fieldName)) {
-            deleteInverseRelation(fieldName, removeResource.getObject());
-            removeResource.markDirty();
+            if (hasInverseRelation(fieldName)) {
+                deleteInverseRelation(fieldName, removeResource.getObject());
+                removeResource.markDirty();
+            }
         }
 
-        if (original != modified && original != null && !original.equals(modified)) {
+        if (!Objects.equals(original, modified)) {
             this.markDirty();
         }
+
+        RelationshipType type = getRelationshipType(fieldName);
+        if (type.isToOne()) {
+            //hook for updateToOneRelation
+            transaction.updateToOneRelation(transaction, obj, fieldName, null, requestScope);
+        } else {
+            //hook for updateToManyRelation
+            transaction.updateToManyRelation(transaction, obj, fieldName,
+                    new LinkedHashSet<>(), Sets.newHashSet(removeResource.getObject()), requestScope);
+        }
     }
 
     /**
      * Add relation link from a given parent resource to a child resource.
      *
-     * @param fieldName which relation link
+     * @param fieldName   which relation link
      * @param newRelation the new relation
      */
     public void addRelation(String fieldName, PersistentResource newRelation) {
-        checkSharePermission(Collections.singleton(newRelation));
+        checkTransferablePermission(Collections.singleton(newRelation));
         Object relation = this.getValueUnchecked(fieldName);
 
         if (relation instanceof Collection) {
-            if (addToCollection((Collection) relation, fieldName, newRelation)) {
+            if (modifyCollection((Collection) relation, fieldName,
+                    Set.of(newRelation.getObject()), Collections.emptySet(), true)) {
                 this.markDirty();
+
+                //Hook for updateToManyRelation
+                transaction.updateToManyRelation(transaction, obj, fieldName,
+                        Sets.newHashSet(newRelation.getObject()), new LinkedHashSet<>(), requestScope);
+
+                addInverseRelation(fieldName, newRelation.getObject());
             }
-            addInverseRelation(fieldName, newRelation.getObject());
         } else {
             // Not a collection, but may be trying to create a ToOne relationship.
             // NOTE: updateRelation marks dirty.
             updateRelation(fieldName, Collections.singleton(newRelation));
-            return;
         }
     }
 
@@ -684,7 +998,7 @@ public void addRelation(String fieldName, PersistentResource newRelation) {
      *
      * @param resourceIdentifiers The persistent resources that are being added
      */
-    protected void checkSharePermission(Set<PersistentResource> resourceIdentifiers) {
+    protected void checkTransferablePermission(Set<PersistentResource> resourceIdentifiers) {
         if (resourceIdentifiers == null) {
             return;
         }
@@ -692,10 +1006,26 @@ protected void checkSharePermission(Set<PersistentResource> resourceIdentifiers)
         final Set<PersistentResource> newResources = getRequestScope().getNewPersistentResources();
 
         for (PersistentResource persistentResource : resourceIdentifiers) {
-            if (!newResources.contains(persistentResource)
-                    && !lineage.getRecord(persistentResource.getType()).contains(persistentResource)) {
-                checkPermission(SharePermission.class, persistentResource);
+
+            //New resources are exempt from NonTransferable checks
+            if (newResources.contains(persistentResource)
+                    //This allows nested object hierarchies of non-transferables that are created in more than one
+                    //client request. A & B are created in one request and C is created in a subsequent request).
+                    //Even though B is non-transferable, while creating C in /A/B, C is allowed to
+                    //reference B because B & C are part of the same non-transferable object hierarchy.
+                    //To do this, the client must be able to read B (since they navigated through it) and also
+                    //update the relationship that links B & C.
+
+                    //The object being added (C) is non-transferable
+                    || (!dictionary.isTransferable(getResourceType())
+                    //The object being added to (B) is not strict
+                    && !dictionary.isStrictNonTransferable(persistentResource.getResourceType())
+                    //B is in C's lineage (/B/C).
+                    && persistentResource.equals(lineage.getParent()))) {
+                continue;
             }
+
+            checkPermission(NonTransferable.class, persistentResource);
         }
     }
 
@@ -706,17 +1036,23 @@ protected void checkSharePermission(Set<PersistentResource> resourceIdentifiers)
      */
     public void deleteResource() throws ForbiddenAccessException {
         checkPermission(DeletePermission.class, this);
-
         /*
          * Search for bidirectional relationships.  For each bidirectional relationship,
          * we need to remove ourselves from that relationship
          */
-        Map<String, Relationship> relations = getRelationships();
-        for (Map.Entry<String, Relationship> entry : relations.entrySet()) {
-            String relationName = entry.getKey();
-            String inverseRelationName = dictionary.getRelationInverse(getResourceClass(), relationName);
-            if (!inverseRelationName.equals("")) {
-                for (PersistentResource inverseResource : getRelationCheckedFiltered(relationName)) {
+
+        Type<?> resourceClass = getResourceType();
+        List<String> relationships = dictionary.getRelationships(resourceClass);
+        for (String relationName : relationships) {
+
+            /* Skip updating inverse relationships for deletes which are cascaded */
+            if (dictionary.cascadeDeletes(resourceClass, relationName)) {
+                continue;
+            }
+            String inverseRelationName = dictionary.getRelationInverse(resourceClass, relationName);
+            if (!"".equals(inverseRelationName)) {
+                for (PersistentResource inverseResource : getRelationUncheckedUnfiltered(relationName)
+                        .toList().blockingGet()) {
                     if (hasInverseRelation(relationName)) {
                         deleteInverseRelation(relationName, inverseResource.getObject());
                         inverseResource.markDirty();
@@ -725,9 +1061,10 @@ public void deleteResource() throws ForbiddenAccessException {
             }
         }
 
-        transaction.delete(getObject());
+        transaction.delete(getObject(), requestScope);
         auditClass(Audit.Action.DELETE, new ChangeSpec(this, null, getObject(), null));
-        runTriggers(OnDelete.class);
+        requestScope.publishLifecycleEvent(this, DELETE);
+        requestScope.getDeletedResources().add(this);
     }
 
     /**
@@ -735,6 +1072,7 @@ public void deleteResource() throws ForbiddenAccessException {
      *
      * @return ID id
      */
+    @Override
     public String getId() {
         return dictionary.getId(getObject());
     }
@@ -745,7 +1083,7 @@ public String getId() {
      * @param id resource id
      */
     public void setId(String id) {
-        this.setValue(dictionary.getIdFieldName(getResourceClass()), id);
+        dictionary.setId(obj, id);
     }
 
     /**
@@ -754,335 +1092,265 @@ public void setId(String id) {
      * @return Boolean
      */
     public boolean isIdGenerated() {
-        return getIdAnnotations().stream().anyMatch(a -> a.annotationType().equals(GeneratedValue.class));
-    }
-
-    /**
-     * Returns annotations applied to the ID field.
-     *
-     * @return Collection of Annotations
-     */
-    private Collection<Annotation> getIdAnnotations() {
-        return dictionary.getIdAnnotations(getObject());
+        return dictionary.getEntityBinding(type).isIdGenerated();
     }
 
     /**
      * Gets UUID.
+     *
      * @return the UUID
      */
+    @Override
     public Optional<String> getUUID() {
         return uuid;
     }
 
+    /**
+     * Get relation looking for a _single_ id.
+     * <p>
+     * NOTE: Filter expressions for this type are _not_ applied at this level.
+     *
+     * @param relationship The relationship
+     * @param id           single id to lookup
+     * @return The PersistentResource of the sought id or null if does not exist.
+     */
+    public PersistentResource getRelation(com.yahoo.elide.core.request.Relationship relationship, String id) {
+        List<PersistentResource> resources =
+                getRelation(Collections.singletonList(id), relationship).toList().blockingGet();
+
+        if (resources.isEmpty()) {
+            return null;
+        }
+        // If this is an in-memory object (i.e. UUID being created within tx), datastore may not be able to filter.
+        // If we get multiple results back, make sure we find the right id first.
+        for (PersistentResource resource : resources) {
+            if (resource.matchesId(id)) {
+                return resource;
+            }
+        }
+        return null;
+    }
 
     /**
-     * Load a single entity relation from the PersistentResource.
+     * Load a relation from the PersistentResource.
      *
-     * @param relation the relation
-     * @param id the id
+     * @param relationship the relation
+     * @param ids          a list of object identifiers to optionally load.  Can be empty.
      * @return PersistentResource relation
      */
-    public PersistentResource getRelation(String relation, String id) {
-
-        Optional<FilterExpression> filterExpression;
-        boolean skipNew = false;
-        // Criteria filtering not supported in Patch extension
-        if (requestScope instanceof PatchRequestScope) {
-            filterExpression = Optional.empty();
-            // NOTE: We can safely _skip_ tests here since we are only skipping READ checks on
-            // NEWLY created objects. We assume a user can READ their object in the midst of creation.
-            // Imposing a constraint to the contrary-- at this moment-- seems arbitrary and does not
-            // reflect reality (i.e. if a user is creating an object with values, he/she knows those values
-            // already).
-            skipNew = true;
-        } else {
-            Class<?> entityType = dictionary.getParameterizedType(getResourceClass(), relation);
-            if (entityType == null) {
-                throw new InvalidAttributeException(relation, type);
-            }
-            Class<?> idType = dictionary.getIdType(entityType);
-            Object idVal = CoerceUtil.coerce(id, idType);
-            String idField = dictionary.getIdFieldName(entityType);
-
-            List<Predicate.PathElement> path = Lists.newArrayList(
-                new Predicate.PathElement(
-                    getResourceClass(),
-                    getType(),
-                    entityType,
-                    relation
-                ),
-                new Predicate.PathElement(
-                    entityType,
-                    relation,
-                    idType,
-                    idField
-                )
-            );
+    public Observable<PersistentResource> getRelation(List<String> ids,
+                                                      com.yahoo.elide.core.request.Relationship relationship) {
+
+        FilterExpression filterExpression = Optional.ofNullable(relationship.getProjection().getFilterExpression())
+                .orElse(null);
+
+        assertPropertyExists(relationship.getName());
+        Type<?> entityType = dictionary.getParameterizedType(getResourceType(), relationship.getName());
 
-            filterExpression = Optional.of(new Predicate(
-                    path,
-                    Operator.IN,
-                    Collections.singletonList(idVal)));
+        Set<PersistentResource> newResources = new LinkedHashSet<>();
+
+        /* If this is a bulk edit request and the ID we are fetching for is newly created... */
+        if (!ids.isEmpty()) {
+            // Fetch our set of new resources that we know about since we can't find them in the datastore
+            newResources = requestScope.getNewPersistentResources().stream()
+                    .filter(resource -> entityType.isAssignableFrom(resource.getResourceType())
+                            && ids.contains(resource.getUUID().orElse("")))
+                    .collect(Collectors.toSet());
+
+            FilterExpression idExpression = buildIdFilterExpression(ids, entityType, dictionary, requestScope);
+
+            // Combine filters if necessary
+            filterExpression = Optional.ofNullable(relationship.getProjection().getFilterExpression())
+                    .map(fe -> (FilterExpression) new AndFilterExpression(idExpression, fe))
+                    .orElse(idExpression);
         }
 
-        Set<PersistentResource> resources =
-                filter(ReadPermission.class,
-                (Set) getRelationChecked(relation, filterExpression),
-                skipNew);
+        // TODO: Filter on new resources?
+        // TODO: Update pagination to subtract the number of new resources created?
 
-        for (PersistentResource childResource : resources) {
-            if (childResource.matchesId(id)) {
-                return childResource;
+        Observable<PersistentResource> existingResources = filter(
+                ReadPermission.class,
+                Optional.ofNullable(filterExpression),
+                relationship.getProjection().getRequestedFields(),
+                getRelation(relationship.copyOf()
+                        .projection(relationship.getProjection().copyOf()
+                                .filterExpression(filterExpression)
+                                .build())
+                        .build(), true));
+
+        // TODO: Sort again in memory now that two sets are glommed together?
+        Observable<PersistentResource> allResources =
+                Observable.fromIterable(newResources).mergeWith(existingResources);
+
+        Set<String> foundIds = new HashSet<>();
+
+        allResources = allResources.doOnNext((resource) -> {
+            String id = (String) (resource.getUUID().orElseGet(resource::getId));
+            if (ids.contains(id)) {
+                foundIds.add(id);
             }
-        }
-        throw new InvalidObjectIdentifierException(id, relation);
-    }
+        });
 
-    /**
-     * Get collection of resources from relation field.
-     *
-     * @param relationName field
-     * @return collection relation
-     */
-    public Set<PersistentResource> getRelationCheckedFiltered(String relationName) {
-        return filter(ReadPermission.class, (Set) getRelation(relationName, true));
+        allResources = allResources.doOnComplete(() -> {
+            Set<String> missedIds = Sets.difference(new HashSet<>(ids), foundIds);
+            if (!missedIds.isEmpty()) {
+                throw new InvalidObjectIdentifierException(missedIds.toString(), relationship.getName());
+            }
+        });
+
+        return allResources;
     }
 
     /**
-     * Get collection of resources from relation field.
+     * Get observable of resources from relation field.
      *
-     * @param relationName field
+     * @param relationship relationship
      * @return collection relation
      */
-    public Set<PersistentResource> getRelationCheckedFilteredWithSortingAndPagination(String relationName) {
-        return filter(ReadPermission.class, (Set) getRelationWithSortingAndPagination(relationName, true));
+    public Observable<PersistentResource> getRelationCheckedFiltered(
+            com.yahoo.elide.core.request.Relationship relationship) {
+        return filter(ReadPermission.class,
+                Optional.ofNullable(relationship.getProjection().getFilterExpression()),
+                relationship.getProjection().getRequestedFields(),
+                getRelation(relationship, true));
     }
 
-    private Set<PersistentResource> getRelationUncheckedUnfiltered(String relationName) {
-        return getRelation(relationName, false);
+    private Observable<PersistentResource> getRelationUncheckedUnfiltered(String relationName) {
+        assertPropertyExists(relationName);
+        return getRelation(com.yahoo.elide.core.request.Relationship.builder()
+                .name(relationName)
+                .alias(relationName)
+                .projection(EntityProjection.builder()
+                        .type(dictionary.getParameterizedType(getResourceType(), relationName))
+                        .build())
+                .build(), false);
     }
 
-    private Set<PersistentResource> getRelation(String relationName, boolean checked) {
-
-        if (checked && !checkRelation(relationName)) {
-            return Collections.emptySet();
+    private void assertPropertyExists(String propertyName) {
+        if (propertyName == null || dictionary.getParameterizedType(obj, propertyName) == null) {
+            throw new InvalidAttributeException(propertyName, this.getTypeName());
         }
-        Optional<FilterExpression> expression = getExpressionForRelation(relationName);
-        return getRelationUnchecked(relationName, expression);
     }
 
-    private Optional<FilterExpression> getExpressionForRelation(String relationName) {
-        final Class<?> entityClass = dictionary.getParameterizedType(obj, relationName);
-        if (entityClass == null) {
-            throw new InvalidAttributeException(relationName, type);
-        }
-        final String valType = dictionary.getJsonAliasFor(entityClass);
-        return requestScope.getFilterExpressionByType(valType);
-    }
+    private Observable<PersistentResource> getRelation(com.yahoo.elide.core.request.Relationship relationship,
+                                                       boolean checked) {
 
-    /**
-     * Gets the relational entities to a entity (author/1/books) - books would be fetched here.
-     * @param relationName The relationship name - eg. books
-     * @param checked The flag to denote if we are doing security checks on this relationship
-     * @return The resulting records from underlying data store
-     */
-    private Set<PersistentResource> getRelationWithSortingAndPagination(String relationName, boolean checked) {
-        if (checked && !checkRelation(relationName)) {
-            return Collections.emptySet();
+        if (checked && !checkRelation(relationship)) {
+            return Observable.empty();
         }
 
-        final Class<?> relationClass = dictionary.getParameterizedType(obj, relationName);
-        if (! requestScope.getPagination().isDefaultInstance()
-                && !CanPaginateVisitor.canPaginate(relationClass, dictionary, requestScope)) {
-            throw new InvalidPredicateException(String.format("Cannot paginate %s",
+        Type<?> relationClass = dictionary.getParameterizedType(obj, relationship.getName());
+
+        Optional<Pagination> pagination = Optional.ofNullable(relationship.getProjection().getPagination());
+
+        if (pagination.filter(Predicates.not(Pagination::isDefaultInstance)).isPresent()
+                && !CanPaginateVisitor.canPaginate(
+                relationClass,
+                dictionary,
+                requestScope,
+                relationship.getProjection().getRequestedFields())) {
+
+            throw new BadRequestException(String.format("Cannot paginate %s",
                     dictionary.getJsonAliasFor(relationClass)));
         }
 
-        Optional<FilterExpression> filterExpression = getExpressionForRelation(relationName);
-        return getRelationUncheckedWithSortingAndPagination(relationName, filterExpression);
+        return getRelationUnchecked(relationship);
     }
 
     /**
      * Check the permissions of the relationship, and return true or false.
-     * @param relationName The relationship to the entity
+     *
+     * @param relationship The relationship to the entity
      * @return True if the relationship to the entity has valid permissions for the user
      */
-    protected boolean checkRelation(String relationName) {
-        List<String> relations = dictionary.getRelationships(obj);
+    protected boolean checkRelation(com.yahoo.elide.core.request.Relationship relationship) {
+        String relationName = relationship.getName();
 
         String realName = dictionary.getNameFromAlias(obj, relationName);
         relationName = (realName == null) ? relationName : realName;
 
-        if (relationName == null || relations == null || !relations.contains(relationName)) {
-            throw new InvalidAttributeException(relationName, type);
-        }
+        assertPropertyExists(relationName);
 
         checkFieldAwareDeferPermissions(ReadPermission.class, relationName, null, null);
 
-        final PermissionExecutor executor = requestScope.getPermissionExecutor();
-        try {
-            //The collection can be skipped if the User check for the objects inside the relationship evaluates to false
-            executor.checkUserPermissions(dictionary.getParameterizedType(obj, relationName), ReadPermission.class);
-        } catch (ForbiddenAccessException e) {
-            return false;
-        }
-
-        return true;
+        return !shouldSkipCollection(
+                dictionary.getParameterizedType(obj, relationName),
+                ReadPermission.class,
+                requestScope,
+                relationship.getProjection().getRequestedFields());
     }
 
     /**
-     * Get collection of resources from relation field.
+     * Get collection of resources from relation field.  Does not filter the relationship and does
+     * not invoke lifecycle hooks.
      *
-     * @param relationName field
-     * @param filterExpression An optional filter expression
+     * @param relationship the relationship to fetch
      * @return collection relation
      */
-    protected Set<PersistentResource> getRelationChecked(String relationName,
-                                                         Optional<FilterExpression> filterExpression) {
-        if (!checkRelation(relationName)) {
-            return Collections.emptySet();
+    public Observable<PersistentResource> getRelationChecked(com.yahoo.elide.core.request.Relationship relationship) {
+        if (!checkRelation(relationship)) {
+            return Observable.empty();
         }
-        return getRelationUnchecked(relationName, filterExpression);
-
+        return getRelationUnchecked(relationship);
     }
 
     /**
-     * Retrieve an uncheck set of relations.
-     *
-     * @param relationName field
-     * @param filterExpression An optional filter expression
-     * @return the resources in the relationship
+     * Retrieve an unchecked set of relations.
      */
-    private Set<PersistentResource> getRelationUnchecked(String relationName,
-                                                         Optional<FilterExpression> filterExpression) {
-        RelationshipType type = getRelationshipType(relationName);
-        final Class<?> relationClass = dictionary.getParameterizedType(obj, relationName);
-
-        //Invoke filterExpressionCheck and then merge with filterExpression.
-        Optional<FilterExpression> permissionFilter = getPermissionFilterExpression(relationClass, requestScope);
-        if (permissionFilter.isPresent()) {
-            if (filterExpression.isPresent()) {
-                FilterExpression mergedExpression =
-                        new AndFilterExpression(filterExpression.get(), permissionFilter.get());
-                filterExpression = Optional.of(mergedExpression);
-            } else {
-                filterExpression = permissionFilter;
-            }
-        }
-
-        Object val;
+    private Observable<PersistentResource> getRelationUnchecked(
+            com.yahoo.elide.core.request.Relationship relationship) {
+        String relationName = relationship.getName();
+        FilterExpression filterExpression = relationship.getProjection().getFilterExpression();
+        Pagination pagination = relationship.getProjection().getPagination();
+        Sorting sorting = relationship.getProjection().getSorting();
 
-        /* If elide was configured for Elide 3.0 data store interface */
-        if (requestScope.useFilterExpressions()) {
-            String path = requestScope.getPath();
-            val = requestScope.getTransaction()
-                    .getRelation(obj, type, relationName, relationClass, dictionary,
-                            filterExpression, null, null);
-
-        /* Otherwise use the Elide 2.0 interface */
-        } else {
-
-            /* Convert the expression to a set of predicates */
-            Set<Predicate> filters;
-            PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-            if (filterExpression.isPresent()) {
-                filters = filterExpression.get().accept(visitor);
-            } else {
-                filters = Collections.emptySet();
-            }
-            val = requestScope.getTransaction()
-                    .getRelation(obj, type, relationName, relationClass, dictionary, filters);
+        RelationshipType type = getRelationshipType(relationName);
+        final Type<?> relationClass = dictionary.getParameterizedType(obj, relationName);
+        if (relationClass == null) {
+            throw new InvalidAttributeException(relationName, this.getTypeName());
         }
 
-        if (val == null) {
-            return Collections.emptySet();
-        }
+        //Invoke filterExpressionCheck and then merge with filterExpression.
+        Optional<FilterExpression> permissionFilter = getPermissionFilterExpression(relationClass,
+                requestScope, relationship.getProjection().getRequestedFields());
+        Optional<FilterExpression> computedFilters = Optional.ofNullable(filterExpression);
 
-        Set<PersistentResource<Object>> resources = Sets.newLinkedHashSet();
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-            resources = new PersistentResourceSet(this, filteredVal, requestScope);
-        } else if (type.isToOne()) {
-            resources = new SingleElementSet(new PersistentResource(this, val, requestScope));
-        } else {
-            resources.add(new PersistentResource(this, val, requestScope));
+        if (permissionFilter.isPresent() && filterExpression != null) {
+            FilterExpression mergedExpression =
+                    new AndFilterExpression(filterExpression, permissionFilter.get());
+            computedFilters = Optional.of(mergedExpression);
+        } else if (permissionFilter.isPresent()) {
+            computedFilters = permissionFilter;
         }
 
-        return (Set) resources;
-    }
-
-    /**
-     * Fetches the relationship entities with sorting and pagination support via HQLTransaction.
-     * @param relationName The entity whose relationships we want to fetch
-     * @param filterExpression An optional filter expression
-     * @return The persistent resources
-     */
-    private Set<PersistentResource> getRelationUncheckedWithSortingAndPagination(
-            String relationName,
-            Optional<FilterExpression> filterExpression) {
-        RelationshipType type = getRelationshipType(relationName);
-        final Class<?> relationClass = dictionary.getParameterizedType(obj, relationName);
+        com.yahoo.elide.core.request.Relationship modifiedRelationship = relationship.copyOf()
+                .projection(relationship.getProjection().copyOf()
+                        .filterExpression(computedFilters.orElse(null))
+                        .sorting(sorting)
+                        .pagination(pagination)
+                        .build()
+                ).build();
 
-        Object val;
+        Observable<PersistentResource> resources;
 
-        String path = requestScope.getPath();
-        /* If elide was configured for Elide 3.0 data store interface */
-        if (requestScope.useFilterExpressions()) {
-            val = requestScope.getTransaction()
-                    .getRelation(obj, type, relationName, relationClass, dictionary,
-                            filterExpression, requestScope.getSorting(), requestScope.getPagination());
+        if (type.isToMany()) {
+            DataStoreIterable val = transaction.getToManyRelation(transaction, obj, modifiedRelationship, requestScope);
 
-        /* Otherwise use the Elide 2.0 interface */
-        } else {
-            /* Convert the expression to a set of predicates */
-            Set<Predicate> filters;
-            PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-            if (filterExpression.isPresent()) {
-                filters = filterExpression.get().accept(visitor);
-            } else {
-                filters = Collections.emptySet();
+            if (val == null) {
+                return Observable.empty();
             }
-
-            val = requestScope.getTransaction()
-                    .getRelationWithSortingAndPagination(obj, type, relationName, relationClass, dictionary,
-                            filters, requestScope.getSorting(), requestScope.getPagination());
-        }
-
-        if (val == null) {
-            return Collections.emptySet();
-        }
-
-        Set<PersistentResource<Object>> resources = Sets.newLinkedHashSet();
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-            resources = new PersistentResourceSet(this, filteredVal, requestScope);
-        } else if (type.isToOne()) {
-            resources = new SingleElementSet(new PersistentResource(this, val, requestScope));
+            resources = Observable.fromIterable(
+                    new PersistentResourceSet(this, relationName, val, requestScope));
         } else {
-            resources.add(new PersistentResource(this, val, requestScope));
+            Object val = transaction.getToOneRelation(transaction, obj, modifiedRelationship, requestScope);
+            if (val == null) {
+                return Observable.empty();
+            }
+            resources = Observable.fromArray(new PersistentResource(val, this, relationName,
+                    requestScope.getUUIDFor(val), requestScope));
         }
 
-        return (Set) resources;
-    }
-
-    /**
-     * Determine whether or not to skip loading a collection.
-     *
-     * @param resourceClass Resource class
-     * @param annotationClass Annotation class
-     * @param requestScope Request scope
-     * @param <A> type parameter
-     * @return True if collection should be skipped (i.e. denied access), false otherwise
-     */
-    private static <A extends Annotation> boolean shouldSkipCollection(Class<?> resourceClass,
-                                                                       Class<A> annotationClass,
-                                                                       RequestScope requestScope) {
-        try {
-            requestScope.getPermissionExecutor().checkUserPermissions(resourceClass, annotationClass);
-        } catch (ForbiddenAccessException e) {
-            return true;
-        }
-        return false;
+        return resources;
     }
 
     /**
@@ -1097,10 +1365,29 @@ public RelationshipType getRelationshipType(String relation) {
 
     /**
      * Get the value for a particular attribute (i.e. non-relational field)
+     *
      * @param attr Attribute name
      * @return Object value for attribute
      */
+    @Deprecated
     public Object getAttribute(String attr) {
+        assertPropertyExists(attr);
+
+        return this.getAttribute(
+                Attribute.builder()
+                        .name(attr)
+                        .alias(attr)
+                        .type(dictionary.getParameterizedType(getResourceType(), attr))
+                        .build());
+    }
+
+    /**
+     * Get the value for a particular attribute (i.e. non-relational field)
+     *
+     * @param attr the Attribute
+     * @return Object value for attribute
+     */
+    public Object getAttribute(Attribute attr) {
         return this.getValueChecked(attr);
     }
 
@@ -1109,12 +1396,14 @@ public Object getAttribute(String attr) {
      *
      * @return bean object
      */
+    @Override
     public T getObject() {
         return obj;
     }
 
     /**
      * Sets object.
+     *
      * @param obj the obj
      */
     public void setObject(T obj) {
@@ -1126,17 +1415,20 @@ public void setObject(T obj) {
      *
      * @return type resource class
      */
+    @Override
     @JsonIgnore
-    public Class<T> getResourceClass() {
-        return (Class) dictionary.lookupEntityClass(obj.getClass());
+    public Type<T> getResourceType() {
+        return (Type) dictionary.lookupBoundClass(getType(obj));
     }
 
     /**
      * Gets type.
+     *
      * @return the type
      */
-    public String getType() {
-        return type;
+    @Override
+    public String getTypeName() {
+        return typeName;
     }
 
     @Override
@@ -1154,7 +1446,7 @@ public int hashCode() {
             //         that newly created object within the context of the request. Thus, if any such action was
             //         required, the user would be forced to provide a UUID anyway.
             String id = dictionary.getId(getObject());
-            if (uuid.isPresent() && "0".equals(id)) {
+            if (uuid.isPresent() && ("0".equals(id) || "null".equals(id))) {
                 hashCode = Objects.hashCode(uuid);
             } else {
                 hashCode = Objects.hashCode(id);
@@ -1171,13 +1463,23 @@ public boolean equals(Object obj) {
                 return true;
             }
             String theirId = dictionary.getId(that.getObject());
-            return this.matchesId(theirId) && Objects.equals(this.type, that.type);
+            return this.matchesId(theirId) && Objects.equals(this.typeName, that.typeName);
         }
         return false;
     }
 
+    /**
+     * Returns whether or not this resource was created in this transaction.
+     *
+     * @return True if this resource is newly created.
+     */
+    public boolean isNewlyCreated() {
+        return requestScope.getNewResources().contains(this);
+    }
+
     /**
      * Gets lineage.
+     *
      * @return the lineage
      */
     public ResourceLineage getLineage() {
@@ -1186,6 +1488,7 @@ public ResourceLineage getLineage() {
 
     /**
      * Gets dictionary.
+     *
      * @return the dictionary
      */
     public EntityDictionary getDictionary() {
@@ -1194,8 +1497,10 @@ public EntityDictionary getDictionary() {
 
     /**
      * Gets request scope.
+     *
      * @return the request scope
      */
+    @Override
     public RequestScope getRequestScope() {
         return requestScope;
     }
@@ -1211,25 +1516,43 @@ public Resource toResource() {
 
     /**
      * Fetch a resource with support for lambda function for getting relationships and attributes.
+     *
      * @return The Resource
      */
-    public Resource toResourceWithSortingAndPagination() {
-        return toResource(this::getRelationshipsWithSortingAndPagination, this::getAttributes);
+    public Resource toResource(EntityProjection projection) {
+        return toResource(() -> getRelationships(projection), this::getAttributes);
     }
 
     /**
      * Fetch a resource with support for lambda function for getting relationships and attributes.
+     *
      * @param relationshipSupplier The relationship supplier (getRelationships())
+     * @param attributeSupplier    The attribute supplier
+     * @return The Resource
+     */
+    private Resource toResource(final Supplier<Map<String, Relationship>> relationshipSupplier,
+                                final Supplier<Map<String, Object>> attributeSupplier) {
+        return toResource(relationshipSupplier.get(), attributeSupplier.get());
+    }
+
+    /**
+     * Convert a persistent resource to a resource.
+     *
+     * @param relationships The relationships
+     * @param attributes    The attributes
      * @return The Resource
      */
-    public Resource toResource(final Supplier<Map<String, Relationship>> relationshipSupplier,
-                               final Supplier<Map<String, Object>> attributeSupplier) {
-        final Resource resource = new Resource(type, (obj == null)
+    public Resource toResource(final Map<String, Relationship> relationships,
+                               final Map<String, Object> attributes) {
+        final Resource resource = new Resource(typeName, (obj == null)
                 ? uuid.orElseThrow(
                 () -> new InvalidEntityBodyException("No id found on object"))
                 : dictionary.getId(obj));
-        resource.setRelationships(relationshipSupplier.get());
-        resource.setAttributes(attributeSupplier.get());
+        resource.setRelationships(relationships);
+        resource.setAttributes(attributes);
+        if (requestScope.getElideSettings().isEnableJsonLinks()) {
+            resource.setLinks(requestScope.getElideSettings().getJsonApiLinks().getResourceLevelLinks(this));
+        }
         return resource;
     }
 
@@ -1239,7 +1562,19 @@ public Resource toResource(final Supplier<Map<String, Relationship>> relationshi
      * @return Relationship mapping
      */
     protected Map<String, Relationship> getRelationships() {
-        return getRelationshipsWithRelationshipFunction(this::getRelationCheckedFiltered);
+        return getRelationshipsWithRelationshipFunction((relationName) -> {
+            Optional<FilterExpression> filterExpression = requestScope.getExpressionForRelation(getResourceType(),
+                    relationName);
+
+            return getRelationCheckedFiltered(com.yahoo.elide.core.request.Relationship.builder()
+                    .alias(relationName)
+                    .name(relationName)
+                    .projection(EntityProjection.builder()
+                            .type(dictionary.getParameterizedType(getResourceType(), relationName))
+                            .filterExpression(filterExpression.orElse(null))
+                            .build())
+                    .build());
+        });
     }
 
     /**
@@ -1247,38 +1582,48 @@ protected Map<String, Relationship> getRelationships() {
      *
      * @return Relationship mapping
      */
-    protected Map<String, Relationship> getRelationshipsWithSortingAndPagination() {
-        return getRelationshipsWithRelationshipFunction(this::getRelationCheckedFilteredWithSortingAndPagination);
+    private Map<String, Relationship> getRelationships(EntityProjection projection) {
+        return getRelationshipsWithRelationshipFunction(
+                (relationName) -> getRelationCheckedFiltered(projection.getRelationship(relationName)
+                        .orElseThrow(IllegalStateException::new)
+                ));
     }
 
     /**
      * Get relationship mappings.
      *
+     * @param relationshipFunction a function to load the value of a relationship. Takes a string of the relationship
+     *                             name and returns the relationship's value.
      * @return Relationship mapping
      */
     protected Map<String, Relationship> getRelationshipsWithRelationshipFunction(
-            final Function<String, Set<PersistentResource>> relationshipFunction) {
+            final Function<String, Observable<PersistentResource>> relationshipFunction) {
         final Map<String, Relationship> relationshipMap = new LinkedHashMap<>();
         final Set<String> relationshipFields = filterFields(dictionary.getRelationships(obj));
 
         for (String field : relationshipFields) {
-            TreeMap<String, Resource> orderedById = new TreeMap<>(comparator);
-            for (PersistentResource relationship : relationshipFunction.apply(field)) {
+            TreeMap<String, Resource> orderedById = new TreeMap<>(lengthFirstComparator);
+            for (PersistentResource relationship : relationshipFunction.apply(field).toList().blockingGet()) {
                 orderedById.put(relationship.getId(),
-                        new ResourceIdentifier(relationship.getType(), relationship.getId()).castToResource());
+                        new ResourceIdentifier(relationship.getTypeName(), relationship.getId()).castToResource());
 
             }
-            Collection<Resource> resources = orderedById.values();
+            Observable<Resource> resources = Observable.fromIterable(orderedById.values());
 
             Data<Resource> data;
             RelationshipType relationshipType = getRelationshipType(field);
             if (relationshipType.isToOne()) {
-                data = resources.isEmpty() ? new Data<>((Resource) null) : new Data<>(resources.iterator().next());
+                data = new Data<>(firstOrNullIfEmpty(resources));
             } else {
                 data = new Data<>(resources);
             }
-            // TODO - links
-            relationshipMap.put(field, new Relationship(null, data));
+            Map<String, String> links = null;
+            if (requestScope.getElideSettings().isEnableJsonLinks()) {
+                links = requestScope.getElideSettings()
+                        .getJsonApiLinks()
+                        .getRelationshipLinks(this, field);
+            }
+            relationshipMap.put(field, new Relationship(links, data));
         }
 
         return relationshipMap;
@@ -1302,19 +1647,26 @@ protected Map<String, Object> getAttributes() {
 
     /**
      * Sets value.
+     *
      * @param fieldName the field name
-     * @param newValue the new value
+     * @param newValue  the new value
      */
     protected void setValueChecked(String fieldName, Object newValue) {
-        checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, newValue, getValueUnchecked(fieldName));
+        Object existingValue = getValueUnchecked(fieldName);
+
+        // TODO: Need to refactor this logic. For creates this is properly converted in the executor. This logic
+        // should be explicitly encapsulated here, not there.
+        checkFieldAwareDeferPermissions(UpdatePermission.class, fieldName, newValue, existingValue);
+
         setValue(fieldName, newValue);
     }
 
     /**
      * Nulls the relationship or attribute and checks update permissions.
      * Invokes the set[fieldName] method on the target object OR set the field with the corresponding name.
+     *
      * @param fieldName the field name to set or invoke equivalent set method
-     * @param oldValue the old value
+     * @param oldValue  the old value
      */
     protected void nullValue(String fieldName, PersistentResource oldValue) {
         if (oldValue == null) {
@@ -1322,19 +1674,20 @@ protected void nullValue(String fieldName, PersistentResource oldValue) {
         }
         String inverseField = getInverseRelationField(fieldName);
         if (!inverseField.isEmpty()) {
-            oldValue.checkFieldAwarePermissions(UpdatePermission.class, inverseField, null, getObject());
+            oldValue.checkFieldAwareDeferPermissions(UpdatePermission.class, inverseField, null, getObject());
         }
         this.setValueChecked(fieldName, null);
     }
 
     /**
      * Gets a value from an entity and checks read permissions.
-     * @param fieldName the field name
+     *
+     * @param attribute the attribute to fetch.
      * @return value value
      */
-    protected Object getValueChecked(String fieldName) {
-        checkFieldAwareDeferPermissions(ReadPermission.class, fieldName, (Object) null, (Object) null);
-        return getValue(getObject(), fieldName, dictionary);
+    protected Object getValueChecked(Attribute attribute) {
+        checkFieldAwareDeferPermissions(ReadPermission.class, attribute.getName(), null, null);
+        return transaction.getAttribute(getObject(), attribute, requestScope);
     }
 
     /**
@@ -1344,364 +1697,165 @@ protected Object getValueChecked(String fieldName) {
      * @return Value
      */
     protected Object getValueUnchecked(String fieldName) {
-        return getValue(getObject(), fieldName, dictionary);
-    }
-
-    /**
-     * Adds a new element to a collection and tests update permission.
-     * @param collection the collection
-     * @param collectionName the collection name
-     * @param toAdd the to add
-     * @return True if added to collection false otherwise (i.e. element already in collection)
-     */
-    protected boolean addToCollection(Collection collection, String collectionName, PersistentResource toAdd) {
-        final Collection singleton = Collections.singleton(toAdd.getObject());
-        final Collection original = copyCollection(collection);
-        checkFieldAwareDeferPermissions(
-                UpdatePermission.class,
-                collectionName,
-                CollectionUtils.union(CollectionUtils.emptyIfNull(collection), singleton),
-                original);
-        if (collection == null) {
-            collection = Collections.singleton(toAdd.getObject());
-            Object value = getValueUnchecked(collectionName);
-            if ((value == null && toAdd.getObject() != null) || (value != null && !value.equals(toAdd.getObject()))) {
-                this.setValueChecked(collectionName, collection);
-                return true;
-            }
-        } else {
-            if (!collection.contains(toAdd.getObject())) {
-                collection.add(toAdd.getObject());
-                auditField(new ChangeSpec(this, collectionName, original, collection));
-                return true;
-            }
-        }
-        return false;
+        return getValue(getObject(), fieldName, requestScope);
     }
 
-    /**
-     * Deletes an existing element in a collection and tests update and delete permissions.
-     * @param collection the collection
-     * @param collectionName the collection name
-     * @param toDelete the to delete
-     * @param isInverseCheck Whether or not the deletion is already coming from cleaning up an inverse.
-     *                       Without this parameter, we could find ourselves in a loop of checks.
-     *                       TODO: This is a band-aid for a quick fix. This should certainly be refactored.
-     */
-    protected void delFromCollection(
-            Collection collection,
+    protected boolean modifyCollection(
+            Collection toModify,
             String collectionName,
-            PersistentResource toDelete,
-            boolean isInverseCheck) {
-        final Collection original = copyCollection(collection);
+            Collection toAdd,
+            Collection toRemove,
+            boolean updateInverse) {
+
+        Collection copyOfOriginal = copyCollection(toModify);
+
+        Collection modified = CollectionUtils.union(CollectionUtils.emptyIfNull(toModify), toAdd);
+        modified = CollectionUtils.subtract(modified, toRemove);
+
         checkFieldAwareDeferPermissions(
                 UpdatePermission.class,
                 collectionName,
-                CollectionUtils.disjunction(collection, Collections.singleton(toDelete.getObject())),
-                original
-        );
+                modified,
+                copyOfOriginal);
 
-        String inverseField = getInverseRelationField(collectionName);
-        if (!isInverseCheck && !inverseField.isEmpty()) {
-            // Compute the ChangeSpec for the inverse relation and check whether or not we have access
-            // to apply this change to that field.
-            final Object originalValue = toDelete.getValueUnchecked(inverseField);
-            final Collection originalBidirectional;
-
-            if (originalValue instanceof Collection) {
-                originalBidirectional = copyCollection((Collection) originalValue);
-            } else {
-                originalBidirectional = Collections.singleton(originalValue);
+        if (updateInverse) {
+            for (Object adding : toAdd) {
+                addInverseRelation(collectionName, adding);
             }
 
-            final Collection removedBidrectional = CollectionUtils
-                    .disjunction(Collections.singleton(this.getObject()), originalBidirectional);
-
-            toDelete.checkFieldAwareDeferPermissions(
-                    UpdatePermission.class,
-                    inverseField,
-                    removedBidrectional,
-                    originalBidirectional
-            );
+            for (Object removing : toRemove) {
+                deleteInverseRelation(collectionName, removing);
+            }
         }
 
-        if (collection == null) {
-            return;
-        }
+        if (toModify == null) {
+            this.setValueChecked(collectionName, modified);
+            return true;
+        } else {
+            if (copyOfOriginal.equals(modified)) {
+                return false;
+            }
+            toModify.addAll(toAdd);
+            toModify.removeAll(toRemove);
 
-        collection.remove(toDelete.getObject());
-        auditField(new ChangeSpec(this, collectionName, original, collection));
+            triggerUpdate(collectionName, copyOfOriginal, modified);
+            return true;
+        }
     }
 
     /**
      * Invoke the set[fieldName] method on the target object OR set the field with the corresponding name.
+     *
      * @param fieldName the field name to set or invoke equivalent set method
-     * @param value the value to set
+     * @param value     the value to set
      */
     protected void setValue(String fieldName, Object value) {
-        Class<?> targetClass = obj.getClass();
         final Object original = getValueUnchecked(fieldName);
-        try {
-            Class<?> fieldClass = dictionary.getType(targetClass, fieldName);
-            String realName = dictionary.getNameFromAlias(obj, fieldName);
-            fieldName = (realName != null) ? realName : fieldName;
-            String setMethod = "set" + WordUtils.capitalize(fieldName);
-            Method method = EntityDictionary.findMethod(targetClass, setMethod, fieldClass);
-            method.invoke(obj, coerce(value, fieldName, fieldClass));
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new InvalidAttributeException(fieldName, type);
-        } catch (IllegalArgumentException | NoSuchMethodException noMethod) {
-            try {
-                Field field = targetClass.getField(fieldName);
-                field.set(obj, coerce(value, fieldName, field.getType()));
-            } catch (NoSuchFieldException | IllegalAccessException noField) {
-                throw new InvalidAttributeException(fieldName, type);
-            }
-        }
-
-        runTriggers(OnUpdate.class, fieldName);
-        this.requestScope.queueCommitTrigger(this, fieldName);
-        auditField(new ChangeSpec(this, fieldName, original, value));
-    }
-
-    <A extends Annotation> void runTriggers(Class<A> annotationClass) {
-        runTriggers(annotationClass, "");
-    }
-
-    <A extends Annotation> void runTriggers(Class<A> annotationClass, String fieldName) {
-        Class<?> targetClass = obj.getClass();
-
-        Collection<Method> methods = dictionary.getTriggers(targetClass, annotationClass, fieldName);
-        for (Method method : methods) {
-            try {
-                method.invoke(obj);
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-    }
-
-    /**
-     * Coerce provided value into expected class type.
-     *
-     * @param value provided value
-     * @param fieldClass expected class type
-     * @return coerced value
-     */
-    private Object coerce(Object value, String fieldName, Class<?> fieldClass) {
-        if (fieldClass != null && Collection.class.isAssignableFrom(fieldClass) && value instanceof Collection) {
-            return coerceCollection((Collection) value, fieldName, fieldClass);
-        }
-
-        if (fieldClass != null && Map.class.isAssignableFrom(fieldClass) && value instanceof Map) {
-            return coerceMap((Map<?, ?>) value, fieldName, fieldClass);
-        }
-
-        return CoerceUtil.coerce(value, fieldClass);
-    }
-
-    private Collection coerceCollection(Collection<?> values, String fieldName, Class<?> fieldClass) {
-        Class<?> providedType = dictionary.getParameterizedType(obj, fieldName);
-
-        // check if collection is of and contains the correct types
-        if (fieldClass.isAssignableFrom(values.getClass())) {
-            boolean valid = true;
-            for (Object member : values) {
-                if (member != null && !providedType.isAssignableFrom(member.getClass())) {
-                    valid = false;
-                    break;
-                }
-            }
-            if (valid) {
-                return values;
-            }
-        }
-
-        ArrayList<Object> list = new ArrayList<>(values.size());
-        for (Object member : values) {
-            list.add(CoerceUtil.coerce(member, providedType));
-        }
-
-        if (Set.class.isAssignableFrom(fieldClass)) {
-            return new LinkedHashSet<>(list);
-        }
-
-        return list;
-    }
-
-    private Map coerceMap(Map<?, ?> values, String fieldName, Class<?> fieldClass) {
-        Class<?> keyType = dictionary.getParameterizedType(obj, fieldName, 0);
-        Class<?> valueType = dictionary.getParameterizedType(obj, fieldName, 1);
-
-        // Verify the existing Map
-        if (isValidParameterizedMap(values, keyType, valueType)) {
-            return values;
-        }
 
-        LinkedHashMap<Object, Object> result = new LinkedHashMap<>(values.size());
-        for (Map.Entry<?, ?> entry : values.entrySet()) {
-            result.put(CoerceUtil.coerce(entry.getKey(), keyType), CoerceUtil.coerce(entry.getValue(), valueType));
-        }
-
-        return result;
-    }
-
-    private boolean isValidParameterizedMap(Map<?, ?> values, Class<?> keyType, Class<?> valueType) {
-        for (Map.Entry<?, ?> entry : values.entrySet()) {
-            Object key = entry.getKey();
-            Object value = entry.getValue();
-            if ((key != null && !keyType.isAssignableFrom(key.getClass()))
-                    || (value != null && !valueType.isAssignableFrom(value.getClass()))) {
-                return false;
-            }
-        }
-        return true;
-    }
+        dictionary.setValue(obj, fieldName, value);
 
-    /**
-     * Invoke the get[fieldName] method on the target object OR get the field with the corresponding name.
-     * @param target the object to get
-     * @param fieldName the field name to get or invoke equivalent get method
-     * @param dictionary the dictionary
-     * @return the value
-     */
-    public static Object getValue(Object target, String fieldName, EntityDictionary dictionary) {
-        AccessibleObject accessor = dictionary.getAccessibleObject(target, fieldName);
-        try {
-            if (accessor instanceof Method) {
-                return ((Method) accessor).invoke(target);
-            } else if (accessor instanceof Field) {
-                return ((Field) accessor).get(target);
-            }
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new InvalidAttributeException(fieldName, dictionary.getJsonAliasFor(target.getClass()));
-        }
-        throw new InvalidAttributeException(fieldName, dictionary.getJsonAliasFor(target.getClass()));
+        triggerUpdate(fieldName, original, value);
     }
 
     /**
      * If a bidirectional relationship exists, attempts to delete itself from the inverse
      * relationship. Given A to B as the relationship, A corresponds to this and B is the inverse.
-     * @param relationName The name of the relationship on this (A) object.
+     *
+     * @param relationName  The name of the relationship on this (A) object.
      * @param inverseEntity The value (B) which has been deleted from this object.
      */
     protected void deleteInverseRelation(String relationName, Object inverseEntity) {
-        String inverseRelationName = getInverseRelationField(relationName);
+        String inverseField = getInverseRelationField(relationName);
 
-        if (!inverseRelationName.equals("")) {
-            Class<?> inverseRelationType = dictionary.getType(inverseEntity.getClass(), inverseRelationName);
+        if (!"".equals(inverseField)) {
+            Type<?> inverseType = dictionary.getType(inverseEntity, inverseField);
 
-            PersistentResource inverseResource = new PersistentResource(this, inverseEntity, getRequestScope());
-            Object inverseRelation = inverseResource.getValueUnchecked(inverseRelationName);
+            String uuid = requestScope.getUUIDFor(inverseEntity);
+            PersistentResource inverseResource = new PersistentResource(inverseEntity,
+                    this, relationName, uuid, requestScope);
+            Object inverseRelation = inverseResource.getValueUnchecked(inverseField);
 
             if (inverseRelation == null) {
                 return;
             }
 
             if (inverseRelation instanceof Collection) {
-                inverseResource.delFromCollection((Collection) inverseRelation, inverseRelationName, this, true);
-            } else if (inverseRelationType.equals(this.getResourceClass())) {
-                inverseResource.nullValue(inverseRelationName, this);
+                inverseResource.modifyCollection((Collection) inverseRelation, inverseField,
+                        Collections.emptySet(), Set.of(this.getObject()), false);
+            } else if (inverseType.isAssignableFrom(this.getResourceType())) {
+                inverseResource.nullValue(inverseField, this);
             } else {
                 throw new InternalServerErrorException("Relationship type mismatch");
             }
             inverseResource.markDirty();
+
+            RelationshipType inverseRelationType = inverseResource.getRelationshipType(inverseField);
+            if (inverseRelationType.isToOne()) {
+                //hook for updateToOneRelation
+                transaction.updateToOneRelation(transaction, inverseEntity, inverseField, null, requestScope);
+            } else {
+                //hook for updateToManyRelation
+                assert (inverseRelation instanceof Collection) : inverseField + " not a collection";
+                transaction.updateToManyRelation(transaction, inverseEntity, inverseField,
+                        new LinkedHashSet<>(), Sets.newHashSet(obj), requestScope);
+            }
         }
     }
 
     private boolean hasInverseRelation(String relationName) {
         String inverseField = getInverseRelationField(relationName);
-        return inverseField != null && !inverseField.isEmpty();
+        return StringUtils.isNotEmpty(inverseField);
     }
 
     private String getInverseRelationField(String relationName) {
-        return dictionary.getRelationInverse(obj.getClass(), relationName);
+        return dictionary.getRelationInverse(type, relationName);
     }
 
     /**
      * If a bidirectional relationship exists, attempts to add itself to the inverse
      * relationship. Given A to B as the relationship, A corresponds to this and B is the inverse.
+     *
      * @param relationName The name of the relationship on this (A) object.
-     * @param relationValue The value (B) which has been added to this object.
+     * @param inverseObj   The value (B) which has been added to this object.
      */
-    protected void addInverseRelation(String relationName, Object relationValue) {
-        Object inverseEntity = relationValue; // Assigned to improve readability.
-        String inverseRelationName = dictionary.getRelationInverse(obj.getClass(), relationName);
+    protected void addInverseRelation(String relationName, Object inverseObj) {
+        String inverseName = dictionary.getRelationInverse(type, relationName);
 
-        if (!inverseRelationName.equals("")) {
-            Class<?> inverseRelationType = dictionary.getType(inverseEntity.getClass(), inverseRelationName);
+        if (!"".equals(inverseName)) {
+            Type<?> inverseType = dictionary.getType(inverseObj, inverseName);
 
-            PersistentResource inverseResource = new PersistentResource(this, inverseEntity, getRequestScope());
-            Object inverseRelation = inverseResource.getValueUnchecked(inverseRelationName);
+            String uuid = requestScope.getUUIDFor(inverseObj);
+            PersistentResource inverseResource = new PersistentResource(inverseObj,
+                    this, relationName, uuid, requestScope);
+            Object inverseRelation = inverseResource.getValueUnchecked(inverseName);
 
-            if (Collection.class.isAssignableFrom(inverseRelationType)) {
+            if (COLLECTION_TYPE.isAssignableFrom(inverseType)) {
                 if (inverseRelation != null) {
-                    inverseResource.addToCollection((Collection) inverseRelation, inverseRelationName, this);
+                    inverseResource.modifyCollection((Collection) inverseRelation, inverseName,
+                            Set.of(this.getObject()), Collections.emptySet(), false);
                 } else {
-                    inverseResource.setValueChecked(inverseRelationName, Collections.singleton(this.getObject()));
+                    inverseResource.setValueChecked(inverseName, Collections.singleton(this.getObject()));
                 }
-            } else if (inverseRelationType.equals(this.getResourceClass())) {
-                inverseResource.setValueChecked(inverseRelationName, this.getObject());
+            } else if (inverseType.isAssignableFrom(this.getResourceType())) {
+                inverseResource.setValueChecked(inverseName, this.getObject());
             } else {
                 throw new InternalServerErrorException("Relationship type mismatch");
             }
             inverseResource.markDirty();
-        }
-    }
-
-    /**
-     * Filter a set of PersistentResources.
-     *
-     * @param <A> the type parameter
-     * @param <T> the type parameter
-     * @param permission the permission
-     * @param resources  the resources
-     * @return Filtered set of resources
-     */
-    protected static <A extends Annotation, T> Set<PersistentResource<T>> filter(Class<A> permission,
-                                                                                 Set<PersistentResource<T>> resources) {
-        return filter(permission, resources, false);
-    }
 
-    /**
-     * Filter a set of PersistentResources.
-     *
-     * @param <A> the type parameter
-     * @param <T> the type parameter
-     * @param permission the permission
-     * @param resources  the resources
-     * @param skipNew
-     * @return Filtered set of resources
-     */
-    protected static <A extends Annotation, T> Set<PersistentResource<T>> filter(Class<A> permission,
-                                                                                 Set<PersistentResource<T>> resources,
-                                                                                 boolean skipNew) {
-        Set<PersistentResource<T>> filteredSet = new LinkedHashSet<>();
-        for (PersistentResource<T> resource : resources) {
-            PermissionExecutor permissionExecutor = resource.getRequestScope().getPermissionExecutor();
-            try {
-                if (!(skipNew && resource.getRequestScope().getNewResources().contains(resource))) {
-                    if (!permissionExecutor
-                            .shouldShortCircuitPermissionChecks(permission, resource.getResourceClass(), null)) {
-                        ExpressionResult expressionResult
-                                = permissionExecutor.checkUserPermissions(resource.getResourceClass(), permission);
-                        if (expressionResult == ExpressionResult.PASS) {
-                            filteredSet.add(resource);
-                            continue;
-                        }
-                        resource.checkFieldAwarePermissions(permission);
-                    }
-                }
-                filteredSet.add(resource);
-            } catch (ForbiddenAccessException e) {
-                // Do nothing. Filter from set.
+            RelationshipType inverseRelationType = inverseResource.getRelationshipType(inverseName);
+            if (inverseRelationType.isToOne()) {
+                //hook for updateToOneRelation
+                transaction.updateToOneRelation(transaction, inverseObj, inverseName,
+                        obj, requestScope);
+            } else {
+                //hook for updateToManyRelation
+                assert (inverseRelation == null || inverseRelation instanceof Collection)
+                        : inverseName + " not a collection";
+                transaction.updateToManyRelation(transaction, inverseObj, inverseName,
+                        Sets.newHashSet(obj), new LinkedHashSet<>(), requestScope);
             }
         }
-        // keep original SingleElementSet
-        if (resources instanceof SingleElementSet && resources.equals(filteredSet)) {
-            return resources;
-        }
-        return filteredSet;
     }
 
     /**
@@ -1714,22 +1868,9 @@ protected Set<String> filterFields(Collection<String> fields) {
         Set<String> filteredSet = new LinkedHashSet<>();
         for (String field : fields) {
             try {
-                if (checkIncludeSparseField(requestScope.getSparseFields(), type, field)) {
-                    if (requestScope.getPermissionExecutor()
-                            .shouldShortCircuitPermissionChecks(ReadPermission.class, getResourceClass(), field)) {
-                        filteredSet.add(field);
-                        continue;
-                    }
-
-                    ExpressionResult expressionResult = requestScope.getPermissionExecutor()
-                            .checkUserPermissions(this, ReadPermission.class, field);
-
-                    if (expressionResult == ExpressionResult.PASS) {
-                        filteredSet.add(field);
-                        continue;
-                    }
 
-                    checkFieldAwarePermissions(ReadPermission.class, field, (Object) null, (Object) null);
+                if (checkIncludeSparseField(requestScope.getSparseFields(), typeName, field)) {
+                    checkFieldAwareReadPermissions(field);
                     filteredSet.add(field);
                 }
             } catch (ForbiddenAccessException e) {
@@ -1739,62 +1880,43 @@ protected Set<String> filterFields(Collection<String> fields) {
         return filteredSet;
     }
 
-    private static <A extends Annotation> ExpressionResult checkPermission(
-            Class<A> annotationClass, PersistentResource resource) {
-        return resource.requestScope.getPermissionExecutor().checkPermission(annotationClass, resource);
-    }
+    /**
+     * Queue the @*Update triggers iff this is not a newly created object (otherwise we run @*Create)
+     */
+    private void triggerUpdate(String fieldName, Object original, Object value) {
+        ChangeSpec changeSpec = new ChangeSpec(this, fieldName, original, value);
+        LifeCycleHookBinding.Operation action = isNewlyCreated()
+                ? CREATE
+                : UPDATE;
 
-    private <A extends Annotation> ExpressionResult checkFieldAwarePermissions(Class<A> annotationClass) {
-        return requestScope.getPermissionExecutor().checkPermission(annotationClass, this);
+        requestScope.publishLifecycleEvent(this, fieldName, action, Optional.of(changeSpec));
+        requestScope.publishLifecycleEvent(this, action);
+        auditField(new ChangeSpec(this, fieldName, original, value));
     }
 
-    private <A extends Annotation> ExpressionResult checkFieldAwarePermissions(Class<A> annotationClass,
-                                                                   String fieldName,
-                                                                   Object modified,
-                                                                   Object original) {
-        ChangeSpec changeSpec = (UpdatePermission.class.isAssignableFrom(annotationClass))
-                ? new ChangeSpec(this, fieldName, original, modified)
-                : null;
+    private <A extends Annotation> ExpressionResult checkFieldAwarePermissions(
+            Class<A> annotationClass,
+            Set<String> requestedFields
+    ) {
+        return requestScope.getPermissionExecutor().checkPermission(annotationClass, this, requestedFields);
+    }
 
+    private <A extends Annotation> ExpressionResult checkFieldAwareReadPermissions(String fieldName) {
         return requestScope.getPermissionExecutor()
-                .checkSpecificFieldPermissions(this, changeSpec, annotationClass, fieldName);
+                .checkSpecificFieldPermissions(this, null, ReadPermission.class, fieldName);
     }
 
     private <A extends Annotation> ExpressionResult checkFieldAwareDeferPermissions(Class<A> annotationClass,
-                                                                        String fieldName,
-                                                                        Object modified,
-                                                                        Object original) {
+                                                                                    String fieldName,
+                                                                                    Object modified,
+                                                                                    Object original) {
         ChangeSpec changeSpec = (UpdatePermission.class.isAssignableFrom(annotationClass))
                 ? new ChangeSpec(this, fieldName, original, modified)
                 : null;
-        // Defer checks for newly created objects if:
-        //   1. This is a patch extension request
-        //   2. This is an update request (note: changeSpec != null is a faster change check than rechecking permission)
-        if (requestScope.getNewResources().contains(this)
-                && ((requestScope instanceof PatchRequestScope)
-                || changeSpec != null)) {
-            return requestScope
-                    .getPermissionExecutor()
-                    .checkSpecificFieldPermissionsDeferred(this, changeSpec, annotationClass, fieldName);
-        }
+
         return requestScope
                 .getPermissionExecutor()
-                .checkSpecificFieldPermissions(this, changeSpec, annotationClass, fieldName);
-    }
-
-    protected static boolean checkIncludeSparseField(Map<String, Set<String>> sparseFields, String type,
-                                                     String fieldName) {
-        if (!sparseFields.isEmpty()) {
-            if (!sparseFields.containsKey(type)) {
-                return false;
-            }
-
-            if (!sparseFields.get(type).contains(fieldName)) {
-                return false;
-            }
-        }
-
-        return true;
+                .checkSpecificFieldPermissionsDeferred(this, changeSpec, annotationClass, fieldName);
     }
 
     /**
@@ -1804,7 +1926,7 @@ protected static boolean checkIncludeSparseField(Map<String, Set<String>> sparse
      */
     protected void auditField(final ChangeSpec changeSpec) {
         final String fieldName = changeSpec.getFieldName();
-        Audit[] annotations = dictionary.getAttributeOrRelationAnnotations(getResourceClass(),
+        Audit[] annotations = dictionary.getAttributeOrRelationAnnotations(getResourceType(),
                 Audit.class,
                 fieldName
         );
@@ -1816,7 +1938,7 @@ protected void auditField(final ChangeSpec changeSpec) {
         }
         for (Audit annotation : annotations) {
             if (annotation.action().length == 1 && annotation.action()[0] == Audit.Action.UPDATE) {
-                LogMessage message = new LogMessage(annotation, this, Optional.of(changeSpec));
+                LogMessage message = new LogMessageImpl(annotation, this, Optional.of(changeSpec));
                 getRequestScope().getAuditLogger().log(message);
             } else {
                 throw new InvalidSyntaxException("Only Audit.Action.UPDATE is allowed on fields.");
@@ -1827,18 +1949,19 @@ protected void auditField(final ChangeSpec changeSpec) {
     /**
      * Audit an action on an entity.
      *
-     * @param action the action
+     * @param action     the action
+     * @param changeSpec the change that occurred
      */
     protected void auditClass(Audit.Action action, ChangeSpec changeSpec) {
-        Audit[] annotations = getResourceClass().getAnnotationsByType(Audit.class);
+        Audit[] annotations = getResourceType().getAnnotationsByType(Audit.class);
 
         if (annotations == null) {
             return;
         }
         for (Audit annotation : annotations) {
             for (Audit.Action auditAction : annotation.action()) {
-                if (auditAction == action) {
-                    LogMessage message = new LogMessage(annotation, this, Optional.ofNullable(changeSpec));
+                if (auditAction == action) { // compare object reference
+                    LogMessage message = new LogMessageImpl(annotation, this, Optional.ofNullable(changeSpec));
                     getRequestScope().getAuditLogger().log(message);
                 }
             }
@@ -1853,7 +1976,7 @@ protected void auditClass(Audit.Action action, ChangeSpec changeSpec) {
      */
     private Collection copyCollection(final Collection collection) {
         final ArrayList newCollection = new ArrayList();
-        if (collection == null || collection.isEmpty()) {
+        if (CollectionUtils.isEmpty(collection)) {
             return newCollection;
         }
         collection.iterator().forEachRemaining(newCollection::add);
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/PersistentResourceSet.java b/elide-core/src/main/java/com/yahoo/elide/core/PersistentResourceSet.java
index f870398f5b..97dea5801d 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/PersistentResourceSet.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/PersistentResourceSet.java
@@ -9,6 +9,8 @@
 
 import java.util.AbstractSet;
 import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
 
 /**
  * Stream iterable list as a set of PersistentResource.
@@ -17,17 +19,20 @@
 public class PersistentResourceSet<T> extends AbstractSet<PersistentResource<T>> {
 
     final private PersistentResource<?> parent;
+    final private String parentRelationship;
     final private Iterable<T> list;
     final private RequestScope requestScope;
 
-    public PersistentResourceSet(PersistentResource<?> parent, Iterable<T> list, RequestScope requestScope) {
+    public PersistentResourceSet(PersistentResource<?> parent, String parentRelationship,
+                                 Iterable<T> list, RequestScope requestScope) {
         this.parent = parent;
+        this.parentRelationship = parentRelationship;
         this.list = list;
         this.requestScope = requestScope;
     }
 
     public PersistentResourceSet(Iterable<T> list, RequestScope requestScope) {
-        this(null, list, requestScope);
+        this(null, null, list, requestScope);
     }
 
     @Override
@@ -41,10 +46,9 @@ public boolean hasNext() {
 
             @Override
             public PersistentResource<T> next() {
-                if (parent == null) {
-                    return new PersistentResource<>(iterator.next(), requestScope);
-                }
-                return new PersistentResource<>(parent, iterator.next(), requestScope);
+                T obj = iterator.next();
+                return new PersistentResource<>(obj, parent, parentRelationship,
+                        requestScope.getUUIDFor(obj), requestScope);
             }
         };
     }
@@ -53,4 +57,9 @@ public PersistentResource<T> next() {
     public int size() {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public Spliterator<PersistentResource<T>> spliterator() {
+        return Spliterators.spliteratorUnknownSize(iterator(), 0);
+    }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/RequestScope.java b/elide-core/src/main/java/com/yahoo/elide/core/RequestScope.java
index 0c4a85f2fd..6a6364b88e 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/RequestScope.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/RequestScope.java
@@ -5,137 +5,152 @@
  */
 package com.yahoo.elide.core;
 
-import com.yahoo.elide.annotation.OnCommit;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.core.filter.dialect.MultipleFilterDialect;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.ALL_OPERATIONS;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
 import com.yahoo.elide.core.filter.dialect.ParseException;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
+import com.yahoo.elide.core.lifecycle.CRUDEvent;
+import com.yahoo.elide.core.lifecycle.LifecycleHookInvoker;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.executors.ActivePermissionExecutor;
+import com.yahoo.elide.core.security.executors.MultiplexPermissionExecutor;
+import com.yahoo.elide.core.type.Type;
 import com.yahoo.elide.jsonapi.JsonApiMapper;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.SecurityMode;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.executors.ActivePermissionExecutor;
-
+import org.apache.commons.collections.MapUtils;
 import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.Setter;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.Function;
-
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * Request scope object for relaying request-related data to various subsystems.
  */
-@Slf4j
-public class RequestScope implements com.yahoo.elide.security.RequestScope {
+public class RequestScope implements com.yahoo.elide.core.security.RequestScope {
     @Getter private final JsonApiDocument jsonApiDocument;
     @Getter private final DataStoreTransaction transaction;
     @Getter private final User user;
-    @Getter private final EntityDictionary dictionary;
+    @Getter protected final EntityDictionary dictionary;
     @Getter private final JsonApiMapper mapper;
     @Getter private final AuditLogger auditLogger;
-    @Getter private final Optional<MultivaluedMap<String, String>> queryParams;
+    @Getter private final MultivaluedMap<String, String> queryParams;
     @Getter private final Map<String, Set<String>> sparseFields;
-    @Getter private final Pagination pagination;
-    @Getter private final Sorting sorting;
-    @Getter private final SecurityMode securityMode;
+    @Getter private final Map<String, List<String>> requestHeaders;
     @Getter private final PermissionExecutor permissionExecutor;
     @Getter private final ObjectEntityCache objectEntityCache;
     @Getter private final Set<PersistentResource> newPersistentResources;
     @Getter private final LinkedHashSet<PersistentResource> dirtyResources;
+    @Getter private final LinkedHashSet<PersistentResource> deletedResources;
+    @Getter private final String baseUrlEndPoint;
     @Getter private final String path;
-    private final boolean useFilterExpressions;
-    private final MultipleFilterDialect filterDialect;
+    @Getter private final ElideSettings elideSettings;
+    @Getter private final int updateStatusCode;
+    @Getter private final MultipleFilterDialect filterDialect;
+    @Getter private final String apiVersion;
+
+    //TODO - this ought to be read only and set in the constructor.
+    @Getter @Setter private EntityProjection entityProjection;
+    @Getter private final UUID requestId;
     private final Map<String, FilterExpression> expressionsByType;
 
+    private LinkedHashSet<CRUDEvent> eventQueue;
+
     /* Used to filter across heterogeneous types during the first load */
     private FilterExpression globalFilterExpression;
 
-    final private transient LinkedHashSet<Runnable> commitTriggers;
-
     /**
-     * Create a new RequestScope.
+     * Create a new RequestScope with specified update status code.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
      * @param path the URL path
+     * @param apiVersion the API version.
      * @param jsonApiDocument the document for this request
      * @param transaction the transaction for this request
      * @param user the user making this request
-     * @param dictionary the entity dictionary
-     * @param mapper converts JsonApiDocuments to raw JSON
-     * @param auditLogger logger for this request
      * @param queryParams the query parameters
-     * @param securityMode the current security mode
-     * @param permissionExecutorGenerator the user-provided function that will generate a permissionExecutor
+     * @param requestHeaders the requestHeaders
+     * @param elideSettings Elide settings object
      */
-    public RequestScope(String path,
+    public RequestScope(String baseUrlEndPoint,
+                        String path,
+                        String apiVersion,
                         JsonApiDocument jsonApiDocument,
                         DataStoreTransaction transaction,
                         User user,
-                        EntityDictionary dictionary,
-                        JsonApiMapper mapper,
-                        AuditLogger auditLogger,
                         MultivaluedMap<String, String> queryParams,
-                        SecurityMode securityMode,
-                        Function<RequestScope, PermissionExecutor> permissionExecutorGenerator,
-                        MultipleFilterDialect filterDialect,
-                        boolean useFilterExpressions) {
+                        Map<String, List<String>> requestHeaders,
+                        UUID requestId,
+                        ElideSettings elideSettings) {
+        this.apiVersion = apiVersion;
+        this.eventQueue = new LinkedHashSet<>();
+
         this.path = path;
+        this.baseUrlEndPoint = baseUrlEndPoint;
         this.jsonApiDocument = jsonApiDocument;
         this.transaction = transaction;
         this.user = user;
-        this.dictionary = dictionary;
-        this.mapper = mapper;
-        this.auditLogger = auditLogger;
-        this.securityMode = securityMode;
-        this.filterDialect = filterDialect;
-        this.useFilterExpressions = useFilterExpressions;
+        this.dictionary = elideSettings.getDictionary();
+        this.mapper = elideSettings.getMapper();
+        this.auditLogger = elideSettings.getAuditLogger();
+        this.filterDialect = new MultipleFilterDialect(elideSettings.getJoinFilterDialects(),
+                elideSettings.getSubqueryFilterDialects());
+        this.elideSettings = elideSettings;
+        this.updateStatusCode = elideSettings.getUpdateStatusCode();
 
         this.globalFilterExpression = null;
         this.expressionsByType = new HashMap<>();
         this.objectEntityCache = new ObjectEntityCache();
         this.newPersistentResources = new LinkedHashSet<>();
         this.dirtyResources = new LinkedHashSet<>();
-        this.commitTriggers = new LinkedHashSet<>();
+        this.deletedResources = new LinkedHashSet<>();
+        this.requestId = requestId;
+        this.queryParams = queryParams == null ? new MultivaluedHashMap<>() : queryParams;
 
-        this.permissionExecutor = (permissionExecutorGenerator == null)
-                ? new ActivePermissionExecutor(this)
-                : permissionExecutorGenerator.apply(this);
+        this.requestHeaders = MapUtils.isEmpty(requestHeaders)
+                ? Collections.emptyMap()
+                : requestHeaders;
 
-        this.queryParams = (queryParams == null || queryParams.size() == 0)
-                ? Optional.empty()
-                : Optional.of(queryParams);
+        this.sparseFields = parseSparseFields(getQueryParams());
 
-        if (this.queryParams.isPresent()) {
+        if (!this.queryParams.isEmpty()) {
 
             /* Extract any query param that starts with 'filter' */
-            MultivaluedMap filterParams = getFilterParams(queryParams);
+            MultivaluedMap<String, String> filterParams = getFilterParams(this.queryParams);
 
             String errorMessage = "";
             if (! filterParams.isEmpty()) {
 
                 /* First check to see if there is a global, cross-type filter */
                 try {
-                    globalFilterExpression = filterDialect.parseGlobalExpression(path, filterParams);
+                    globalFilterExpression = filterDialect.parseGlobalExpression(path, filterParams, apiVersion);
                 } catch (ParseException e) {
                     errorMessage = e.getMessage();
                 }
 
                 /* Next check to see if there is are type specific filters */
                 try {
-                    expressionsByType.putAll(filterDialect.parseTypedExpression(path, filterParams));
+                    expressionsByType.putAll(filterDialect.parseTypedExpression(path, filterParams, apiVersion));
                 } catch (ParseException e) {
 
                     /* If neither dialect parsed, report the last error found */
@@ -149,145 +164,64 @@ public RequestScope(String path,
                             errorMessage = errorMessage + "\n" + e.getMessage();
                         }
 
-                        throw new InvalidPredicateException(errorMessage);
+                        throw new BadRequestException(errorMessage, e);
                     }
                 }
             }
-
-            this.sparseFields = parseSparseFields(queryParams);
-            this.sorting = Sorting.parseQueryParams(queryParams);
-            this.pagination = Pagination.parseQueryParams(queryParams);
-        } else {
-            this.sparseFields = Collections.emptyMap();
-            this.sorting = Sorting.getDefaultEmptyInstance();
-            this.pagination = Pagination.getDefaultPagination();
-        }
-
-        if (transaction instanceof RequestScopedTransaction) {
-            ((RequestScopedTransaction) transaction).setRequestScope(this);
         }
-    }
 
-    public RequestScope(String path,
-                        JsonApiDocument jsonApiDocument,
-                        DataStoreTransaction transaction,
-                        User user,
-                        EntityDictionary dictionary,
-                        JsonApiMapper mapper,
-                        AuditLogger auditLogger,
-                        SecurityMode securityMode,
-                        Function<RequestScope, PermissionExecutor> permissionExecutor) {
-        this(
-                path,
-                jsonApiDocument,
-                transaction,
-                user,
-                dictionary,
-                mapper,
-                auditLogger,
-                null,
-                securityMode,
-                permissionExecutor,
-                new MultipleFilterDialect(dictionary),
-                false
-        );
-    }
-
-    public RequestScope(String path,
-                        JsonApiDocument jsonApiDocument,
-                        DataStoreTransaction transaction,
-                        User user,
-                        EntityDictionary dictionary,
-                        JsonApiMapper mapper,
-                        AuditLogger auditLogger,
-                        MultivaluedMap<String, String> queryParams) {
-        this(
-                path,
-                jsonApiDocument,
-                transaction,
-                user,
-                dictionary,
-                mapper,
-                auditLogger,
-                queryParams,
-                SecurityMode.SECURITY_ACTIVE,
-                null,
-                new MultipleFilterDialect(dictionary),
-                false
-        );
-    }
-
-    public RequestScope(String path,
-                        JsonApiDocument jsonApiDocument,
-                        DataStoreTransaction transaction,
-                        User user,
-                        EntityDictionary dictionary,
-                        JsonApiMapper mapper,
-                        AuditLogger auditLogger) {
-        this(
-                path,
-                jsonApiDocument,
-                transaction,
-                user,
-                dictionary,
-                mapper,
-                auditLogger,
-                null,
-                SecurityMode.SECURITY_ACTIVE,
-                null,
-                new MultipleFilterDialect(dictionary),
-                false
+        Function<RequestScope, PermissionExecutor> permissionExecutorGenerator = elideSettings.getPermissionExecutor();
+        this.permissionExecutor = new MultiplexPermissionExecutor(
+                dictionary.buildPermissionExecutors(this),
+                (permissionExecutorGenerator == null)
+                        ? new ActivePermissionExecutor(this)
+                        : permissionExecutorGenerator.apply(this),
+                dictionary
         );
     }
 
-    /**
-     * Outer RequestScope constructor for use by Patch Extension.
-     *
-     * @param transaction the transaction
-     * @param user        the user
-     * @param dictionary  the dictionary
-     * @param mapper      the mapper
-     * @param auditLogger      the logger
-     */
-    protected RequestScope(DataStoreTransaction transaction,
-                           User user,
-                           EntityDictionary dictionary,
-                           JsonApiMapper mapper,
-                           AuditLogger auditLogger) {
-        this(null, null, transaction, user, dictionary, mapper, auditLogger);
-    }
-
     /**
      * Special copy constructor for use by PatchRequestScope.
      *
+     * @param path the URL path
+     * @param apiVersion the API version
      * @param jsonApiDocument   the json api document
      * @param outerRequestScope the outer request scope
      */
-    protected RequestScope(String path, JsonApiDocument jsonApiDocument, RequestScope outerRequestScope) {
+    protected RequestScope(String path, String apiVersion,
+                           JsonApiDocument jsonApiDocument, RequestScope outerRequestScope) {
         this.jsonApiDocument = jsonApiDocument;
+        this.baseUrlEndPoint = outerRequestScope.baseUrlEndPoint;
+        this.apiVersion = apiVersion;
         this.path = path;
         this.transaction = outerRequestScope.transaction;
         this.user = outerRequestScope.user;
         this.dictionary = outerRequestScope.dictionary;
         this.mapper = outerRequestScope.mapper;
         this.auditLogger = outerRequestScope.auditLogger;
-        this.queryParams = Optional.empty();
-        this.sparseFields = Collections.emptyMap();
-        this.sorting = Sorting.getDefaultEmptyInstance();
-        this.pagination = Pagination.getDefaultPagination();
+        this.queryParams = new MultivaluedHashMap<>();
+        this.requestHeaders = new MultivaluedHashMap<>();
+        this.requestHeaders.putAll(outerRequestScope.requestHeaders);
         this.objectEntityCache = outerRequestScope.objectEntityCache;
-        this.securityMode = outerRequestScope.securityMode;
         this.newPersistentResources = outerRequestScope.newPersistentResources;
-        this.commitTriggers = outerRequestScope.commitTriggers;
         this.permissionExecutor = outerRequestScope.getPermissionExecutor();
         this.dirtyResources = outerRequestScope.dirtyResources;
+        this.deletedResources = outerRequestScope.deletedResources;
         this.filterDialect = outerRequestScope.filterDialect;
         this.expressionsByType = outerRequestScope.expressionsByType;
-        this.useFilterExpressions = outerRequestScope.useFilterExpressions;
+        this.elideSettings = outerRequestScope.elideSettings;
+        this.eventQueue = outerRequestScope.eventQueue;
+        this.updateStatusCode = outerRequestScope.updateStatusCode;
+        this.requestId = outerRequestScope.requestId;
+        this.sparseFields = outerRequestScope.sparseFields;
     }
 
-    public Set<com.yahoo.elide.security.PersistentResource> getNewResources() {
-        return (Set<com.yahoo.elide.security.PersistentResource>) (Set) newPersistentResources;
+    public Set<com.yahoo.elide.core.security.PersistentResource> getNewResources() {
+        return (Set) newPersistentResources;
+    }
+
+    public boolean isNewResource(Object entity) {
+        return newPersistentResources.stream().anyMatch(r -> r.getObject() == entity);
     }
 
     /**
@@ -295,7 +229,7 @@ public Set<com.yahoo.elide.security.PersistentResource> getNewResources() {
      * @param queryParams The request query parameters
      * @return Parsed sparseFields map
      */
-    private static Map<String, Set<String>> parseSparseFields(MultivaluedMap<String, String> queryParams) {
+    public static Map<String, Set<String>> parseSparseFields(MultivaluedMap<String, String> queryParams) {
         Map<String, Set<String>> result = new HashMap<>();
 
         for (Map.Entry<String, List<String>> kv : queryParams.entrySet()) {
@@ -326,39 +260,50 @@ public Optional<FilterExpression> getFilterExpressionByType(String type) {
         return Optional.ofNullable(expressionsByType.get(type));
     }
 
+    /**
+     * Get filter expression for a specific collection type.
+     * @param entityClass The class to lookup
+     * @return The filter expression for the given type
+     */
+    public Optional<FilterExpression> getFilterExpressionByType(Type<?> entityClass) {
+        return Optional.ofNullable(expressionsByType.get(dictionary.getJsonAliasFor(entityClass)));
+    }
+
     /**
      * Get the global/cross-type filter expression.
-     * @param loadClass
+     * @param loadClass Entity class
      * @return The global filter expression evaluated at the first load
      */
-    public Optional<FilterExpression> getLoadFilterExpression(Class<?> loadClass) {
-        Optional<FilterExpression> permissionFilter;
-        permissionFilter = getPermissionExecutor().getReadPermissionFilter(loadClass);
-        Optional<FilterExpression> globalFilterExpressionOptional = null;
+    public Optional<FilterExpression> getLoadFilterExpression(Type<?> loadClass) {
+        Optional<FilterExpression> filterExpression;
         if (globalFilterExpression == null) {
             String typeName = dictionary.getJsonAliasFor(loadClass);
-            globalFilterExpressionOptional =  getFilterExpressionByType(typeName);
+            filterExpression =  getFilterExpressionByType(typeName);
         } else {
-            globalFilterExpressionOptional = Optional.of(globalFilterExpression);
+            filterExpression = Optional.of(globalFilterExpression);
         }
+        return filterExpression;
+    }
 
-        if (globalFilterExpressionOptional.isPresent() && permissionFilter.isPresent()) {
-            return Optional.of(new AndFilterExpression(globalFilterExpressionOptional.get(),
-                    permissionFilter.get()));
-        }
-        else if (globalFilterExpressionOptional.isPresent()) {
-            return globalFilterExpressionOptional;
-        }
-        else if (permissionFilter.isPresent()) {
-            return permissionFilter;
-        } else {
-            return Optional.empty();
+    /**
+     * Get the filter expression for a particular relationship.
+     * @param parentType The parent type which has the relationship
+     * @param relationName The relationship name
+     * @return A type specific filter expression for the given relationship
+     */
+    public Optional<FilterExpression> getExpressionForRelation(Type<?> parentType, String relationName) {
+        final Type<?> entityClass = dictionary.getParameterizedType(parentType, relationName);
+        if (entityClass == null) {
+            throw new InvalidAttributeException(relationName, dictionary.getJsonAliasFor(parentType));
         }
+
+        final String valType = dictionary.getJsonAliasFor(entityClass);
+        return getFilterExpressionByType(valType);
     }
 
     /**
      * Extracts any query params that start with 'filter'.
-     * @param queryParams
+     * @param queryParams request query params
      * @return extracted filter params
      */
     private static MultivaluedMap<String, String> getFilterParams(MultivaluedMap<String, String> queryParams) {
@@ -366,40 +311,157 @@ private static MultivaluedMap<String, String> getFilterParams(MultivaluedMap<Str
 
         queryParams.entrySet()
                 .stream()
-                .filter((entry) -> entry.getKey().startsWith("filter"))
-                .forEach((entry) -> {
-                    returnMap.put(entry.getKey(), entry.getValue());
-                });
+                .filter(entry -> entry.getKey().startsWith("filter"))
+                .forEach(entry -> returnMap.put(entry.getKey(), entry.getValue()));
         return returnMap;
     }
 
+    private void notifySubscribers(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase
+    ) {
+        LifecycleHookInvoker invoker = new LifecycleHookInvoker(dictionary, operation, phase);
+
+        this.eventQueue.stream()
+                .filter(event -> event.getEventType().equals(operation))
+                .forEach(event -> {
+                    invoker.onNext(event);
+                });
+    }
+
     /**
-     * run any deferred post-commit triggers.
-     *
-     * @see com.yahoo.elide.annotation.CreatePermission
+     * Run queued pre-security lifecycle triggers.
      */
-    public void runCommitTriggers() {
-        new ArrayList<>(commitTriggers).forEach(Runnable::run);
-        commitTriggers.clear();
+    public void runQueuedPreSecurityTriggers() {
+        notifySubscribers(LifeCycleHookBinding.Operation.CREATE, LifeCycleHookBinding.TransactionPhase.PRESECURITY);
     }
 
-    public void queueCommitTrigger(PersistentResource resource) {
-        queueCommitTrigger(resource, "");
+    /**
+     * Run queued pre-flush lifecycle triggers.
+     */
+    public void runQueuedPreFlushTriggers() {
+        runQueuedPreFlushTriggers(ALL_OPERATIONS);
     }
 
-    public void queueCommitTrigger(PersistentResource resource, String fieldName) {
-        commitTriggers.add(() -> resource.runTriggers(OnCommit.class, fieldName));
+    /**
+     * Run queued pre-flush lifecycle triggers.
+     * @param operations List of operations to run pre-flush triggers for.
+     */
+    public void runQueuedPreFlushTriggers(LifeCycleHookBinding.Operation[] operations) {
+        for (LifeCycleHookBinding.Operation op : operations) {
+            notifySubscribers(op, LifeCycleHookBinding.TransactionPhase.PREFLUSH);
+        }
     }
 
-    public void saveObjects() {
-        dirtyResources.stream().map(PersistentResource::getObject).forEach(transaction::save);
+    /**
+     * Run queued pre-commit lifecycle triggers.
+     */
+    public void runQueuedPreCommitTriggers() {
+        for (LifeCycleHookBinding.Operation op : ALL_OPERATIONS) {
+            notifySubscribers(op, LifeCycleHookBinding.TransactionPhase.PRECOMMIT);
+        }
     }
 
     /**
-     * Whether or not to use Elide 3.0 filter expressions for DataStoreTransaction calls
-     * @return
+     * Run queued post-commit lifecycle triggers.
      */
-    public boolean useFilterExpressions() {
-        return useFilterExpressions;
+    public void runQueuedPostCommitTriggers() {
+        for (LifeCycleHookBinding.Operation op : ALL_OPERATIONS) {
+            notifySubscribers(op, LifeCycleHookBinding.TransactionPhase.POSTCOMMIT);
+        }
+    }
+
+    /**
+     * Publishes a lifecycle event to all listeners.
+     *
+     * @param resource Resource on which to execute trigger
+     * @param crudAction CRUD action
+     */
+    protected void publishLifecycleEvent(PersistentResource<?> resource, LifeCycleHookBinding.Operation crudAction) {
+        publishLifecycleEvent(new CRUDEvent(crudAction, resource, PersistentResource.CLASS_NO_FIELD, Optional.empty()));
+    }
+
+    /**
+     * Publishes a lifecycle event to all listeners.
+     *
+     * @param resource Resource on which to execute trigger
+     * @param fieldName Field name for which to specify trigger
+     * @param crudAction CRUD Action
+     * @param changeSpec Optional ChangeSpec to pass to the lifecycle hook
+     */
+    protected void publishLifecycleEvent(PersistentResource<?> resource,
+                                         String fieldName,
+                                         LifeCycleHookBinding.Operation crudAction,
+                                         Optional<ChangeSpec> changeSpec) {
+        publishLifecycleEvent(new CRUDEvent(crudAction, resource, fieldName, changeSpec));
+    }
+
+    protected void publishLifecycleEvent(CRUDEvent event) {
+        if (! eventQueue.contains(event)) {
+            if (event.getEventType().equals(LifeCycleHookBinding.Operation.DELETE)
+                    || event.getEventType().equals(LifeCycleHookBinding.Operation.UPDATE)) {
+
+                LifecycleHookInvoker invoker = new LifecycleHookInvoker(dictionary,
+                        event.getEventType(),
+                        LifeCycleHookBinding.TransactionPhase.PRESECURITY);
+
+                invoker.onNext(event);
+            }
+
+            eventQueue.add(event);
+        }
+    }
+
+    public void saveOrCreateObjects() {
+        dirtyResources.removeAll(newPersistentResources);
+        // Delete has already been called on these objects
+        dirtyResources.removeAll(deletedResources);
+        newPersistentResources
+                .stream()
+                .map(PersistentResource::getObject)
+                .forEach(s -> transaction.createObject(s, this));
+        dirtyResources.stream().map(PersistentResource::getObject).forEach(obj -> transaction.save(obj, this));
+    }
+
+    public String getUUIDFor(Object o) {
+        return objectEntityCache.getUUID(o);
+    }
+
+    public Object getObjectById(Type<?> type, String id) {
+        Type<?> boundType = dictionary.lookupBoundClass(type);
+
+        Object result = objectEntityCache.get(boundType.getName(), id);
+
+        // Check inheritance too
+        Iterator<Type<?>> it = dictionary.getSubclassingEntities(boundType).iterator();
+        while (result == null && it.hasNext()) {
+            String newType = getInheritanceKey(it.next().getName(), boundType.getName());
+            result = objectEntityCache.get(newType, id);
+        }
+
+        return result;
+    }
+
+    public void setUUIDForObject(Type<?> type, String id, Object object) {
+        Type<?> boundType = dictionary.lookupBoundClass(type);
+
+        objectEntityCache.put(boundType.getName(), id, object);
+
+        // Insert for all inherited entities as well
+        dictionary.getSuperClassEntities(type).stream()
+                .map(i -> getInheritanceKey(boundType.getName(), i.getName()))
+                .forEach((newType) -> objectEntityCache.put(newType, id, object));
+    }
+
+    private String getInheritanceKey(String subClass, String superClass) {
+        return subClass + "!" + superClass;
+    }
+
+    @Override
+    public String getRequestHeaderByName(String headerName) {
+        if (this.requestHeaders.get(headerName) == null) {
+            return null;
+        }
+        return this.requestHeaders.get(headerName).get(0);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/RequestScopedTransaction.java b/elide-core/src/main/java/com/yahoo/elide/core/RequestScopedTransaction.java
deleted file mode 100644
index 814df22d37..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/RequestScopedTransaction.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-/**
- * Scope aware transaction
- */
-public interface RequestScopedTransaction extends DataStoreTransaction {
-
-    void setRequestScope(RequestScope requestScope);
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/ResourceLineage.java b/elide-core/src/main/java/com/yahoo/elide/core/ResourceLineage.java
index 9ac777c0e9..67fb822878 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/ResourceLineage.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/ResourceLineage.java
@@ -7,9 +7,11 @@
 
 import org.apache.commons.collections4.map.LinkedMap;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import lombok.Value;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -19,37 +21,37 @@
  */
 public class ResourceLineage {
     private final LinkedMap<String, List<PersistentResource>> resourceMap;
+    private final List<LineagePath> resourcePath;
 
     /**
-     * Empty lineage for objects rooted in the URL.
+     * A node in the lineage that includes the resource and the link to the next node.
      */
-    public ResourceLineage() {
-        resourceMap = new LinkedMap<>();
+    @Value
+    public static class LineagePath {
+        private PersistentResource resource;
+
+        //The relationship that links this path element to the next.
+        private String relationship;
     }
 
     /**
-     * Extends a lineage with a new resource.
-     * @param sharedLineage the shared lineage
-     * @param next the next
+     * Empty lineage for objects rooted in the URL.
      */
-    public ResourceLineage(ResourceLineage sharedLineage, PersistentResource next) {
-        resourceMap = new LinkedMap<>(sharedLineage.resourceMap);
-        addRecord(next);
+    public ResourceLineage() {
+        resourceMap = new LinkedMap<>();
+        resourcePath = new LinkedList<>();
     }
 
     /**
-     * Extends a lineage with a new resource that has an alias.  An alias is useful if
-     * there are two objects in the lineage with the same type or class.  The resource
-     * lineage does not allow two resources to have the same name.  As long as one of the two
-     * resources can be given an alias (by annotation), then two objects with the same type/class
-     * can exist in the lineage.  This case is likely to be uncommon.
+     * Extends a lineage with a new resource.
      * @param sharedLineage the shared lineage
      * @param next the next
-     * @param nextAlias the next alias
+     * @param relationship The relationship name that links the lineage with the next element.
      */
-    public ResourceLineage(ResourceLineage sharedLineage, PersistentResource next, String nextAlias) {
+    public ResourceLineage(ResourceLineage sharedLineage, PersistentResource next, String relationship) {
         resourceMap = new LinkedMap<>(sharedLineage.resourceMap);
-        addRecord(next, nextAlias);
+        resourcePath = new LinkedList<>(sharedLineage.resourcePath);
+        addRecord(next, relationship);
     }
 
     /**
@@ -63,6 +65,18 @@ public List<PersistentResource> getRecord(String name) {
         return list == null ? Collections.emptyList() : list;
     }
 
+    /**
+     *  Returns the immediate parent resource if one exists.
+     * @return the parent or null if there is no parent.
+     */
+    public PersistentResource getParent() {
+        if (resourcePath.isEmpty()) {
+            return null;
+        }
+
+        return resourcePath.get(resourcePath.size() - 1).resource;
+    }
+
     /**
      * Gets keys.
      *
@@ -72,8 +86,8 @@ public List<String> getKeys() {
         return resourceMap.asList();
     }
 
-    private void addRecord(PersistentResource latest) {
-        addRecord(latest, latest.getType());
+    public List<LineagePath> getResourcePath() {
+        return resourcePath;
     }
 
     @Override
@@ -98,10 +112,11 @@ public boolean equals(Object input) {
                 return false;
             }
         }
-        return true;
+        return other.resourcePath.equals(this.resourcePath);
     }
 
-    private void addRecord(PersistentResource latest, String alias) {
+    private void addRecord(PersistentResource latest, String relationship) {
+        String alias = latest.getTypeName();
         List<PersistentResource> resources;
         if (resourceMap.containsKey(alias)) {
             resources = resourceMap.get(alias);
@@ -110,5 +125,6 @@ private void addRecord(PersistentResource latest, String alias) {
             resourceMap.put(alias, resources);
         }
         resources.add(latest);
+        resourcePath.add(new ResourceLineage.LineagePath(latest, relationship));
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/TransactionRegistry.java b/elide-core/src/main/java/com/yahoo/elide/core/TransactionRegistry.java
new file mode 100644
index 0000000000..ab279214e7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/TransactionRegistry.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core;
+
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+* Transaction Registry class.
+*/
+@Getter
+public class TransactionRegistry {
+    private Map<UUID, DataStoreTransaction> transactionMap = new ConcurrentHashMap<>();
+
+    public Map<UUID, DataStoreTransaction> getRunningTransactions() {
+        return transactionMap;
+    }
+
+    public DataStoreTransaction getRunningTransaction(UUID requestId) {
+        return transactionMap.get(requestId);
+    }
+
+    public void addRunningTransaction(UUID requestId, DataStoreTransaction tx) {
+        transactionMap.put(requestId, tx);
+    }
+
+    public void removeRunningTransaction(UUID requestId) {
+        transactionMap.remove(requestId);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/audit/AuditLogger.java b/elide-core/src/main/java/com/yahoo/elide/core/audit/AuditLogger.java
new file mode 100644
index 0000000000..1407484982
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/audit/AuditLogger.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.audit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Base Audit Logger
+ * <p>
+ * This class uses ThreadLocal list to be thread safe.
+ */
+public abstract class AuditLogger {
+    protected static final ThreadLocal<List<LogMessage>> MESSAGES =
+        ThreadLocal.withInitial(ArrayList::new);
+
+    public void log(LogMessage message) {
+        MESSAGES.get().add(message);
+    }
+
+    public abstract void commit() throws IOException;
+
+    public void clear() {
+        List<LogMessage> remainingMessages = MESSAGES.get();
+        if (remainingMessages != null) {
+            remainingMessages.clear();
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/InvalidSyntaxException.java b/elide-core/src/main/java/com/yahoo/elide/core/audit/InvalidSyntaxException.java
similarity index 93%
rename from elide-core/src/main/java/com/yahoo/elide/audit/InvalidSyntaxException.java
rename to elide-core/src/main/java/com/yahoo/elide/core/audit/InvalidSyntaxException.java
index f14290d848..a3beb1c7f8 100644
--- a/elide-core/src/main/java/com/yahoo/elide/audit/InvalidSyntaxException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/audit/InvalidSyntaxException.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.audit;
+package com.yahoo.elide.core.audit;
 
 /**
  * Thrown if audit has been configured incorrectly by the programmer.
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessage.java b/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessage.java
new file mode 100644
index 0000000000..4ce04d91e7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessage.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.audit;
+
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PersistentResource;
+import com.yahoo.elide.core.security.User;
+
+import java.util.Optional;
+
+/**
+ * Elide audit entity for a CRUD action.
+ */
+public interface LogMessage {
+
+    /**
+     * Gets message.
+     *
+     * @return the message
+     */
+    public String getMessage();
+
+    /**
+     * Gets operation code.  The operation code is assigned by the developer to uniquely identify
+     * the type of change that is being audited.  Operation code definitions are outside the scope of Elide.
+     *
+     * @return the operation code
+     */
+    public int getOperationCode();
+
+    /**
+     * Get the user principal associated with the request.
+     *
+     * @return the user principal.
+     */
+    public User getUser();
+
+    /**
+     * Get the change specification
+     *
+     * @return the change specification.
+     */
+    public Optional<ChangeSpec> getChangeSpec();
+
+    /**
+     * Get the resource that was manipulated.
+     *
+     * @return the resource.
+     */
+    public PersistentResource getPersistentResource();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessageImpl.java b/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessageImpl.java
new file mode 100644
index 0000000000..df29309ac8
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/audit/LogMessageImpl.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.audit;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.core.ResourceLineage;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PersistentResource;
+import com.yahoo.elide.core.security.User;
+import de.odysseus.el.ExpressionFactoryImpl;
+import de.odysseus.el.util.SimpleContext;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.security.Principal;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.el.ELException;
+import javax.el.ExpressionFactory;
+import javax.el.PropertyNotFoundException;
+import javax.el.ValueExpression;
+
+/**
+ * An audit log message that can be logged to a logger.
+ */
+@ToString
+@EqualsAndHashCode
+public class LogMessageImpl implements LogMessage {
+    //Supposedly this is thread safe.
+    private static final ExpressionFactory EXPRESSION_FACTORY = new ExpressionFactoryImpl();
+    private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+    private final String template;
+    private final String[] expressions;
+
+    @Getter
+    private final int operationCode;
+
+    @Getter
+    private final Optional<ChangeSpec> changeSpec;
+
+    @Getter
+    private final User user;
+
+    @Getter
+    private final PersistentResource persistentResource;
+
+    /**
+     * Construct a log message that does not involve any templating.
+     * @param template - The unsubstituted text that will be logged.
+     * @param code - The operation code of the auditable action.
+     */
+    public LogMessageImpl(String template, int code) {
+        this(template, null, EMPTY_STRING_ARRAY, code, Optional.empty());
+    }
+
+    /**
+     * Construct a log message from an Audit annotation and the record that was updated in some way.
+     * @param audit - The annotation containing the type of operation (UPDATE, DELETE, CREATE)
+     * @param record - The modified record
+     * @param changeSpec - Change spec of modified elements (if logging object change). empty otherwise
+     * @throws InvalidSyntaxException if the Audit annotation has invalid syntax.
+     */
+    public LogMessageImpl(Audit audit, PersistentResource record, Optional<ChangeSpec> changeSpec)
+            throws InvalidSyntaxException {
+        this(audit.logStatement(), record, audit.logExpressions(), audit.operation(), changeSpec);
+    }
+
+    /**
+     * Construct a log message.
+     * @param template - The log message template that requires variable substitution.
+     * @param record - The record which will serve as the data to substitute.
+     * @param expressions - A set of UEL expressions that reference record.
+     * @param code - The operation code of the auditable action.
+     * @param changeSpec - the change spec that we want to log
+     * @throws InvalidSyntaxException the invalid syntax exception
+     */
+    public LogMessageImpl(String template,
+                          PersistentResource record,
+                          String[] expressions,
+                          int code,
+                          Optional<ChangeSpec> changeSpec) throws InvalidSyntaxException {
+        this.template = template;
+        this.persistentResource = record;
+        this.expressions = expressions;
+        this.operationCode = code;
+        this.changeSpec = changeSpec;
+        this.user = (record == null ? null : record.getRequestScope().getUser());
+    }
+
+    @Override
+    public String getMessage() {
+        final SimpleContext ctx = new SimpleContext();
+        final SimpleContext singleElementContext = new SimpleContext();
+
+        if (persistentResource != null) {
+            /* Create a new lineage which includes the passed in record */
+            com.yahoo.elide.core.PersistentResource internalResource = (
+                    com.yahoo.elide.core.PersistentResource) persistentResource;
+            ResourceLineage lineage = new ResourceLineage(internalResource.getLineage(), internalResource, null);
+
+            for (String name : lineage.getKeys()) {
+                List<com.yahoo.elide.core.PersistentResource> values = lineage.getRecord(name);
+
+                final ValueExpression expression;
+                final ValueExpression singleElementExpression;
+                if (values.size() == 1) {
+                    expression = EXPRESSION_FACTORY.createValueExpression(values.get(0).getObject(), Object.class);
+                    singleElementExpression = expression;
+                } else {
+                    List<Object> objects = values.stream().map(PersistentResource::getObject)
+                            .collect(Collectors.toList());
+                    expression = EXPRESSION_FACTORY.createValueExpression(objects, List.class);
+                    singleElementExpression = EXPRESSION_FACTORY.createValueExpression(values.get(values.size() - 1)
+                            .getObject(), Object.class);
+                }
+                ctx.setVariable(name, expression);
+                singleElementContext.setVariable(name, singleElementExpression);
+            }
+
+            final Principal user = getUser().getPrincipal();
+            if (user != null) {
+                final ValueExpression opaqueUserValueExpression = EXPRESSION_FACTORY
+                    .createValueExpression(
+                        user, Object.class
+                    );
+                ctx.setVariable("opaqueUser", opaqueUserValueExpression);
+                singleElementContext.setVariable("opaqueUser", opaqueUserValueExpression);
+            }
+        }
+
+        Object[] results = new Object[expressions.length];
+        for (int idx = 0; idx < results.length; idx++) {
+            String expressionText = expressions[idx];
+
+            final ValueExpression expression;
+            final ValueExpression singleElementExpression;
+            try {
+                expression = EXPRESSION_FACTORY.createValueExpression(ctx, expressionText, Object.class);
+                singleElementExpression =
+                        EXPRESSION_FACTORY.createValueExpression(singleElementContext, expressionText, Object.class);
+            } catch (ELException e) {
+                throw new InvalidSyntaxException(e);
+            }
+
+            Object result;
+            try {
+                // Single element expressions are intended to allow for access to ${entityType.field} when there are
+                // multiple "entityType" types listed in the lineage. Without this, any access to an entityType
+                // without an explicit list index would otherwise result in a 500. Similarly, since we already
+                // supported lists (i.e. the ${entityType[idx].field} syntax), this also continues to support that.
+                // It should be noted, however, that list indexing is somewhat brittle unless properly accounted for
+                // from all possible paths.
+                result = singleElementExpression.getValue(singleElementContext);
+            } catch (PropertyNotFoundException e) {
+                // Try list syntax if not single element
+                result = expression.getValue(ctx);
+            }
+            results[idx] = result;
+        }
+
+        try {
+            return MessageFormat.format(template, results);
+        } catch (IllegalArgumentException e) {
+            throw new InvalidSyntaxException(e);
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/audit/Slf4jLogger.java b/elide-core/src/main/java/com/yahoo/elide/core/audit/Slf4jLogger.java
similarity index 81%
rename from elide-core/src/main/java/com/yahoo/elide/audit/Slf4jLogger.java
rename to elide-core/src/main/java/com/yahoo/elide/core/audit/Slf4jLogger.java
index c291696f83..8ce7bdf50e 100644
--- a/elide-core/src/main/java/com/yahoo/elide/audit/Slf4jLogger.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/audit/Slf4jLogger.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.audit;
+package com.yahoo.elide.core.audit;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -18,11 +18,11 @@ public class Slf4jLogger extends AuditLogger {
     @Override
     public void commit() throws IOException {
         try {
-            for (LogMessage message : messages.get()) {
+            for (LogMessage message : MESSAGES.get()) {
                 log.info("{} {} {}", System.currentTimeMillis(), message.getOperationCode(), message.getMessage());
             }
         } finally {
-            messages.get().clear();
+            MESSAGES.get().clear();
         }
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/DataStore.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStore.java
similarity index 88%
rename from elide-core/src/main/java/com/yahoo/elide/core/DataStore.java
rename to elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStore.java
index b55049793d..c40dbe09cd 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/DataStore.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStore.java
@@ -3,7 +3,9 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.core;
+package com.yahoo.elide.core.datastore;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 
 /**
  * Database interface library.
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterable.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterable.java
new file mode 100644
index 0000000000..88c647dfd3
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterable.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore;
+
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Consumer;
+
+/**
+ * Returns data loaded from a DataStore.   Wraps an iterable but also communicates to Elide
+ * if the framework needs to filter, sort, or paginate the iterable in memory before returning to the client.
+ * @param <T> The type being iterated over.
+ */
+public interface DataStoreIterable<T> extends Iterable<T> {
+
+    /**
+     * Returns the underlying iterable.
+     * @return The underlying iterable.
+     */
+    Iterable<T> getWrappedIterable();
+
+    @Override
+    default Iterator<T> iterator() {
+        return getWrappedIterable().iterator();
+    }
+
+    @Override
+    default void forEach(Consumer<? super T> action) {
+        getWrappedIterable().forEach(action);
+    }
+
+    @Override
+    default Spliterator<T> spliterator() {
+        return Spliterators.spliteratorUnknownSize(iterator(), 0);
+    }
+
+    /**
+     * Whether the iterable should be filtered in memory.
+     * @return true if the iterable needs sorting in memory.  false otherwise.
+     */
+    default boolean needsInMemoryFilter() {
+        return false;
+    }
+
+    /**
+     * Whether the iterable should be sorted in memory.
+     * @return true if the iterable needs sorting in memory.  false otherwise.
+     */
+    default boolean needsInMemorySort() {
+        return false;
+    }
+
+    /**
+     * Whether the iterable should be paginated in memory.
+     * @return true if the iterable needs pagination in memory.  false otherwise.
+     */
+    default boolean needsInMemoryPagination() {
+        return false;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterableBuilder.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterableBuilder.java
new file mode 100644
index 0000000000..ba12743df0
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreIterableBuilder.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore;
+
+import java.util.ArrayList;
+
+/**
+ * Constructs DataStoreIterables.
+ * @param <T>
+ */
+public class DataStoreIterableBuilder<T> {
+
+    private boolean filterInMemory = false;
+    private boolean sortInMemory = false;
+    private boolean paginateInMemory = false;
+    private final Iterable<T> wrapped;
+
+    /**
+     * Constructor.
+     */
+    public DataStoreIterableBuilder() {
+        this.wrapped = new ArrayList<>();
+    }
+
+    /**
+     * Constructor.
+     * @param wrapped Required iterable to wrap.
+     */
+    public DataStoreIterableBuilder(Iterable<T> wrapped) {
+        if (wrapped == null) {
+            this.wrapped = new ArrayList<>();
+        } else {
+            this.wrapped = wrapped;
+        }
+    }
+
+    /**
+     * Filter the iterable in memory.
+     * @param filterInMemory true to filter in memory.
+     * @return the builder.
+     */
+    public DataStoreIterableBuilder filterInMemory(boolean filterInMemory) {
+        this.filterInMemory = filterInMemory;
+        return this;
+    }
+
+    /**
+     * Sorts the iterable in memory.
+     * @param sortInMemory true to sort in memory.
+     * @return the builder.
+     */
+    public DataStoreIterableBuilder sortInMemory(boolean sortInMemory) {
+        this.sortInMemory = sortInMemory;
+        return this;
+    }
+
+    /**
+     * Paginates the iterable in memory.
+     * @param paginateInMemory true to paginate in memory.
+     * @return the builder.
+     */
+    public DataStoreIterableBuilder paginateInMemory(boolean paginateInMemory) {
+        this.paginateInMemory = paginateInMemory;
+        return this;
+    }
+
+    /**
+     * Filter, sort, and paginate in memory.
+     * @return the builder.
+     */
+    public DataStoreIterableBuilder allInMemory() {
+        this.filterInMemory = true;
+        this.sortInMemory = true;
+        this.paginateInMemory = true;
+        return this;
+    }
+
+    /**
+     * Constructs the DataStoreIterable.
+     * @return the new iterable.
+     */
+    public DataStoreIterable<T> build() {
+        return new DataStoreIterable<T>() {
+            @Override
+            public Iterable<T> getWrappedIterable() {
+                return wrapped;
+            }
+
+            @Override
+            public boolean needsInMemoryFilter() {
+                return filterInMemory;
+            }
+
+            @Override
+            public boolean needsInMemorySort() {
+                return sortInMemory;
+            }
+
+            @Override
+            public boolean needsInMemoryPagination() {
+                return paginateInMemory;
+            }
+        };
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreTransaction.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreTransaction.java
new file mode 100644
index 0000000000..22c5da62d3
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/DataStoreTransaction.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ParameterizedModel;
+import com.yahoo.elide.core.type.Type;
+
+import java.io.Closeable;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Set;
+/**
+ * Wraps the Database Transaction type.
+ */
+public interface DataStoreTransaction extends Closeable {
+    /**
+     * Save the updated object.
+     *
+     * @param entity - the object to save.
+     * @param scope - contains request level metadata.
+     * @param <T> The model type being saved.
+     */
+    <T> void save(T entity, RequestScope scope);
+
+    /**
+     * Delete the object.
+     *
+     * @param entity - the object to delete.
+     * @param scope - contains request level metadata.
+     * @param <T> The model type being deleted.
+     */
+    <T> void delete(T entity, RequestScope scope);
+
+    /**
+     * Write any outstanding entities before processing response.
+     *
+     * @param scope the request scope for the current request
+     */
+    void flush(RequestScope scope);
+
+    /**
+     * End the current transaction.
+     *
+     * @param scope the request scope for the current request
+     */
+    void commit(RequestScope scope);
+
+    /**
+     * Called before commit checks are evaluated and before save, flush, and commit are called.
+     * The sequence goes:
+     * 1. transaction.preCommit();
+     * 2. Invoke security checks evaluated at commit time
+     * 3. transaction.save(...); - Invoked for every object which changed in the transaction.
+     * 4. transaction.flush();
+     * 5. transaction.commit();
+     */
+    default void preCommit(RequestScope scope) {
+    }
+
+    /**
+     * Elide will create and populate the object with the attributes and relationships before
+     * calling this method.  Operation security checks will be evaluated before invocation but commit
+     * security checks will be called later immediately prior to `commit` being called.
+     *
+     * @param entity - the object to create in the data store.
+     * @param scope - contains request level metadata.
+     * @param <T> The model type being created.
+     */
+    <T> void createObject(T entity, RequestScope scope);
+
+    /**
+     * Create a new instance of an object.
+     *
+     * @param entityClass the class
+     * @param <T> the model type to create
+     * @return a new instance of type T
+     */
+    default <T> T createNewObject(Type<T> entityClass, RequestScope scope) {
+        Injector injector = scope.getDictionary().getInjector();
+
+        T obj;
+        if (entityClass.getUnderlyingClass().isPresent()) {
+            obj = injector.instantiate(entityClass.getUnderlyingClass().get());
+        } else {
+            try {
+                obj = entityClass.newInstance();
+            } catch (java.lang.InstantiationException | IllegalAccessException e) {
+                obj = null;
+            }
+        }
+        return obj;
+    }
+
+    /**
+     * Loads an object by ID.  The reason we support both load by ID and load by filter is that
+     * some legacy stores are optimized to load by ID.
+     *
+     * @param entityProjection the collection to load.
+     * @param id - the ID of the object to load.
+     * @param scope - the current request scope
+     * @param <T> The model type being loaded.
+     * It is optional for the data store to attempt evaluation.
+     * @return the loaded object if it exists AND any provided security filters pass.
+     */
+    default <T> T loadObject(EntityProjection entityProjection,
+                             Serializable id,
+                             RequestScope scope) {
+        Type<?> entityClass = entityProjection.getType();
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+
+        EntityDictionary dictionary = scope.getDictionary();
+        Type idType = dictionary.getIdType(entityClass);
+        String idField = dictionary.getIdFieldName(entityClass);
+        FilterExpression idFilter = new InPredicate(
+                new Path.PathElement(entityClass, idType, idField),
+                id
+        );
+        FilterExpression joinedFilterExpression = (filterExpression != null)
+                ? new AndFilterExpression(idFilter, filterExpression)
+                : idFilter;
+
+        Iterable<T> results = loadObjects(entityProjection.copyOf()
+                .filterExpression(joinedFilterExpression)
+                .build(),
+                scope);
+
+        Iterator<T> it = results == null ? null : results.iterator();
+        if (it != null && it.hasNext()) {
+            T obj = it.next();
+            if (!it.hasNext()) {
+              return obj;
+            }
+
+            //Multiple objects with the same ID.
+            throw new InvalidObjectIdentifierException(id.toString(), dictionary.getJsonAliasFor(entityClass));
+        }
+        return null;
+    }
+
+    /**
+     * Loads a collection of objects.
+     *
+     * @param entityProjection - the class to load
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type being loaded.
+     * @return a collection of the loaded objects
+     */
+    <T> DataStoreIterable<T> loadObjects(
+            EntityProjection entityProjection,
+            RequestScope scope);
+
+    /**
+     * Retrieve a to-many relation from an object.
+     *
+     * @param relationTx - The datastore that governs objects of the relationhip's type.
+     * @param entity - The object which owns the relationship.
+     * @param relationship - the relationship to fetch.
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the relationship.
+     * @param <R> - The model type of the relationship.
+     * @return the object in the relation
+     */
+    default <T, R> DataStoreIterable<R> getToManyRelation(
+            DataStoreTransaction relationTx,
+            T entity,
+            Relationship relationship,
+            RequestScope scope) {
+
+        return new DataStoreIterableBuilder(
+                (Iterable) PersistentResource.getValue(entity, relationship.getName(), scope)).allInMemory().build();
+    }
+
+    /**
+     * Retrieve a to-one relation from an object.
+     *
+     * @param relationTx - The datastore that governs objects of the relationhip's type.
+     * @param entity - The object which owns the relationship.
+     * @param relationship - the relationship to fetch.
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the relationship.
+     * @param <R> - The model type of the relationship.
+     * @return the object in the relation
+     */
+    default <T, R> R getToOneRelation(
+            DataStoreTransaction relationTx,
+            T entity,
+            Relationship relationship,
+            RequestScope scope) {
+
+        return (R) PersistentResource.getValue(entity, relationship.getName(), scope);
+    }
+
+    /**
+     * Elide core will update the in memory representation of the objects to the requested state.
+     * These functions allow a data store to optionally persist the relationship if needed.
+     *
+     * @param relationTx - The datastore that governs objects of the relationhip's type.
+     * @param entity - The object which owns the relationship.
+     * @param relationName - name of the relationship.
+     * @param newRelationships - the set of the added relationship to the collection.
+     * @param deletedRelationships - the set of the deleted relationship to the collection.
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the relationship.
+     * @param <R> - The model type of the relationship.
+     */
+    default <T, R> void updateToManyRelation(DataStoreTransaction relationTx,
+                                      T entity,
+                                      String relationName,
+                                      Set<R> newRelationships,
+                                      Set<R> deletedRelationships,
+                                      RequestScope scope) {
+    }
+
+    /**
+     * Elide core will update the in memory representation of the objects to the requested state.
+     * These functions allow a data store to optionally persist the relationship if needed.
+     *
+     * @param relationTx - The datastore that governs objects of the relationhip's type.
+     * @param entity - The object which owns the relationship.
+     * @param relationName - name of the relationship.
+     * @param relationshipValue - the new value of the updated one-to-one relationship
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the relationship.
+     * @param <R> - The model type of the relationship.
+     */
+    default <T, R> void updateToOneRelation(DataStoreTransaction relationTx,
+                                     T entity,
+                                     String relationName,
+                                     R relationshipValue,
+                                     RequestScope scope) {
+    }
+
+    /**
+     * Get an attribute from an object.
+     *
+     * @param entity - The object which owns the attribute.
+     * @param attribute - The attribute to fetch
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the attribute.
+     * @param <R> - The type of the attribute.
+     * @return the value of the attribute
+     */
+    default <T, R> R getAttribute(T entity,
+                                  Attribute attribute,
+                                  RequestScope scope) {
+        if (entity instanceof ParameterizedModel) {
+            return ((ParameterizedModel) entity).invoke(attribute);
+        }
+        return (R) PersistentResource.getValue(entity, attribute.getName(), scope);
+
+    }
+
+    /**
+     * Set an attribute on an object in the data store.
+     * <p>
+     * Elide core will update the in memory representation of the objects to the requested state.
+     * This function allow a data store to optionally persist the attribute if needed.
+     *
+     * @param entity - The object which owns the attribute.
+     * @param attribute - the attribute to set.
+     * @param scope - contains request level metadata.
+     * @param <T> - The model type which owns the attribute.
+     */
+    default <T> void setAttribute(T entity,
+                                  Attribute attribute,
+                                  RequestScope scope) {
+    }
+
+    /**
+     * Cancel running transaction.
+     * Implementation must be thread-safe.
+     * @param scope contains request level metadata.
+     */
+    void cancel(RequestScope scope);
+
+    /**
+     * Returns a data store transaction property.
+     * @param propertyName The property name.
+     * @param <T> The type of the property.
+     * @return The property.
+     */
+    default <T> T getProperty(String propertyName) {
+        return null;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/FilteredIterator.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/FilteredIterator.java
new file mode 100644
index 0000000000..d8d479e95b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/FilteredIterator.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.InMemoryFilterExecutor;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.function.Predicate;
+
+/**
+ * An iterator which filters another iterator by an Elide filter expression.
+ * @param <T> The type being iterated over.
+ */
+public class FilteredIterator<T> implements Iterator<T> {
+
+    private Iterator<T> wrapped;
+    private Predicate<T> predicate;
+
+    private T next;
+
+    /**
+     * Constructor.
+     * @param filterExpression The filter expression to filter on.
+     * @param scope Request scope.
+     * @param wrapped The wrapped iterator.
+     */
+    public FilteredIterator(FilterExpression filterExpression, RequestScope scope, Iterator<T> wrapped) {
+        this.wrapped = wrapped;
+        InMemoryFilterExecutor executor = new InMemoryFilterExecutor(scope);
+
+        predicate = filterExpression.accept(executor);
+    }
+
+    @Override
+    public boolean hasNext() {
+        try {
+            next = next();
+        } catch (NoSuchElementException e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public T next() {
+        if (next != null) {
+            T result = next;
+            next = null;
+            return result;
+        }
+
+        while (next == null && wrapped.hasNext()) {
+            try {
+                next = wrapped.next();
+            } catch (NoSuchElementException e) {
+                next = null;
+            }
+            if (next == null || ! predicate.test(next)) {
+                next = null;
+            }
+        }
+
+        if (next == null) {
+            throw new NoSuchElementException();
+        }
+
+        return next;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapDataStore.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapDataStore.java
new file mode 100644
index 0000000000..d26f1440f0
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapDataStore.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.google.common.collect.Sets;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Simple in-memory only database.
+ */
+public class HashMapDataStore implements DataStore, DataStoreTestHarness {
+    protected final Map<Type<?>, Map<String, Object>> dataStore = Collections.synchronizedMap(new HashMap<>());
+    @Getter protected EntityDictionary dictionary;
+    @Getter private final ConcurrentHashMap<Type<?>, AtomicLong> typeIds = new ConcurrentHashMap<>();
+
+    public HashMapDataStore(ClassScanner scanner, Package beanPackage) {
+        this(scanner, Sets.newHashSet(beanPackage));
+    }
+
+    public HashMapDataStore(ClassScanner scanner, Set<Package> beanPackages) {
+        for (Package beanPackage : beanPackages) {
+            scanner.getAllClasses(beanPackage.getName()).stream()
+                .map(ClassType::new)
+                .filter(modelType -> EntityDictionary.getFirstAnnotation(modelType,
+                        Arrays.asList(Include.class, Exclude.class)) instanceof Include)
+                .forEach(modelType -> dataStore.put(modelType,
+                        Collections.synchronizedMap(new LinkedHashMap<>())));
+        }
+    }
+
+    public HashMapDataStore(Collection<Class<?>> beanClasses) {
+        beanClasses.stream()
+                .map(ClassType::new)
+                .filter(modelType -> EntityDictionary.getFirstAnnotation(modelType,
+                        Arrays.asList(Include.class, Exclude.class)) instanceof Include)
+                .forEach(modelType -> dataStore.put(modelType,
+                        Collections.synchronizedMap(new LinkedHashMap<>())));
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        for (Type<?> clazz : dataStore.keySet()) {
+            dictionary.bindEntity(clazz);
+        }
+
+        this.dictionary = dictionary;
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new HashMapStoreTransaction(dataStore, dictionary, typeIds);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Data store contents ");
+        for (Map.Entry<Type<?>, Map<String, Object>> dse : dataStore.entrySet()) {
+            sb.append("\n Table ").append(dse.getKey()).append(" contents \n");
+            for (Map.Entry<String, Object> e : dse.getValue().entrySet()) {
+                sb.append(" Id: ").append(e.getKey()).append(" Value: ").append(e.getValue());
+            }
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public DataStore getDataStore() {
+        return this;
+    }
+
+    /**
+     * Returns metadata mapping for an entity class.
+     * @param cls entity class
+     * @return Map
+     */
+    public Map<String, Object> get(Type<?> cls) {
+        return dataStore.get(cls);
+    }
+
+    @Override
+    public void cleanseTestData() {
+        for (Map<String, Object> objects : dataStore.values()) {
+            objects.clear();
+        }
+        typeIds.clear();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapStoreTransaction.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapStoreTransaction.java
new file mode 100644
index 0000000000..45eee754e4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/HashMapStoreTransaction.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.TransactionException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.persistence.GeneratedValue;
+
+/**
+ * HashMapDataStore transaction handler.
+ */
+public class HashMapStoreTransaction implements DataStoreTransaction {
+    private final Map<Type<?>, Map<String, Object>> dataStore;
+    private final List<Operation> operations;
+    private final EntityDictionary dictionary;
+    private final Map<Type<?>, AtomicLong> typeIds;
+
+    public HashMapStoreTransaction(Map<Type<?>, Map<String, Object>> dataStore,
+                                   EntityDictionary dictionary, Map<Type<?>, AtomicLong> typeIds) {
+        this.dataStore = dataStore;
+        this.dictionary = dictionary;
+        this.operations = new ArrayList<>();
+        this.typeIds = typeIds;
+    }
+
+    @Override
+    public void flush(RequestScope requestScope) {
+        // Do nothing
+    }
+
+    @Override
+    public void save(Object object, RequestScope requestScope) {
+        if (object == null) {
+            return;
+        }
+        String id = dictionary.getId(object);
+        if (id == null || "null".equals(id) || "0".equals(id)) {
+            createObject(object, requestScope);
+        }
+        id = dictionary.getId(object);
+        operations.add(new Operation(id, object, EntityDictionary.getType(object), Operation.OpType.UPDATE));
+        replicateOperationToParent(object, Operation.OpType.UPDATE);
+    }
+
+    @Override
+    public void delete(Object object, RequestScope requestScope) {
+        if (object == null) {
+            return;
+        }
+
+        String id = dictionary.getId(object);
+        operations.add(new Operation(id, object, EntityDictionary.getType(object), Operation.OpType.DELETE));
+        replicateOperationToParent(object, Operation.OpType.DELETE);
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        synchronized (dataStore) {
+            operations.stream()
+                    .filter(op -> op.getInstance() != null)
+                    .forEach(op -> {
+                        Object instance = op.getInstance();
+                        String id = op.getId();
+                        Map<String, Object> data = dataStore.get(op.getType());
+                        if (op.getOpType() == Operation.OpType.DELETE) {
+                            data.remove(id);
+                        } else {
+                            if (op.getOpType() == Operation.OpType.CREATE && data.get(id) != null) {
+                                throw new TransactionException(new IllegalStateException("Duplicate key"));
+                            }
+                            data.put(id, instance);
+                        }
+                    });
+            operations.clear();
+        }
+    }
+
+    @Override
+    public void createObject(Object entity, RequestScope scope) {
+        Type entityClass = EntityDictionary.getType(entity);
+
+        String idFieldName = dictionary.getIdFieldName(entityClass);
+        String id;
+
+        if (containsObject(entity)) {
+            throw new TransactionException(new IllegalStateException("Duplicate key"));
+        }
+
+        //GeneratedValue means the DB needs to assign the ID.
+        if (dictionary.getAttributeOrRelationAnnotation(entityClass, GeneratedValue.class, idFieldName) != null) {
+            // TODO: Id's are not necessarily numeric.
+            AtomicLong nextId;
+            synchronized (dataStore) {
+                nextId = getId(entityClass);
+            }
+            id = String.valueOf(nextId.getAndIncrement());
+            setId(entity, id);
+        } else {
+            id = dictionary.getId(entity);
+        }
+
+        replicateOperationToParent(entity, Operation.OpType.CREATE);
+        operations.add(new Operation(id, entity, EntityDictionary.getType(entity), Operation.OpType.CREATE));
+    }
+
+    public void setId(Object value, String id) {
+        dictionary.setValue(value, dictionary.getIdFieldName(EntityDictionary.getType(value)), id);
+    }
+
+    @Override
+    public DataStoreIterable<Object> getToManyRelation(DataStoreTransaction relationTx,
+                                                       Object entity,
+                                                       Relationship relationship,
+                                                       RequestScope scope) {
+        return new DataStoreIterableBuilder(
+                (Iterable) dictionary.getValue(entity, relationship.getName(), scope)).allInMemory().build();
+    }
+
+    @Override
+    public DataStoreIterable<Object> loadObjects(EntityProjection projection,
+                                                          RequestScope scope) {
+        synchronized (dataStore) {
+            Map<String, Object> data = dataStore.get(projection.getType());
+            return new DataStoreIterableBuilder<>(data.values()).allInMemory().build();
+        }
+    }
+
+    @Override
+    public Object loadObject(EntityProjection projection, Serializable id, RequestScope scope) {
+
+        EntityDictionary dictionary = scope.getDictionary();
+
+        synchronized (dataStore) {
+            Map<String, Object> data = dataStore.get(projection.getType());
+            if (data == null) {
+                return null;
+            }
+            Serde serde = dictionary.getSerdeLookup().apply(id.getClass());
+
+            String idString = (serde == null) ? id.toString() : (String) serde.serialize(id);
+            return data.get(idString);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        operations.clear();
+    }
+
+    private boolean containsObject(Object obj) {
+        return containsObject(EntityDictionary.getType(obj), obj);
+    }
+
+    private boolean containsObject(Type<?> clazz, Object obj) {
+        return dataStore.get(clazz).containsValue(obj);
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        //nothing to cancel in HashMap store transaction
+    }
+
+    private void replicateOperationToParent(Object entity, Operation.OpType opType) {
+        dictionary.getSuperClassEntities(EntityDictionary.getType(entity)).stream()
+            .forEach(superClass -> {
+                if (opType.equals(Operation.OpType.CREATE) && containsObject(superClass, entity)) {
+                    throw new TransactionException(new IllegalStateException("Duplicate key in Parent"));
+                }
+                String id = dictionary.getId(entity);
+                operations.add(new Operation(id, entity, superClass, opType));
+            });
+    }
+
+    /**
+     * Get shared ID from Parent for inherited classes.
+     * If not inherited, generate new ID.
+     * @param entityClass Class Type of Entity
+     * @return AtomicLong instance for Id generation.
+     */
+    private AtomicLong getId(Type<?> entityClass) {
+        return dictionary.getSuperClassEntities(entityClass).stream()
+                .findFirst()
+                .map(this::getId)
+                .orElseGet(() -> typeIds.computeIfAbsent(entityClass,
+                    (key) -> {
+                        long maxId = dataStore.get(key).keySet().stream()
+                                .mapToLong(Long::parseLong)
+                                .max()
+                                .orElse(0);
+                        return new AtomicLong(maxId + 1);
+                    }
+                ));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryDataStore.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryDataStore.java
new file mode 100644
index 0000000000..4b46f1dfba
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryDataStore.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+
+/**
+ * Data Store that wraps another store and provides in-memory filtering, soring, and pagination
+ * when the underlying store cannot perform the equivalent function.
+ */
+public class InMemoryDataStore implements DataStore {
+
+    private DataStore wrappedStore;
+
+    public InMemoryDataStore(DataStore wrappedStore) {
+        this.wrappedStore = wrappedStore;
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        wrappedStore.populateEntityDictionary(dictionary);
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new InMemoryStoreTransaction(wrappedStore.beginTransaction());
+    }
+
+    @Override
+    public DataStoreTransaction beginReadTransaction() {
+        return new InMemoryStoreTransaction(wrappedStore.beginReadTransaction());
+    }
+
+    @Override
+    public String toString() {
+        return "Wrapped:[" + String.valueOf(wrappedStore) + "]";
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransaction.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransaction.java
new file mode 100644
index 0000000000..4cf1da1aff
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransaction.java
@@ -0,0 +1,459 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterPredicatePushdownExtractor;
+import com.yahoo.elide.core.filter.expression.InMemoryExecutionVerifier;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+
+/**
+ * Data Store Transaction that wraps another transaction and provides in-memory filtering, soring, and pagination
+ * when the underlying transaction cannot perform the equivalent function.
+ */
+public class InMemoryStoreTransaction implements DataStoreTransaction {
+
+    private final DataStoreTransaction tx;
+    private static final Comparator<Object> NULL_SAFE_COMPARE = (a, b) -> {
+        if (a == null && b == null) {
+            return 0;
+        }
+        if (a == null) {
+            return -1;
+        }
+        if (b == null) {
+            return 1;
+        }
+        if (a instanceof Comparable) {
+            return ((Comparable) a).compareTo(b);
+        }
+        throw new IllegalStateException("Trying to comparing non-comparable types!");
+    };
+
+    /**
+     * Fetches data from the store.
+     */
+    @FunctionalInterface
+    private interface DataFetcher {
+        DataStoreIterable<Object> fetch(Optional<FilterExpression> filterExpression,
+                                        Optional<Sorting> sorting,
+                                        Optional<Pagination> pagination,
+                                        RequestScope scope);
+    }
+
+    public InMemoryStoreTransaction(DataStoreTransaction tx) {
+        this.tx = tx;
+    }
+
+    @Override
+    public DataStoreIterable<Object> getToManyRelation(DataStoreTransaction relationTx,
+                                    Object entity,
+                                    Relationship relationship,
+                                    RequestScope scope) {
+        DataFetcher fetcher = (filterExpression, sorting, pagination, requestScope) ->
+                tx.getToManyRelation(relationTx, entity, relationship.copyOf()
+                        .projection(relationship.getProjection().copyOf()
+                                .filterExpression(filterExpression.orElse(null))
+                                .sorting(sorting.orElse(null))
+                                .pagination(pagination.orElse(null))
+                                .build()
+                        ).build(), requestScope);
+
+
+        /*
+         * If we are mutating multiple entities, the data store transaction cannot perform filter & pagination directly.
+         * It must be done in memory by Elide as some newly created entities have not yet been persisted.
+         */
+        boolean filterInMemory = scope.getNewPersistentResources().size() > 0;
+        return fetchData(fetcher, relationship.getProjection(), filterInMemory, scope);
+    }
+
+    @Override
+    public Object loadObject(EntityProjection projection,
+                      Serializable id,
+                      RequestScope scope) {
+        if (projection.getFilterExpression() == null) {
+            return tx.loadObject(projection, id, scope);
+        }
+
+        return DataStoreTransaction.super.loadObject(projection, id, scope);
+    }
+
+    @Override
+    public DataStoreIterable<Object> loadObjects(EntityProjection projection,
+                                        RequestScope scope) {
+
+        DataFetcher fetcher = (filterExpression, sorting, pagination, requestScope) ->
+                tx.loadObjects(projection.copyOf()
+                        .filterExpression(filterExpression.orElse(null))
+                        .pagination(pagination.orElse(null))
+                        .sorting(sorting.orElse(null))
+                        .build(), requestScope);
+
+        return fetchData(fetcher, projection, false, scope);
+    }
+
+    @Override
+    public void save(Object entity, RequestScope scope) {
+        tx.save(entity, scope);
+    }
+
+    @Override
+    public void delete(Object entity, RequestScope scope) {
+        tx.delete(entity, scope);
+    }
+
+    @Override
+    public void preCommit(RequestScope scope) {
+        tx.preCommit(scope);
+    }
+
+    @Override
+    public <T> T createNewObject(Type<T> entityClass, RequestScope scope) {
+        return tx.createNewObject(entityClass, scope);
+    }
+
+    @Override
+    public <T, R> R getToOneRelation(
+            DataStoreTransaction relationTx,
+            T entity, Relationship relationship,
+            RequestScope scope
+    ) {
+        return tx.getToOneRelation(relationTx, entity, relationship, scope);
+    }
+
+    @Override
+    public void close() throws IOException {
+        tx.close();
+    }
+
+    @Override
+    public <T, R> void updateToManyRelation(DataStoreTransaction relationTx,
+                                     T entity,
+                                     String relationName,
+                                     Set<R> newRelationships,
+                                     Set<R> deletedRelationships,
+                                     RequestScope scope) {
+        tx.updateToManyRelation(relationTx, entity, relationName, newRelationships, deletedRelationships, scope);
+    }
+
+    @Override
+    public <T, R> void updateToOneRelation(DataStoreTransaction relationTx,
+                                    T entity,
+                                    String relationName,
+                                    R relationshipValue,
+                                    RequestScope scope) {
+        tx.updateToOneRelation(relationTx, entity, relationName, relationshipValue, scope);
+    }
+
+    @Override
+    public Object getAttribute(Object entity, Attribute attribute, RequestScope scope) {
+        return tx.getAttribute(entity, attribute, scope);
+    }
+
+    @Override
+    public void setAttribute(Object entity, Attribute attribute, RequestScope scope) {
+        tx.setAttribute(entity, attribute, scope);
+    }
+
+    @Override
+    public void flush(RequestScope scope) {
+        tx.flush(scope);
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        tx.commit(scope);
+    }
+
+    @Override
+    public void createObject(Object entity, RequestScope scope) {
+        tx.createObject(entity, scope);
+    }
+
+    private DataStoreIterable<Object> filterLoadedData(DataStoreIterable<Object> loadedRecords,
+                                                Optional<FilterExpression> filterExpression,
+                                                RequestScope scope) {
+
+        if (! filterExpression.isPresent()) {
+            return loadedRecords;
+        }
+
+        return new DataStoreIterable<>() {
+            @Override
+            public Iterable<Object> getWrappedIterable() {
+                return loadedRecords;
+            }
+
+            @Override
+            public Iterator<Object> iterator() {
+                return new FilteredIterator<>(filterExpression.get(), scope, loadedRecords.iterator());
+            }
+
+            @Override
+            public boolean needsInMemoryFilter() {
+                return true;
+            }
+
+            @Override
+            public boolean needsInMemorySort() {
+                return true;
+            }
+
+            @Override
+            public boolean needsInMemoryPagination() {
+                return true;
+            }
+        };
+    }
+
+    private DataStoreIterable<Object> fetchData(
+            DataFetcher fetcher,
+            EntityProjection projection,
+            boolean filterInMemory,
+            RequestScope scope
+    ) {
+        Optional<FilterExpression> filterExpression = Optional.ofNullable(projection.getFilterExpression());
+
+        Pair<Optional<FilterExpression>, Optional<FilterExpression>> expressionSplit = splitFilterExpression(
+                scope, projection, filterInMemory);
+
+        Optional<FilterExpression> dataStoreFilter = expressionSplit.getLeft();
+        Optional<FilterExpression> inMemoryFilter = expressionSplit.getRight();
+
+        Optional<Sorting> dataStoreSorting = getDataStoreSorting(scope, projection, filterInMemory);
+
+        boolean sortingInMemory = dataStoreSorting.isEmpty() && projection.getSorting() != null;
+
+        Optional<Pagination> dataStorePagination = inMemoryFilter.isPresent() || sortingInMemory
+                ? Optional.empty() : Optional.ofNullable(projection.getPagination());
+
+        DataStoreIterable<Object> loadedRecords =
+                fetcher.fetch(dataStoreFilter, dataStoreSorting, dataStorePagination, scope);
+
+        if (loadedRecords == null) {
+            return new DataStoreIterableBuilder().build();
+        }
+
+        if (inMemoryFilter.isPresent() || (loadedRecords.needsInMemoryFilter()
+                && projection.getFilterExpression() != null)) {
+            loadedRecords = filterLoadedData(loadedRecords, filterExpression, scope);
+        }
+
+        return sortAndPaginateLoadedData(
+                    loadedRecords,
+                    sortingInMemory,
+                    projection.getSorting(),
+                    projection.getPagination(),
+                    scope);
+    }
+
+    private DataStoreIterable<Object> sortAndPaginateLoadedData(
+            DataStoreIterable<Object> loadedRecords,
+            boolean sortingInMemory,
+            Sorting sorting,
+            Pagination pagination,
+            RequestScope scope
+    ) {
+
+        Map<Path, Sorting.SortOrder> sortRules = sorting == null ? new HashMap<>() : sorting.getSortingPaths();
+
+        boolean mustSortInMemory = ! sortRules.isEmpty()
+                && (sortingInMemory || loadedRecords.needsInMemorySort());
+
+        boolean mustPaginateInMemory = pagination != null
+                && (mustSortInMemory || loadedRecords.needsInMemoryPagination());
+
+        //Try to skip the data copy if possible
+        if (! mustSortInMemory && ! mustPaginateInMemory) {
+            return loadedRecords;
+        }
+
+        //We need an in memory copy to sort or paginate.
+        List<Object> results = StreamSupport.stream(loadedRecords.spliterator(), false).collect(Collectors.toList());
+
+        if (! sortRules.isEmpty()) {
+            results = sortInMemory(results, sortRules, scope);
+        }
+
+        if (pagination != null) {
+            results = paginateInMemory(results, pagination);
+        }
+
+        return new DataStoreIterableBuilder(results).build();
+    }
+
+    private List<Object> paginateInMemory(List<Object> records, Pagination pagination) {
+        int offset = pagination.getOffset();
+        int limit = pagination.getLimit();
+        if (offset < 0 || offset >= records.size()) {
+            return Collections.emptyList();
+        }
+
+        int endIdx = offset + limit;
+        if (endIdx > records.size()) {
+            endIdx = records.size();
+        }
+
+        if (pagination.returnPageTotals()) {
+            pagination.setPageTotals((long) records.size());
+        }
+        return records.subList(offset, endIdx);
+    }
+
+    private List<Object> sortInMemory(List<Object> records,
+                                        Map<Path, Sorting.SortOrder> sortRules,
+                                        RequestScope scope) {
+        //Build a comparator that handles multiple comparison rules.
+        Comparator<Object> noSort = (left, right) -> 0;
+
+        Comparator<Object> comp = sortRules.entrySet().stream()
+            .map(entry -> getComparator(entry.getKey(), entry.getValue(), scope))
+            .reduce(noSort, (comparator1, comparator2) -> (left, right) -> {
+                int comparison = comparator1.compare(left, right);
+                if (comparison == 0) {
+                    return comparator2.compare(left, right);
+                }
+                return comparison;
+            });
+
+        records.sort(comp);
+        return records;
+    }
+
+    private Comparator<Object> getComparator(Path path, Sorting.SortOrder order, RequestScope requestScope) {
+        return (left, right) -> {
+            Object leftCompare = left;
+            Object rightCompare = right;
+
+            // Drill down into path to find value for comparison
+            for (Path.PathElement pathElement : path.getPathElements()) {
+                leftCompare = (leftCompare == null ? null
+                        : PersistentResource.getValue(leftCompare, pathElement.getFieldName(), requestScope));
+                rightCompare = (rightCompare == null ? null
+                        : PersistentResource.getValue(rightCompare, pathElement.getFieldName(), requestScope));
+            }
+
+            if (order == Sorting.SortOrder.asc) {
+                return NULL_SAFE_COMPARE.compare(leftCompare, rightCompare);
+            }
+            return NULL_SAFE_COMPARE.compare(rightCompare, leftCompare);
+        };
+    }
+
+    /**
+     * Returns the sorting (if any) that should be pushed to the datastore.
+     * @param scope The request context
+     * @param projection The projection being loaded.
+     * @param filterInMemory Whether or not the transaction requires in memory filtering.
+     * @return An optional sorting.
+     */
+    private Optional<Sorting> getDataStoreSorting(
+            RequestScope scope,
+            EntityProjection projection,
+            boolean filterInMemory
+    ) {
+        Sorting sorting = projection.getSorting();
+        if (filterInMemory) {
+            return Optional.empty();
+        }
+        Map<Path, Sorting.SortOrder> sortRules = sorting == null ? new HashMap<>() : sorting.getSortingPaths();
+
+        boolean sortingOnComputedAttribute = false;
+        for (Path path: sortRules.keySet()) {
+            if (path.isComputed(scope.getDictionary())) {
+                Type<?> pathType = path.getPathElements().get(0).getType();
+                if (projection.getType().equals(pathType)) {
+                    sortingOnComputedAttribute = true;
+                    break;
+                }
+            }
+        }
+        if (sortingOnComputedAttribute) {
+            return Optional.empty();
+        } else {
+            return Optional.ofNullable(sorting);
+        }
+    }
+
+    /**
+     * Splits a filter expression into two components.  They are:
+     *  - a component that should be pushed down to the data store
+     *  - a component that should be executed in memory
+     * @param scope The request context
+     * @param projection The projection being loaded.
+     * @param filterInMemory Whether or not the transaction requires in memory filtering.
+     * @return A pair of filter expressions (data store expression, in memory expression)
+     */
+    private Pair<Optional<FilterExpression>, Optional<FilterExpression>> splitFilterExpression(
+            RequestScope scope,
+            EntityProjection projection,
+            boolean filterInMemory
+    ) {
+
+        Optional<FilterExpression> filterExpression = Optional.ofNullable(projection.getFilterExpression());
+        Optional<FilterExpression> inStoreFilterExpression = filterExpression;
+        Optional<FilterExpression> inMemoryFilterExpression = Optional.empty();
+
+        boolean transactionNeedsInMemoryFiltering = filterInMemory;
+
+        if (filterExpression.isPresent()) {
+            if (transactionNeedsInMemoryFiltering) {
+                inStoreFilterExpression = Optional.empty();
+            } else {
+                inStoreFilterExpression = Optional.ofNullable(
+                        FilterPredicatePushdownExtractor.extractPushDownPredicate(scope.getDictionary(),
+                                filterExpression.get()));
+            }
+
+            boolean expressionNeedsInMemoryFiltering = InMemoryExecutionVerifier.shouldExecuteInMemory(
+                    scope.getDictionary(), filterExpression.get());
+
+            if (transactionNeedsInMemoryFiltering || expressionNeedsInMemoryFiltering) {
+                inMemoryFilterExpression = filterExpression;
+            }
+        }
+
+        return Pair.of(inStoreFilterExpression, inMemoryFilterExpression);
+    }
+
+   @Override
+   public void cancel(RequestScope scope) {
+       tx.cancel(scope);
+   }
+
+    @Override
+    public <T> T getProperty(String propertyName) {
+        return tx.getProperty(propertyName);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/Operation.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/Operation.java
new file mode 100644
index 0000000000..fc7fc1043e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/inmemory/Operation.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore.inmemory;
+
+import com.yahoo.elide.core.type.Type;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+class Operation {
+    enum OpType {
+        CREATE,
+        DELETE,
+        UPDATE
+    };
+
+    @Getter private final String id;
+    @Getter private final Object instance;
+    @Getter private final Type<?> type;
+    @Getter private final OpType opType;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/test/DataStoreTestHarness.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/test/DataStoreTestHarness.java
new file mode 100644
index 0000000000..e66d6b8989
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/test/DataStoreTestHarness.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.test;
+
+import com.yahoo.elide.core.datastore.DataStore;
+
+/**
+ * Any data store that wants IT tests to run against it needs to provide an implementation of this harness.
+ */
+public interface DataStoreTestHarness {
+    public DataStore getDataStore();
+    public void cleanseTestData();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapper.java b/elide-core/src/main/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapper.java
new file mode 100644
index 0000000000..dd9781ef8a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapper.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.wrapped;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * Delegates all calls to a wrapped transaction.
+ */
+@Data
+@AllArgsConstructor
+public abstract class TransactionWrapper implements DataStoreTransaction {
+    protected DataStoreTransaction tx;
+
+    @Override
+    public void preCommit(RequestScope scope) {
+        tx.preCommit(scope);
+    }
+
+    @Override
+    public <T> T loadObject(EntityProjection projection, Serializable id,
+                             RequestScope scope) {
+        return tx.loadObject(projection, id, scope);
+    }
+
+    @Override
+    public <T, R> DataStoreIterable<R> getToManyRelation(DataStoreTransaction relationTx, T entity,
+                                                              Relationship relationship, RequestScope scope) {
+        return tx.getToManyRelation(relationTx, entity, relationship, scope);
+    }
+
+    @Override
+    public <T, R> R getToOneRelation(DataStoreTransaction relationTx, T entity,
+                                     Relationship relationship, RequestScope scope) {
+        return tx.getToOneRelation(relationTx, entity, relationship, scope);
+    }
+
+    @Override
+    public <T, R> void updateToManyRelation(DataStoreTransaction relationTx, T entity, String relationName,
+                                     Set<R> newRelationships, Set<R> deletedRelationships,
+                                     RequestScope scope) {
+        tx.updateToManyRelation(relationTx, entity, relationName, newRelationships, deletedRelationships, scope);
+
+    }
+
+    @Override
+    public <T, R> void updateToOneRelation(DataStoreTransaction relationTx, T entity,
+                                    String relationName, R relationshipValue, RequestScope scope) {
+        tx.updateToOneRelation(relationTx, entity, relationName, relationshipValue, scope);
+    }
+
+    @Override
+    public <T, R> R getAttribute(T entity, Attribute attribute, RequestScope scope) {
+        return tx.getAttribute(entity, attribute, scope);
+    }
+
+    @Override
+    public <T> void setAttribute(T entity, Attribute attribute, RequestScope scope) {
+        tx.setAttribute(entity, attribute, scope);
+    }
+
+    @Override
+    public <T> void save(T o, RequestScope requestScope) {
+        tx.save(o, requestScope);
+    }
+
+    @Override
+    public <T> void delete(T o, RequestScope requestScope) {
+        tx.delete(o, requestScope);
+    }
+
+    @Override
+    public void flush(RequestScope requestScope) {
+        tx.flush(requestScope);
+    }
+
+    @Override
+    public void commit(RequestScope requestScope) {
+        tx.commit(requestScope);
+    }
+
+    @Override
+    public void createObject(Object o, RequestScope requestScope) {
+        tx.createObject(o, requestScope);
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection projection, RequestScope scope) {
+        return tx.loadObjects(projection, scope);
+    }
+
+    @Override
+    public void close() throws IOException {
+        tx.close();
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        tx.cancel(scope);
+    }
+
+    @Override
+    public <T> T getProperty(String propertyName) {
+        return tx.getProperty(propertyName);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/dictionary/ArgumentType.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/ArgumentType.java
new file mode 100644
index 0000000000..7024a6a66d
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/ArgumentType.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import com.yahoo.elide.core.type.Type;
+import lombok.Builder;
+import lombok.Value;
+
+/**
+ * Argument Type wraps an argument to the type of value it accepts.
+ */
+@Value
+public class ArgumentType {
+    private String name;
+    private Type<?> type;
+    private Object defaultValue;
+
+    public ArgumentType(String name, Type<?> type) {
+        this(name, type, null);
+    }
+
+    @Builder
+    public ArgumentType(String name, Type<?> type, Object defaultValue) {
+        this.name = name;
+        this.type = type;
+        this.defaultValue = defaultValue;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityBinding.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityBinding.java
new file mode 100644
index 0000000000..3aaae7a159
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityBinding.java
@@ -0,0 +1,757 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.REGULAR_ID_NAME;
+import static com.yahoo.elide.core.type.ClassType.OBJ_METHODS;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.Operation;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase;
+import com.yahoo.elide.annotation.ToMany;
+import com.yahoo.elide.annotation.ToOne;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.DuplicateMappingException;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.core.type.Member;
+import com.yahoo.elide.core.type.Method;
+import com.yahoo.elide.core.type.Type;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
+import lombok.Getter;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.inject.Inject;
+import javax.persistence.AccessType;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapsId;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+
+/**
+ * Entity Dictionary maps JSON API Entity beans to/from Entity type names.
+ *
+ * @see com.yahoo.elide.annotation.Include#name
+ */
+public class EntityBinding {
+    public static final List<Class<? extends Annotation>> ID_ANNOTATIONS = List.of(Id.class, EmbeddedId.class);
+
+    private static final List<Class<? extends Annotation>> RELATIONSHIP_TYPES =
+            Arrays.asList(ManyToMany.class, ManyToOne.class, OneToMany.class, OneToOne.class,
+                    ToOne.class, ToMany.class);
+
+    @Getter
+    private final boolean isElideModel;
+    @Getter
+    public final Type<?> entityClass;
+    @Getter
+    public final String jsonApiType;
+    @Getter
+    public boolean idGenerated;
+    @Getter
+    private AccessibleObject idField;
+    @Getter
+    private String idFieldName;
+    @Getter
+    private Type<?> idType;
+    @Getter
+    private AccessType accessType;
+
+    @Getter
+    private final boolean injected;
+
+    private Injector injector;
+
+    @Getter
+    private String apiVersion;
+
+    public final EntityPermissions entityPermissions;
+    public final List<String> apiAttributes;
+    public final List<String> apiRelationships;
+    public final List<Type<?>> inheritedTypes;
+    public final ConcurrentLinkedDeque<String> attributesDeque = new ConcurrentLinkedDeque<>();
+    public final ConcurrentLinkedDeque<String> relationshipsDeque = new ConcurrentLinkedDeque<>();
+
+    public final ConcurrentHashMap<String, RelationshipType> relationshipTypes = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<String, String> relationshipToInverse = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<String, CascadeType[]> relationshipToCascadeTypes = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<String, AccessibleObject> fieldsToValues = new ConcurrentHashMap<>();
+    public final MultiValuedMap<Triple<String, Operation, TransactionPhase>, LifeCycleHook> fieldTriggers =
+            new HashSetValuedHashMap<>();
+    public final MultiValuedMap<Pair<Operation, TransactionPhase>, LifeCycleHook> classTriggers =
+            new HashSetValuedHashMap<>();
+    public final ConcurrentHashMap<String, Type<?>> fieldsToTypes = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<String, String> aliasesToFields = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<Method, Boolean> requestScopeableMethods = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<AccessibleObject, Set<ArgumentType>> attributeArguments = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<String, ArgumentType> entityArguments = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<Object, Annotation> annotations = new ConcurrentHashMap<>();
+
+    public static final EntityBinding EMPTY_BINDING = new EntityBinding();
+    public static final Set<ArgumentType> EMPTY_ATTRIBUTES_ARGS = Collections.unmodifiableSet(new HashSet<>());
+
+    /* empty binding constructor */
+    private EntityBinding() {
+        isElideModel = false;
+        injected = false;
+        jsonApiType = null;
+        apiVersion = NO_VERSION;
+        apiAttributes = new ArrayList<>();
+        apiRelationships = new ArrayList<>();
+        inheritedTypes = new ArrayList<>();
+        idField = null;
+        idType = null;
+        entityClass = null;
+        entityPermissions = EntityPermissions.EMPTY_PERMISSIONS;
+        idGenerated = false;
+        injector = null;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param injector Instantiates and injects new entities
+     * @param cls Entity class
+     * @param type Declared Elide type name
+     */
+    public EntityBinding(Injector injector,
+                         Type<?> cls,
+                         String type) {
+        this(injector, cls, type, NO_VERSION, unused -> false);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param injector Instantiates and injects new entities.
+     * @param cls Entity class
+     * @param type Declared Elide type name
+     * @param apiVersion API version
+     * @param isFieldHidden Function which determines if a given field should be in the dictionary but not exposed.
+     */
+    public EntityBinding(Injector injector,
+                         Type<?> cls,
+                         String type,
+                         String apiVersion,
+                         Predicate<AccessibleObject> isFieldHidden) {
+        this(injector, cls, type, apiVersion, true, isFieldHidden);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param injector Instantiates and injects new entities.
+     * @param cls Entity class
+     * @param type Declared Elide type name
+     * @param apiVersion API version
+     * @param isElideModel Whether or not this type is an Elide model or not.
+     * @param isFieldHidden Function which determines if a given field should be in the dictionary but not exposed.
+     */
+    public EntityBinding(Injector injector,
+                         Type<?> cls,
+                         String type,
+                         String apiVersion,
+                         boolean isElideModel,
+                         Predicate<AccessibleObject> isFieldHidden) {
+        this.isElideModel = isElideModel;
+        this.injector = injector;
+        entityClass = cls;
+        jsonApiType = type;
+        this.apiVersion = apiVersion;
+        inheritedTypes = getInheritedTypes(cls);
+
+        // Map id's, attributes, and relationships
+        List<AccessibleObject> fieldOrMethodList = getAllFields();
+        injected = shouldInject();
+
+        if (fieldOrMethodList.stream().anyMatch(EntityBinding::isIdField)) {
+            accessType = AccessType.FIELD;
+
+            /* Add all public methods that are computed OR life cycle hooks */
+            fieldOrMethodList.addAll(
+                    getInstanceMembers(cls.getMethods(),
+                            (method) -> method.isAnnotationPresent(LifeCycleHookBinding.class)
+                            || method.isAnnotationPresent(ComputedAttribute.class)
+                            || method.isAnnotationPresent(ComputedRelationship.class)
+                    )
+            );
+
+            //Elide needs to manipulate private fields that are exposed.
+            fieldOrMethodList.forEach(field -> field.setAccessible(true));
+        } else {
+            /* Preserve the behavior of Elide 4.2.6 and earlier */
+            accessType = AccessType.PROPERTY;
+
+            fieldOrMethodList.clear();
+
+            /* Add all public fields */
+            fieldOrMethodList.addAll(getInstanceMembers(cls.getFields()));
+
+            /* Add all public methods */
+            fieldOrMethodList.addAll(getInstanceMembers(cls.getMethods()));
+        }
+
+        bindEntityFields(cls, type, fieldOrMethodList, isFieldHidden);
+        bindTriggerIfPresent();
+
+        apiAttributes = dequeToList(attributesDeque);
+        apiRelationships = dequeToList(relationshipsDeque);
+        entityPermissions = new EntityPermissions(cls, fieldOrMethodList);
+    }
+
+    /**
+     * Filters a list of class Members to instance methods & fields.
+     *
+     * @param objects
+     * @param <T>
+     * @return A list of the filtered members
+     */
+    private <T extends Member> List<T> getInstanceMembers(T[] objects) {
+        return getInstanceMembers(objects, o -> true);
+    }
+
+    /**
+     * Filters a list of class Members to instance methods & fields.
+     *
+     * @param objects    The list of Members to filter
+     * @param <T>        Concrete Member Type
+     * @param filteredBy An additional filter predicate to apply
+     * @return A list of the filtered members
+     */
+    private <T extends Member> List<T> getInstanceMembers(T[] objects, Predicate<T> filteredBy) {
+        return Arrays.stream(objects)
+                .filter(o -> !Modifier.isStatic(o.getModifiers()))
+                .filter(filteredBy)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Get all fields of the entity class, including fields of superclasses (excluding Object).
+     * @return All fields of the EntityBindings entity class and all superclasses (excluding Object)
+     */
+    public List<AccessibleObject> getAllFields() {
+        List<AccessibleObject> fields = new ArrayList<>();
+
+        fields.addAll(getInstanceMembers(entityClass.getDeclaredFields(), (field) -> !field.isSynthetic()));
+        for (Type<?> type : inheritedTypes) {
+            fields.addAll(getInstanceMembers(type.getDeclaredFields(), (field) -> !field.isSynthetic()));
+        }
+
+        return fields;
+    }
+
+    public List<AccessibleObject> getAllMethods() {
+        List<AccessibleObject> methods = new ArrayList<>();
+
+        methods.addAll(getInstanceMembers(entityClass.getDeclaredMethods(), (method) -> !method.isSynthetic()));
+        for (Type<?> type : inheritedTypes) {
+            methods.addAll(getInstanceMembers(type.getDeclaredMethods(), (method) -> !method.isSynthetic()));
+        }
+
+        return methods;
+    }
+
+    /**
+     * Bind fields of an entity including the Id field, attributes, and relationships.
+     *
+     * @param cls               Class type to bind fields
+     * @param type              JSON API type identifier
+     * @param fieldOrMethodList List of fields and methods on entity
+     * @param isFieldHidden Function which determines if a given field should be in the dictionary but not exposed.
+     */
+    private void bindEntityFields(Type<?> cls, String type,
+                                  Collection<AccessibleObject> fieldOrMethodList,
+                                  Predicate<AccessibleObject> isFieldHidden) {
+        for (AccessibleObject fieldOrMethod : fieldOrMethodList) {
+            bindTriggerIfPresent(fieldOrMethod);
+
+            if (isIdField(fieldOrMethod)) {
+                bindEntityId(cls, type, fieldOrMethod);
+            } else if (fieldOrMethod.isAnnotationPresent(Transient.class)
+                    && !fieldOrMethod.isAnnotationPresent(ComputedAttribute.class)
+                    && !fieldOrMethod.isAnnotationPresent(ComputedRelationship.class)) {
+                continue; // Transient. Don't serialize
+            } else if (!fieldOrMethod.isAnnotationPresent(Exclude.class)) {
+                if (fieldOrMethod instanceof Field && Modifier.isTransient(((Field) fieldOrMethod).getModifiers())) {
+                    continue; // Transient. Don't serialize
+                }
+                if (fieldOrMethod instanceof Method && Modifier.isTransient(((Method) fieldOrMethod).getModifiers())) {
+                    continue; // Transient. Don't serialize
+                }
+                if (fieldOrMethod instanceof Field
+                        && !fieldOrMethod.isAnnotationPresent(Column.class)
+                        && Modifier.isStatic(((Field) fieldOrMethod).getModifiers())) {
+                    continue; // Field must have Column annotation?
+                }
+                bindAttrOrRelation(
+                        fieldOrMethod,
+                        isFieldHidden.test(fieldOrMethod));
+            }
+        }
+    }
+
+    /**
+     * Bind an id field to an entity.
+     *
+     * @param cls           Class type to bind fields
+     * @param type          JSON API type identifier
+     * @param fieldOrMethod Field or method to bind
+     */
+    private void bindEntityId(Type<?> cls, String type, AccessibleObject fieldOrMethod) {
+        String fieldName = getFieldName(fieldOrMethod);
+        Type<?> fieldType = getFieldType(cls, fieldOrMethod);
+
+        //Add id field to type map for the entity
+        fieldsToTypes.put(fieldName, fieldType);
+
+        //Set id field, type, and name
+        idField = fieldOrMethod;
+        idType = fieldType;
+        idFieldName = fieldName;
+
+        fieldsToValues.put(fieldName, fieldOrMethod);
+
+        if (idField != null && !fieldOrMethod.equals(idField)) {
+            throw new DuplicateMappingException(type + " " + cls.getName() + ":" + fieldName);
+        }
+        if (fieldOrMethod.isAnnotationPresent(GeneratedValue.class)) {
+            idGenerated = true;
+        }
+    }
+
+    /**
+     * Convert a deque to a list.
+     *
+     * @param deque Deque to convert
+     * @return Deque as a list
+     */
+    private static List<String> dequeToList(final Deque<String> deque) {
+        ArrayList<String> result = new ArrayList<>();
+        deque.stream().forEachOrdered(result::add);
+        result.sort(String.CASE_INSENSITIVE_ORDER);
+        return Collections.unmodifiableList(result);
+    }
+
+    /**
+     * Bind an attribute or relationship.
+     *
+     * @param fieldOrMethod Field or method to bind
+     * @param isHidden Whether this field is hidden from API
+     */
+    private void bindAttrOrRelation(AccessibleObject fieldOrMethod, boolean isHidden) {
+        boolean isRelation = RELATIONSHIP_TYPES.stream().anyMatch(fieldOrMethod::isAnnotationPresent);
+
+        String fieldName = getFieldName(fieldOrMethod);
+        Type<?> fieldType = getFieldType(entityClass, fieldOrMethod);
+
+        if (fieldName == null || REGULAR_ID_NAME.equals(fieldName) || "class".equals(fieldName)
+                || OBJ_METHODS.contains(fieldOrMethod)) {
+            return; // Reserved
+        }
+
+        if (fieldOrMethod instanceof Method) {
+            Method method = (Method) fieldOrMethod;
+            requestScopeableMethods.put(method, isRequestScopeableMethod(method));
+        }
+
+        if (isRelation) {
+            bindRelation(fieldOrMethod, fieldName, fieldType, isHidden);
+        } else {
+            bindAttr(fieldOrMethod, fieldName, fieldType, isHidden);
+        }
+    }
+
+    /**
+     * Bind a relationship to current class
+     *
+     * @param fieldOrMethod Field or method to bind
+     * @param fieldName Field name
+     * @param fieldType Field type
+     * @param isHidden Whether this field is hidden from API
+     */
+    private void bindRelation(AccessibleObject fieldOrMethod, String fieldName, Type<?> fieldType, boolean isHidden) {
+        boolean manyToMany = fieldOrMethod.isAnnotationPresent(ManyToMany.class);
+        boolean manyToOne = fieldOrMethod.isAnnotationPresent(ManyToOne.class);
+        boolean oneToMany = fieldOrMethod.isAnnotationPresent(OneToMany.class);
+        boolean oneToOne = fieldOrMethod.isAnnotationPresent(OneToOne.class);
+        boolean toOne = fieldOrMethod.isAnnotationPresent(ToOne.class);
+        boolean toMany = fieldOrMethod.isAnnotationPresent(ToMany.class);
+        boolean computedRelationship = fieldOrMethod.isAnnotationPresent(ComputedRelationship.class);
+
+        if (fieldOrMethod.isAnnotationPresent(MapsId.class)) {
+            idGenerated = true;
+        }
+
+        RelationshipType type;
+        String mappedBy = "";
+        CascadeType[] cascadeTypes = new CascadeType[0];
+        if (oneToMany) {
+            type = computedRelationship ? RelationshipType.COMPUTED_ONE_TO_MANY : RelationshipType.ONE_TO_MANY;
+            mappedBy = fieldOrMethod.getAnnotation(OneToMany.class).mappedBy();
+            cascadeTypes = fieldOrMethod.getAnnotation(OneToMany.class).cascade();
+        } else if (oneToOne) {
+            type = computedRelationship ? RelationshipType.COMPUTED_ONE_TO_ONE : RelationshipType.ONE_TO_ONE;
+            mappedBy = fieldOrMethod.getAnnotation(OneToOne.class).mappedBy();
+            cascadeTypes = fieldOrMethod.getAnnotation(OneToOne.class).cascade();
+        } else if (manyToMany) {
+            type = computedRelationship ? RelationshipType.COMPUTED_MANY_TO_MANY : RelationshipType.MANY_TO_MANY;
+            mappedBy = fieldOrMethod.getAnnotation(ManyToMany.class).mappedBy();
+            cascadeTypes = fieldOrMethod.getAnnotation(ManyToMany.class).cascade();
+        } else if (manyToOne) {
+            type = computedRelationship ? RelationshipType.COMPUTED_MANY_TO_ONE : RelationshipType.MANY_TO_ONE;
+            cascadeTypes = fieldOrMethod.getAnnotation(ManyToOne.class).cascade();
+        } else if (toOne) {
+            type = RelationshipType.COMPUTED_ONE_TO_ONE;
+        } else if (toMany) {
+            type = RelationshipType.COMPUTED_ONE_TO_MANY;
+        } else {
+            type = computedRelationship ? RelationshipType.COMPUTED_NONE : RelationshipType.NONE;
+        }
+        relationshipTypes.put(fieldName, type);
+        relationshipToInverse.put(fieldName, mappedBy);
+        relationshipToCascadeTypes.put(fieldName, cascadeTypes);
+
+        if (!isHidden) {
+            relationshipsDeque.push(fieldName);
+        }
+        fieldsToValues.put(fieldName, fieldOrMethod);
+        fieldsToTypes.put(fieldName, fieldType);
+    }
+
+    /**
+     * Bind an attribute to current class
+     *
+     * @param fieldOrMethod Field or method to bind
+     * @param fieldName Field name
+     * @param fieldType Field type
+     * @param isHidden Whether this field is hidden from API
+     */
+    private void bindAttr(AccessibleObject fieldOrMethod, String fieldName, Type<?> fieldType, boolean isHidden) {
+        if (!isHidden) {
+            attributesDeque.push(fieldName);
+        }
+        fieldsToValues.put(fieldName, fieldOrMethod);
+        fieldsToTypes.put(fieldName, fieldType);
+    }
+
+    /**
+     * Returns name of field whether public member or method.
+     *
+     * @param fieldOrMethod field or method
+     * @return field or method name
+     */
+    public static String getFieldName(AccessibleObject fieldOrMethod) {
+        if (fieldOrMethod instanceof Field) {
+            return ((Field) fieldOrMethod).getName();
+        }
+        Method method = (Method) fieldOrMethod;
+        String name = method.getName();
+        boolean hasValidParameterCount = method.getParameterCount() == 0 || isRequestScopeableMethod(method);
+
+        if (name.startsWith("get") && hasValidParameterCount) {
+            return StringUtils.uncapitalize(name.substring("get".length()));
+        }
+        if (name.startsWith("is") && hasValidParameterCount) {
+            return StringUtils.uncapitalize(name.substring("is".length()));
+        }
+        return null;
+    }
+
+    /**
+     * Check whether or not method expects a RequestScope.
+     *
+     * @param method Method to check
+     * @return True if accepts a RequestScope, false otherwise
+     */
+    public static boolean isRequestScopeableMethod(Method method) {
+        return isComputedMethod(method) && method.getParameterCount() == 1
+                && com.yahoo.elide.core.security.RequestScope.class.isAssignableFrom(method.getParameterTypes()[0]);
+    }
+
+    /**
+     * Check whether or not the provided method described a computed attribute or relationship.
+     *
+     * @param method Method to check
+     * @return True if method is a computed type, false otherwise
+     */
+    public static boolean isComputedMethod(Method method) {
+        return Stream.of(method.getAnnotations())
+                .map(Annotation::annotationType)
+                .anyMatch(c -> ComputedAttribute.class == c || ComputedRelationship.class == c);
+    }
+
+    /**
+     * Returns type of field whether member or method.
+     *
+     * @param parentClass The class which owns the given field or method
+     * @param fieldOrMethod field or method
+     * @return field type
+     */
+    public static Type<?> getFieldType(Type<?> parentClass,
+                                         AccessibleObject fieldOrMethod) {
+        return getFieldType(parentClass, fieldOrMethod, Optional.empty());
+    }
+
+    /**
+     * Returns type of field whether member or method.
+     *
+     * @param parentClass The class which owns the given field or method
+     * @param fieldOrMethod field or method
+     * @param index Optional parameter index for parameterized types that take one or more parameters.  If
+     *              an index is provided, the type returned is the parameter type.  Otherwise it is the
+     *              parameterized type.
+     * @return field type
+     */
+    public static Type<?> getFieldType(Type<?> parentClass,
+                                       AccessibleObject fieldOrMethod,
+                                       Optional<Integer> index) {
+        if (fieldOrMethod instanceof Field) {
+            return ((Field) fieldOrMethod).getParameterizedType(parentClass, index);
+        }
+        return ((Method) fieldOrMethod).getParameterizedReturnType(parentClass, index);
+    }
+
+    private void bindTriggerIfPresent(AccessibleObject fieldOrMethod) {
+        LifeCycleHookBinding[] triggers = fieldOrMethod.getAnnotationsByType(LifeCycleHookBinding.class);
+        for (LifeCycleHookBinding trigger : triggers) {
+            bindTrigger(trigger, getFieldName(fieldOrMethod));
+        }
+    }
+    private void bindTriggerIfPresent() {
+        LifeCycleHookBinding[] triggers = entityClass.getAnnotationsByType(LifeCycleHookBinding.class);
+        for (LifeCycleHookBinding trigger : triggers) {
+            bindTrigger(trigger);
+        }
+    }
+
+    public void bindTrigger(Operation operation,
+                            TransactionPhase phase,
+                            String fieldOrMethodName,
+                            LifeCycleHook hook) {
+        Triple<String, Operation, TransactionPhase> key =
+                Triple.of(fieldOrMethodName, operation, phase);
+
+        fieldTriggers.put(key, hook);
+    }
+
+    private void bindTrigger(LifeCycleHookBinding binding,
+                            String fieldOrMethodName) {
+        LifeCycleHook hook = injector.instantiate(binding.hook());
+        injector.inject(hook);
+        bindTrigger(binding.operation(), binding.phase(), fieldOrMethodName, hook);
+    }
+
+    public void bindTrigger(Operation operation,
+                            TransactionPhase phase,
+                            LifeCycleHook hook) {
+        Pair<Operation, TransactionPhase> key =
+                Pair.of(operation, phase);
+
+        classTriggers.put(key, hook);
+    }
+
+    private void bindTrigger(LifeCycleHookBinding binding) {
+        if (binding.oncePerRequest()) {
+            bindTrigger(binding, PersistentResource.CLASS_NO_FIELD);
+            return;
+        }
+
+        LifeCycleHook hook = injector.instantiate(binding.hook());
+        injector.inject(hook);
+        bindTrigger(binding.operation(), binding.phase(), hook);
+    }
+
+    public Collection<LifeCycleHook> getTriggers(Operation op,
+            TransactionPhase phase,
+            String fieldName) {
+        Triple<String, Operation, TransactionPhase> key =
+                Triple.of(fieldName, op, phase);
+        Collection<LifeCycleHook> bindings = fieldTriggers.get(key);
+        return (bindings == null ? Collections.emptyList() : bindings);
+    }
+
+    public Collection<LifeCycleHook> getTriggers(Operation op,
+            TransactionPhase phase) {
+
+        Pair<Operation, TransactionPhase> key =
+                Pair.of(op, phase);
+        Collection<LifeCycleHook> bindings = classTriggers.get(key);
+        return (bindings == null ? Collections.emptyList() : bindings);
+    }
+
+    /**
+     * Cache placeholder for no annotation.
+     */
+    private static final Annotation NO_ANNOTATION = () -> null;
+
+    /**
+     * Return annotation from class, parents or package.
+     *
+     * @param annotationClass the annotation class
+     * @param <A>             annotation type
+     * @return the annotation
+     */
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        Annotation annotation = annotations.computeIfAbsent(annotationClass, cls -> Optional.ofNullable(
+                EntityDictionary.getFirstAnnotation(entityClass, Collections.singletonList(annotationClass)))
+                .orElse(NO_ANNOTATION));
+        return annotation == NO_ANNOTATION ? null : annotationClass.cast(annotation);
+    }
+
+    /**
+     * Return annotation for provided method.
+     *
+     * @param annotationClass the annotation class
+     * @param method the method
+     * @param <A> annotation type
+     * @return the annotation
+     */
+    public <A extends Annotation> A getMethodAnnotation(Class<A> annotationClass, String method) {
+        Annotation annotation = annotations.computeIfAbsent(Pair.of(annotationClass, method), key -> {
+            try {
+                return Optional.ofNullable((Annotation) entityClass.getMethod(method).getAnnotation(annotationClass))
+                        .orElse(NO_ANNOTATION);
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new IllegalStateException(e);
+            }
+        });
+        return annotation == NO_ANNOTATION ? null : annotationClass.cast(annotation);
+    }
+
+    private boolean shouldInject() {
+        boolean hasField = getAllFields().stream()
+                .anyMatch(accessibleObject -> accessibleObject.isAnnotationPresent(Inject.class));
+
+        if (hasField) {
+            return true;
+        }
+
+        boolean hasMethod = getAllMethods().stream()
+                .anyMatch(accessibleObject -> accessibleObject.isAnnotationPresent(Inject.class));
+
+        if (hasMethod) {
+            return true;
+        }
+
+        boolean hasConstructor = Arrays.stream(entityClass.getConstructors())
+                .anyMatch(ctor -> ctor.getAnnotation(Inject.class) != null);
+
+        return hasConstructor;
+    }
+
+    private List<Type<?>> getInheritedTypes(Type<?> entityCls) {
+        ArrayList<Type<?>> results = new ArrayList<>();
+
+        for (Type<?> cls = entityCls.getSuperclass(); cls != null && cls.hasSuperType(); cls = cls.getSuperclass()) {
+            results.add(cls);
+        }
+
+        return results;
+    }
+
+    /**
+     * Add a collection of arguments to the attributes of this Entity.
+     * @param attribute attribute name to which argument has to be added
+     * @param arguments Set of Argument Type for the attribute
+     */
+    public void addArgumentsToAttribute(String attribute, Set<ArgumentType> arguments) {
+        AccessibleObject fieldObject = fieldsToValues.get(attribute);
+        if (fieldObject != null && arguments != null) {
+            Set<ArgumentType> existingArgs = attributeArguments.get(fieldObject);
+            if (existingArgs != null) {
+                //Replace any argument names with new value
+                existingArgs.addAll(arguments);
+            } else {
+                attributeArguments.put(fieldObject, new HashSet<>(arguments));
+            }
+        }
+    }
+
+    /**
+     * Returns the Collection of all attributes of an argument.
+     * @param attribute Name of the argument for ehich arguments are to be retrieved.
+     * @return A Set of ArgumentType for the given attribute.
+     */
+    public Set<ArgumentType> getAttributeArguments(String attribute) {
+        AccessibleObject fieldObject = fieldsToValues.get(attribute);
+        return (fieldObject != null)
+                ? attributeArguments.getOrDefault(fieldObject, EMPTY_ATTRIBUTES_ARGS)
+                : EMPTY_ATTRIBUTES_ARGS;
+    }
+
+    /**
+     * Add argument to this Entity.
+     * @param argument Argument Type for the attribute
+     */
+    public void addArgumentToEntity(ArgumentType argument) {
+        if (argument != null) {
+            //Replace any argument names with new value
+            entityArguments.put(argument.getName(), argument);
+        }
+    }
+
+    /**
+     * Returns all the bound model attribute types.
+     * @return model attribute types.
+     */
+    public Set<Type<?>> getAttributes() {
+        return apiAttributes
+                .stream()
+                .map((attributeName) -> fieldsToTypes.get(attributeName))
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns a list of fields filtered by a given predicate.
+     * @param filter The filter predicate.
+     * @return All fields that satisfy the predicate.
+     */
+    public Set<AccessibleObject> getAllFields(Predicate<AccessibleObject> filter) {
+        return fieldsToValues.values().stream().filter(filter).collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns the Collection of all attributes of an Entity.
+     * @return A Set of ArgumentType for the given entity.
+     */
+    public Set<ArgumentType> getEntityArguments() {
+        return new HashSet<>(entityArguments.values());
+    }
+
+    public static boolean isIdField(AccessibleObject field) {
+        return (field.isAnnotationPresent(Id.class) || field.isAnnotationPresent(EmbeddedId.class));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityDictionary.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityDictionary.java
new file mode 100644
index 0000000000..a993929fff
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityDictionary.java
@@ -0,0 +1,2245 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Copyright 2018, the original author or authors.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import static com.yahoo.elide.core.dictionary.EntityBinding.EMPTY_BINDING;
+import static com.yahoo.elide.core.security.checks.prefab.Role.ALL_ROLE;
+import static com.yahoo.elide.core.security.checks.prefab.Role.NONE_ROLE;
+import static com.yahoo.elide.core.type.ClassType.COLLECTION_TYPE;
+import static com.yahoo.elide.core.type.ClassType.MAP_TYPE;
+import com.yahoo.elide.annotation.ApiVersion;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.Operation;
+import com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase;
+import com.yahoo.elide.annotation.NonTransferable;
+import com.yahoo.elide.annotation.OnCreatePostCommit;
+import com.yahoo.elide.annotation.OnCreatePreCommit;
+import com.yahoo.elide.annotation.OnCreatePreSecurity;
+import com.yahoo.elide.annotation.OnDeletePostCommit;
+import com.yahoo.elide.annotation.OnDeletePreCommit;
+import com.yahoo.elide.annotation.OnDeletePreSecurity;
+import com.yahoo.elide.annotation.OnUpdatePostCommit;
+import com.yahoo.elide.annotation.OnUpdatePreCommit;
+import com.yahoo.elide.annotation.OnUpdatePreSecurity;
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.core.exceptions.InternalServerErrorException;
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.checks.prefab.Collections.AppendOnly;
+import com.yahoo.elide.core.security.checks.prefab.Collections.RemoveOnly;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Dynamic;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.core.type.Method;
+import com.yahoo.elide.core.type.Package;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import javax.persistence.AccessType;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.Transient;
+import javax.ws.rs.WebApplicationException;
+
+/**
+ * Entity Dictionary maps JSON API Entity beans to/from Entity type names.
+ *
+ * @see Include#name
+ */
+@Slf4j
+@SuppressWarnings("static-method")
+public class EntityDictionary {
+
+    public static final String ELIDE_PACKAGE_PREFIX = "com.yahoo.elide";
+    public static final String NO_VERSION = "";
+
+    public static final Injector DEFAULT_INJECTOR = (noop) -> {
+        //NOOP
+    };
+    private static final Map<Class<?>, Type<?>> TYPE_MAP = new ConcurrentHashMap<>();
+
+    protected final ConcurrentHashMap<Pair<String, String>, Type<?>> bindJsonApiToEntity = new ConcurrentHashMap<>();
+    protected final ConcurrentHashMap<Type<?>, EntityBinding> entityBindings = new ConcurrentHashMap<>();
+
+    @Getter
+    protected final ConcurrentHashMap<Type<?>, Function<RequestScope, PermissionExecutor>> entityPermissionExecutor =
+            new ConcurrentHashMap<>();
+    protected final CopyOnWriteArrayList<Type<?>> bindEntityRoots = new CopyOnWriteArrayList<>();
+    protected final ConcurrentHashMap<Type<?>, List<Type<?>>> subclassingEntities = new ConcurrentHashMap<>();
+    protected final BiMap<String, Class<? extends Check>> checkNames;
+    protected final Map<Class<? extends Check>, Check> checkInstances;
+    protected final Map<String, UserCheck> roleChecks;
+
+    @Getter
+    protected final Set<String> apiVersions;
+
+    @Getter
+    protected final Injector injector;
+
+    @Getter
+    protected final ClassScanner scanner;
+
+    @Getter
+    protected final Function<Class, Serde> serdeLookup ;
+
+    @Getter
+    private final Set<Type<?>> entitiesToExclude;
+
+    public static final String REGULAR_ID_NAME = "id";
+    private static final ConcurrentHashMap<Type, String> SIMPLE_NAMES = new ConcurrentHashMap<>();
+    private static final String ALL_FIELDS = "*";
+
+    @Builder
+    public EntityDictionary(Map<String, Class<? extends Check>> checks,
+                            Map<String, UserCheck> roleChecks,
+                            Injector injector,
+                            Function<Class, Serde> serdeLookup,
+                            Set<Type<?>> entitiesToExclude,
+                            ClassScanner scanner) {
+        this.scanner = scanner;
+        this.serdeLookup = serdeLookup;
+        this.checkNames = Maps.synchronizedBiMap(HashBiMap.create(checks));
+        this.checkInstances = new ConcurrentHashMap<>();
+        this.roleChecks = roleChecks == null ? new HashMap<>() : new HashMap<>(roleChecks);
+        this.apiVersions = new HashSet<>();
+        initializeChecks();
+        this.injector = injector;
+        this.entitiesToExclude = new HashSet<>(entitiesToExclude);
+
+        //Hydrate check instances at boot.
+        checkNames.keySet().forEach(checkName -> {
+            getCheckInstance(checkName);
+        });
+    }
+
+    private void initializeChecks() {
+        UserCheck all = new Role.ALL();
+        UserCheck none = new Role.NONE();
+
+        addRoleCheck("Prefab.Role.All", all);
+        addRoleCheck(ALL_ROLE, all);
+        addRoleCheck("Prefab.Role.None", none);
+        addRoleCheck(NONE_ROLE, none);
+
+        addPrefabCheck("Prefab.Collections.AppendOnly", AppendOnly.class);
+        addPrefabCheck("Prefab.Collections.RemoveOnly", RemoveOnly.class);
+    }
+
+
+    private void addPrefabCheck(String alias, Class<? extends Check> checkClass) {
+        if (checkNames.containsKey(alias) || checkNames.inverse().containsKey(checkClass)) {
+            return;
+        }
+
+        checkNames.put(alias, checkClass);
+    }
+
+    private static Package getParentPackage(Package pkg) {
+        return pkg.getParentPackage();
+    }
+
+    /**
+     * Adds a user check for a given role to the dictionary.
+     * @param role The role associated with the check.
+     * @param check The instantiated check class.
+     */
+    public void addRoleCheck(String role, UserCheck check) {
+        roleChecks.put(role, check);
+    }
+
+    /**
+     * Returns an instantiated role check for the given role.
+     * @param role The role associated with the check.
+     * @return The user check associated with the role.
+     */
+    public UserCheck getRoleCheck(String role) {
+        return roleChecks.get(role);
+    }
+
+    /**
+     * Returns the map of role to their user role check object.
+     * @return
+     */
+    public Map<String, UserCheck> getRoleChecks() {
+        return roleChecks;
+    }
+
+    /**
+     * Gets all the registered check identifiers.
+     * @return A set of check identifier strings.
+     */
+    public Set<String> getCheckIdentifiers() {
+        return Sets.union(roleChecks.keySet(), checkNames.keySet());
+    }
+
+    /**
+     * Cache the simple name of the provided class.
+     * @param cls the {@code Class} object to be checked
+     * @return simple name
+     */
+    public static String getSimpleName(Type<?> cls) {
+        return SIMPLE_NAMES.computeIfAbsent(cls, key -> cls.getSimpleName());
+    }
+
+    /**
+     * Find an arbitrary method.
+     *
+     * @param entityClass the entity class
+     * @param name        the name
+     * @param paramClass  the param class
+     * @return method method
+     * @throws NoSuchMethodException the no such method exception
+     */
+    public static Method findMethod(Type<?> entityClass, String name, Type<?>... paramClass)
+            throws NoSuchMethodException {
+        Method m = entityClass.getMethod(name, paramClass);
+        int modifiers = m.getModifiers();
+        if (Modifier.isAbstract(modifiers)
+                || m.isAnnotationPresent(Transient.class)
+                && !m.isAnnotationPresent(ComputedAttribute.class)
+                && !m.isAnnotationPresent(ComputedRelationship.class)) {
+            throw new NoSuchMethodException(name);
+        }
+        return m;
+    }
+
+    /**
+     * Returns an entity binding if the provided class has been bound in the dictionary.
+     * Otherwise the behavior depends on whether the unbound class is an Entity or not.
+     * If it is not an Entity, we return an EMPTY_BINDING.  This preserves existing behavior for relationships
+     * which are entities but not bound.  Otherwise, we throw an exception - which also preserves behavior
+     * for unbound non-entities.
+     * @param entityClass
+     * @return
+     */
+    public EntityBinding getEntityBinding(Type<?> entityClass) {
+
+        //Common case of no inheritance.  This lookup is a performance boost so we don't have to do reflection.
+        EntityBinding binding = entityBindings.get(entityClass);
+        if (binding != null) {
+            return binding;
+        }
+
+        Type<?> declaredClass = lookupBoundClass(entityClass);
+
+        if (declaredClass != null) {
+            return entityBindings.get(declaredClass);
+        }
+
+        //Will throw an exception if entityClass is not an entity.
+        lookupEntityClass(entityClass);
+        return EMPTY_BINDING;
+    }
+
+    /**
+     * Returns whether or not the ID field for a given model is generated by the persistence layer.
+     * @param entityClass The model to lookup.
+     * @return True if the ID field is generated.  False otherwise.
+     */
+    public boolean isIdGenerated(Type<?> entityClass) {
+        return getEntityBinding(entityClass).isIdGenerated();
+    }
+
+    /**
+     * Returns the binding class for a given entity name.
+     *
+     * @param entityName entity name
+     * @return binding class
+     */
+    public Type<?> getEntityClass(String entityName, String version) {
+        Type<?> lookup = bindJsonApiToEntity.getOrDefault(Pair.of(entityName, version), null);
+
+        if (lookup == null) {
+            //Elide standard models transcend API versions.
+            return entityBindings.values().stream()
+                    .filter(binding -> binding.entityClass.getName().startsWith(ELIDE_PACKAGE_PREFIX))
+                    .filter(binding -> binding.jsonApiType.equals(entityName))
+                    .map(EntityBinding::getEntityClass)
+                    .findFirst()
+                    .orElse(null);
+        }
+        return lookup;
+    }
+
+    /**
+     * Returns the Include name for a given binding class.
+     *
+     * @param entityClass the entity class
+     * @return binding class
+     * @see Include
+     */
+    public String getJsonAliasFor(Type<?> entityClass) {
+        return getEntityBinding(entityClass).jsonApiType;
+    }
+
+    /**
+     * Determine if a given (entity class, permission) pair have any permissions defined.
+     *
+     * @param resourceClass the entity class
+     * @param annotationClass the permission annotation
+     * @return {@code true} if that permission is defined anywhere within the class
+     */
+    public boolean entityHasChecksForPermission(Type<?> resourceClass, Class<? extends Annotation> annotationClass) {
+        EntityBinding binding = getEntityBinding(resourceClass);
+        return binding.entityPermissions.hasChecksForPermission(annotationClass);
+    }
+
+    /**
+     * Gets the specified permission definition (if any) at the class level.
+     *
+     * @param resourceClass the entity to check
+     * @param annotationClass the permission to look for
+     * @return a {@code ParseTree} expressing the permissions, if one exists
+     *         or {@code null} if the permission is not specified at a class level
+     */
+    public ParseTree getPermissionsForClass(Type<?> resourceClass, Class<? extends Annotation> annotationClass) {
+        EntityBinding binding = getEntityBinding(resourceClass);
+        return binding.entityPermissions.getClassChecksForPermission(annotationClass);
+    }
+
+    /**
+     * Gets the specified permission definition (if any) at the class level.
+     *
+     * @param resourceClass the entity to check
+     * @param field the field to inspect
+     * @param annotationClass the permission to look for
+     * @return a {@code ParseTree} expressing the permissions, if one exists
+     *         or {@code null} if the permission is not specified on that field
+     */
+    public ParseTree getPermissionsForField(Type<?> resourceClass,
+                                            String field,
+                                            Class<? extends Annotation> annotationClass) {
+        EntityBinding binding = getEntityBinding(resourceClass);
+        return binding.entityPermissions.getFieldChecksForPermission(field, annotationClass);
+    }
+
+    /**
+     * Returns the check class mapped to a particular identifier.
+     *
+     * @param checkIdentifier the name from the expression string
+     * @return the {@link Check} class mapped to the identifier.
+     */
+    public Class<? extends Check> getCheck(String checkIdentifier) {
+        return checkNames.computeIfAbsent(checkIdentifier, cls -> {
+            try {
+                return Class.forName(checkIdentifier).asSubclass(Check.class);
+            } catch (ClassNotFoundException | ClassCastException e) {
+                throw new IllegalArgumentException(
+                        "Could not instantiate specified check '" + checkIdentifier + "'.", e);
+            }
+        });
+    }
+
+    /**
+     * Returns the check mapped to a particular identifier.
+     *
+     * @param checkIdentifier the name from the expression string
+     * @return the {@link Check} mapped to the identifier.
+     */
+    public Check getCheckInstance(String checkIdentifier) {
+        //Role checks may contain the same class for different checks.
+        if (roleChecks.containsKey(checkIdentifier)) {
+            return roleChecks.get(checkIdentifier);
+        }
+
+        Class<? extends Check> checkClass = getCheck(checkIdentifier);
+
+        Check check;
+        if (checkInstances.containsKey(checkClass)) {
+            check = checkInstances.get(checkClass);
+        } else {
+            check = injector.instantiate(checkClass);
+            injector.inject(check);
+            checkInstances.put(checkClass, check);
+        }
+
+        return check;
+    }
+
+    /**
+     * Fetch all entity classes that provided entity inherits from (i.e. all superclass entities down to,
+     * but excluding Object).
+     *
+     * @param entityClass Entity class
+     * @return  List of all super class entity classes
+     */
+    public List<Type<?>> getSuperClassEntities(Type<?> entityClass) {
+        return getEntityBinding(entityClass).inheritedTypes.stream()
+                .filter(entityBindings::containsKey)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Get a list of inherited entities from a particular entity.
+     * Namely, the list of entities inheriting from the provided class.
+     *
+     * @param entityClass Entity class
+     * @return  List of all inherited entity types
+     */
+     public List<Type<?>> getSubclassingEntities(Type entityClass) {
+         return subclassingEntities.computeIfAbsent(entityClass, unused -> entityBindings
+                            .keySet().stream()
+                            .filter(c -> c != entityClass && entityClass.isAssignableFrom(c))
+                            .collect(Collectors.toList()));
+     }
+
+    /**
+     * Returns the friendly named mapped to this given check.
+     * @param checkClass The class to lookup
+     * @return the friendly name of the check.
+     */
+    public String getCheckIdentifier(Class<? extends Check> checkClass) {
+        String identifier = checkNames.inverse().get(checkClass);
+
+        if (identifier != null) {
+            return identifier;
+        }
+
+        if (UserCheck.class.isAssignableFrom(checkClass)) {
+            for (Map.Entry<String, UserCheck> entry : roleChecks.entrySet()) {
+                UserCheck check = entry.getValue();
+                String name = entry.getKey();
+                if (check.getClass().equals(checkClass)) {
+                    return name;
+                }
+            }
+        }
+
+        return checkClass.getName();
+    }
+
+    /**
+     * Returns the name of the id field.
+     *
+     * @param entityClass Entity class
+     * @return id field name
+     */
+    public String getIdFieldName(Type<?> entityClass) {
+        return getEntityBinding(entityClass).getIdFieldName();
+    }
+
+    /**
+     * Returns whether the entire entity uses Field or Property level access.
+     * @param entityClass Entity Class
+     * @return The JPA Access Type
+     */
+    public AccessType getAccessType(Type<?> entityClass) {
+        return getEntityBinding(entityClass).getAccessType();
+    }
+
+    /**
+     * Get all bound model classes.
+     *
+     * @return the bound classes
+     */
+    public Set<Type<?>> getBoundClasses() {
+        return getBoundClasses(true);
+    }
+
+    /**
+     * Get all bound classes.
+     * @param elideModelsOnly Restrict to only Elide models (skip complex embedded types).
+     *
+     * @return the bound classes
+     */
+    public Set<Type<?>> getBoundClasses(boolean elideModelsOnly) {
+        return entityBindings.values().stream()
+                .filter(binding -> elideModelsOnly ? binding.isElideModel() : true)
+                .map(EntityBinding::getEntityClass)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Get all bound classes for a particular API version.
+     * @param apiVersion The API version
+     * @param elideModelsOnly Restrict to only Elide models (skip complex embedded types).
+     *
+     * @return the bound classes
+     */
+    public Set<Type<?>> getBoundClassesByVersion(String apiVersion, boolean elideModelsOnly) {
+        return entityBindings.values().stream()
+                .filter(binding -> elideModelsOnly ? binding.isElideModel() : true)
+                .filter(binding ->
+                        binding.getApiVersion().equals(apiVersion)
+                                || binding.entityClass.getName().startsWith(ELIDE_PACKAGE_PREFIX)
+                )
+                .map(EntityBinding::getEntityClass)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Get all bound classes for a particular API version.
+     * @param apiVersion The API version
+     *
+     * @return the bound classes
+     */
+    public Set<Type<?>> getBoundClassesByVersion(String apiVersion) {
+        return getBoundClassesByVersion(apiVersion, true);
+    }
+
+    /**
+     * Get all model bindings.
+     *
+     * @return the bindings
+     */
+    public Set<EntityBinding> getBindings() {
+        return getBindings(true);
+    }
+
+    /**
+     * Get all bindings.
+     * @param elideModelsOnly Restrict to only Elide models (skip complex embedded types).
+     *
+     * @return the bindings
+     */
+    public Set<EntityBinding> getBindings(boolean elideModelsOnly) {
+        return entityBindings.values()
+                .stream()
+                .filter(binding -> elideModelsOnly ? binding.isElideModel() : true)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Get the check mappings.
+     * @return a map of check mappings this dictionary knows about
+     */
+    public Map<String, Class<? extends Check>> getCheckMappings() {
+        return checkNames;
+    }
+
+    /**
+     * Get the list of attribute names for an entity.
+     *
+     * @param entityClass entity name
+     * @return List of attribute names for entity
+     */
+    public List<String> getAttributes(Type<?> entityClass) {
+        return getEntityBinding(entityClass).apiAttributes;
+    }
+
+    /**
+     * Get the Injector for this dictionary.
+     *
+     * @return Injector instance.
+     */
+    public Injector getInjector() {
+        return injector;
+    }
+
+    /**
+     * Get the list of attribute names for an entity.
+     *
+     * @param entity entity instance
+     * @return List of attribute names for entity
+     */
+    public List<String> getAttributes(Object entity) {
+        return getAttributes(getType(entity));
+    }
+
+    /**
+     * Get the list of relationship names for an entity.
+     *
+     * @param entityClass entity name
+     * @return List of relationship names for entity
+     */
+    public List<String> getRelationships(Type<?> entityClass) {
+        return getEntityBinding(entityClass).apiRelationships;
+    }
+
+    /**
+     * Get the list of relationship names for an entity.
+     *
+     * @param entity entity instance
+     * @return List of relationship names for entity
+     */
+    public List<String> getRelationships(Object entity) {
+        return getRelationships(getType(entity));
+    }
+
+    /**
+     * Get a list of elide-bound relationships.
+     *
+     * @param entityClass Entity class to find relationships for
+     * @return List of elide-bound relationship names.
+     */
+    public List<String> getElideBoundRelationships(Type<?> entityClass) {
+        return getRelationships(entityClass).stream()
+                .filter(relationName -> getBoundClasses().contains(getParameterizedType(entityClass, relationName)))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Get a list of elide-bound relationships.
+     *
+     * @param entity Entity instance to find relationships for
+     * @return List of elide-bound relationship names.
+     */
+    public List<String> getElideBoundRelationships(Object entity) {
+        return getElideBoundRelationships(getType(entity));
+    }
+
+    /**
+     * Determine whether or not a method is request scopeable.
+     *
+     * @param entity  Entity instance
+     * @param method  Method on entity to check
+     * @return True if method accepts a RequestScope, false otherwise.
+     */
+    public boolean isMethodRequestScopeable(Object entity, Method method) {
+        return isMethodRequestScopeable(getType(entity), method);
+    }
+
+    /**
+     * Determine whether or not a method is request scopeable.
+     *
+     * @param entityClass  Entity to check
+     * @param method  Method on entity to check
+     * @return True if method accepts a RequestScope, false otherwise.
+     */
+    public boolean isMethodRequestScopeable(Type<?> entityClass, Method method) {
+        return getEntityBinding(entityClass).requestScopeableMethods.getOrDefault(method, false);
+    }
+
+    /**
+     * Get a list of all fields including both relationships and attributes (but excluding hidden fields).
+     *
+     * @param entityClass entity name
+     * @return List of all exposed fields.
+     */
+    public List<String> getAllExposedFields(Type<?> entityClass) {
+        List<String> fields = new ArrayList<>();
+
+        List<String> attrs = getAttributes(entityClass);
+        List<String> rels = getRelationships(entityClass);
+
+        if (attrs != null) {
+            fields.addAll(attrs);
+        }
+
+        if (rels != null) {
+            fields.addAll(rels);
+        }
+
+        return fields;
+    }
+
+    /**
+     * Get a list of all fields including both relationships and attributes.
+     *
+     * @param entity entity
+     * @return List of all fields.
+     */
+    public List<String> getAllExposedFields(Object entity) {
+        return getAllExposedFields(getType(entity));
+    }
+
+    /**
+     * Get the type of relationship from a relation.
+     *
+     * @param cls      Entity class
+     * @param relation Name of relationship field
+     * @return Relationship type. RelationshipType.NONE if is none found.
+     */
+    public RelationshipType getRelationshipType(Type<?> cls, String relation) {
+        final ConcurrentHashMap<String, RelationshipType> types = getEntityBinding(cls).relationshipTypes;
+        if (types == null) {
+            return RelationshipType.NONE;
+        }
+        final RelationshipType type = types.get(relation);
+        return (type == null) ? RelationshipType.NONE : type;
+    }
+
+    /**
+     * If a relationship is bidirectional, returns the name of the peer relationship in the peer entity.
+     *
+     * @param cls      the cls
+     * @param relation the relation
+     * @return relation inverse
+     */
+    public String getRelationInverse(Type<?> cls, String relation) {
+        final EntityBinding clsBinding = getEntityBinding(cls);
+        final ConcurrentHashMap<String, String> mappings = clsBinding.relationshipToInverse;
+        if (mappings != null) {
+            final String mapping = mappings.get(relation);
+
+            if (mapping != null && !"".equals(mapping)) {
+                return mapping;
+            }
+        }
+
+        /*
+         * This could be the owning side of the relation.  Let's see if the entity referenced in the relation
+         * has a bidirectional reference that is mapped to the given relation.
+         */
+        final Type<?> inverseType = getParameterizedType(cls, relation);
+        final ConcurrentHashMap<String, String> inverseMappings =
+                getEntityBinding(inverseType).relationshipToInverse;
+
+        for (Map.Entry<String, String> inverseMapping : inverseMappings.entrySet()) {
+            String inverseRelationName = inverseMapping.getKey();
+            String inverseMappedBy = inverseMapping.getValue();
+
+            if (relation.equals(inverseMappedBy)
+                    && getParameterizedType(inverseType, inverseRelationName).equals(clsBinding.entityClass)) {
+                return inverseRelationName;
+            }
+
+        }
+        return "";
+    }
+
+    /**
+     * Get the type of relationship from a relation.
+     *
+     * @param entity   Entity instance
+     * @param relation Name of relationship field
+     * @return Relationship type. RelationshipType.NONE if is none found.
+     */
+    public RelationshipType getRelationshipType(Object entity, String relation) {
+        return getRelationshipType(getType(entity), relation);
+    }
+
+    /**
+     * Get a type for a field on an entity.
+     * <p>
+     * If this method is called on a bean such as the following
+     * <pre>
+     * {@code
+     * public class Address {
+     *     {@literal @}Id
+     *     private Long id
+     *
+     *     private String street1;
+     *
+     *     private String street2;
+     * }
+     * }
+     * </pre>
+     * then
+     * <pre>
+     * {@code
+     * getType(Address.class, "id") = Long.class
+     * getType(Address.class, "street1") = String.class
+     * getType(Address.class, "street2") = String.class
+     * }
+     * </pre>
+     * But if the ID field is not "id" and there is no such non-ID field called "id", i.e.
+     * <pre>
+     * {@code
+     * public class Address {
+     *     {@literal @}Id
+     *     private Long surrogateKey
+     *
+     *     private String street1;
+     *
+     *     private String street2;
+     * }
+     * }
+     * </pre>
+     * then
+     * <pre>
+     * {@code
+     * getType(Address.class, "id") = Long.class
+     * getType(Address.class, "surrogateKey") = Long.class
+     * getType(Address.class, "street1") = String.class
+     * getType(Address.class, "street2") = String.class
+     * }
+     * </pre>
+     * JSON-API spec does not allow "id" as non-ID field name. If, therefore, there is a non-ID field called "id",
+     * calling this method has undefined behavior
+     *
+     * @param entityClass Entity class
+     * @param identifier  Identifier/Field to lookup type
+     * @return Type of entity
+     */
+    public Type<?> getType(Type<?> entityClass, String identifier) {
+        if (identifier.equals(REGULAR_ID_NAME)) {
+            return getEntityBinding(entityClass).getIdType();
+        }
+
+        ConcurrentHashMap<String, Type<?>> fieldTypes = getEntityBinding(entityClass).fieldsToTypes;
+        return fieldTypes == null ? null : fieldTypes.get(identifier);
+    }
+
+    /**
+     * Get a type for a field on an entity.
+     *
+     * @param entity     Entity instance
+     * @param identifier Field to lookup type
+     * @return Type of entity
+     */
+    public Type<?> getType(Object entity, String identifier) {
+        return getType(getType(entity), identifier);
+    }
+
+    /**
+     * Retrieve the parameterized type for the given field.
+     *
+     * @param entityClass the entity class
+     * @param identifier  the identifier
+     * @return Entity type for field otherwise null.
+     */
+    public Type<?> getParameterizedType(Type<?> entityClass, String identifier) {
+        return getParameterizedType(entityClass, identifier, 0);
+    }
+
+    /**
+     * Retrieve the parameterized type for the given field.
+     *
+     * @param entityClass the entity class
+     * @param identifier  the identifier/field name
+     * @param paramIndex  the index of the parameterization
+     * @return Entity type for field otherwise null.
+     */
+    public Type<?> getParameterizedType(Type<?> entityClass, String identifier, int paramIndex) {
+        ConcurrentHashMap<String, AccessibleObject> fieldOrMethods = getEntityBinding(entityClass).fieldsToValues;
+        if (fieldOrMethods == null) {
+            return null;
+        }
+        AccessibleObject fieldOrMethod = fieldOrMethods.get(identifier);
+        if (fieldOrMethod == null) {
+            return null;
+        }
+
+        return EntityBinding.getFieldType(entityClass, fieldOrMethod, Optional.of(paramIndex));
+    }
+
+    /**
+     * Retrieve the parameterized type for the given field.
+     *
+     * @param entity     Entity instance
+     * @param identifier Field to lookup
+     * @return Entity type for field otherwise null.
+     */
+    public Type<?> getParameterizedType(Object entity, String identifier) {
+        return getParameterizedType(getType(entity), identifier);
+    }
+
+    /**
+     * Retrieve the parameterized type for the given field.
+     *
+     * @param entity     Entity instance
+     * @param identifier Field to lookup
+     * @param paramIndex the index of the parameterization
+     * @return Entity type for field otherwise null.
+     */
+    public Type<?> getParameterizedType(Object entity, String identifier, int paramIndex) {
+        return getParameterizedType(getType(entity), identifier, paramIndex);
+    }
+
+    /**
+     * Get the true field/method name from an alias.
+     *
+     * @param entityClass Entity name
+     * @param alias       Alias to convert
+     * @return Real field/method name as a string. null if not found.
+     */
+    public String getNameFromAlias(Type<?> entityClass, String alias) {
+        ConcurrentHashMap<String, String> map = getEntityBinding(entityClass).aliasesToFields;
+        if (map != null) {
+            return map.get(alias);
+        }
+        return null;
+    }
+
+    /**
+     * Get the true field/method name from an alias.
+     *
+     * @param entity Entity instance
+     * @param alias  Alias to convert
+     * @return Real field/method name as a string. null if not found.
+     */
+    public String getNameFromAlias(Object entity, String alias) {
+        return getNameFromAlias(getType(entity), alias);
+    }
+
+    /**
+     * Initialize an entity.
+     *
+     * @param <T>    the type parameter
+     * @param entity Entity to initialize
+     */
+    public <T> void initializeEntity(T entity) {
+        Type type = getType(entity);
+        if (entity != null) {
+            EntityBinding binding = getEntityBinding(type);
+
+            if (binding.isInjected()) {
+                injector.inject(entity);
+            }
+        }
+    }
+
+    /**
+     * Returns whether or not an entity is shareable.
+     *
+     * @param entityClass the entity type to check for the shareable permissions
+     * @return true if entityClass is shareable.  False otherwise.
+     */
+    public boolean isTransferable(Type<?> entityClass) {
+        NonTransferable nonTransferable = getAnnotation(entityClass, NonTransferable.class);
+
+        return (nonTransferable == null || !nonTransferable.enabled());
+    }
+
+    /**
+     * Returns whether or not an entity can ever be shared post creation.
+     *
+     * @param entityClass the entity type to check for the shareable permissions
+     * @return true if entityClass can never be shared post creation.  False otherwise.
+     */
+    public boolean isStrictNonTransferable(Type<?> entityClass) {
+        NonTransferable nonTransferable = getAnnotation(entityClass, NonTransferable.class);
+
+        return (nonTransferable != null && nonTransferable.enabled() && nonTransferable.strict());
+    }
+
+    /**
+     * Add given Entity bean to dictionary.
+     *
+     * @param cls Entity bean class
+     */
+    public void bindEntity(Class<?> cls) {
+        bindEntity(ClassType.of(cls));
+    }
+
+    /**
+     * Add given Entity bean to dictionary.
+     *
+     * @param cls Entity bean class
+     */
+    public void bindEntity(Type<?> cls) {
+        bindEntity(cls, unused -> false);
+    }
+
+    /**
+     * Add given Entity bean to dictionary.
+     *
+     * @param cls Entity bean class
+     * @param isFieldHidden Function which determines if a given field should be in the dictionary but not exposed.
+     */
+    public void bindEntity(Class<?> cls, Predicate<AccessibleObject> isFieldHidden) {
+        bindEntity(ClassType.of(cls), isFieldHidden);
+    }
+
+    /**
+     * Add given Entity bean to dictionary.
+     *
+     * @param cls Entity bean class
+     * @param isFieldHidden Function which determines if a given field should be in the dictionary but not exposed.
+     */
+    public void bindEntity(Type<?> cls, Predicate<AccessibleObject> isFieldHidden) {
+        Type<?> declaredClass = lookupIncludeClass(cls);
+
+        if (entitiesToExclude.contains(declaredClass)) {
+            //Exclude Entity
+            return;
+        }
+
+        if (declaredClass == null) {
+            log.trace("Missing include or excluded class {}", cls.getName());
+            return;
+        }
+
+        if (isClassBound(declaredClass)) {
+            //Ignore duplicate bindings.
+            return;
+        }
+
+        String type = getEntityName(declaredClass);
+        String version = getModelVersion(declaredClass);
+
+        bindJsonApiToEntity.put(Pair.of(type, version), declaredClass);
+        apiVersions.add(version);
+        EntityBinding binding = new EntityBinding(injector, declaredClass, type, version, isFieldHidden);
+        entityBindings.put(declaredClass, binding);
+
+        Include include = (Include) getFirstAnnotation(declaredClass, Arrays.asList(Include.class));
+        if (include != null && include.rootLevel()) {
+            bindEntityRoots.add(declaredClass);
+        }
+
+        bindLegacyHooks(binding);
+        discoverEmbeddedTypeBindings(declaredClass);
+    }
+
+    /**
+     * Add an EntityBinding instance to dictionary.
+     *
+     * @param entityBinding EntityBinding instance
+     */
+    public void bindEntity(EntityBinding entityBinding) {
+        Type<?> declaredClass = entityBinding.entityClass;
+
+        if (entitiesToExclude.contains(declaredClass)) {
+            //Exclude Entity
+            return;
+        }
+
+        if (isClassBound(declaredClass)) {
+            //Ignore duplicate bindings.
+            return;
+        }
+
+        Include include = (Include) getFirstAnnotation(declaredClass, Collections.singletonList(Include.class));
+
+        String version = getModelVersion(declaredClass);
+        bindJsonApiToEntity.put(Pair.of(entityBinding.jsonApiType, version), declaredClass);
+        entityBindings.put(declaredClass, entityBinding);
+        apiVersions.add(version);
+        if (include != null && include.rootLevel()) {
+            bindEntityRoots.add(declaredClass);
+        }
+    }
+
+    /**
+     * Add a permissionExecutorGenerator to the provided class.
+     * @param clz Entity model class
+     * @param permissionExecutorFunction Function that given a request scope returns permissionExecutor
+     */
+    public void bindPermissionExecutor(Class<?> clz,
+                                       Function<RequestScope, PermissionExecutor> permissionExecutorFunction) {
+        bindPermissionExecutor(ClassType.of(clz), permissionExecutorFunction);
+    }
+
+    /**
+     * Add a permissionExecutorGenerator to the provided class.
+     * @param clz Entity model type
+     * @param permissionExecutorFunction Function that given a request scope returns permissionExecutor
+     */
+    public void bindPermissionExecutor(Type<?> clz,
+                                       Function<RequestScope, PermissionExecutor> permissionExecutorFunction) {
+        entityPermissionExecutor.put(lookupBoundClass(clz), permissionExecutorFunction);
+    }
+
+    /**
+     * Create a PermissionExecutor from list of bound permissionExecutorGenerator.
+     * @param scope - request scope to generate permission executor.
+     * @return Map of bound model type to its permission executor object.
+     */
+    public Map<Type<?>, PermissionExecutor> buildPermissionExecutors(RequestScope scope) {
+        return entityPermissionExecutor.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        e -> e.getValue().apply(scope)
+                ));
+    }
+
+    /**
+     * Return annotation from class, parents or package.
+     *
+     * @param record          the record
+     * @param annotationClass the annotation class
+     * @param <A>             genericClass
+     * @return the annotation
+     */
+    public <A extends Annotation> A getAnnotation(PersistentResource record, Class<A> annotationClass) {
+        return getAnnotation(record.getResourceType(), annotationClass);
+    }
+
+    /**
+     * Return annotation from class, parents or package.
+     *
+     * @param recordClass     the record class
+     * @param annotationClass the annotation class
+     * @param <A>             genericClass
+     * @return the annotation
+     */
+    public <A extends Annotation> A getAnnotation(Type<?> recordClass, Class<A> annotationClass) {
+        return getEntityBinding(recordClass).getAnnotation(annotationClass);
+    }
+
+    /**
+     * Returns whether a class (including superclasses) or any of its
+     * fields (attributes/relationships) has a given annotation.
+     * @param recordClass The elide model to check.
+     * @param annotationClass The annotation to search for.
+     * @param <A> The annotation type.
+     * @return True if the model is decorated with the annotation.  False otherwise.
+     */
+    public <A extends Annotation> boolean hasAnnotation(Type<?> recordClass, Class<A> annotationClass) {
+        if (this.getAnnotation(recordClass, annotationClass) != null) {
+            return true;
+        }
+
+        for (String fieldName : getEntityBinding(recordClass).fieldsToValues.keySet()) {
+            if (this.getAttributeOrRelationAnnotation(recordClass, annotationClass, fieldName) != null) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Return annotation from class for provided method.
+     * @param recordClass the record class
+     * @param method the method
+     * @param annotationClass the annotation class
+     * @param <A> genericClass
+     * @return the annotation
+     */
+    public <A extends Annotation> A getMethodAnnotation(Type<?> recordClass, String method, Class<A> annotationClass) {
+        return getEntityBinding(recordClass).getMethodAnnotation(annotationClass, method);
+    }
+
+    public Collection<LifeCycleHook> getTriggers(Type<?> cls,
+            Operation op,
+            TransactionPhase phase,
+            String fieldName) {
+        return getEntityBinding(cls).getTriggers(op, phase, fieldName);
+    }
+
+    public Collection<LifeCycleHook> getTriggers(Type<?> cls,
+            Operation op,
+            TransactionPhase phase) {
+        return getEntityBinding(cls).getTriggers(op, phase);
+    }
+
+    /**
+     * Return a single annotation from field or accessor method.
+     *
+     * @param entityClass     the entity class
+     * @param annotationClass given annotation type
+     * @param identifier      the identifier
+     * @param <A>             genericClass
+     * @return annotation found
+     */
+    public <A extends Annotation> A getAttributeOrRelationAnnotation(Type<?> entityClass,
+                                                                     Class<A> annotationClass,
+                                                                     String identifier) {
+        AccessibleObject fieldOrMethod = getEntityBinding(entityClass).fieldsToValues.get(identifier);
+        if (fieldOrMethod == null) {
+            return null;
+        }
+        return fieldOrMethod.getAnnotation(annotationClass);
+    }
+
+    /**
+     * Return multiple annotations from field or accessor method.
+     *
+     * @param <A>             the type parameter
+     * @param entityClass     the entity class
+     * @param annotationClass given annotation type
+     * @param identifier      the identifier
+     * @return annotation found or null if none found
+     */
+    public <A extends Annotation> A[] getAttributeOrRelationAnnotations(Type<?> entityClass,
+                                                                        Class<A> annotationClass,
+                                                                        String identifier) {
+        AccessibleObject fieldOrMethod = getEntityBinding(entityClass).fieldsToValues.get(identifier);
+        if (fieldOrMethod == null) {
+            return null;
+        }
+        return fieldOrMethod.getAnnotationsByType(annotationClass);
+    }
+
+    /**
+     * Return first matching annotation from class, parents or package.
+     *
+     * @param entityClass         Entity class type
+     * @param annotationClassList List of sought annotations
+     * @return annotation found
+     */
+    public static Annotation getFirstAnnotation(Type<?> entityClass,
+                                                List<Class<? extends Annotation>> annotationClassList) {
+        Annotation annotation = null;
+        for (Type<?> cls = entityClass; annotation == null && cls != null; cls = cls.getSuperclass()) {
+            for (Class<? extends Annotation> annotationClass : annotationClassList) {
+                annotation = cls.getDeclaredAnnotation(annotationClass);
+                if (annotation != null) {
+                    return annotation;
+                }
+            }
+        }
+
+        return getFirstPackageAnnotation(entityClass, annotationClassList);
+    }
+
+    /**
+     * Return first matching annotation from a package or parent package.
+     *
+     * @param entityClass         Entity class type
+     * @param annotationClassList List of sought annotations
+     * @return annotation found
+     */
+    public static Annotation getFirstPackageAnnotation(Type<?> entityClass,
+                                                       List<Class<? extends Annotation>> annotationClassList) {
+        Annotation annotation = null;
+        // no class annotation, try packages
+        for (Package pkg = entityClass.getPackage(); annotation == null && pkg != null; pkg = getParentPackage(pkg)) {
+            for (Class<? extends Annotation> annotationClass : annotationClassList) {
+                annotation = pkg.getDeclaredAnnotation(annotationClass);
+                if (annotation != null) {
+                    break;
+                }
+            }
+        }
+        return annotation;
+    }
+
+    /**
+     * Is root.
+     *
+     * @param entityClass the entity class
+     * @return the boolean
+     */
+    public boolean isRoot(Type<?> entityClass) {
+        return bindEntityRoots.contains(entityClass);
+    }
+
+    /**
+     * Gets id.
+     *
+     * @param value the value
+     * @return the id
+     */
+    public String getId(Object value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            AccessibleObject idField = null;
+
+            Type<?> valueClass = getType(value);
+
+            for (; idField == null && valueClass != null; valueClass = valueClass.getSuperclass()) {
+                try {
+                    idField = getEntityBinding(valueClass).getIdField();
+                } catch (NullPointerException e) {
+                    log.warn("Class: {} ID Field: {}", valueClass.getSimpleName(), idField);
+                }
+            }
+
+            Type<?> idClass;
+            Object idValue;
+            if (idField instanceof Field) {
+                idValue = ((Field) idField).get(value);
+                idClass = ((Field) idField).getType();
+            } else if (idField instanceof Method) {
+                idValue = ((Method) idField).invoke(value, (Object[]) null);
+                idClass = ((Method) idField).getReturnType();
+            } else {
+                return null;
+            }
+
+            Serde serde = serdeLookup.apply(((ClassType) idClass).getCls());
+            if (serde != null) {
+                return String.valueOf(serde.serialize(idValue));
+            }
+
+            return String.valueOf(idValue);
+        } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Returns type of id field.
+     *
+     * @param entityClass the entity class
+     * @return ID type
+     */
+    public Type<?> getIdType(Type<?> entityClass) {
+        return getEntityBinding(entityClass).getIdType();
+    }
+
+    /**
+     * Returns annotations applied to the ID field.
+     *
+     * @param value the value
+     * @return Collection of Annotations
+     */
+    public Collection<Annotation> getIdAnnotations(Object value) {
+        if (value == null) {
+            return null;
+        }
+
+        AccessibleObject idField = getEntityBinding(getType(value)).getIdField();
+        if (idField != null) {
+            return Arrays.asList(idField.getDeclaredAnnotations());
+        }
+
+        return Collections.emptyList();
+    }
+
+    /**
+     * Follow for this class or super-class for JPA {@link Entity} annotation.
+     *
+     * @param objClass provided class
+     * @return class with Entity annotation
+     */
+    public Type<?> lookupEntityClass(Type<?> objClass) {
+        Type<?> declaringClass = lookupAnnotationDeclarationClass(objClass, Entity.class);
+        if (declaringClass != null) {
+            return declaringClass;
+        }
+        throw new IllegalArgumentException("Unbound Entity " + objClass);
+    }
+
+    /**
+     * Follow for this class or super-class for Include annotation.
+     *
+     * @param objClass provided class
+     * @return class with Include annotation or
+     */
+    public Type<?> lookupIncludeClass(Type<?> objClass) {
+        Annotation first = getFirstAnnotation(objClass, Arrays.asList(Exclude.class, Include.class));
+        if (first instanceof Include) {
+            Type<?> declaringClass = lookupAnnotationDeclarationClass(objClass, Include.class);
+            if (declaringClass != null) {
+                return declaringClass;
+            }
+
+            //If we didn't find Include declared on a class, it must be declared at the package level.
+            return objClass;
+        }
+        return null;
+    }
+
+    /**
+     * Search a class hierarchy to find the first instance of a declared annotation.
+     * @param objClass The class to start searching.
+     * @param annotationClass The annotation to search for.
+     * @return The class which declares the annotation or null.
+     */
+    public static Type<?> lookupAnnotationDeclarationClass(Type<?> objClass,
+                                                            Class<? extends Annotation> annotationClass) {
+        for (Type<?> cls = objClass; cls != null; cls = cls.getSuperclass()) {
+            if (cls.getDeclaredAnnotation(annotationClass) != null) {
+                return cls;
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * Return bound entity or null.
+     *
+     * @param objClass provided class
+     * @return Bound class.
+     */
+    public Type<?> lookupBoundClass(Type<?> objClass) {
+        //Common case - we can avoid reflection by checking the map ...
+        EntityBinding binding = entityBindings.getOrDefault(objClass, EMPTY_BINDING);
+        if (binding != EMPTY_BINDING) {
+            return binding.entityClass;
+        }
+
+        Type<?> declaredClass = lookupIncludeClass(objClass);
+        if (declaredClass == null) {
+            return null;
+        }
+
+        binding = entityBindings.getOrDefault(declaredClass, EMPTY_BINDING);
+        if (binding != EMPTY_BINDING) {
+            return binding.entityClass;
+        }
+
+        try {
+            //Special Case for ORM proxied objects.  If the class is a proxy,
+            //and it is unbound, try the superclass.
+            return lookupEntityClass(declaredClass.getSuperclass());
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Return if the class has been bound or not.  Only safe to call while binding an entity (does not consider
+     * ORM proxy objects).
+     *
+     * @param objClass provided class
+     * @return true if the class is already bound.
+     */
+    private boolean isClassBound(Type<?> objClass) {
+        return (entityBindings.getOrDefault(objClass, EMPTY_BINDING) != EMPTY_BINDING);
+    }
+
+    /**
+     * Check whether a class is a JPA entity.
+     *
+     * @param objClass class
+     * @return True if it is a JPA entity
+     */
+    public final boolean isJPAEntity(Type<?> objClass) {
+        try {
+            lookupEntityClass(objClass);
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Retrieve the accessible object for a field from a target object.
+     *
+     * @param target    the object to get
+     * @param fieldName the field name to get or invoke equivalent get method
+     * @return the value
+     */
+    public AccessibleObject getAccessibleObject(Object target, String fieldName) {
+        return getAccessibleObject(getType(target), fieldName);
+    }
+
+    public boolean isComputed(Type<?> entityClass, String fieldName) {
+        AccessibleObject fieldOrMethod = getAccessibleObject(entityClass, fieldName);
+
+        return fieldOrMethod != null
+                && (fieldOrMethod.isAnnotationPresent(ComputedAttribute.class)
+                || fieldOrMethod.isAnnotationPresent(ComputedRelationship.class));
+    }
+
+    /**
+     * Retrieve the accessible object for a field.
+     *
+     * @param targetClass the object to get
+     * @param fieldName   the field name to get or invoke equivalent get method
+     * @return the value
+     */
+    public AccessibleObject getAccessibleObject(Type<?> targetClass, String fieldName) {
+        return getEntityBinding(targetClass).fieldsToValues.get(fieldName);
+    }
+
+    /**
+     * Retrieve fields from an object containing a particular type.
+     *
+     * @param targetClass Class to search for fields
+     * @param targetType Type of fields to find
+     * @return Set containing field names
+     */
+    public Set<String> getFieldsOfType(Type<?> targetClass, Type<?> targetType) {
+        HashSet<String> fields = new HashSet<>();
+        for (String field : getAllExposedFields(targetClass)) {
+            if (getParameterizedType(targetClass, field).equals(targetType)) {
+                fields.add(field);
+            }
+        }
+        return fields;
+    }
+
+    public boolean isRelation(Type<?> entityClass, String relationName) {
+        return getEntityBinding(entityClass).apiRelationships.contains(relationName);
+    }
+
+    public boolean isAttribute(Type<?> entityClass, String attributeName) {
+        return getEntityBinding(entityClass).apiAttributes.contains(attributeName);
+    }
+
+    /**
+     * Scan for security checks and automatically bind them to the dictionary.
+     */
+    public void scanForSecurityChecks() {
+
+        // Logic is based on https://github.com/illyasviel/elide-spring-boot/blob/master
+        // /elide-spring-boot-autoconfigure/src/main/java/org/illyasviel/elide
+        // /spring/boot/autoconfigure/ElideAutoConfiguration.java
+
+        Set<Class<?>> classes = scanner.getAnnotatedClasses(SecurityCheck.class);
+
+        addSecurityChecks(classes);
+    }
+
+    /**
+     * Add security checks and bind them to the dictionary.
+     * @param classes Security check classes.
+     */
+    public void addSecurityChecks(Set<Class<?>> classes) {
+
+        if (CollectionUtils.isEmpty(classes)) {
+            return;
+        }
+
+        classes.forEach(this::addSecurityCheck);
+    }
+
+    /**
+     * Add security checks and bind them to the dictionary.
+     * @param cls Security check class.
+     */
+    public void addSecurityCheck(Class<?> cls) {
+        if (Check.class.isAssignableFrom(cls)) {
+            SecurityCheck securityCheckMeta = cls.getAnnotation(SecurityCheck.class);
+            log.debug("Register Elide Check [{}] with expression [{}]",
+                    cls.getCanonicalName(), securityCheckMeta.value());
+            checkNames.put(securityCheckMeta.value(), cls.asSubclass(Check.class));
+
+            //Populate check instance.
+            getCheckInstance(securityCheckMeta.value());
+        } else {
+            throw new IllegalStateException("Class annotated with SecurityCheck is not a Check");
+        }
+    }
+
+    /**
+     * Binds a lifecycle hook to a particular field or method in an entity.  The hook will be called a
+     * single time per request per field CREATE, or UPDATE.
+     * @param entityClass The entity that triggers the lifecycle hook.
+     * @param fieldOrMethodName The name of the field or method.
+     * @param operation CREATE, or UPDATE
+     * @param phase PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     * @param hook The callback to invoke.
+     */
+    public void bindTrigger(Class<?> entityClass,
+            String fieldOrMethodName,
+            Operation operation,
+            TransactionPhase phase,
+            LifeCycleHook hook) {
+        bindTrigger(ClassType.of(entityClass), fieldOrMethodName, operation, phase, hook);
+    }
+
+    /**
+     * Binds a lifecycle hook to a particular field or method in an entity.  The hook will be called a
+     * single time per request per field CREATE, or UPDATE.
+     * @param entityClass The entity that triggers the lifecycle hook.
+     * @param fieldOrMethodName The name of the field or method.
+     * @param operation CREATE, or UPDATE
+     * @param phase PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     * @param hook The callback to invoke.
+     */
+    public void bindTrigger(Type<?> entityClass,
+            String fieldOrMethodName,
+            Operation operation,
+            TransactionPhase phase,
+            LifeCycleHook hook) {
+        bindIfUnbound(entityClass);
+
+        getEntityBinding(entityClass).bindTrigger(operation, phase, fieldOrMethodName, hook);
+    }
+
+    /**
+     * Binds a lifecycle hook to a particular entity class.  The hook will either be called:
+     *  - A single time single time per request per class CREATE, UPDATE, or DELETE.
+     *  - Multiple times per request per field CREATE, or UPDATE.
+     *
+     * The behavior is determined by the value of the {@code allowMultipleInvocations} flag.
+     * @param entityClass The entity that triggers the lifecycle hook.
+     * @param operation CREATE, or UPDATE
+     * @param phase PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     * @param hook The callback to invoke.
+     * @param allowMultipleInvocations Should the same life cycle hook be invoked multiple times for multiple
+     *                                 CRUD actions on the same model.
+     */
+    public void bindTrigger(Class<?> entityClass,
+            Operation operation,
+            TransactionPhase phase,
+            LifeCycleHook hook,
+            boolean allowMultipleInvocations) {
+        bindTrigger(ClassType.of(entityClass), operation, phase, hook, allowMultipleInvocations);
+    }
+
+    /**
+     * Binds a lifecycle hook to a particular entity class.  The hook will either be called:
+     *  - A single time single time per request per class CREATE, UPDATE, or DELETE.
+     *  - Multiple times per request per field CREATE, or UPDATE.
+     *
+     * The behavior is determined by the value of the {@code allowMultipleInvocations} flag.
+     * @param entityClass The entity that triggers the lifecycle hook.
+     * @param operation CREATE, or UPDATE
+     * @param phase PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     * @param hook The callback to invoke.
+     * @param allowMultipleInvocations Should the same life cycle hook be invoked multiple times for multiple
+     *                                 CRUD actions on the same model.
+     */
+    public void bindTrigger(Type<?> entityClass,
+            Operation operation,
+            TransactionPhase phase,
+            LifeCycleHook hook,
+            boolean allowMultipleInvocations) {
+        bindIfUnbound(entityClass);
+
+        if (allowMultipleInvocations) {
+            getEntityBinding(entityClass).bindTrigger(operation, phase, hook);
+        } else {
+            getEntityBinding(entityClass).bindTrigger(operation, phase, PersistentResource.CLASS_NO_FIELD, hook);
+        }
+    }
+
+    /**
+     * Returns true if the relationship cascades deletes and false otherwise.
+     * @param targetClass The class which owns the relationship.
+     * @param fieldName The relationship
+     * @return true or false
+     */
+    public boolean cascadeDeletes(Type<?> targetClass, String fieldName) {
+        CascadeType [] cascadeTypes =
+                getEntityBinding(targetClass).relationshipToCascadeTypes.getOrDefault(fieldName, new CascadeType[0]);
+
+        for (CascadeType cascadeType : cascadeTypes) {
+            if (cascadeType == CascadeType.ALL || cascadeType == CascadeType.REMOVE) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Walks the entity graph and performs a transform function on each element.
+     * @param entities The roots of the entity graph.
+     * @param transform The function to transform each entity class into a result.
+     * @param <T> The result type.
+     * @return The collection of results.
+     */
+    public <T> List<T> walkEntityGraph(Set<Type<?>> entities, Function<Type<?>, T> transform) {
+        ArrayList<T> results = new ArrayList<>();
+        Queue<Type<?>> toVisit = new ArrayDeque<>(entities);
+        Set<Type<?>> visited = new HashSet<>();
+        while (! toVisit.isEmpty()) {
+            Type<?> clazz = toVisit.remove();
+            results.add(transform.apply(clazz));
+            visited.add(clazz);
+
+            for (String relationship : getElideBoundRelationships(clazz)) {
+                Type<?> relationshipClass = getParameterizedType(clazz, relationship);
+
+
+                if (lookupBoundClass(relationshipClass) == null) {
+                    /* The relationship hasn't been bound */
+                    continue;
+                }
+
+                if (!visited.contains(relationshipClass)) {
+                    toVisit.add(relationshipClass);
+                }
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Returns whether or not a class is already bound.
+     * @param cls The class to verify.
+     * @return true if the class is bound.  False otherwise.
+     */
+    public boolean hasBinding(Type<?> cls) {
+        return entityBindings.values().stream()
+                .anyMatch(binding -> binding.entityClass.equals(cls));
+    }
+
+    /**
+     * Invoke the get[fieldName] method on the target object OR get the field with the corresponding name.
+     * @param target the object to get
+     * @param fieldName the field name to get or invoke equivalent get method
+     * @return the value
+     */
+    public Object getValue(Object target, String fieldName, RequestScope scope) {
+        AccessibleObject accessor = getAccessibleObject(target, fieldName);
+        try {
+            if (accessor instanceof Method) {
+                // Pass RequestScope into @Computed fields if requested
+                if (isMethodRequestScopeable(target, (Method) accessor)) {
+                    return ((Method) accessor).invoke(target, scope);
+                }
+                return ((Method) accessor).invoke(target);
+            }
+            if (accessor instanceof Field) {
+                return ((Field) accessor).get(target);
+            }
+        } catch (IllegalAccessException e) {
+            throw new InvalidAttributeException(fieldName, getJsonAliasFor(getType(target)), e);
+        } catch (InvocationTargetException e) {
+            throw handleInvocationTargetException(e);
+        }
+        throw new InvalidAttributeException(fieldName, getJsonAliasFor(getType(target)));
+    }
+
+    /**
+     * Sets the ID field of a target object.
+     * @param target the object which owns the ID to set.
+     * @param id the value to set
+     */
+    public void setId(Object target, String id) {
+        setValue(target, getIdFieldName(lookupBoundClass(getType(target))), id);
+    }
+
+    /**
+     * Invoke the set[fieldName] method on the target object OR set the field with the corresponding name.
+     * @param target The object which owns the field to set
+     * @param fieldName the field name to set or invoke equivalent set method
+     * @param value the value to set
+     */
+    public void setValue(Object target, String fieldName, Object value) {
+        Type<?> targetClass = getType(target);
+        String targetType = getJsonAliasFor(targetClass);
+
+        String fieldAlias = fieldName;
+        try {
+            Type<?> fieldClass = getType(targetClass, fieldName);
+            String realName = getNameFromAlias(target, fieldName);
+            fieldAlias = (realName != null) ? realName : fieldName;
+            String setMethod = "set" + StringUtils.capitalize(fieldAlias);
+            Method method = EntityDictionary.findMethod(targetClass, setMethod, fieldClass);
+            method.invoke(target, coerce(target, value, fieldAlias, fieldClass));
+        } catch (IllegalAccessException e) {
+            throw new InvalidAttributeException(fieldAlias, targetType, e);
+        } catch (InvocationTargetException e) {
+            throw handleInvocationTargetException(e);
+        } catch (IllegalArgumentException | NoSuchMethodException noMethod) {
+            AccessibleObject accessor = getAccessibleObject(target, fieldAlias);
+            if (accessor != null && accessor instanceof Field) {
+                Field field = (Field) accessor;
+                try {
+                    field.set(target, coerce(target, value, fieldAlias, field.getType()));
+                } catch (IllegalAccessException noField) {
+                    throw new InvalidAttributeException(fieldAlias, targetType, noField);
+                }
+            } else {
+                throw new InvalidAttributeException(fieldAlias, targetType);
+            }
+        }
+    }
+
+    /**
+     * Handle an invocation target exception.
+     *
+     * @param e Exception the exception encountered while reflecting on an object's field
+     * @return Equivalent runtime exception
+     */
+    private static RuntimeException handleInvocationTargetException(InvocationTargetException e) {
+        Throwable exception = e.getTargetException();
+        if (exception instanceof HttpStatusException || exception instanceof WebApplicationException) {
+            return (RuntimeException) exception;
+        }
+        log.error("Caught an unexpected exception (rethrowing as internal server error)", e);
+        return new InternalServerErrorException("Unexpected exception caught", e);
+    }
+
+    /**
+     * Coerce provided value into expected class type.
+     *
+     * @param target The model instance which owns the field being coerced.
+     * @param value The value being coerced.
+     * @param fieldName the field name in the owning model instance.
+     * @param fieldType expected class type
+     * @return coerced value
+     */
+    public Object coerce(Object target, Object value, String fieldName, Type<?> fieldType) {
+
+        Class<?> fieldClass = null;
+        if (fieldType != null) {
+            Preconditions.checkState(fieldType instanceof ClassType);
+            fieldClass = ((ClassType) fieldType).getCls();
+
+            if (COLLECTION_TYPE.isAssignableFrom(fieldType) && value instanceof Collection) {
+                return coerceCollection(target, (Collection) value, fieldName, fieldClass);
+            }
+
+            if (MAP_TYPE.isAssignableFrom(fieldType) && value instanceof Map) {
+                return coerceMap(target, (Map<?, ?>) value, fieldName);
+            }
+        }
+
+        return CoerceUtil.coerce(value, fieldClass);
+    }
+
+    private Collection coerceCollection(Object target, Collection<?> values, String fieldName, Class<?> fieldClass) {
+        ClassType<?> providedType = (ClassType) getParameterizedType(target, fieldName);
+
+        // check if collection is of and contains the correct types
+        if (fieldClass.isAssignableFrom(values.getClass())) {
+            boolean valid = true;
+            for (Object member : values) {
+                if (member != null && !providedType.isAssignableFrom(getType(member))) {
+                    valid = false;
+                    break;
+                }
+            }
+            if (valid) {
+                return values;
+            }
+        }
+
+        ArrayList<Object> list = new ArrayList<>(values.size());
+        for (Object member : values) {
+            list.add(CoerceUtil.coerce(member, providedType.getCls()));
+        }
+
+        if (Set.class.isAssignableFrom(fieldClass)) {
+            return new LinkedHashSet<>(list);
+        }
+
+        return list;
+    }
+
+    private Map coerceMap(Object target, Map<?, ?> values, String fieldName) {
+        Class<?> keyType = ((ClassType) getParameterizedType(target, fieldName, 0)).getCls();
+        Class<?> valueType = ((ClassType) getParameterizedType(target, fieldName, 1)).getCls();
+
+        // Verify the existing Map
+        if (isValidParameterizedMap(values, keyType, valueType)) {
+            return values;
+        }
+
+        LinkedHashMap<Object, Object> result = new LinkedHashMap<>(values.size());
+        for (Map.Entry<?, ?> entry : values.entrySet()) {
+            result.put(CoerceUtil.coerce(entry.getKey(), keyType), CoerceUtil.coerce(entry.getValue(), valueType));
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns whether or not a specified annotation is present on an entity field or its corresponding method.
+     *
+     * @param fieldName  The entity field
+     * @param annotationClass  The provided annotation class
+     *
+     * @param <A>  The type of the {@code annotationClass}
+     *
+     * @return {@code true} if the field is annotated by the {@code annotationClass}
+     */
+    public <A extends Annotation> boolean attributeOrRelationAnnotationExists(
+            Type<?> cls,
+            String fieldName,
+            Class<A> annotationClass
+    ) {
+        return getAttributeOrRelationAnnotation(cls, annotationClass, fieldName) != null;
+    }
+
+    /**
+     * Returns whether or not a specified field exists in an entity.
+     *
+     * @param cls  The entity
+     * @param fieldName  The provided field to check
+     *
+     * @return {@code true} if the field exists in the entity
+     */
+    public boolean isValidField(Type<?> cls, String fieldName) {
+        return getAllExposedFields(cls).contains(fieldName);
+    }
+
+    private boolean isValidParameterizedMap(Map<?, ?> values, Class<?> keyType, Class<?> valueType) {
+        for (Map.Entry<?, ?> entry : values.entrySet()) {
+            Object key = entry.getKey();
+            Object value = entry.getValue();
+            if ((key != null && !keyType.isAssignableFrom(key.getClass()))
+                    || (value != null && !valueType.isAssignableFrom(value.getClass()))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Binds the entity class if not yet bound.
+     * @param entityClass the class to bind.
+     */
+    private void bindIfUnbound(Type<?> entityClass) {
+        /* This is safe to call with non-proxy objects. Not safe to call with ORM proxy objects. */
+
+        if (! isClassBound(entityClass)) {
+            bindEntity(entityClass);
+        }
+    }
+
+    /**
+     * Add a collection of argument to the attributes.
+     * @param cls The entity
+     * @param attributeName attribute name to which argument has to be added
+     * @param arguments Set of Argument type containing name and type of each argument.
+     */
+    public void addArgumentsToAttribute(Type<?> cls, String attributeName, Set<ArgumentType> arguments) {
+        getEntityBinding(cls).addArgumentsToAttribute(attributeName, arguments);
+    }
+
+    /**
+     * Add a single argument to the attribute.
+     * @param cls The entity
+     * @param attributeName attribute name to which argument has to be added
+     * @param argument A single argument
+     */
+    public void addArgumentToAttribute(Type<?> cls, String attributeName, ArgumentType argument) {
+        this.addArgumentsToAttribute(cls, attributeName, Sets.newHashSet(argument));
+    }
+
+    /**
+     * Add a single argument to the Entity.
+     * @param cls The entity
+     * @param argument A single argument
+     */
+    public void addArgumentToEntity(Type<?> cls, ArgumentType argument) {
+        getEntityBinding(cls).addArgumentToEntity(argument);
+    }
+
+    /**
+     * Returns the Collection of all arguments of an attribute.
+     * @param cls The entity
+     * @param attributeName Name of the argument for ehich arguments are to be retrieved.
+     * @return A Set of ArgumentType for the given attribute.
+     */
+    public Set<ArgumentType> getAttributeArguments(Type<?> cls, String attributeName) {
+        return entityBindings.getOrDefault(cls, EMPTY_BINDING).getAttributeArguments(attributeName);
+    }
+
+    /**
+     * Returns the Collection of all arguments of an entity.
+     * @param cls The entity
+     * @return A Set of ArgumentType for the given entity.
+     */
+    public Set<ArgumentType> getEntityArguments(Type<?> cls) {
+        return entityBindings.getOrDefault(cls, EMPTY_BINDING).getEntityArguments();
+    }
+
+    /**
+     * Get column name using JPA.
+     *
+     * @param cls The entity class.
+     * @param fieldName The entity attribute.
+     * @return The jpa column name.
+     */
+    public String getAnnotatedColumnName(Type<?> cls, String fieldName) {
+        Column[] column = getAttributeOrRelationAnnotations(cls, Column.class, fieldName);
+
+        // this would only be valid for dimension columns
+        JoinColumn[] joinColumn = getAttributeOrRelationAnnotations(cls, JoinColumn.class, fieldName);
+
+        if (column == null || column.length == 0) {
+            if (joinColumn == null || joinColumn.length == 0) {
+                return fieldName;
+            }
+            return joinColumn[0].name();
+        }
+        return column[0].name();
+    }
+
+    /**
+     * BFS Walks the Elide model attribute tree and registers all complex attribute types and their sub-types.
+     * @param elideModel The elide model to scan.
+     */
+    protected void discoverEmbeddedTypeBindings(Type<?> elideModel) {
+        Queue<Type<?>> toVisit = new ArrayDeque<>();
+        Set<Type<?>> visited = new HashSet<>();
+
+        EntityBinding binding = getEntityBinding(elideModel);
+
+        toVisit.addAll(binding.getAttributes()
+                .stream()
+                .filter(this::canBind)
+                .collect(Collectors.toSet()));
+
+        while (! toVisit.isEmpty()) {
+            Type<?> next = toVisit.remove();
+
+            if (visited.contains(next) || entityBindings.containsKey(next)) {
+                continue;
+            }
+
+            visited.add(next);
+
+            EntityBinding nextBinding = new EntityBinding(injector,
+                    next,
+                    next.getSimpleName(),
+                    binding.getApiVersion(),
+                    false,
+                    (unused) -> false);
+
+            entityBindings.put(next, nextBinding);
+
+            toVisit.addAll(nextBinding.getAttributes()
+                    .stream()
+                    .filter(this::canBind)
+                    .collect(Collectors.toSet()));
+        }
+    }
+
+    /**
+     * Returns the api version bound to a particular model class.
+     * @param modelClass The model class to lookup.
+     * @return The api version associated with the model or empty string if there is no association.
+     */
+    public static String getModelVersion(Type<?> modelClass) {
+        ApiVersion apiVersionAnnotation =
+                (ApiVersion) getFirstPackageAnnotation(modelClass, Arrays.asList(ApiVersion.class));
+
+        return (apiVersionAnnotation == null) ? NO_VERSION : apiVersionAnnotation.version();
+    }
+
+    private static String getEntityPrefix(Type<?> modelClass) {
+        Include include =
+                (Include) getFirstPackageAnnotation(modelClass, Arrays.asList(Include.class));
+
+        if (include == null || include.name() == null || include.name().isEmpty()) {
+            return "";
+        }
+
+        return include.name() + "_";
+    }
+
+    /**
+     * Looks up the API model name for a given class.
+     * @param modelClass The model class to lookup.
+     * @return the API name for the model class.
+     */
+    public static String getEntityName(Type<?> modelClass) {
+        Type<?> declaringClass = lookupAnnotationDeclarationClass(modelClass, Include.class);
+        if (declaringClass == null) {
+            declaringClass = lookupAnnotationDeclarationClass(modelClass, Entity.class);
+        }
+
+        String entityPrefix = getEntityPrefix(modelClass);
+
+        Preconditions.checkNotNull(declaringClass);
+        Include include = declaringClass.getAnnotation(Include.class);
+
+        if (include != null && ! "".equals(include.name())) {
+            return entityPrefix + include.name();
+        }
+
+        Entity entity = (Entity) getFirstAnnotation(declaringClass, Arrays.asList(Entity.class));
+        if (entity == null || "".equals(entity.name())) {
+            return entityPrefix + StringUtils.uncapitalize(declaringClass.getSimpleName());
+        }
+        return entityPrefix + entity.name();
+    }
+
+    /**
+     * Looks up the model description for a given class.
+     * @param modelClass The model class to lookup.
+     * @return the description for the model class.
+     */
+    public static String getEntityDescription(Type<?> modelClass) {
+        Include include = (Include) getFirstAnnotation(modelClass, Arrays.asList(Include.class));
+        if (include == null || include.description().isEmpty()) {
+            return null;
+        }
+
+        return include.description();
+    }
+
+    public static <T> Type<T> getType(T object) {
+        if (object instanceof Dynamic) {
+            return ((Dynamic) object).getType();
+        } else {
+            ClassType<T> classType = (ClassType<T>) TYPE_MAP.computeIfAbsent(
+                    object.getClass(),
+                    ClassType::new);
+            return classType;
+        }
+    }
+
+    public void bindLegacyHooks(EntityBinding binding) {
+        binding.getAllMethods().stream()
+                .map(Method.class::cast)
+                .forEach(method -> {
+                    if (method.isAnnotationPresent(OnCreatePostCommit.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnCreatePostCommit.class).value(),
+                                TransactionPhase.POSTCOMMIT, Operation.CREATE);
+                    }
+                    if (method.isAnnotationPresent(OnCreatePreCommit.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnCreatePreCommit.class).value(),
+                                TransactionPhase.PRECOMMIT, Operation.CREATE);
+                    }
+                    if (method.isAnnotationPresent(OnCreatePreSecurity.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnCreatePreSecurity.class).value(),
+                                TransactionPhase.PRESECURITY, Operation.CREATE);
+                    }
+                    if (method.isAnnotationPresent(OnUpdatePostCommit.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnUpdatePostCommit.class).value(),
+                                TransactionPhase.POSTCOMMIT, Operation.UPDATE);
+                    }
+                    if (method.isAnnotationPresent(OnUpdatePreCommit.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnUpdatePreCommit.class).value(),
+                                TransactionPhase.PRECOMMIT, Operation.UPDATE);
+                    }
+                    if (method.isAnnotationPresent(OnUpdatePreSecurity.class)) {
+                        bindHookMethod(binding, method, method.getAnnotation(OnUpdatePreSecurity.class).value(),
+                                TransactionPhase.PRESECURITY, Operation.UPDATE);
+                    }
+                    if (method.isAnnotationPresent(OnDeletePostCommit.class)) {
+                        bindHookMethod(binding, method, null, TransactionPhase.POSTCOMMIT, Operation.DELETE);
+                    }
+                    if (method.isAnnotationPresent(OnDeletePreCommit.class)) {
+                        bindHookMethod(binding, method, null, TransactionPhase.PRECOMMIT, Operation.DELETE);
+                    }
+                    if (method.isAnnotationPresent(OnDeletePreSecurity.class)) {
+                        bindHookMethod(binding, method, null, TransactionPhase.PRESECURITY, Operation.DELETE);
+                    }
+                });
+    }
+
+    /**
+     * Returns whether or not a given model attribute is a complex (not primitive or String) type.
+     * @param clazz The elide model type.
+     * @param fieldName The attribute name.
+     * @return true if the attribute is 'complex'.
+     */
+    public boolean isComplexAttribute(Type<?> clazz, String fieldName) {
+        EntityBinding binding = getEntityBinding(clazz);
+
+        if (! binding.apiAttributes.contains(fieldName)) {
+            return false;
+        }
+
+        Type<?> attributeType = getType(clazz, fieldName);
+
+        return canBind(attributeType);
+    }
+
+    private void bindHookMethod(
+            EntityBinding binding,
+            Method method,
+            String annotationField,
+            TransactionPhase phase,
+            Operation operation) {
+
+        if (StringUtils.isEmpty(annotationField)) {
+            bindTrigger(binding.entityClass, operation, phase, generateHook(method), false);
+        } else if (annotationField.equals(ALL_FIELDS)) {
+            bindTrigger(binding.entityClass, operation, phase, generateHook(method), true);
+        } else {
+            bindTrigger(binding.entityClass, annotationField, operation, phase, generateHook(method));
+        }
+    }
+
+    private static LifeCycleHook generateHook(Method method) {
+        return (operation, phase, model, scope, changes) -> {
+            try {
+                int paramCount = method.getParameterCount();
+                Class<?>[] paramTypes = method.getParameterTypes();
+
+                if (changes.isPresent() && paramCount == 2
+                        && paramTypes[0].isInstance(scope)
+                        && paramTypes[1].isInstance(changes.get())) {
+                    method.invoke(model, scope, changes.get());
+                } else if (paramCount == 1 && paramTypes[0].isInstance(scope)) {
+                    method.invoke(model, scope);
+                } else if (paramCount == 0) {
+                    method.invoke(model);
+                } else {
+                    throw new IllegalArgumentException();
+                }
+            } catch (ReflectiveOperationException e) {
+                Throwables.propagateIfPossible(e.getCause());
+                throw new IllegalArgumentException(e);
+            }
+        };
+    }
+
+    private boolean canBind(Type<?> type) {
+        if (! type.getUnderlyingClass().isPresent()) {
+            return false;
+        }
+
+        Class<?> clazz = type.getUnderlyingClass().get();
+
+        boolean hasNoArgConstructor =
+                Arrays.stream(clazz.getConstructors()).anyMatch(constructor -> constructor.getParameterCount() == 0);
+
+        //We don't bind primitives.
+        if (ClassUtils.isPrimitiveOrWrapper(clazz)
+                || clazz.equals(String.class)
+                || clazz.isEnum()
+
+                //We don't bind collections.
+                || Collection.class.isAssignableFrom(clazz)
+                || Map.class.isAssignableFrom(clazz)
+
+                //We can't bind an attribute type if Elide can't create it...
+                || ! hasNoArgConstructor
+
+                //We don't bind Elide models as attributes.
+                ||  lookupIncludeClass(type) != null
+
+                //If there is a Serde, we assume the type is opaque to Elide....
+                || serdeLookup.apply(clazz) != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static class EntityDictionaryBuilder {
+        public EntityDictionary build() {
+
+            if (scanner == null) {
+                scanner = DefaultClassScanner.getInstance();
+            }
+
+            if (roleChecks == null) {
+                roleChecks = Collections.emptyMap();
+            }
+
+            if (checks == null) {
+                checks = Collections.emptyMap();
+            }
+
+            if (serdeLookup == null) {
+                serdeLookup = CoerceUtil::lookup;
+            }
+
+            if (injector == null) {
+                injector = DEFAULT_INJECTOR;
+            }
+
+            if (entitiesToExclude == null) {
+                entitiesToExclude = Collections.emptySet();
+            }
+
+            return new EntityDictionary(
+                    checks,
+                    roleChecks,
+                    injector,
+                    serdeLookup,
+                    entitiesToExclude,
+                    scanner
+            );
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityPermissions.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityPermissions.java
new file mode 100644
index 0000000000..14afa05515
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/EntityPermissions.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.NonTransferable;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.generated.parsers.ExpressionLexer;
+import com.yahoo.elide.generated.parsers.ExpressionParser;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.antlr.v4.runtime.tree.ParseTree;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Extract permissions related annotation data for a model.
+ */
+@Slf4j
+public class EntityPermissions {
+    private static final List<Class<? extends Annotation>> PERMISSION_ANNOTATIONS = Arrays.asList(
+            ReadPermission.class,
+            CreatePermission.class,
+            DeletePermission.class,
+            NonTransferable.class,
+            UpdatePermission.class
+    );
+
+    public static final EntityPermissions EMPTY_PERMISSIONS = new EntityPermissions();
+
+    private static final AnnotationBinding EMPTY_BINDING = new AnnotationBinding(null, Collections.emptyMap());
+    private final HashMap<Class<? extends Annotation>, AnnotationBinding> bindings = new HashMap<>();
+
+    private static class AnnotationBinding {
+        final ParseTree classPermission;
+        final Map<String, ParseTree> fieldPermissions;
+
+        public AnnotationBinding(ParseTree classPermission, Map<String, ParseTree> fieldPermissions) {
+            this.classPermission = classPermission;
+            this.fieldPermissions = fieldPermissions.isEmpty() ? Collections.emptyMap() : fieldPermissions;
+        }
+    }
+
+
+    private EntityPermissions() {
+    }
+
+    /**
+     * Create bindings for entity class to its permission checks.
+     * @param cls entity class
+     * @param fieldOrMethodList list of fields/methods
+     */
+    public EntityPermissions(Type<?> cls,
+                             Collection<AccessibleObject> fieldOrMethodList)  {
+        for (Class<? extends Annotation> annotationClass : PERMISSION_ANNOTATIONS) {
+            final Map<String, ParseTree> fieldPermissions = new HashMap<>();
+            fieldOrMethodList.stream()
+                    .forEach(member -> bindMemberPermissions(fieldPermissions, member, annotationClass));
+            if (annotationClass != NonTransferable.class) {
+                ParseTree classPermission = bindClassPermissions(cls, annotationClass);
+                if (classPermission != null || !fieldPermissions.isEmpty()) {
+                    bindings.put(annotationClass, new AnnotationBinding(classPermission, fieldPermissions));
+                }
+            }
+        }
+    }
+
+    private ParseTree bindClassPermissions(Type<?> cls, Class<? extends Annotation> annotationClass) {
+        Annotation annotation = EntityDictionary.getFirstAnnotation(cls, Arrays.asList(annotationClass));
+        return (annotation == null) ? null : getPermissionExpressionTree(annotationClass, annotation);
+    }
+
+    private void bindMemberPermissions(Map<String, ParseTree> fieldPermissions,
+            AccessibleObject field, Class<? extends Annotation> annotationClass) {
+        Annotation annotation = field.getAnnotation(annotationClass);
+        if (annotation != null) {
+            ParseTree permissions = getPermissionExpressionTree(annotationClass, annotation);
+            fieldPermissions.put(EntityBinding.getFieldName(field), permissions);
+        }
+    }
+
+    private ParseTree getPermissionExpressionTree(Class<? extends Annotation> annotationClass, Annotation annotation) {
+        try {
+            String expression = (String) annotationClass.getMethod("expression").invoke(annotation);
+
+            boolean hasExpression = !expression.isEmpty();
+
+            if (!hasExpression) {
+                log.warn("Poorly configured permission: {} {}", annotationClass.getName(), "no checks specified.");
+                throw new IllegalArgumentException("Poorly configured permission '" + annotationClass.getName() + "'");
+            }
+
+            return parseExpression(expression);
+        } catch (ReflectiveOperationException e) {
+            log.warn("Unknown permission: {}, {}", annotationClass.getName(), e.toString());
+            throw new IllegalArgumentException("Unknown permission '" + annotationClass.getName() + "'", e);
+        }
+    }
+
+    public static ParseTree parseExpression(String expression) {
+        CharStream is = CharStreams.fromString(expression);
+        ExpressionLexer lexer = new ExpressionLexer(is);
+        lexer.removeErrorListeners();
+        lexer.addErrorListener(new BaseErrorListener() {
+            @Override
+            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+                                    int charPositionInLine, String msg, RecognitionException e) {
+                throw new ParseCancellationException(msg, e);
+            }
+        });
+        ExpressionParser parser = new ExpressionParser(new CommonTokenStream(lexer));
+        parser.setErrorHandler(new BailErrorStrategy());
+        lexer.reset();
+        return parser.start();
+    }
+
+    /**
+     * Does this permission check annotation exist for this entity or any field?
+     * @param annotationClass permission class
+     * @return true if annotation exists
+     */
+    public boolean hasChecksForPermission(Class<? extends Annotation> annotationClass) {
+        return bindings.containsKey(annotationClass);
+    }
+
+    /**
+     * Get entity permission ParseTree.
+     * @param annotationClass permission class
+     * @return entity permission ParseTree or null if none
+     */
+    public ParseTree getClassChecksForPermission(Class<? extends Annotation> annotationClass) {
+        return bindings.getOrDefault(annotationClass, EMPTY_BINDING).classPermission;
+    }
+
+    /**
+     * Get field permission ParseTree for provided name.
+     * @param field provided field name
+     * @param annotationClass permission class
+     * @return entity permission ParseTree or null if none
+     */
+    public ParseTree getFieldChecksForPermission(String field, Class<? extends Annotation> annotationClass) {
+        return bindings.getOrDefault(annotationClass, EMPTY_BINDING).fieldPermissions.get(field);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/dictionary/Injector.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/Injector.java
new file mode 100644
index 0000000000..17d875be0b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/Injector.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
+
+/**
+ * Abstraction around dependency injection.
+ */
+@FunctionalInterface
+public interface Injector {
+
+    /**
+     * Inject an elide object.
+     *
+     * @param entity object to inject
+     */
+    void inject(Object entity);
+
+    /**
+     * Instantiates a new instance of a class using the DI framework.
+     *
+     * @param cls The class to instantiate.
+     * @return An instance of the class.
+     */
+    default <T> T instantiate(Class<T> cls) {
+        try {
+            return Objects.requireNonNull(cls).getDeclaredConstructor().newInstance();
+        } catch (NoSuchMethodException
+                | InvocationTargetException
+                | IllegalAccessException
+                | InstantiationException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/RelationshipType.java b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/RelationshipType.java
similarity index 96%
rename from elide-core/src/main/java/com/yahoo/elide/core/RelationshipType.java
rename to elide-core/src/main/java/com/yahoo/elide/core/dictionary/RelationshipType.java
index b61e3907e9..fc66bed334 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/RelationshipType.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/dictionary/RelationshipType.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.core;
+package com.yahoo.elide.core.dictionary;
 
 /**
  * Relationship types.
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/BadRequestException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/BadRequestException.java
new file mode 100644
index 0000000000..26cd3a5be8
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/BadRequestException.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+/**
+ * Invalid predicate exception.
+ */
+public class BadRequestException extends HttpStatusException {
+    public BadRequestException(String message) {
+        super(HttpStatus.SC_BAD_REQUEST, message);
+    }
+
+    public BadRequestException(String message, Throwable cause) {
+        super(HttpStatus.SC_BAD_REQUEST, message, cause, null);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/CustomErrorException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/CustomErrorException.java
new file mode 100644
index 0000000000..b451f57fa6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/CustomErrorException.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.Objects;
+
+/**
+ * Define your business exception extend this.
+ */
+public class CustomErrorException extends HttpStatusException {
+    private static final long serialVersionUID = 1L;
+
+    private final ErrorObjects errorObjects;
+
+    /**
+     * constructor.
+     * @param status http status
+     * @param message exception message
+     * @param errorObjects custom error objects, not {@code null}
+     */
+    public CustomErrorException(int status, String message, ErrorObjects errorObjects) {
+        this(status, message, null, errorObjects);
+    }
+
+    /**
+     * constructor.
+     * @param status http status
+     * @param message exception message
+     * @param cause the cause
+     * @param errorObjects custom error objects, not {@code null}
+     */
+    public CustomErrorException(int status, String message, Throwable cause, ErrorObjects errorObjects) {
+        super(status, message, cause, null);
+        this.errorObjects = Objects.requireNonNull(errorObjects, "errorObjects must not be null");
+    }
+
+    @Override
+    public Pair<Integer, JsonNode> getErrorResponse() {
+        return buildCustomResponse();
+    }
+
+    @Override
+    public Pair<Integer, JsonNode> getVerboseErrorResponse() {
+        return buildCustomResponse();
+    }
+
+    private Pair<Integer, JsonNode> buildCustomResponse() {
+        // TODO: should support for encoding custom responses be added?
+        JsonNode responseBody = OBJECT_MAPPER.convertValue(errorObjects, JsonNode.class);
+        return Pair.of(getStatus(), responseBody);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorMapper.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorMapper.java
new file mode 100644
index 0000000000..26ce379915
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorMapper.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import javax.annotation.Nullable;
+
+/**
+ * The ErrorMapper allows mapping any RuntimeException of your choice into more meaningful
+ * CustomErrorExceptions to improved your error response to the client.
+ */
+@FunctionalInterface
+public interface ErrorMapper {
+    /**
+     * @param origin any Exception not caught by default
+     * @return a mapped CustomErrorException or null if you do not want to map this error
+     */
+    @Nullable CustomErrorException map(Exception origin);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorObjects.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorObjects.java
new file mode 100644
index 0000000000..74856c8b30
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ErrorObjects.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Error Objects, see http://jsonapi.org/format/#error-objects. <br><br>
+ * Builder example: <br>
+ * <pre><code>
+ *   ErrorObjects errorObjects = ErrorObjects.builder()
+ *       .addError()
+ *           .withDetail("first error message")
+ *       .addError()
+ *           .withDetail("second error message")
+ *       .build();
+ * </code></pre>
+ */
+public class ErrorObjects {
+    @Getter private final List<Map<String, Object>> errors;
+
+    public ErrorObjects(List<Map<String, Object>> errors) {
+        this.errors = Objects.requireNonNull(errors, "errors must not be null");
+    }
+
+    public static ErrorObjectsBuilder builder() {
+        return new ErrorObjectsBuilder();
+    }
+
+    /**
+     * ErrorObjectsBuilder.
+     */
+    public static class ErrorObjectsBuilder {
+        private final List<Map<String, Object>> errors;
+        private Map<String, Object> currentError;
+
+        ErrorObjectsBuilder() {
+            this.errors = new ArrayList<>();
+        }
+
+        public ErrorObjectsBuilder withId(String id) {
+            return with("id", id);
+        }
+
+        public ErrorObjectsBuilder withStatus(String status) {
+            return with("status", status);
+        }
+
+        public ErrorObjectsBuilder withCode(String code) {
+            return with("code", code);
+        }
+
+        public ErrorObjectsBuilder withTitle(String title) {
+            return with("title", title);
+        }
+
+        public ErrorObjectsBuilder withDetail(String detail) {
+            return with("detail", detail);
+        }
+
+        public ErrorObjectsBuilder with(String key, Object value) {
+            currentError.put(key, value);
+            return this;
+        }
+
+        public ErrorObjectsBuilder addError() {
+            validateCurrentError();
+            Map<String, Object> error = new HashMap<>();
+            errors.add(error);
+            currentError = error;
+            return this;
+        }
+
+        public ErrorObjects build() {
+            if (errors.isEmpty()) {
+                throw new IllegalArgumentException("At least one error is required");
+            }
+            validateCurrentError();
+            return new ErrorObjects(errors);
+        }
+
+        private void validateCurrentError() throws IllegalArgumentException {
+            if (currentError != null && currentError.isEmpty()) {
+                throw new IllegalArgumentException("Error must contain at least one key-value pair");
+            }
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ForbiddenAccessException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ForbiddenAccessException.java
index 60291a648e..175f6d87d4 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ForbiddenAccessException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/ForbiddenAccessException.java
@@ -5,35 +5,43 @@
  */
 package com.yahoo.elide.core.exceptions;
 
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.type.ClassType;
 import lombok.Getter;
 
+import java.lang.annotation.Annotation;
 import java.util.Optional;
 
 /**
  * Access to the requested resource is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_FORBIDDEN forbidden}
+ * {@link HttpStatus#SC_FORBIDDEN forbidden}
  */
 public class ForbiddenAccessException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
 
     @Getter private final Optional<Expression> expression;
+    @Getter private final Optional<Expression.EvaluationMode> evaluationMode;
 
-    public ForbiddenAccessException(String message) {
-        super(HttpStatus.SC_FORBIDDEN, null, message);
-        this.expression = Optional.empty();
+    public ForbiddenAccessException(Class<? extends Annotation> permission) {
+        this(permission, null, null);
     }
 
-    public ForbiddenAccessException(String message, Expression expression) {
-        super(HttpStatus.SC_FORBIDDEN, null, message);
-        this.expression = Optional.of(expression);
+    public ForbiddenAccessException(Class<? extends Annotation> permission,
+                                    Expression expression, Expression.EvaluationMode mode) {
+        super(HttpStatus.SC_FORBIDDEN, getMessage(permission), null, () -> getMessage(permission) + ": " + expression);
+
+        this.expression = Optional.ofNullable(expression);
+        this.evaluationMode = Optional.ofNullable(mode);
     }
 
     public String getLoggedMessage() {
-        return String.format("ForbiddenAccessException : Message[%s] Expression [%s]",
-                getVerboseMessage(),
-                getExpression());
+        return String.format("ForbiddenAccessException: Message=%s\tMode=%s\tExpression=[%s]",
+                             getVerboseMessage(), getEvaluationMode(), getExpression());
+    }
+
+    private static String getMessage(Class<? extends Annotation> permission) {
+        return EntityDictionary.getSimpleName(ClassType.of(permission)) + " Denied";
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/HttpStatus.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatus.java
similarity index 80%
rename from elide-core/src/main/java/com/yahoo/elide/core/HttpStatus.java
rename to elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatus.java
index 208cc22ab6..7d94083993 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/HttpStatus.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatus.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.core;
+package com.yahoo.elide.core.exceptions;
 
 /**
  * HTTP status codes.
@@ -16,6 +16,8 @@ public class HttpStatus {
     public static final int SC_BAD_REQUEST = 400;
     public static final int SC_FORBIDDEN = 403;
     public static final int SC_NOT_FOUND = 404;
+    public static final int SC_METHOD_NOT_ALLOWED = 405;
+    public static final int SC_TIMEOUT = 408;
     public static final int SC_LOCKED = 423;
     public static final int SC_INTERNAL_SERVER_ERROR = 500;
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatusException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatusException.java
index 9c84abd75f..3d8709e417 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatusException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/HttpStatusException.java
@@ -5,14 +5,17 @@
  */
 package com.yahoo.elide.core.exceptions;
 
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.owasp.encoder.Encode;
+import lombok.extern.slf4j.Slf4j;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * Superclass for exceptions that return a Http error status.
@@ -22,71 +25,77 @@
 public abstract class HttpStatusException extends RuntimeException {
     private static final long serialVersionUID = 1L;
     protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    protected final int status;
 
-    public int getStatus() {
-        return status;
-    }
-
-    private final String verboseMessage;
-
-    public HttpStatusException(int status) {
-        this(status, null);
-    }
+    protected final int status;
+    private final Optional<Supplier<String>> verboseMessageSupplier;
 
     public HttpStatusException(int status, String message) {
-        this(status, message, null);
-    }
-
-    public HttpStatusException(int status, String message, String verboseMessage) {
-        this(status, message, verboseMessage, null);
+        this(status, message, (Throwable) null, null);
     }
 
-    public HttpStatusException(int status, String message, String verboseMessage, Throwable cause) {
+    public HttpStatusException(int status, String message, Throwable cause, Supplier<String> verboseMessageSupplier) {
         super(message, cause, true, log.isTraceEnabled());
         this.status = status;
-        this.verboseMessage = verboseMessage;
+        this.verboseMessageSupplier = Optional.ofNullable(verboseMessageSupplier);
     }
 
     protected static String formatExceptionCause(Throwable e) {
         // if the throwable has a cause use that, otherwise the throwable is the cause
-        Throwable error = e.getCause() == null
-                ? e
-                : e.getCause();
-        return error == null
-                ? null : error.getMessage() == null ? error.toString()
-                : error.getMessage();
+        Throwable error = e.getCause() == null ? e : e.getCause();
+        return error != null
+                ? StringUtils.defaultIfBlank(error.getMessage(), error.toString())
+                : null;
     }
 
+    /**
+     * Get a response detailing the error that occurred.
+     * Encode the error message to be safe for HTML.
+     * @return Pair containing status code and a JsonNode containing error details
+     */
     public Pair<Integer, JsonNode> getErrorResponse() {
-        Map<String, List<String>> errors = Collections.singletonMap(
-                "errors", Collections.singletonList(toString())
-        );
-        return buildResponse(errors);
+        return buildResponse(getMessage());
     }
 
+    /**
+     * Get a verbose response detailing the error that occurred.
+     * Encode the error message to be safe for HTML.
+     * @return Pair containing status code and a JsonNode containing error details
+     */
     public Pair<Integer, JsonNode> getVerboseErrorResponse() {
-        Map<String, List<String>> errors = Collections.singletonMap(
-                "errors", Collections.singletonList(getVerboseMessage())
-        );
-        return buildResponse(errors);
+        return buildResponse(getVerboseMessage());
     }
 
-    private Pair<Integer, JsonNode> buildResponse(Map<String, List<String>> errors) {
+    private Pair<Integer, JsonNode> buildResponse(String message) {
+        String errorDetail = message;
+        errorDetail = Encode.forHtml(errorDetail);
+
+        ErrorObjects errors = ErrorObjects.builder().addError().withDetail(errorDetail).build();
         JsonNode responseBody = OBJECT_MAPPER.convertValue(errors, JsonNode.class);
+
         return Pair.of(getStatus(), responseBody);
     }
 
     public String getVerboseMessage() {
-        return verboseMessage != null
-                ? verboseMessage
-                : toString();
+        String result = verboseMessageSupplier.map(Supplier::get)
+                .orElseGet(this::getMessage);
+
+        if (result.equals(this.getMessage())) {
+            return result;
+        } else {
+
+            //return both the message and the verbose message.
+            return this.getMessage() + "\n" + result;
+        }
+    }
+
+    public int getStatus() {
+        return status;
     }
 
     @Override
     public String toString() {
         String message = getMessage();
-        String className = getClass().getSimpleName();
+        String className = EntityDictionary.getSimpleName(ClassType.of(getClass()));
 
         if (message == null) {
             message = className;
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InternalServerErrorException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InternalServerErrorException.java
index 69e90922a5..80cc8819c7 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InternalServerErrorException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InternalServerErrorException.java
@@ -5,12 +5,10 @@
  */
 package com.yahoo.elide.core.exceptions;
 
-import com.yahoo.elide.core.HttpStatus;
-
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_INTERNAL_SERVER_ERROR invalid}
+ * {@link HttpStatus#SC_INTERNAL_SERVER_ERROR invalid}
  */
 public class InternalServerErrorException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
@@ -18,7 +16,12 @@ public class InternalServerErrorException extends HttpStatusException {
     public InternalServerErrorException(String message) {
         super(HttpStatus.SC_INTERNAL_SERVER_ERROR, message);
     }
-    public InternalServerErrorException(Exception e) {
-        super(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.toString(), null, e);
+
+    public InternalServerErrorException(Throwable e) {
+        super(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.toString(), e, null);
+    }
+
+    public InternalServerErrorException(String message, Throwable e) {
+        super(HttpStatus.SC_INTERNAL_SERVER_ERROR, message, e, null);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidAttributeException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidAttributeException.java
index a00da00792..0e4bc5c495 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidAttributeException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidAttributeException.java
@@ -4,19 +4,22 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_NOT_FOUND invalid}
+ * {@link HttpStatus#SC_NOT_FOUND invalid}
  */
 public class InvalidAttributeException extends HttpStatusException {
+    public InvalidAttributeException(String attributeName, String type, Throwable cause) {
+        super(HttpStatus.SC_NOT_FOUND, "Unknown attribute " + attributeName + " in " + type + "", cause, null);
+    }
+
     public InvalidAttributeException(String attributeName, String type) {
-        super(HttpStatus.SC_NOT_FOUND, "Unknown attribute '" + attributeName + "' in " + "'" + type + "'");
+        this(attributeName, type, null);
     }
 
     public InvalidAttributeException(String message, Throwable cause) {
-        super(HttpStatus.SC_NOT_FOUND, message, null, cause);
+        super(HttpStatus.SC_NOT_FOUND, message, cause, null);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidCollectionException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidCollectionException.java
index 1c4ebb3100..6e19e560df 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidCollectionException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidCollectionException.java
@@ -4,16 +4,15 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_NOT_FOUND invalid}
+ * {@link HttpStatus#SC_NOT_FOUND invalid}
  */
 public class InvalidCollectionException extends HttpStatusException {
     public InvalidCollectionException(String collection) {
-        this("Unknown collection '%s'",  collection);
+        this("Unknown collection %s",  collection);
     }
 
     public InvalidCollectionException(String format, String collection) {
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidConstraintException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidConstraintException.java
new file mode 100644
index 0000000000..0145fe2920
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidConstraintException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+
+/**
+ * Invalid constraint exception. Message is exactly what is provided in the constructor.
+ *
+ * {@link HttpStatus#SC_BAD_REQUEST invalid}
+ */
+public class InvalidConstraintException extends HttpStatusException {
+    private static final long serialVersionUID = 1L;
+
+    public InvalidConstraintException(String message) {
+        super(HttpStatus.SC_BAD_REQUEST, message);
+    }
+
+    @Override
+    public String toString() {
+        String message = getMessage();
+
+        if (message == null) {
+            return EntityDictionary.getSimpleName(ClassType.of(getClass()));
+        }
+
+        return message;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidEntityBodyException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidEntityBodyException.java
index eb040dda0d..d76b683451 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidEntityBodyException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidEntityBodyException.java
@@ -4,12 +4,11 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_BAD_REQUEST invalid}
+ * {@link HttpStatus#SC_BAD_REQUEST invalid}
  */
 public class InvalidEntityBodyException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidObjectIdentifierException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidObjectIdentifierException.java
index a9fed4d1ee..3de41c34b0 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidObjectIdentifierException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidObjectIdentifierException.java
@@ -4,17 +4,16 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_NOT_FOUND invalid}
+ * {@link HttpStatus#SC_NOT_FOUND invalid}
  */
 public class InvalidObjectIdentifierException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
 
     public InvalidObjectIdentifierException(String id, String objectOrFieldName) {
-        super(HttpStatus.SC_NOT_FOUND, "Unknown identifier '" + id + "' for " + objectOrFieldName);
+        super(HttpStatus.SC_NOT_FOUND, "Unknown identifier " + id + " for " + objectOrFieldName);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperationException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperationException.java
index 854d38315e..fc4af234c6 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperationException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperationException.java
@@ -5,8 +5,6 @@
  */
 package com.yahoo.elide.core.exceptions;
 
-import com.yahoo.elide.core.HttpStatus;
-
 /**
  * Exception representing invalid operations on entities or collections.
  */
@@ -14,6 +12,6 @@ public class InvalidOperationException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
 
     public InvalidOperationException(String body) {
-        super(HttpStatus.SC_BAD_REQUEST, "Invalid operation: '" + body + "'");
+        super(HttpStatus.SC_BAD_REQUEST, "Invalid operation: " + body);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperatorNegationException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperatorNegationException.java
new file mode 100644
index 0000000000..7306581347
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidOperatorNegationException.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+/**
+ * Invalid predicate negation error.
+ *
+ * {@link HttpStatus#SC_INTERNAL_SERVER_ERROR invalid}
+ */
+public class InvalidOperatorNegationException extends HttpStatusException {
+    public InvalidOperatorNegationException() {
+        super(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Invalid usage of NOT in FilterExpression.");
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidParameterizedAttributeException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidParameterizedAttributeException.java
new file mode 100644
index 0000000000..7de8baefed
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidParameterizedAttributeException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+
+/**
+ * 400 Exception for invalid attribute parameters.
+ */
+public class InvalidParameterizedAttributeException extends HttpStatusException {
+    public InvalidParameterizedAttributeException(Attribute attribute) {
+        super(HttpStatus.SC_BAD_REQUEST, "No attribute found with matching parameters for attribute: " + attribute);
+    }
+
+    public InvalidParameterizedAttributeException(String attributeName, Argument argument) {
+        super(HttpStatus.SC_BAD_REQUEST, String.format("Invalid argument : %s for attribute: %s",
+                argument, attributeName));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidPredicateException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidPredicateException.java
deleted file mode 100644
index ddbfbb2c20..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidPredicateException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.exceptions;
-
-import com.yahoo.elide.core.HttpStatus;
-
-/**
- * Invalid predicate exception.
- */
-public class InvalidPredicateException extends HttpStatusException {
-    public InvalidPredicateException(String message) {
-        super(HttpStatus.SC_BAD_REQUEST, message);
-    }
-
-    public InvalidPredicateException(String message, Throwable cause) {
-        super(HttpStatus.SC_BAD_REQUEST, message, null, cause);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidURLException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidURLException.java
index 65916f9f08..e7e91fbce3 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidURLException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidURLException.java
@@ -4,12 +4,11 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_INTERNAL_SERVER_ERROR invalid}
+ * {@link HttpStatus#SC_INTERNAL_SERVER_ERROR invalid}
  */
 public class InvalidURLException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidValueException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidValueException.java
index cbc667bc01..58895a078a 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidValueException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/InvalidValueException.java
@@ -4,24 +4,23 @@
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.exceptions;
-import com.yahoo.elide.core.HttpStatus;
 
 /**
  * Exception when an invalid value is used.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_BAD_REQUEST invalid}
+ * {@link HttpStatus#SC_BAD_REQUEST invalid}
  */
 public class InvalidValueException extends HttpStatusException {
 
     public InvalidValueException(Object value) {
-        super(HttpStatus.SC_BAD_REQUEST, "Invalid value: " + value.toString());
+        this(value, null);
     }
 
     public InvalidValueException(Object value, String verboseMessage) {
-        super(HttpStatus.SC_BAD_REQUEST, "Invalid value: " + value.toString(), verboseMessage);
+        super(HttpStatus.SC_BAD_REQUEST, "Invalid value: " + value, null, () -> verboseMessage);
     }
 
     public InvalidValueException(String message, Throwable cause) {
-        super(HttpStatus.SC_BAD_REQUEST, message, null, cause);
+        super(HttpStatus.SC_BAD_REQUEST, message, cause, null);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/JsonPatchExtensionException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/JsonPatchExtensionException.java
index c5c78aa265..13a776e068 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/JsonPatchExtensionException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/JsonPatchExtensionException.java
@@ -15,16 +15,17 @@ public class JsonPatchExtensionException extends HttpStatusException {
     private final Pair<Integer, JsonNode> response;
 
     public JsonPatchExtensionException(int status, final JsonNode errorNode) {
-        super(status);
+        super(status, "");
         response = Pair.of(status, errorNode);
     }
 
-    public JsonPatchExtensionException(final Pair<Integer, JsonNode> response) {
-        super(response.getLeft());
-        this.response = response;
+    @Override
+    public Pair<Integer, JsonNode> getErrorResponse() {
+        return response;
     }
 
-    public Pair<Integer, JsonNode> getResponse() {
+    @Override
+    public Pair<Integer, JsonNode> getVerboseErrorResponse() {
         return response;
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TimeoutException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TimeoutException.java
new file mode 100644
index 0000000000..7cfb452c64
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TimeoutException.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+/**
+ * Thrown for request timeouts.
+ *
+ * {@link HttpStatus#SC_TIMEOUT}
+ */
+public class TimeoutException extends HttpStatusException {
+    private static final long serialVersionUID = 1L;
+
+    public TimeoutException(Throwable e) {
+        super(HttpStatus.SC_TIMEOUT, "Request Timeout", e, null);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TransactionException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TransactionException.java
index a93aff3f13..11a949c40e 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TransactionException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/TransactionException.java
@@ -5,17 +5,15 @@
  */
 package com.yahoo.elide.core.exceptions;
 
-import com.yahoo.elide.core.HttpStatus;
-
 /**
  * Requested object ID is.
  *
- * {@link com.yahoo.elide.core.HttpStatus#SC_LOCKED}
+ * {@link HttpStatus#SC_LOCKED}
  */
 public class TransactionException extends HttpStatusException {
     private static final long serialVersionUID = 1L;
 
     public TransactionException(Throwable e) {
-        super(HttpStatus.SC_LOCKED, formatExceptionCause(e), null, e);
+        super(HttpStatus.SC_LOCKED, formatExceptionCause(e), e, null);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnableToAddSerdeException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnableToAddSerdeException.java
new file mode 100644
index 0000000000..e793801410
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnableToAddSerdeException.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+public class UnableToAddSerdeException extends RuntimeException {
+    public UnableToAddSerdeException(String message) {
+        super(message);
+    }
+
+    public UnableToAddSerdeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnknownEntityException.java b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnknownEntityException.java
index 8d6e9680b3..983a191e14 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnknownEntityException.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/exceptions/UnknownEntityException.java
@@ -5,13 +5,11 @@
  */
 package com.yahoo.elide.core.exceptions;
 
-import com.yahoo.elide.core.HttpStatus;
-
 /**
  * Unknown entity exception.
  */
 public class UnknownEntityException extends HttpStatusException {
     public UnknownEntityException(String entityType) {
-        super(HttpStatus.SC_BAD_REQUEST, "Unknown entity type: '" + entityType + "'");
+        super(HttpStatus.SC_BAD_REQUEST, "Unknown entity type: " + entityType);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/FilterOperation.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/FilterOperation.java
index 5d1ed0b6fd..803ba966c8 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/FilterOperation.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/FilterOperation.java
@@ -5,13 +5,12 @@
  */
 package com.yahoo.elide.core.filter;
 
-import java.util.Set;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
 
 /**
  * Interface for filter operations.
  * @param <T> the return type for apply
  */
 public interface FilterOperation<T> {
-    T apply(Predicate predicate);
-    T applyAll(Set<Predicate> predicates);
+    T apply(FilterPredicate expression);
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/InMemoryFilterOperation.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/InMemoryFilterOperation.java
index 31923278de..a31c65279e 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/InMemoryFilterOperation.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/InMemoryFilterOperation.java
@@ -5,39 +5,34 @@
  */
 package com.yahoo.elide.core.filter;
 
-import com.yahoo.elide.core.EntityDictionary;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
 
 import java.util.Collections;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
 
 /**
- * InMemoryFilterOperation
+ * InMemoryFilterOperation.
  */
-public class InMemoryFilterOperation implements FilterOperation<Set<java.util.function.Predicate>> {
-    private final EntityDictionary dictionary;
+public class InMemoryFilterOperation implements FilterOperation<Set<Predicate>> {
+    private final RequestScope requestScope;
 
-    public InMemoryFilterOperation(EntityDictionary dictionary) {
-        this.dictionary = dictionary;
+    public InMemoryFilterOperation(RequestScope requestScope) {
+        this.requestScope = requestScope;
     }
 
     @Override
-    public Set<java.util.function.Predicate> apply(Predicate predicate) {
-        return Collections.singleton(this.applyOperator(predicate));
+    public Set<Predicate> apply(FilterPredicate filterPredicate) {
+        return Collections.singleton(this.applyOperator(filterPredicate));
     }
 
-    @Override
-    public Set<java.util.function.Predicate> applyAll(Set<Predicate> predicates) {
-        return predicates.stream()
-                .map(this::applyOperator)
-                .collect(Collectors.toSet());
-    }
-
-    private java.util.function.Predicate applyOperator(Predicate predicate) {
-        return predicate.apply(dictionary);
+    private Predicate applyOperator(FilterPredicate filterPredicate) {
+        return filterPredicate.apply(requestScope);
     }
 
     public EntityDictionary getDictionary() {
-        return dictionary;
+        return requestScope.getDictionary();
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/Operator.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/Operator.java
index 61ff9fa1f9..d271e58f92 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/Operator.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/Operator.java
@@ -5,15 +5,29 @@
  */
 package com.yahoo.elide.core.filter;
 
-import com.yahoo.elide.core.EntityDictionary;
+import static com.yahoo.elide.core.type.ClassType.COLLECTION_TYPE;
+import com.yahoo.elide.core.Path;
 import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidOperatorNegationException;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiPredicate;
+import java.util.function.IntPredicate;
 import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Operator enum for predicates.
@@ -22,94 +36,197 @@
 public enum Operator {
     IN("in", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.in(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return in(fieldPath, values, requestScope);
+        }
+    },
+
+    IN_INSENSITIVE("ini", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return in(fieldPath, values, requestScope, FOLD_CASE);
         }
     },
 
     NOT("not", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.notIn(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return (T entity) -> !in(fieldPath, values, requestScope).test(entity);
+        }
+    },
+
+    NOT_INSENSITIVE("noti", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return (T entity) -> !in(fieldPath, values, requestScope, FOLD_CASE).test(entity);
+        }
+    },
+
+    PREFIX_CASE_INSENSITIVE("prefixi", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return prefix(fieldPath, values, requestScope, s -> s.toLowerCase(Locale.ENGLISH));
         }
     },
 
     PREFIX("prefix", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.prefix(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return prefix(fieldPath, values, requestScope, UnaryOperator.identity());
         }
     },
 
     POSTFIX("postfix", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.postfix(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return postfix(fieldPath, values, requestScope, UnaryOperator.identity());
+        }
+    },
+
+    POSTFIX_CASE_INSENSITIVE("postfixi", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return postfix(fieldPath, values, requestScope, FOLD_CASE);
         }
     },
 
     INFIX("infix", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.infix(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return infix(fieldPath, values, requestScope, UnaryOperator.identity());
+        }
+    },
+
+    INFIX_CASE_INSENSITIVE("infixi", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return infix(fieldPath, values, requestScope, FOLD_CASE);
         }
     },
 
     ISNULL("isnull", false) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.isNull(field, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return isNull(fieldPath, requestScope);
         }
     },
 
     NOTNULL("notnull", false) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.isNotNull(field, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return (val) -> !isNull(fieldPath, requestScope).test(val);
         }
     },
 
     LT("lt", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.lt(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return lt(fieldPath, values, requestScope);
         }
     },
 
     LE("le", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.le(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return le(fieldPath, values, requestScope);
         }
     },
 
     GT("gt", true) {
         @Override
         public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.gt(field, values, dictionary);
+                Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return gt(fieldPath, values, requestScope);
         }
     },
 
     GE("ge", true) {
         @Override
-        public <T> Predicate<T> contextualize(
-                String field, List<Object> values, EntityDictionary dictionary) {
-            return Operator.ge(field, values, dictionary);
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return ge(fieldPath, values, requestScope);
+        }
+    },
+
+    TRUE("true", false) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return isTrue();
+        }
+    },
+
+    FALSE("false", false) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return isFalse();
+        }
+    },
+
+    ISEMPTY("isempty", false) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return isEmpty(fieldPath, requestScope);
+        }
+    },
+
+    NOTEMPTY("notempty", false) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return (entity) -> !isEmpty(fieldPath, requestScope).test(entity);
+        }
+    },
+
+    HASMEMBER("hasmember", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return hasMember(fieldPath, values, requestScope);
+        }
+    },
+
+    HASNOMEMBER("hasnomember", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return entity -> !hasMember(fieldPath, values, requestScope).test(entity);
+        }
+    },
+    BETWEEN("between", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return entity -> between(fieldPath, values, requestScope).test(entity);
+        }
+    },
+    NOTBETWEEN("notbetween", true) {
+        @Override
+        public <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope) {
+            return entity -> !between(fieldPath, values, requestScope).test(entity);
         }
     };
 
+    public static final UnaryOperator<String> FOLD_CASE = s -> s.toLowerCase(Locale.ENGLISH);
     @Getter private final String notation;
     @Getter private final boolean parameterized;
+    private Operator negated;
+
+    // initialize negated values
+    static {
+        GE.negated = LT;
+        GT.negated = LE;
+        LE.negated = GT;
+        LT.negated = GE;
+        IN.negated = NOT;
+        IN_INSENSITIVE.negated = NOT_INSENSITIVE;
+        NOT.negated = IN;
+        NOT_INSENSITIVE.negated = IN_INSENSITIVE;
+        TRUE.negated = FALSE;
+        FALSE.negated = TRUE;
+        ISNULL.negated = NOTNULL;
+        NOTNULL.negated = ISNULL;
+        ISEMPTY.negated = NOTEMPTY;
+        NOTEMPTY.negated = ISEMPTY;
+        HASMEMBER.negated = HASNOMEMBER;
+        HASNOMEMBER.negated = HASMEMBER;
+        BETWEEN.negated = NOTBETWEEN;
+        NOTBETWEEN.negated = BETWEEN;
+    }
 
     /**
      * Returns Operator from query parameter operator notation.
@@ -124,155 +241,279 @@ public static Operator fromString(final String string) {
             }
         }
 
-        throw new InvalidPredicateException("Unknown operator in filter: " + string);
+        throw new BadRequestException("Unknown operator in filter: " + string);
     }
 
-    public abstract <T> Predicate<T> contextualize(
-            String field, List<Object> values, EntityDictionary dictionary);
+    public abstract <T> Predicate<T> contextualize(Path fieldPath, List<Object> values, RequestScope requestScope);
 
     //
     // Predicate generation
     //
 
-    private static <T> Predicate<T> in(
-            String field, List<Object> values, EntityDictionary dictionary) {
+    //
+    // In with strict equality
+    private static <T> Predicate<T> in(Path fieldPath, List<Object> values, RequestScope requestScope) {
         return (T entity) -> {
-            Object val = PersistentResource.getValue(entity, field, dictionary);
+            BiPredicate predicate = (a, b) -> a.equals(b);
 
-            return val != null && values.stream()
-                    .map(v -> CoerceUtil.coerce(v, val.getClass()))
-                    .anyMatch(val::equals);
+            return evaluate(entity, fieldPath, values, predicate, requestScope);
         };
     }
 
-    private static <T> Predicate<T> notIn(String field, List<Object> values, EntityDictionary dictionary) {
+    //
+    // String-like In with optional transformation
+    private static <T> Predicate<T> in(Path fieldPath, List<Object> values,
+            RequestScope requestScope, UnaryOperator<String> transform) {
         return (T entity) -> {
-            Object val = PersistentResource.getValue(entity, field, dictionary);
 
-            return val == null || values.stream()
-                    .map(v -> CoerceUtil.coerce(v, val.getClass()))
-                    .noneMatch(val::equals);
+            BiPredicate predicate = (a, b) -> {
+                if (!a.getClass().isAssignableFrom(String.class)) {
+                    throw new IllegalStateException("Cannot case insensitive compare non-string values");
+                }
+
+                String lhs = transform.apply((String) a);
+                String rhs = transform.apply(CoerceUtil.coerce(b, String.class));
+
+                return lhs.equals(rhs);
+            };
+
+            return evaluate(entity, fieldPath, values, predicate, requestScope);
         };
     }
 
-    private static <T> Predicate<T> prefix(
-            String field, List<Object> values, EntityDictionary dictionary) {
+    //
+    // String-like prefix matching with optional transformation
+    private static <T> Predicate<T> prefix(Path fieldPath, List<Object> values,
+            RequestScope requestScope, UnaryOperator<String> transform) {
         return (T entity) -> {
             if (values.size() != 1) {
-                throw new InvalidPredicateException("PREFIX can only take one argument");
+                throw new BadRequestException("PREFIX can only take one argument");
             }
 
-            Object val = PersistentResource.getValue(entity, field, dictionary);
-            String valStr = CoerceUtil.coerce(val, String.class);
-            String filterStr = CoerceUtil.coerce(values.get(0), String.class);
+            BiPredicate predicate = (a, b) -> {
+                String lhs = transform.apply(CoerceUtil.coerce(a, String.class));
+                String rhs = transform.apply(CoerceUtil.coerce(b, String.class));
+
+                return lhs != null && rhs != null && lhs.startsWith(rhs);
+            };
 
-            return valStr != null
-                    && filterStr != null
-                    && valStr.startsWith(filterStr);
+            return evaluate(entity, fieldPath, values, predicate, requestScope);
         };
     }
 
-    private static <T> Predicate<T> postfix(
-            String field, List<Object> values, EntityDictionary dictionary) {
+    //
+    // String-like postfix matching with optional transformation
+    private static <T> Predicate<T> postfix(Path fieldPath, List<Object> values,
+            RequestScope requestScope, UnaryOperator<String> transform) {
         return (T entity) -> {
             if (values.size() != 1) {
-                throw new InvalidPredicateException("POSTFIX can only take one argument");
+                throw new BadRequestException("POSTFIX can only take one argument");
             }
 
-            Object val = PersistentResource.getValue(entity, field, dictionary);
-            String valStr = CoerceUtil.coerce(val, String.class);
-            String filterStr = CoerceUtil.coerce(values.get(0), String.class);
+            BiPredicate predicate = (a, b) -> {
+                String lhs = transform.apply(CoerceUtil.coerce(a, String.class));
+                String rhs = transform.apply(CoerceUtil.coerce(b, String.class));
+
+                return lhs != null && rhs != null && lhs.endsWith(rhs);
+            };
 
-            return valStr != null
-                    && filterStr != null
-                    && valStr.endsWith(filterStr);
+            return evaluate(entity, fieldPath, values, predicate, requestScope);
         };
     }
 
-    private static <T> Predicate<T> infix(String field, List<Object> values, EntityDictionary dictionary) {
+    //
+    // String-like infix matching with optional transformation
+    private static <T> Predicate<T> infix(Path fieldPath, List<Object> values,
+            RequestScope requestScope, UnaryOperator<String> transform) {
         return (T entity) -> {
             if (values.size() != 1) {
-                throw new InvalidPredicateException("INFIX can only take one argument");
+                throw new BadRequestException("INFIX can only take one argument");
             }
 
-            Object val = PersistentResource.getValue(entity, field, dictionary);
-            String valStr = CoerceUtil.coerce(val, String.class);
-            String filterStr = CoerceUtil.coerce(values.get(0), String.class);
+            BiPredicate predicate = (a, b) -> {
+                String lhs = transform.apply(CoerceUtil.coerce(a, String.class));
+                String rhs = transform.apply(CoerceUtil.coerce(b, String.class));
+
+                return lhs != null && rhs != null && lhs.contains(rhs);
+            };
 
-            return valStr != null
-                    && filterStr != null
-                    && valStr.contains(filterStr);
+            return evaluate(entity, fieldPath, values, predicate, requestScope);
         };
     }
 
-    private static <T> Predicate<T> isNull(String field, EntityDictionary dictionary) {
-        return (T entity) -> {
-            Object val = PersistentResource.getValue(entity, field, dictionary);
-            return val == null;
-        };
+    //
+    // Null checking
+    private static <T> Predicate<T> isNull(Path fieldPath, RequestScope requestScope) {
+        return (T entity) -> getFieldValue(entity, fieldPath, requestScope) == null;
     }
 
-    private static <T> Predicate<T> isNotNull(String field, EntityDictionary dictionary) {
-        return (T entity) -> {
-            Object val = PersistentResource.getValue(entity, field, dictionary);
+    private static <T> Predicate<T> lt(Path fieldPath, List<Object> values, RequestScope requestScope) {
+        return getComparator(fieldPath, values, requestScope, compareResult -> compareResult < 0);
+    }
 
-            return val != null;
-        };
+    private static <T> Predicate<T> le(Path fieldPath, List<Object> values, RequestScope requestScope) {
+        return getComparator(fieldPath, values, requestScope, compareResult -> compareResult <= 0);
+    }
+
+    private static <T> Predicate<T> gt(Path fieldPath, List<Object> values, RequestScope requestScope) {
+        return getComparator(fieldPath, values, requestScope, compareResult -> compareResult > 0);
     }
 
-    private static <T> Predicate<T> lt(String field, List<Object> values, EntityDictionary dictionary) {
+    private static <T> Predicate<T> ge(Path fieldPath, List<Object> values, RequestScope requestScope) {
+        return getComparator(fieldPath, values, requestScope, compareResult -> compareResult >= 0);
+    }
+
+    private static <T> Predicate<T> between(Path fieldPath, List<Object> values, RequestScope requestScope) {
         return (T entity) -> {
-            if (values.size() != 1) {
-                throw new InvalidPredicateException("LT can only take one argument");
+            if (values.size() != 2) {
+                throw new BadRequestException("Between operator expects exactly 2 values");
             }
-            Object val = PersistentResource.getValue(entity, field, dictionary);
+            Object fieldVal = getFieldValue(entity, fieldPath, requestScope);
 
-            return val != null
-                    && getComparisonResult(val, values.get(0)) < 0;
+            if (fieldVal instanceof Collection) {
+                return false;
+            }
+
+            return fieldVal != null
+                    && compare(fieldVal, values.get(0)) >= 0
+                    && compare(fieldVal, values.get(1)) <= 0;
         };
     }
 
-    private static <T> Predicate<T> le(String field, List<Object> values, EntityDictionary dictionary) {
+    private static <T> Predicate<T> isTrue() {
+        return (T entity) -> true;
+    }
+
+    private static <T> Predicate<T> isFalse() {
+        return (T entity) -> false;
+    }
+
+    private static <T> Predicate<T> isEmpty(Path fieldPath, RequestScope requestScope) {
         return (T entity) -> {
-            if (values.size() != 1) {
-                throw new InvalidPredicateException("LE can only take one argument");
+
+            Object val = getFieldValue(entity, fieldPath, requestScope);
+            if (val instanceof Collection<?>) {
+                return ((Collection<?>) val).isEmpty();
+            }
+            if (val instanceof Map<?, ?>) {
+                return ((Map<?, ?>) val).isEmpty();
             }
-            Object val = PersistentResource.getValue(entity, field, dictionary);
 
-            return val != null
-                    && getComparisonResult(val, values.get(0)) <= 0;
+            return false;
         };
     }
 
-    private static <T> Predicate<T> gt(String field, List<Object> values, EntityDictionary dictionary) {
+    private static <T> Predicate<T> hasMember(Path fieldPath, List<Object> values, RequestScope requestScope) {
         return (T entity) -> {
             if (values.size() != 1) {
-                throw new InvalidPredicateException("LE can only take one argument");
+                throw new BadRequestException("HasMember can only take one argument");
+            }
+            Object val = getFieldValue(entity, fieldPath, requestScope);
+            Object filterStr = fieldPath.lastElement()
+                    .map(last -> CoerceUtil.coerce(values.get(0), last.getFieldType()))
+                    .orElseGet(() -> CoerceUtil.coerce(values.get(0), String.class));
+
+            if (val instanceof Collection<?>) {
+                return ((Collection<?>) val).contains(filterStr);
+            }
+            if (val instanceof Map<?, ?>) {
+                return ((Map<?, ?>) val).containsKey(filterStr);
             }
-            Object val = PersistentResource.getValue(entity, field, dictionary);
 
-            return val != null
-                    && getComparisonResult(val, values.get(0)) > 0;
+            return false;
         };
     }
 
-    private static <T> Predicate<T> ge(String field, List<Object> values, EntityDictionary dictionary) {
+    /**
+     * Return value of field/path for given entity. For example this.book.author
+     *
+     * @param <T> the type of entity to retrieve a value from
+     * @param entity Entity bean
+     * @param fieldPath field value/path
+     * @param requestScope Request scope
+     * @return the value of the field
+     */
+    private static <T> Object getFieldValue(T entity, Path fieldPath, RequestScope requestScope) {
+        Object val = entity;
+        for (Path.PathElement field : fieldPath.getPathElements()) {
+            if ("this".equals(field.getFieldName())) {
+                continue;
+            }
+            if (val == null) {
+                break;
+            }
+            if (val instanceof Collection) {
+                val = ((Collection) val).stream()
+                        .filter(Objects::nonNull)
+                        .map(target -> PersistentResource.getValue(target, field.getFieldName(), requestScope))
+                        .filter(Objects::nonNull)
+                        .flatMap(result -> {
+                            if (result instanceof Collection) {
+                                return ((Collection) result).stream();
+                            }
+                            return Stream.of(result);
+                        })
+                        .collect(Collectors.toSet());
+            } else {
+                val = PersistentResource.getValue(val, field.getFieldName(), requestScope);
+            }
+        }
+        return val;
+    }
+
+    private static <T> Predicate<T> getComparator(Path fieldPath, List<Object> values,
+            RequestScope requestScope, IntPredicate condition) {
         return (T entity) -> {
-            if (values.size() != 1) {
-                throw new InvalidPredicateException("LE can only take one argument");
+            if (CollectionUtils.isEmpty(values)) {
+                throw new BadRequestException("No value to compare");
+            }
+            Object fieldVal = getFieldValue(entity, fieldPath, requestScope);
+
+            if (fieldVal instanceof Collection) {
+                return ((Collection) fieldVal).stream()
+                        .anyMatch(fieldValueElement ->
+                            fieldValueElement != null
+                            && values.stream()
+                            .anyMatch(testVal -> condition.test(compare(fieldValueElement, testVal))));
             }
-            Object val = PersistentResource.getValue(entity, field, dictionary);
 
-            return val != null
-                    && getComparisonResult(val, values.get(0)) >= 0;
+            return fieldVal != null
+                    && values.stream()
+                    .anyMatch(testVal -> condition.test(compare(fieldVal, testVal)));
         };
+
+    }
+
+    private static int compare(Object fieldValue, Object rawTestValue) {
+        Object testValue = CoerceUtil.coerce(rawTestValue, fieldValue.getClass());
+        Comparable testComp = CoerceUtil.coerce(testValue, Comparable.class);
+        Comparable fieldComp = CoerceUtil.coerce(fieldValue, Comparable.class);
+
+        return fieldComp.compareTo(testComp);
     }
 
-    private static int getComparisonResult(Object val, Object rawFilterVal) {
-        Object filterVal = CoerceUtil.coerce(rawFilterVal, val.getClass());
-        Comparable filterComp = CoerceUtil.coerce(filterVal, Comparable.class);
-        Comparable valComp = CoerceUtil.coerce(val, Comparable.class);
+    private static boolean evaluate(Object entity, Path fieldPath, List<Object> values,
+                             BiPredicate predicate, RequestScope requestScope) {
+        Type<?> valueClass = fieldPath.lastElement().get().getFieldType();
 
-        return valComp.compareTo(filterComp);
+        Object leftHandSide = getFieldValue(entity, fieldPath, requestScope);
+
+        if (leftHandSide instanceof Collection && !valueClass.isAssignableFrom(COLLECTION_TYPE)) {
+            return ((Collection) leftHandSide).stream()
+                    .anyMatch(leftHandSideElement ->
+                        values.stream()
+                            .map(value -> CoerceUtil.coerce(value, valueClass))
+                            .anyMatch(value -> predicate.test(leftHandSideElement, value)));
+        }
+        return leftHandSide != null && values.stream()
+                .map(value -> valueClass == null ? value : CoerceUtil.coerce(value, valueClass))
+                .anyMatch(value -> predicate.test(leftHandSide, value));
+    }
+
+    public Operator negate() {
+        if (negated == null) {
+            throw new InvalidOperatorNegationException();
+        }
+        return negated;
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/Predicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/Predicate.java
deleted file mode 100644
index c7f22330fe..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/Predicate.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
-import lombok.NonNull;
-
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * Predicate class.
- */
-@AllArgsConstructor
-@EqualsAndHashCode
-public class Predicate implements FilterExpression, Function<EntityDictionary, java.util.function.Predicate> {
-
-    /**
-     * The path taken through data model associations to
-     * reference the field in the operator.
-     * Eg: author.books.publisher.name
-     */
-    @AllArgsConstructor
-    @ToString
-    @EqualsAndHashCode
-    public static class PathElement {
-        @Getter Class type;
-        @Getter String typeName;
-        @Getter Class fieldType;
-        @Getter String fieldName;
-    }
-
-    @Getter @NonNull private List<PathElement> path;
-    @Getter @NonNull private Operator operator;
-    @Getter @NonNull private List<Object> values;
-
-    public Predicate(PathElement pathElement, Operator op, List<Object> values) {
-        this(Collections.singletonList(pathElement), op, values);
-    }
-
-    public Predicate(PathElement pathElement, Operator op) {
-        this(Collections.singletonList(pathElement), op, Collections.emptyList());
-    }
-
-    public Predicate(List<PathElement> path, Operator op) {
-        this(path, op, Collections.emptyList());
-    }
-
-    public String getField() {
-        PathElement last = path.get(path.size() - 1);
-        return last.getFieldName();
-    }
-
-    public String getEntityType() {
-        PathElement last = path.get(path.size() - 1);
-        return last.getTypeName();
-    }
-
-    @Override
-    public <T> T accept(Visitor<T> visitor) {
-        return visitor.visitPredicate(this);
-    }
-
-    @Override
-    public java.util.function.Predicate apply(EntityDictionary dictionary) {
-        return operator.contextualize(getField(), values, dictionary);
-    }
-
-    @Override
-    public String toString() {
-        String formattedPath = path.get(0).getTypeName();
-
-        for (PathElement element : path) {
-            formattedPath = formattedPath + "." + element.getFieldName();
-        }
-
-        return String.format("%s %s %s", formattedPath, operator, values);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/CaseSensitivityStrategy.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/CaseSensitivityStrategy.java
new file mode 100644
index 0000000000..3017545340
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/CaseSensitivityStrategy.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.dialect;
+
+import com.yahoo.elide.core.filter.Operator;
+
+/**
+ * Defines the behavior how string comparisons should be compared regarding case sensitivity.
+ */
+public interface CaseSensitivityStrategy {
+    /**
+     * Maps a general case operator to an operator respecting case sensitivity behavior.
+     *
+     * @param baseOperator the general case operator (case sensitivity not considered)
+     * @return comparison operator (case sensitivity considered)
+     */
+    Operator mapOperator(Operator baseOperator);
+
+    /**
+     * The default Elide strategy which implements the FIQL standard.
+     * Uses lowercase string comparisons.
+     * (@see <a href="https://tools.ietf.org/html/draft-nottingham-atompub-fiql-00#section-3.2.2.1">
+     * FIQL specification</a>)
+     */
+    public class FIQLCompliant implements CaseSensitivityStrategy {
+        public Operator mapOperator(Operator operator) {
+            switch (operator) {
+                case IN:
+                    return Operator.IN_INSENSITIVE;
+                case NOT:
+                    return Operator.NOT_INSENSITIVE;
+                case INFIX:
+                    return Operator.INFIX_CASE_INSENSITIVE;
+                case PREFIX:
+                    return Operator.PREFIX_CASE_INSENSITIVE;
+                case POSTFIX:
+                    return Operator.POSTFIX_CASE_INSENSITIVE;
+                default:
+                    return operator;
+            }
+        }
+    }
+
+    /**
+     * The strategy delegates the decision case sensitivity for string comparison to the
+     * underlying database column collation definition.
+     * <p>
+     * This strategy can be used if the underlying database has performance issues due to
+     * missing functional index functionality (i.e. MySQL).
+     */
+    public class UseColumnCollation implements CaseSensitivityStrategy {
+        public Operator mapOperator(Operator operator) {
+            return operator;
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialect.java
deleted file mode 100644
index 41e8c77fa0..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialect.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.dialect;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.utils.coerce.CoerceUtil;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.io.File;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * The default filter dialect supported in Elide 1.0 and 2.0.
- */
-public class DefaultFilterDialect implements JoinFilterDialect, SubqueryFilterDialect {
-    private final EntityDictionary dictionary;
-
-    public DefaultFilterDialect(EntityDictionary dictionary) {
-        this.dictionary = dictionary;
-    }
-
-    /**
-     * Coverts the query parameters to a list of predicates that are then conjoined or organized by type.
-     * @param queryParams
-     * @return
-     * @throws ParseException
-     */
-    private List<Predicate> extractPredicates(MultivaluedMap<String, String> queryParams) throws ParseException {
-        List<Predicate> predicates = new ArrayList<>();
-
-        for (MultivaluedMap.Entry<String, List<String>> entry : queryParams.entrySet()) {
-            // Match "filter[<type>.<field>]" OR "filter[<type>.<field>][<operator>]"
-
-            String paramName = entry.getKey();
-            List<String> paramValues = entry.getValue();
-
-            Matcher matcher = Pattern.compile("filter\\[([^\\]]+)\\](\\[([^\\]]+)\\])?")
-                .matcher(paramName);
-            if (matcher.find()) {
-                final String[] keyParts = matcher.group(1).split("\\.");
-
-                if (keyParts.length < 2) {
-                    throw new ParseException("Invalid filter format: " + paramName);
-                }
-
-                final Operator operator = (matcher.group(3) == null) ? Operator.IN
-                        : Operator.fromString(matcher.group(3));
-
-                List<Predicate.PathElement> path = getPath(keyParts);
-                Predicate.PathElement last = path.get(path.size() - 1);
-
-                final List<Object> values = new ArrayList<>();
-                for (String valueParams : paramValues) {
-                    for (String valueParam : valueParams.split(",")) {
-                        values.add(CoerceUtil.coerce(valueParam, last.getFieldType()));
-                    }
-                }
-
-                Predicate predicate = new Predicate(path, operator, values);
-
-                predicates.add(predicate);
-            } else {
-                throw new ParseException("Invalid filter format: " + paramName);
-            }
-        }
-
-        return predicates;
-    }
-
-    @Override
-    public FilterExpression parseGlobalExpression(
-            String path,
-            MultivaluedMap<String, String> filterParams) throws ParseException {
-        List<Predicate> predicates;
-        predicates = extractPredicates(filterParams);
-
-        /* Extract the first collection in the URL */
-        path = Paths.get(path).normalize().toString().replace(File.separatorChar, '/');
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
-
-        String[] pathComponents = path.split("/");
-        String firstPathComponent = "";
-        if (pathComponents.length > 0) {
-            firstPathComponent = pathComponents[0];
-        }
-
-        /* Comma separated filter parameters are joined with logical AND. */
-        FilterExpression joinedExpression = null;
-
-        for (Predicate predicate : predicates)  {
-
-            /* The first type in the predicate must match the first collection in the URL */
-            if (! predicate.getPath().get(0).getTypeName().equals(firstPathComponent)) {
-                throw new ParseException(String.format("Invalid predicate: %s", predicate));
-            }
-
-            if (joinedExpression == null) {
-                joinedExpression = predicate;
-            } else {
-                joinedExpression = new AndFilterExpression(joinedExpression, predicate);
-            }
-        }
-        return joinedExpression;
-    }
-
-    @Override
-    public Map<String, FilterExpression> parseTypedExpression(
-            String path,
-            MultivaluedMap<String, String> filterParams) throws ParseException {
-        Map<String, FilterExpression> expressionMap = new HashMap<>();
-
-        List<Predicate> predicates = extractPredicates(filterParams);
-
-        for (Predicate predicate : predicates) {
-            if (predicate.getPath().size() > 1) {
-                throw new ParseException("Invalid predicate: " + predicate);
-            }
-
-            String entityType = predicate.getEntityType();
-
-            if (expressionMap.containsKey(entityType)) {
-                FilterExpression filterExpression = expressionMap.get(entityType);
-                expressionMap.put(entityType, new AndFilterExpression(filterExpression, predicate));
-            } else {
-                expressionMap.put(entityType, predicate);
-            }
-        }
-
-        return expressionMap;
-    }
-
-    /**
-     * Parses [ author, books, publisher, name ] into
-     * [(author, books), (book, publisher), (publisher, name)]
-     * @param keyParts [ author, books, publisher, name ]
-     * @return [(author, books), (book, publisher), (publisher, name)]
-     * @throws ParseException
-     */
-    private List<Predicate.PathElement> getPath(final String[] keyParts) throws ParseException {
-        if (keyParts == null || keyParts.length <= 0) {
-            throw new ParseException("Invalid filter expression");
-        }
-
-        List<Predicate.PathElement> path = new ArrayList<>();
-
-        Class<?>[] types = new Class[keyParts.length];
-        String type = keyParts[0];
-        types[0] = dictionary.getEntityClass(type);
-
-        if (types[0] == null) {
-            throw new ParseException("Unknown entity in filter: " + type);
-        }
-
-        /* Extract all the paths for the associations */
-        for (int i = 1 ; i < keyParts.length ; ++i) {
-            final String field = keyParts[i];
-            final Class<?> entityClass = types[i - 1];
-            final Class<?> fieldType = ("id".equals(field.toLowerCase(Locale.ENGLISH)))
-                    ? dictionary.getIdType(entityClass)
-                    : dictionary.getParameterizedType(entityClass, field);
-            if (fieldType == null) {
-                throw new ParseException("Unknown field in filter: " + field);
-            }
-            types[i] = fieldType;
-        }
-
-
-        /* Build all the Predicate path elements */
-        for (int i = 0 ; i < types.length - 1 ; ++i) {
-            Class typeClass = types[i];
-            String typeName = dictionary.getJsonAliasFor(types[i]);
-            String fieldName = keyParts[i + 1];
-            Class fieldClass = types[i + 1];
-            Predicate.PathElement pathElement = new Predicate.PathElement(typeClass, typeName, fieldClass, fieldName);
-
-            path.add(pathElement);
-        }
-
-        return path;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/JoinFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/JoinFilterDialect.java
deleted file mode 100644
index 0d08534908..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/JoinFilterDialect.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.dialect;
-
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-
-import javax.ws.rs.core.MultivaluedMap;
-
-/**
- * Parses a filter for one or more entity types that results in a join between them.
- * For example, the filter (books.title like '%Foo%' AND books.publisher.name = 'Acme Inc.')
- * would require a join between 'book' and 'publisher'.  The resulting join is filtered by
- * both predicates.
- *
- * This filter dialect is invoked whenever the first entity is loaded from the DataStoreTransaction.
- * For example, the above filter on '/books' would be invoked when 'book' is loaded from the DataStoreTransaction.
- */
-public interface JoinFilterDialect {
-    /**
-     * @param path the URL path
-     * @param filterParams the subset of query parameters that start with 'filter'
-     * @return The root of an expression abstract syntax tree parsed from both the path and the query parameters.
-     * @throws ParseException
-     */
-    public FilterExpression parseGlobalExpression(
-            String path,
-            MultivaluedMap<String, String> filterParams) throws ParseException;
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialect.java
deleted file mode 100644
index 4cff31447a..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialect.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.dialect;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A filter dialect that supports an ordered list of different dialects.  Dialects
- * are attempted in sequence.  The first dialect that successfully parses a filter expression
- * is used.  If no dialect succeeds, the error from the last dialect is returned.
- */
-@AllArgsConstructor
-@Slf4j
-public class MultipleFilterDialect implements JoinFilterDialect, SubqueryFilterDialect {
-    private List<JoinFilterDialect> joinDialects;
-    private List<SubqueryFilterDialect> subqueryDialects;
-
-    public MultipleFilterDialect(EntityDictionary dictionary) {
-        DefaultFilterDialect defaultDialect = new DefaultFilterDialect(dictionary);
-        joinDialects = new ArrayList<>();
-        joinDialects.add(defaultDialect);
-        subqueryDialects = new ArrayList<>();
-        subqueryDialects.add(defaultDialect);
-    }
-
-    @Override
-    public FilterExpression parseGlobalExpression(String path,
-                                                  MultivaluedMap<String, String> queryParams) throws ParseException {
-        if (joinDialects.isEmpty()) {
-            throw new ParseException("Heterogeneous type filtering not supported");
-        }
-
-        return parseExpression(joinDialects, (dialect) -> dialect.parseGlobalExpression(path, queryParams));
-    }
-
-    @Override
-    public Map<String, FilterExpression> parseTypedExpression(String path,
-                                                              MultivaluedMap<String, String> queryParams)
-            throws ParseException {
-
-        if (subqueryDialects.isEmpty()) {
-            throw new ParseException("Type filtering not supported");
-        }
-
-        return parseExpression(subqueryDialects, (dialect) -> dialect.parseTypedExpression(path, queryParams));
-    }
-
-    private static <T, R> R parseExpression(List<T> dialects, ParseFunction<T, R> parseFunction) throws ParseException {
-        ParseException lastFailure = null;
-        for (T dialect : dialects) {
-            try {
-                return parseFunction.apply(dialect);
-            } catch (ParseException e) {
-                log.trace("Parse Failure: {}", e.getMessage());
-                if (lastFailure != null) {
-                    lastFailure = new ParseException(e.getMessage() + "\n" + lastFailure.getMessage());
-                } else {
-                    lastFailure = e;
-                }
-            }
-        }
-        throw lastFailure;
-    }
-
-    /**
-     * A dialect parse function
-     * @param <T> The parser dialect
-     * @param <R> the return type of the parser
-     */
-    @FunctionalInterface
-    public interface ParseFunction<T, R> {
-        R apply(T dialect) throws ParseException;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialect.java
index 4df02f4871..8f4160539f 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialect.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialect.java
@@ -1,20 +1,43 @@
 /*
- * Copyright 2016, Yahoo Inc.
+ * Copyright 2018, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core.filter.dialect;
 
-import com.google.common.collect.ImmutableMap;
-import com.yahoo.elide.core.EntityDictionary;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.REGULAR_ID_NAME;
+import static com.yahoo.elide.core.request.Argument.ARGUMENTS_PATTERN;
+import static com.yahoo.elide.core.request.Argument.getArgumentsFromString;
+import static com.yahoo.elide.core.type.ClassType.COLLECTION_TYPE;
+import static com.yahoo.elide.core.type.ClassType.NUMBER_TYPE;
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static com.yahoo.elide.core.utils.TypeHelper.isPrimitiveNumberType;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.exceptions.InvalidValueException;
 import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
+import com.yahoo.elide.core.filter.dialect.graphql.FilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.JoinFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.SubqueryFilterDialect;
 import com.yahoo.elide.core.filter.expression.AndFilterExpression;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
 import com.yahoo.elide.core.filter.expression.NotFilterExpression;
 import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.predicates.IsEmptyPredicate;
+import com.yahoo.elide.core.filter.predicates.IsNullPredicate;
+import com.yahoo.elide.core.filter.predicates.NotEmptyPredicate;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.collections4.CollectionUtils;
 import cz.jirutka.rsql.parser.RSQLParser;
 import cz.jirutka.rsql.parser.RSQLParserException;
 import cz.jirutka.rsql.parser.ast.AndNode;
@@ -24,73 +47,122 @@
 import cz.jirutka.rsql.parser.ast.OrNode;
 import cz.jirutka.rsql.parser.ast.RSQLOperators;
 import cz.jirutka.rsql.parser.ast.RSQLVisitor;
-import lombok.Getter;
+import lombok.Builder;
+import lombok.NonNull;
 
-import javax.ws.rs.core.MultivaluedMap;
-import java.io.File;
-import java.nio.file.Paths;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * FilterDialect which implements support for RSQL filter dialect.
  */
-public class RSQLFilterDialect implements SubqueryFilterDialect, JoinFilterDialect {
-
+public class RSQLFilterDialect implements FilterDialect, SubqueryFilterDialect, JoinFilterDialect {
+    private static final String SINGLE_PARAMETER_ONLY = "There can only be a single filter query parameter";
+    private static final String INVALID_QUERY_PARAMETER = "Invalid query parameter: ";
     private static final Pattern TYPED_FILTER_PATTERN = Pattern.compile("filter\\[([^\\]]+)\\]");
-
+    // field name followed by zero or more filter arguments
+    // eg: name, orderDate[grain:month] , title[foo:bar][blah:Encoded+Value]
+    private static final Pattern FILTER_SELECTOR_PATTERN = Pattern.compile("(\\w+)(" + ARGUMENTS_PATTERN + ")*$");
+    private static final ComparisonOperator INI = new ComparisonOperator("=ini=", true);
+    private static final ComparisonOperator NOT_INI = new ComparisonOperator("=outi=", true);
     private static final ComparisonOperator ISNULL_OP = new ComparisonOperator("=isnull=", false);
+    private static final ComparisonOperator ISEMPTY_OP = new ComparisonOperator("=isempty=", false);
+    private static final ComparisonOperator HASMEMBER_OP = new ComparisonOperator("=hasmember=", false);
+    private static final ComparisonOperator HASNOMEMBER_OP = new ComparisonOperator("=hasnomember=", false);
+    private static final ComparisonOperator BETWEEN_OP = new ComparisonOperator("=between=", true);
+    private static final ComparisonOperator NOTBETWEEN_OP = new ComparisonOperator("=notbetween=", true);
 
     /* Subset of operators that map directly to Elide operators */
     private static final Map<ComparisonOperator, Operator> OPERATOR_MAP =
             ImmutableMap.<ComparisonOperator, Operator>builder()
-                    .put(RSQLOperators.IN, Operator.IN)
-                    .put(RSQLOperators.NOT_IN, Operator.NOT)
                     .put(RSQLOperators.LESS_THAN, Operator.LT)
                     .put(RSQLOperators.GREATER_THAN, Operator.GT)
                     .put(RSQLOperators.GREATER_THAN_OR_EQUAL, Operator.GE)
                     .put(RSQLOperators.LESS_THAN_OR_EQUAL, Operator.LE)
+                    .put(HASMEMBER_OP, Operator.HASMEMBER)
+                    .put(HASNOMEMBER_OP, Operator.HASNOMEMBER)
+                    .put(BETWEEN_OP, Operator.BETWEEN)
+                    .put(NOTBETWEEN_OP, Operator.NOTBETWEEN)
                     .build();
 
+
     private final RSQLParser parser;
+
+    @NonNull
     private final EntityDictionary dictionary;
+    private final CaseSensitivityStrategy caseSensitivityStrategy;
+    private final Boolean addDefaultArguments;
 
-    public RSQLFilterDialect(EntityDictionary dictionary) {
+    @Builder
+    public RSQLFilterDialect(EntityDictionary dictionary,
+                             CaseSensitivityStrategy caseSensitivityStrategy,
+                             Boolean addDefaultArguments) {
         parser = new RSQLParser(getDefaultOperatorsWithIsnull());
-        this. dictionary = dictionary;
+        this.dictionary = dictionary;
+        if (caseSensitivityStrategy == null) {
+            this.caseSensitivityStrategy = new CaseSensitivityStrategy.UseColumnCollation();
+        } else {
+            this.caseSensitivityStrategy = caseSensitivityStrategy;
+        }
+
+        if (addDefaultArguments == null) {
+            this.addDefaultArguments = true;
+        } else {
+            this.addDefaultArguments = addDefaultArguments;
+        }
     }
 
     //add rsql isnull op to the default ops
-    private static Set<ComparisonOperator> getDefaultOperatorsWithIsnull() {
+    public static final Set<ComparisonOperator> getDefaultOperatorsWithIsnull() {
         Set<ComparisonOperator> operators = RSQLOperators.defaultOperators();
+        operators.add(INI);
+        operators.add(NOT_INI);
         operators.add(ISNULL_OP);
+        operators.add(ISEMPTY_OP);
+        operators.add(HASMEMBER_OP);
+        operators.add(HASNOMEMBER_OP);
+        operators.add(BETWEEN_OP);
+        operators.add(NOTBETWEEN_OP);
         return operators;
     }
 
     @Override
-    public FilterExpression parseGlobalExpression(String path, MultivaluedMap<String, String> filterParams)
+    public FilterExpression parse(Type<?> entityClass,
+                                  Set<Attribute> attributes,
+                                  String filterText,
+                                  String apiVersion)
+            throws ParseException {
+        return parseFilterExpression(filterText, entityClass, true, true, attributes);
+    }
+
+    @Override
+    public FilterExpression parseGlobalExpression(String path, MultivaluedMap<String, String> filterParams,
+                                                  String apiVersion)
             throws ParseException {
         if (filterParams.size() != 1) {
-            throw new ParseException("There can only be a single filter query parameter");
+            throw new ParseException(SINGLE_PARAMETER_ONLY);
         }
 
-        MultivaluedMap.Entry<String, List<String>> entry = filterParams.entrySet().iterator().next();
+        MultivaluedMap.Entry<String, List<String>> entry = CollectionUtils.get(filterParams, 0);
         String queryParamName = entry.getKey();
 
-        if (!queryParamName.equals("filter")) {
-            throw new ParseException("Invalid query parameter: " + queryParamName);
+        if (!"filter".equals(queryParamName)) {
+            throw new ParseException(INVALID_QUERY_PARAMETER + queryParamName);
         }
         List<String> queryParamValues = entry.getValue();
 
         if (queryParamValues.size() != 1) {
-            throw new ParseException("There can only be a single filter query parameter");
+            throw new ParseException(SINGLE_PARAMETER_ONLY);
         }
 
         String queryParamValue = queryParamValues.get(0);
@@ -98,40 +170,27 @@ public FilterExpression parseGlobalExpression(String path, MultivaluedMap<String
         /*
          * Extract the last collection in the URL.
          */
-        path = Paths.get(path).normalize().toString().replace(File.separatorChar, '/');
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
-
-        String[] pathComponents = path.split("/");
-        String lastPathComponent = "";
-        if (pathComponents.length > 0) {
-            lastPathComponent = pathComponents[pathComponents.length - 1];
-        }
+        String normalizedPath = JsonApiParser.normalizePath(path);
+        String[] pathComponents = normalizedPath.split("/");
+        String lastPathComponent = pathComponents.length > 0 ? pathComponents[pathComponents.length - 1] : "";
 
         /*
          * TODO - create a visitor which extracts the type/class of the last path component.
          * This works today by virtue that global filter expressions are only used for root collections
          * and NOT nested associations.
          */
-        Class entityType = dictionary.getEntityClass(lastPathComponent);
+        Type entityType = dictionary.getEntityClass(lastPathComponent, apiVersion);
         if (entityType == null) {
             throw new ParseException("No such collection: " + lastPathComponent);
         }
 
-        try {
-            Node ast = parser.parse(queryParamValue);
-            RSQL2ExpressionFilterVisitor visitor = new RSQL2ExpressionFilterVisitor(true);
-            FilterExpression filterExpression = ast.accept(visitor, entityType);
-            return filterExpression;
-        } catch (RSQLParserException e) {
-            throw new ParseException(e.getMessage());
-        }
+        return parseFilterExpression(queryParamValue, entityType, true);
     }
 
     @Override
-    public Map<String, FilterExpression> parseTypedExpression(String path, MultivaluedMap<String, String>
-            filterParams) throws ParseException {
+    public Map<String, FilterExpression> parseTypedExpression(String path, MultivaluedMap<String, String> filterParams,
+                                                              String apiVersion)
+            throws ParseException {
 
         Map<String, FilterExpression> expressionByType = new HashMap<>();
 
@@ -147,86 +206,198 @@ public Map<String, FilterExpression> parseTypedExpression(String path, Multivalu
                     throw new ParseException("Exactly one RSQL expression must be defined for type : " + typeName);
                 }
 
-                String expressionText = paramValues.get(0);
-
-                Class entityType = dictionary.getEntityClass(typeName);
-
+                Type entityType = dictionary.getEntityClass(typeName, apiVersion);
                 if (entityType == null) {
-                    throw new ParseException("Invalid query parameter: " + paramName);
+                    throw new ParseException(INVALID_QUERY_PARAMETER + paramName);
                 }
 
-                try {
-                    Node ast = parser.parse(expressionText);
-                    RSQL2ExpressionFilterVisitor visitor = new RSQL2ExpressionFilterVisitor(false);
-                    FilterExpression filterExpression = ast.accept(visitor, entityType);
-                    expressionByType.put(typeName, filterExpression);
-                } catch (RSQLParserException e) {
-                    throw new ParseException(e.getMessage());
-                }
+                String expressionText = paramValues.get(0);
+
+                FilterExpression filterExpression = parseFilterExpression(expressionText, entityType, true);
+                expressionByType.put(typeName, filterExpression);
             } else {
-                throw new ParseException("Invalid query parameter: " + paramName);
+                throw new ParseException(INVALID_QUERY_PARAMETER + paramName);
             }
         }
         return expressionByType;
     }
 
+    /**
+     * Parses a RSQL string into an Elide FilterExpression.
+     * @param expressionText the RSQL string
+     * @param entityType The type associated with the predicate
+     * @param allowNestedToManyAssociations Whether or not to reject nested filter paths.
+     * @return An elide FilterExpression abstract syntax tree
+     * @throws ParseException
+     */
+    public FilterExpression parseFilterExpression(String expressionText,
+                                                  Type<?> entityType,
+                                                  boolean allowNestedToManyAssociations) throws ParseException {
+        return parseFilterExpression(expressionText, entityType, true, allowNestedToManyAssociations);
+    }
+
+    /**
+     * Parses a RSQL string into an Elide FilterExpression.
+     * @param expressionText the RSQL string
+     * @param entityType The type associated with the predicate
+     * @param coerceValues Convert values into their underlying type.
+     * @param allowNestedToManyAssociations Whether or not to reject nested filter paths.
+     * @return An elide FilterExpression abstract syntax tree
+     * @throws ParseException
+     */
+    public FilterExpression parseFilterExpression(String expressionText,
+                                                  Type<?> entityType,
+                                                  boolean coerceValues,
+                                                  boolean allowNestedToManyAssociations) throws ParseException {
+        return parseFilterExpression(expressionText, entityType, coerceValues,
+                allowNestedToManyAssociations, Collections.emptySet());
+
+    }
+
+    /**
+     * Parses a RSQL string into an Elide FilterExpression.
+     * @param expressionText the RSQL string
+     * @param entityType The type associated with the predicate
+     * @param coerceValues Convert values into their underlying type.
+     * @param allowNestedToManyAssociations Whether or not to reject nested filter paths.
+     * @param attributes the set of model attributes being requested.
+     * @return An elide FilterExpression abstract syntax tree
+     * @throws ParseException
+     */
+    public FilterExpression parseFilterExpression(String expressionText,
+                                                  Type<?> entityType,
+                                                  boolean coerceValues,
+                                                  boolean allowNestedToManyAssociations,
+                                                  Set<Attribute> attributes) throws ParseException {
+        try {
+            Node ast = parser.parse(expressionText);
+            RSQL2FilterExpressionVisitor visitor = new RSQL2FilterExpressionVisitor(allowNestedToManyAssociations,
+                    coerceValues, attributes);
+            return ast.accept(visitor, entityType);
+        } catch (RSQLParserException e) {
+            throw new ParseException(e.getMessage());
+        }
+    }
+
+    /**
+     * Allows base RSQLParseException to carry a parametrized message.
+     */
+    public static class RSQLParseException extends RSQLParserException {
+        private String message;
+
+        RSQLParseException(String message) {
+            super(null);
+            this.message = message;
+        }
+
+        @Override
+        public String getMessage() {
+            return message;
+        }
+    }
+
     /**
      * Visitor which converts RSQL abstract syntax tree into an Elide filter expression.
      */
-    public class RSQL2ExpressionFilterVisitor implements RSQLVisitor<FilterExpression, Class> {
+    public class RSQL2FilterExpressionVisitor implements RSQLVisitor<FilterExpression, Type> {
+        private boolean allowNestedToManyAssociations = false;
+        private boolean coerceValues = true;
+        private Set<Attribute> attributes;
 
-        /**
-         * Allows base RSQLParseException to carry a parameterized message.
-         */
-        public class RSQLParseException extends RSQLParserException {
-            String message;
-            RSQLParseException(String message) {
-                super(new Throwable() { });
-                this.message = message;
-            }
-            @Override
-            public String getMessage() {
-                return message;
-            }
+        public RSQL2FilterExpressionVisitor(boolean allowNestedToManyAssociations) {
+            this(allowNestedToManyAssociations, true, Collections.emptySet());
         }
 
-        @Getter
-        boolean allowNestedAssociations = false;
+        public RSQL2FilterExpressionVisitor(boolean allowNestedToManyAssociations,
+                                            boolean coerceValues, Set<Attribute> attributes) {
+            this.allowNestedToManyAssociations = allowNestedToManyAssociations;
+            this.coerceValues = coerceValues;
+            this.attributes = attributes;
+        }
 
-        public RSQL2ExpressionFilterVisitor(boolean allowNestedAssociations) {
-            this.allowNestedAssociations = allowNestedAssociations;
+        private Path buildAttribute(Type rootEntityType, String attributeName) {
+            Attribute attribute = attributes.stream()
+                    .filter(attr -> attr.getName().equals(attributeName) || attr.getAlias().equals(attributeName))
+                    .findFirst().orElse(null);
+
+            if (attribute != null) {
+                return new Path(rootEntityType, dictionary, attribute.getName(),
+                        attribute.getAlias(), attribute.getArguments());
+            }
+            return buildPath(rootEntityType, attributeName);
         }
 
-        public List<Predicate.PathElement> buildPath(Class rootEntityType, String selector) {
+        private Path buildPath(Type rootEntityType, String selector) {
             String[] associationNames = selector.split("\\.");
 
-            List<Predicate.PathElement> path = new ArrayList<>();
-            Class entityType = rootEntityType;
+            List<Path.PathElement> path = new ArrayList<>();
+            Type entityType = rootEntityType;
 
             for (String associationName : associationNames) {
-                String typeName = dictionary.getJsonAliasFor(entityType);
 
-                Class fieldType = dictionary.getParameterizedType(entityType, associationName);
+                if (!FILTER_SELECTOR_PATTERN.matcher(associationName).matches()) {
+                    throw new RSQLParseException("Filter expression is not in expected format at: " + associationName);
+                }
+
+                // if the association name is "id", replaced it with real id field name
+                // id field name can be "id" or other string, but non-id field can't have name "id".
+                if (associationName.equals(REGULAR_ID_NAME)) {
+                    associationName = dictionary.getIdFieldName(entityType);
+                }
+
+                Set<Argument> arguments;
+                int argsIndex = associationName.indexOf('[');
+                if (argsIndex > 0) {
+                    try {
+                        arguments = getArgumentsFromString(associationName.substring(argsIndex));
+                    } catch (UnsupportedEncodingException | IllegalArgumentException e) {
+                        throw new RSQLParseException(
+                                        String.format("Filter expression is not in expected format at: %s. %s",
+                                                        associationName, e.getMessage()));
+                    }
+                    associationName = associationName.substring(0, argsIndex);
+                } else {
+                    arguments = new HashSet<>();
+                }
+
+                if (addDefaultArguments) {
+                    addDefaultArguments(arguments, dictionary.getAttributeArguments(entityType, associationName));
+                }
+
+                String typeName = dictionary.getJsonAliasFor(entityType);
+                Type fieldType = dictionary.getParameterizedType(entityType, associationName);
 
                 if (fieldType == null) {
                     throw new RSQLParseException(
                             String.format("No such association %s for type %s", associationName, typeName));
                 }
 
-                Predicate.PathElement pathElement = new Predicate.PathElement(
-                        entityType,
-                        typeName,
-                        fieldType,
-                        associationName);
-                path.add(pathElement);
+                path.add(new Path.PathElement(entityType, fieldType, associationName, associationName, arguments));
 
                 entityType = fieldType;
             }
-            return path;
+            return new Path(path);
+        }
+
+        private void addDefaultArguments(Set<Argument> clientArguments, Set<ArgumentType> availableArgTypes) {
+
+            Set<String> clientArgNames = clientArguments.stream()
+                            .map(Argument::getName)
+                            .collect(Collectors.toSet());
+
+            // Check if there is any argument which has default value but not provided by client, then add it.
+            availableArgTypes.stream()
+                            .filter(argType -> !clientArgNames.contains(argType.getName()))
+                            .filter(argType -> argType.getDefaultValue() != null)
+                            .map(argType -> Argument.builder()
+                                            .name(argType.getName())
+                                            .value(argType.getDefaultValue())
+                                            .build())
+                            .forEach(clientArguments::add);
         }
 
         @Override
-        public FilterExpression visit(AndNode node, Class entityType) {
+        public FilterExpression visit(AndNode node, Type entityType) {
 
             List<Node> children = node.getChildren();
             if (children.size() < 2) {
@@ -246,7 +417,7 @@ public FilterExpression visit(AndNode node, Class entityType) {
         }
 
         @Override
-        public FilterExpression visit(OrNode node, Class entityType) {
+        public FilterExpression visit(OrNode node, Type entityType) {
 
             List<Node> children = node.getChildren();
             if (children.size() < 2) {
@@ -266,16 +437,44 @@ public FilterExpression visit(OrNode node, Class entityType) {
         }
 
         @Override
-        public FilterExpression visit(ComparisonNode node, Class entityType) {
+        public FilterExpression visit(ComparisonNode node, Type entityType) {
             ComparisonOperator op = node.getOperator();
             String relationship = node.getSelector();
             List<String> arguments = node.getArguments();
 
-            List<Predicate.PathElement> path = buildPath(entityType, relationship);
+            Path path;
+            // '[' means it has arguments
+            // If arguments are passed in filter, it overrides the arguments provided in projection.
+            if (relationship.contains(".") || relationship.contains("[")) {
+                path = buildPath(entityType, relationship);
+            } else {
+                path = buildAttribute(entityType, relationship);
+
+            }
 
+            //handles '=isempty=' op before coerce arguments
+            // ToMany Association is allowed if the operation is IsEmpty
+            if (op.equals(ISEMPTY_OP)) {
+                if (FilterPredicate.toManyInPathExceptLastPathElement(dictionary, path)) {
+                    throw new RSQLParseException(
+                            String.format("Invalid association %s. toMany association has to be the target collection.",
+                                    relationship));
+                }
+                return buildIsEmptyOperator(path, arguments);
+            }
+
+            if (op.equals(HASMEMBER_OP) || op.equals(HASNOMEMBER_OP)) {
+                if (FilterPredicate.toManyInPath(dictionary, path)) {
+                    if (FilterPredicate.isLastPathElementAssignableFrom(dictionary, path, COLLECTION_TYPE)) {
+                        throw new RSQLParseException("Invalid Path: Last Path Element cannot be a collection type");
+                    }
+                } else if (!FilterPredicate.isLastPathElementAssignableFrom(dictionary, path, COLLECTION_TYPE)) {
+                    throw new RSQLParseException("Invalid Path: Last Path Element has to be a collection type");
+                }
+            }
 
-            if (path.size() > 1 && !allowNestedAssociations) {
-                throw new RSQLParseException(String.format("No such association %s", relationship));
+            if (FilterPredicate.toManyInPath(dictionary, path) && !allowNestedToManyAssociations) {
+                throw new RSQLParseException(String.format("Invalid association %s", relationship));
             }
 
             //handles '=isnull=' op before coerce arguments
@@ -283,71 +482,125 @@ public FilterExpression visit(ComparisonNode node, Class entityType) {
                 return buildIsNullOperator(path, arguments);
             }
 
-            Class<?> relationshipType = path.get(0).getFieldType();
+            Type<?> relationshipType = path.lastElement()
+                    .map(Path.PathElement::getFieldType)
+                    .orElseThrow(() -> new IllegalStateException("Path must not be empty"));
 
             //Coerce arguments to their correct types
-            List<Object> values = arguments
-                    .stream()
-                    .map((argument) -> (Object) CoerceUtil.coerce(argument, relationshipType))
+            List<Object> values = arguments.stream()
+                    .map(argument ->
+                            isPrimitiveNumberType(relationshipType) || NUMBER_TYPE.isAssignableFrom(relationshipType)
+                                    ? argument.replace("*", "") //Support filtering on number types
+                                    : argument
+                    )
+                    .map((argument) -> {
+                            try {
+                                return CoerceUtil.coerce(argument, relationshipType);
+                            } catch (InvalidValueException e) {
+                                if (coerceValues) {
+                                    throw e;
+                                }
+                                return argument;
+                            }
+                    })
                     .collect(Collectors.toList());
-
-            if (op.equals(RSQLOperators.EQUAL)) {
-                String argument = arguments.get(0);
-                if (argument.startsWith("*") && argument.endsWith("*") && argument.length() > 2) {
-                    argument = argument.substring(1, argument.length() - 1);
-                    return new Predicate(path, Operator.INFIX, Collections.singletonList(argument));
-                } else if (argument.startsWith("*") && argument.length() > 1) {
-                    argument = argument.substring(1, argument.length());
-                    return new Predicate(path, Operator.POSTFIX, Collections.singletonList(argument));
-                } else if (argument.endsWith("*") && argument.length() > 1) {
-                    argument = argument.substring(0, argument.length() - 1);
-                    return new Predicate(path, Operator.PREFIX, Collections.singletonList(argument));
-                } else {
-                    return new Predicate(path, Operator.IN, values);
-                }
-            } else if (op.equals(RSQLOperators.NOT_EQUAL)) {
-                String argument = arguments.get(0);
-                if (argument.startsWith("*") && argument.endsWith("*")) {
-                    argument = argument.substring(1, argument.length() - 1);
-                    return new NotFilterExpression(
-                            new Predicate(path, Operator.INFIX, Collections.singletonList(argument)));
-                } else if (argument.startsWith("*")) {
-                    argument = argument.substring(1, argument.length());
-                    return new NotFilterExpression(
-                            new Predicate(path, Operator.POSTFIX, Collections.singletonList(argument)));
-                } else if (argument.endsWith("*")) {
-                    argument = argument.substring(0, argument.length() - 1);
-                    return new NotFilterExpression(
-                            new Predicate(path, Operator.PREFIX, Collections.singletonList(argument)));
-                } else {
-                    return new NotFilterExpression(new Predicate(path, Operator.IN, values));
-                }
-            } else if (OPERATOR_MAP.containsKey(op)) {
-                return new Predicate(path, OPERATOR_MAP.get(op), values);
+            if (op.equals(RSQLOperators.EQUAL) || op.equals(RSQLOperators.IN)) {
+                return equalityExpression(arguments.get(0), path, values, true);
+            }
+            if (op.equals(INI)) {
+                return equalityExpression(arguments.get(0), path, values, false);
+            }
+            if (op.equals(RSQLOperators.NOT_EQUAL) || op.equals(RSQLOperators.NOT_IN)) {
+                return new NotFilterExpression(equalityExpression(arguments.get(0), path, values, true));
+            }
+            if (op.equals(NOT_INI)) {
+                return new NotFilterExpression(equalityExpression(arguments.get(0), path, values, false));
+            }
+            if (OPERATOR_MAP.containsKey(op)) {
+                return new FilterPredicate(path, OPERATOR_MAP.get(op), values);
             }
 
             throw new RSQLParseException(String.format("Invalid Operator %s", op.getSymbol()));
         }
 
+        private FilterExpression equalityExpression(String argument, Path path,
+                                                    List<Object> values, boolean caseSensitive) {
+            boolean startsWith = argument.startsWith("*");
+            boolean endsWith = argument.endsWith("*");
+            if (startsWith && endsWith && argument.length() > 2) {
+                String value = argument.substring(1, argument.length() - 1);
+                Operator op = caseSensitive
+                        ? caseSensitivityStrategy.mapOperator(Operator.INFIX)
+                        : Operator.INFIX_CASE_INSENSITIVE;
+                return new FilterPredicate(path, op, Collections.singletonList(value));
+            }
+            if (startsWith && argument.length() > 1) {
+                String value = argument.substring(1, argument.length());
+                Operator op = caseSensitive
+                        ? caseSensitivityStrategy.mapOperator(Operator.POSTFIX)
+                        : Operator.POSTFIX_CASE_INSENSITIVE;
+                return new FilterPredicate(path, op, Collections.singletonList(value));
+            }
+            if (endsWith && argument.length() > 1) {
+                String value = argument.substring(0, argument.length() - 1);
+                Operator op = caseSensitive
+                        ? caseSensitivityStrategy.mapOperator(Operator.PREFIX)
+                        : Operator.PREFIX_CASE_INSENSITIVE;
+                return new FilterPredicate(path, op, Collections.singletonList(value));
+            }
+
+            boolean isStringLike = path.lastElement()
+                    .filter(e -> e.getFieldType().isAssignableFrom(STRING_TYPE))
+                    .isPresent();
+            if (isStringLike) {
+                Operator op = caseSensitive
+                        ? caseSensitivityStrategy.mapOperator(Operator.IN)
+                        : Operator.IN_INSENSITIVE;
+                return new FilterPredicate(path, op, values);
+            }
+
+            return caseSensitive
+                    ? new InPredicate(path, values)
+                    : new InInsensitivePredicate(path, values);
+        }
+
         /**
          * Returns Predicate for '=isnull=' case depending on its arguments.
-         *
+         * <p>
          * NOTE: Filter Expression builder specially for '=isnull=' case.
          *
          * @return Returns Predicate for '=isnull=' case depending on its arguments.
          */
-        private FilterExpression buildIsNullOperator(List<Predicate.PathElement> path, List<String> arguments) {
-            Operator elideOP;
+        private FilterExpression buildIsNullOperator(Path path, List<String> arguments) {
+            String arg = arguments.get(0);
             try {
-                boolean argBool = (boolean) CoerceUtil.coerce(arguments.get(0), boolean.class);
-                if (argBool) {
-                    elideOP = Operator.ISNULL;
-                } else {
-                    elideOP = Operator.NOTNULL;
+                boolean wantsNull = CoerceUtil.coerce(arg, boolean.class);
+                if (wantsNull) {
+                    return new IsNullPredicate(path);
+                }
+                return new NotNullPredicate(path);
+            } catch (InvalidValueException ignored) {
+                throw new RSQLParseException(String.format("Invalid value for operator =isnull= '%s'", arg));
+            }
+        }
+
+        /**
+         * Returns Predicate for '=isempty=' case depending on its arguments.
+         * <p>
+         * NOTE: Filter Expression builder specially for '=isempty=' case.
+         *
+         * @return
+         */
+        private FilterExpression buildIsEmptyOperator(Path path, List<String> arguments) {
+            String arg = arguments.get(0);
+            try {
+                boolean wantsEmpty = CoerceUtil.coerce(arg, boolean.class);
+                if (wantsEmpty) {
+                    return new IsEmptyPredicate(path);
                 }
-                return new Predicate(path, elideOP);
-            } catch (InvalidValueException e) {
-                throw new RSQLParseException(String.format("Invalid value for operator =isnull="));
+                return new NotEmptyPredicate(path);
+            } catch (InvalidValueException ignored) {
+                throw new RSQLParseException(String.format("Invalid value for operator =isempty= '%s'", arg));
             }
         }
     }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/graphql/FilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/graphql/FilterDialect.java
new file mode 100644
index 0000000000..e927a415a1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/graphql/FilterDialect.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.dialect.graphql;
+
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.type.Type;
+
+import java.util.Set;
+
+/**
+ * GraphQL Dialect for parsing filter API parameters into Filter Expressions.
+ */
+public interface FilterDialect {
+
+    /**
+     * Parses a graphQL collection filter parameter and converts it into a FilterExpression.
+     * @param entityClass The model type of the collection.
+     * @param attributes The requested attributes, their aliases, and arguments for the given entity model.
+     * @param filterText The filter string to parse.
+     * @param apiVersion The API version.
+     * @return A filter expression.
+     * @throws ParseException If the filter text is invalid.
+     */
+    FilterExpression parse(Type<?> entityClass,
+                           Set<Attribute> attributes,
+                           String filterText,
+                           String apiVersion) throws ParseException;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/DefaultFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/DefaultFilterDialect.java
new file mode 100644
index 0000000000..efca452648
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/DefaultFilterDialect.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.dialect.jsonapi;
+
+import static com.yahoo.elide.core.type.ClassType.COLLECTION_TYPE;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * The default filter dialect supported in Elide 1.0 and 2.0.
+ */
+public class DefaultFilterDialect implements JoinFilterDialect, SubqueryFilterDialect {
+    private final EntityDictionary dictionary;
+    public DefaultFilterDialect(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    /**
+     * Converts the query parameters to a list of predicates that are then conjoined or organized by type.
+     *
+     * @param queryParams the query params
+     * @return a list of the predicates from the query params
+     * @throws ParseException when a filter parameter cannot be parsed
+     */
+    private List<FilterPredicate> extractPredicates(MultivaluedMap<String, String> queryParams,
+                                                    String apiVersion) throws ParseException {
+        List<FilterPredicate> filterPredicates = new ArrayList<>();
+
+        Pattern pattern = Pattern.compile("filter\\[([^\\]]+)\\](\\[([^\\]]+)\\])?");
+        for (MultivaluedMap.Entry<String, List<String>> entry : queryParams.entrySet()) {
+            // Match "filter[<type>.<field>]" OR "filter[<type>.<field>][<operator>]"
+
+            String paramName = entry.getKey();
+            List<String> paramValues = entry.getValue();
+
+            Matcher matcher = pattern.matcher(paramName);
+            if (!matcher.find()) {
+                throw new ParseException("Invalid filter format: " + paramName);
+            }
+
+            final String[] keyParts = matcher.group(1).split("\\.");
+
+            if (keyParts.length < 2) {
+                throw new ParseException("Invalid filter format: " + paramName);
+            }
+
+            final Operator operator = (matcher.group(3) == null) ? Operator.IN
+                    : Operator.fromString(matcher.group(3));
+
+            Path path = getPath(keyParts, apiVersion);
+            List<Path.PathElement> elements = path.getPathElements();
+            Path.PathElement last = elements.get(elements.size() - 1);
+
+            final List<Object> values = new ArrayList<>();
+            if (operator.isParameterized()) {
+                for (String valueParams : paramValues) {
+                    for (String valueParam : valueParams.split(",")) {
+                        values.add(CoerceUtil.coerce(valueParam, last.getFieldType()));
+                    }
+                }
+            }
+
+            FilterPredicate filterPredicate = new FilterPredicate(path, operator, values);
+
+            filterPredicates.add(filterPredicate);
+        }
+
+        return filterPredicates;
+    }
+
+    @Override
+    public FilterExpression parseGlobalExpression(String path, MultivaluedMap<String, String> filterParams,
+                                                  String apiVersion)
+            throws ParseException {
+        List<FilterPredicate> filterPredicates;
+        filterPredicates = extractPredicates(filterParams, apiVersion);
+
+        /* Extract the first collection in the URL */
+        String normalizedPath = JsonApiParser.normalizePath(path);
+        String[] pathComponents = normalizedPath.split("/");
+        String firstPathComponent = "";
+        if (pathComponents.length > 0) {
+            firstPathComponent = pathComponents[0];
+        }
+
+        /* Comma separated filter parameters are joined with logical AND. */
+        FilterExpression joinedExpression = null;
+
+        for (FilterPredicate filterPredicate : filterPredicates) {
+
+            Type firstClass = filterPredicate.getPath().getPathElements().get(0).getType();
+
+            /* The first type in the predicate must match the first collection in the URL */
+            if (!dictionary.getJsonAliasFor(firstClass).equals(firstPathComponent)) {
+                throw new ParseException(String.format("Invalid predicate: %s", filterPredicate));
+            }
+
+            if ((filterPredicate.getOperator().equals(Operator.HASMEMBER)
+                    || filterPredicate.getOperator().equals(Operator.HASNOMEMBER))
+                && !FilterPredicate.isLastPathElementAssignableFrom(
+                        dictionary, filterPredicate.getPath(), COLLECTION_TYPE)) {
+                throw new ParseException("Invalid Path: Last Path Element has to be a collection type");
+            }
+
+            if (joinedExpression == null) {
+                joinedExpression = filterPredicate;
+            } else {
+                joinedExpression = new AndFilterExpression(joinedExpression, filterPredicate);
+            }
+        }
+
+        return joinedExpression;
+    }
+
+    @Override
+    public Map<String, FilterExpression> parseTypedExpression(String path, MultivaluedMap<String, String> filterParams,
+                                                              String apiVersion)
+            throws ParseException {
+        Map<String, FilterExpression> expressionMap = new HashMap<>();
+        List<FilterPredicate> filterPredicates = extractPredicates(filterParams, apiVersion);
+
+        for (FilterPredicate filterPredicate : filterPredicates) {
+            validateFilterPredicate(filterPredicate);
+            String entityType = dictionary.getJsonAliasFor(filterPredicate.getEntityType());
+            FilterExpression filterExpression = expressionMap.get(entityType);
+            if (filterExpression != null) {
+                expressionMap.put(entityType, new AndFilterExpression(filterExpression, filterPredicate));
+            } else {
+                expressionMap.put(entityType, filterPredicate);
+            }
+        }
+
+        return expressionMap;
+    }
+
+    /**
+     * Parses [ author, books, publisher, name ] into [(author, books), (book, publisher), (publisher, name)].
+     *
+     * @param keyParts [ author, books, publisher, name ]
+     * @param apiVersion The client requested version.
+     * @return [(author, books), (book, publisher), (publisher, name)]
+     * @throws ParseException if the filter cannot be parsed
+     */
+    private Path getPath(final String[] keyParts, String apiVersion) throws ParseException {
+        if (keyParts == null || keyParts.length <= 0) {
+            throw new ParseException("Invalid filter expression");
+        }
+
+        List<Path.PathElement> path = new ArrayList<>();
+
+        Type<?>[] types = new Type[keyParts.length];
+        String type = keyParts[0];
+
+        types[0] = dictionary.getEntityClass(type, apiVersion);
+
+        if (types[0] == null) {
+            throw new ParseException("Unknown entity in filter: " + type);
+        }
+
+        /* Extract all the paths for the associations */
+        for (int i = 1; i < keyParts.length; ++i) {
+            final String field = keyParts[i];
+            final Type<?> entityClass = types[i - 1];
+            final Type<?> fieldType = ("id".equals(field.toLowerCase(Locale.ENGLISH)))
+                    ? dictionary.getIdType(entityClass)
+                    : dictionary.getParameterizedType(entityClass, field);
+            if (fieldType == null) {
+                throw new ParseException("Unknown field in filter: " + field);
+            }
+            types[i] = fieldType;
+        }
+
+
+        /* Build all the Predicate path elements */
+        for (int i = 0; i < types.length - 1; ++i) {
+            Type typeClass = types[i];
+            String fieldName = keyParts[i + 1];
+            Type fieldClass = types[i + 1];
+            Path.PathElement pathElement = new Path.PathElement(typeClass, fieldClass, fieldName);
+
+            path.add(pathElement);
+        }
+
+        return new Path(path);
+    }
+
+    /**
+     * Check if the relation type in filter predicate is allowed for an operator.
+     * Defaults behavior is to prevent filter on toMany relationship.
+     * @param filterPredicate
+     * @throws ParseException
+     */
+    private void validateFilterPredicate(FilterPredicate filterPredicate) throws ParseException {
+        switch (filterPredicate.getOperator()) {
+            case ISEMPTY:
+            case NOTEMPTY:
+                emptyOperatorConditions(filterPredicate);
+                break;
+            case HASMEMBER:
+            case HASNOMEMBER:
+                memberOfOperatorConditions(filterPredicate);
+                break;
+        }
+    }
+
+    /**
+     * Check if the predicate has toMany relationship that is not target relationship
+     * on which the empty check is performed.
+     * @param filterPredicate
+     * @throws ParseException
+     */
+    private void emptyOperatorConditions(FilterPredicate filterPredicate) throws ParseException {
+        if (FilterPredicate.toManyInPathExceptLastPathElement(dictionary, filterPredicate.getPath())) {
+            throw new ParseException(
+                    "Invalid toMany join. toMany association has to be the target collection."
+                    + filterPredicate);
+        }
+    }
+
+    private void memberOfOperatorConditions(FilterPredicate filterPredicate) throws ParseException {
+        if (FilterPredicate.toManyInPath(dictionary, filterPredicate.getPath())) {
+            if (FilterPredicate.isLastPathElementAssignableFrom(dictionary,
+                    filterPredicate.getPath(), COLLECTION_TYPE)) {
+                throw new ParseException("Invalid Path: Last Path Element cannot be a collection type");
+            }
+        } else if (!FilterPredicate.isLastPathElementAssignableFrom(dictionary, filterPredicate.getPath(),
+                COLLECTION_TYPE)) {
+            throw new ParseException("Invalid Path: Last Path Element has to be a collection type");
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/JoinFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/JoinFilterDialect.java
new file mode 100644
index 0000000000..e1c6123199
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/JoinFilterDialect.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.dialect.jsonapi;
+
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Parses a filter for one or more entity types that results in a join between them.
+ * For example, the filter (books.title like '%Foo%' AND books.publisher.name = 'Acme Inc.')
+ * would require a join between 'book' and 'publisher'.  The resulting join is filtered by
+ * both predicates.
+ * <p>
+ * This filter dialect is invoked whenever the first entity is loaded from the DataStoreTransaction.
+ * For example, the above filter on '/books' would be invoked when 'book' is loaded from the DataStoreTransaction.
+ */
+public interface JoinFilterDialect {
+    /**
+     * Join filters must be able to parse global expressions.
+     *
+     * @param path the URL path
+     * @param filterParams the subset of query parameters that start with 'filter'
+     * @param apiVersion the version of the API requested.
+     * @return The root of an expression abstract syntax tree parsed from both the path and the query parameters.
+     * @throws ParseException if the expression cannot be parsed.
+     */
+    public FilterExpression parseGlobalExpression(
+            String path,
+            MultivaluedMap<String, String> filterParams,
+            String apiVersion) throws ParseException;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/MultipleFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/MultipleFilterDialect.java
new file mode 100644
index 0000000000..c60bca14cd
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/MultipleFilterDialect.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.dialect.jsonapi;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * A filter dialect that supports an ordered list of different dialects.  Dialects
+ * are attempted in sequence.  The first dialect that successfully parses a filter expression
+ * is used.  If no dialect succeeds, the error from the last dialect is returned.
+ */
+@AllArgsConstructor
+@Slf4j
+public class MultipleFilterDialect implements JoinFilterDialect, SubqueryFilterDialect {
+    private List<JoinFilterDialect> joinDialects;
+    private List<SubqueryFilterDialect> subqueryDialects;
+
+    public MultipleFilterDialect(EntityDictionary dictionary) {
+        DefaultFilterDialect defaultDialect = new DefaultFilterDialect(dictionary);
+        joinDialects = new ArrayList<>();
+        joinDialects.add(defaultDialect);
+        subqueryDialects = new ArrayList<>();
+        subqueryDialects.add(defaultDialect);
+    }
+
+    @Override
+    public FilterExpression parseGlobalExpression(String path,
+                                                  MultivaluedMap<String, String> queryParams,
+                                                  String apiVersion) throws ParseException {
+        if (joinDialects.isEmpty()) {
+            throw new ParseException("Heterogeneous type filtering not supported");
+        }
+
+        return parseExpression(joinDialects, (dialect) -> dialect.parseGlobalExpression(path, queryParams, apiVersion));
+    }
+
+    @Override
+    public Map<String, FilterExpression> parseTypedExpression(String path,
+                                                              MultivaluedMap<String, String> queryParams,
+                                                              String apiVersion)
+            throws ParseException {
+
+        if (subqueryDialects.isEmpty()) {
+            throw new ParseException("Type filtering not supported");
+        }
+
+        return parseExpression(subqueryDialects, (dialect) -> dialect.parseTypedExpression(path,
+                queryParams, apiVersion));
+    }
+
+    private static <T, R> R parseExpression(List<T> dialects, ParseFunction<T, R> parseFunction) throws ParseException {
+        ParseException lastFailure = null;
+        for (T dialect : dialects) {
+            try {
+                return parseFunction.apply(dialect);
+            } catch (ParseException e) {
+                if (log.isTraceEnabled()) {
+                    log.trace("Parse Failure: {}", e.getMessage());
+                }
+                if (lastFailure != null) {
+                    ParseException prev = lastFailure;
+                    lastFailure = new ParseException(e.getMessage() + "\n" + lastFailure.getMessage());
+                    lastFailure.addSuppressed(prev);
+                    lastFailure.addSuppressed(e);
+                } else {
+                    lastFailure = e;
+                }
+            }
+        }
+        if (lastFailure == null) {
+            lastFailure = new ParseException("No dialects");
+        }
+        throw lastFailure;
+    }
+
+    /**
+     * A dialect parse function.
+     *
+     * @param <T> The parser dialect
+     * @param <R> the return type of the parser
+     */
+    @FunctionalInterface
+    public interface ParseFunction<T, R> {
+        R apply(T dialect) throws ParseException;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/SubqueryFilterDialect.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/SubqueryFilterDialect.java
similarity index 77%
rename from elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/SubqueryFilterDialect.java
rename to elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/SubqueryFilterDialect.java
index d98b1998a6..ab0757e691 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/SubqueryFilterDialect.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/dialect/jsonapi/SubqueryFilterDialect.java
@@ -3,12 +3,13 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.core.filter.dialect;
+package com.yahoo.elide.core.filter.dialect.jsonapi;
 
+import com.yahoo.elide.core.filter.dialect.ParseException;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
 
-import javax.ws.rs.core.MultivaluedMap;
 import java.util.Map;
+import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * Parses filters which are bound to a particular entity type.  Whenever a collection of entities
@@ -28,10 +29,15 @@
  */
 public interface SubqueryFilterDialect {
     /**
+     * Parse a filter that is scoped to a particular type.
+     *
      * @param path The URL path
      * @param filterParams The subset of queryParams that start with 'filter'
+     * @param apiVersion The version of the API requested.
      * @return The root of an expression abstract syntax tree parsed from both the path and the query parameters.
+     * @throws ParseException if unable to parse
      */
-    public Map<String, FilterExpression> parseTypedExpression(String path, MultivaluedMap<String, String> filterParams)
+    public Map<String, FilterExpression> parseTypedExpression(String path, MultivaluedMap<String, String> filterParams,
+                                                              String apiVersion)
             throws ParseException;
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/AndFilterExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/AndFilterExpression.java
index 8a3b70799d..503bfacb44 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/AndFilterExpression.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/AndFilterExpression.java
@@ -17,13 +17,40 @@ public class AndFilterExpression implements FilterExpression {
     @Getter private FilterExpression left;
     @Getter private FilterExpression right;
 
+    /**
+     * Returns a new {@link AndFilterExpression} instance with the specified null-able left and right operands.
+     * <p>
+     * The publication rules are
+     * <ol>
+     *     <li> If both left and right are not {@code null}, this method produces the same instance as
+     *          {@link #AndFilterExpression(FilterExpression, FilterExpression)} does,
+     *     <li> If one of them is {@code null}, the other non-null is returned with no modification,
+     *     <li> If both left and right are {@code null}, this method returns
+     *          {@code null}.
+     * </ol>
+     *
+     * @param left  The provided left {@link FilterExpression}
+     * @param right  The provided right {@link FilterExpression}
+     *
+     * @return a new {@link AndFilterExpression} instance or {@code null}
+     */
+    public static FilterExpression fromPair(FilterExpression left, FilterExpression right) {
+        if (left != null && right != null) {
+            return new AndFilterExpression(left, right);
+        }
+        if (left == null) {
+            return right;
+        }
+        return left;
+    }
+
     public AndFilterExpression(FilterExpression left, FilterExpression right) {
         this.left = left;
         this.right = right;
 
     }
     @Override
-    public <T> T accept(Visitor<T> visitor) {
+    public <T> T accept(FilterExpressionVisitor<T> visitor) {
         return visitor.visitAndExpression(this);
     }
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitor.java
new file mode 100644
index 0000000000..84d949123a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitor.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+/**
+ * A Visitor which deep clones an entire filter expression.
+ */
+public class ExpressionScopingVisitor implements FilterExpressionVisitor<FilterExpression> {
+
+    PathElement scope;
+
+    public ExpressionScopingVisitor(PathElement scope) {
+        this.scope = scope;
+    }
+
+    @Override
+    public FilterExpression visitPredicate(FilterPredicate filterPredicate) {
+        return filterPredicate.scopedBy(scope);
+    }
+
+    @Override
+    public FilterExpression visitAndExpression(AndFilterExpression expression) {
+        return new AndFilterExpression(
+                expression.getLeft().accept(this),
+                expression.getRight().accept(this));
+    }
+
+    @Override
+    public FilterExpression visitOrExpression(OrFilterExpression expression) {
+        return new OrFilterExpression(
+                expression.getLeft().accept(this),
+                expression.getRight().accept(this));
+    }
+
+    @Override
+    public FilterExpression visitNotExpression(NotFilterExpression expression) {
+        return new NotFilterExpression(expression.getNegated().accept(this));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpression.java
index fc7d9aa641..17c2ceb08c 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpression.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpression.java
@@ -9,5 +9,5 @@
  * A filter expression.
  */
 public interface FilterExpression {
-    public <T> T accept(Visitor<T> visitor);
+    public <T> T accept(FilterExpressionVisitor<T> visitor);
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpressionVisitor.java
new file mode 100644
index 0000000000..3aedf41a1a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterExpressionVisitor.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+/**
+ * Visitor which walks the filter expression abstract syntax tree.
+ * @param <T> The return type of the visitor
+ */
+public interface FilterExpressionVisitor<T> {
+    T visitPredicate(FilterPredicate filterPredicate);
+    T visitAndExpression(AndFilterExpression expression);
+    T visitOrExpression(OrFilterExpression expression);
+    T visitNotExpression(NotFilterExpression expression);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractor.java
new file mode 100644
index 0000000000..c424e8ff59
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractor.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.expression;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.FilterExpressionNormalizationVisitor;
+
+/**
+ * Examines a FilterExpression to determine if some or all of it can be pushed to the data store.
+ */
+public class FilterPredicatePushdownExtractor implements FilterExpressionVisitor<FilterExpression> {
+
+    private EntityDictionary dictionary;
+
+    public FilterPredicatePushdownExtractor(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    @Override
+    public FilterExpression visitPredicate(FilterPredicate filterPredicate) {
+
+        boolean filterInMemory = filterPredicate.getPath().isComputed(dictionary);
+        return (filterInMemory) ? null : filterPredicate;
+    }
+
+    @Override
+    public FilterExpression visitAndExpression(AndFilterExpression expression) {
+        FilterExpression left = expression.getLeft().accept(this);
+        FilterExpression right = expression.getRight().accept(this);
+
+        if (left == null) {
+            return right;
+        }
+
+        if (right == null) {
+            return left;
+        }
+
+        return new AndFilterExpression(left, right);
+    }
+
+    @Override
+    public FilterExpression visitOrExpression(OrFilterExpression expression) {
+        FilterExpression left = expression.getLeft().accept(this);
+        FilterExpression right = expression.getRight().accept(this);
+
+        if (left == null || right == null) {
+            return null;
+        }
+        return new OrFilterExpression(left, right);
+    }
+
+    @Override
+    public FilterExpression visitNotExpression(NotFilterExpression expression) {
+        FilterExpression inner = expression.getNegated().accept(this);
+
+        if (inner == null) {
+            return null;
+        }
+
+        return expression;
+    }
+
+    /**
+     * @param dictionary
+     * @param expression
+     * @return A filter expression that can be safely executed in the data store.
+     */
+    public static FilterExpression extractPushDownPredicate(EntityDictionary dictionary, FilterExpression expression) {
+        FilterExpressionNormalizationVisitor normalizationVisitor = new FilterExpressionNormalizationVisitor();
+        FilterExpression normalizedExpression = expression.accept(normalizationVisitor);
+        FilterPredicatePushdownExtractor verifier = new FilterPredicatePushdownExtractor(dictionary);
+
+        return normalizedExpression.accept(verifier);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifier.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifier.java
new file mode 100644
index 0000000000..8749c59433
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifier.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.expression;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+/**
+ * Intended to specify whether the expression must be evaluated in memory or can be pushed to the DataStore.
+ * Constructs true if any part of the expression relies on a computed attribute or relationship.
+ * Otherwise constructs false.
+ */
+public class InMemoryExecutionVerifier implements FilterExpressionVisitor<Boolean> {
+    private EntityDictionary dictionary;
+
+    public InMemoryExecutionVerifier(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    @Override
+    public Boolean visitPredicate(FilterPredicate filterPredicate) {
+        return filterPredicate.getPath().isComputed(dictionary);
+    }
+
+    @Override
+    public Boolean visitAndExpression(AndFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // is either computed?
+        return (left.accept(this) || right.accept(this));
+    }
+
+    @Override
+    public Boolean visitOrExpression(OrFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // is either computed?
+        return (left.accept(this) || right.accept(this));
+    }
+
+    @Override
+    public Boolean visitNotExpression(NotFilterExpression expression) {
+        return expression.getNegated().accept(this);
+    }
+
+    /**
+     * @param dictionary
+     * @param expression
+     * @return Returns true if the filter expression must be evaluated in memory.
+     */
+    public static boolean shouldExecuteInMemory(EntityDictionary dictionary, FilterExpression expression) {
+        InMemoryExecutionVerifier verifier = new InMemoryExecutionVerifier(dictionary);
+
+        return expression.accept(verifier);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutor.java
new file mode 100644
index 0000000000..2d1211565e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+import java.util.function.Predicate;
+
+/**
+ * Visitor for in memory filterExpressions.
+ */
+public class InMemoryFilterExecutor implements FilterExpressionVisitor<Predicate> {
+    private final RequestScope requestScope;
+
+    public InMemoryFilterExecutor(RequestScope requestScope) {
+        this.requestScope = requestScope;
+    }
+
+    @Override
+    public Predicate visitPredicate(FilterPredicate filterPredicate) {
+        return filterPredicate.apply(requestScope);
+    }
+
+    @Override
+    public Predicate visitAndExpression(AndFilterExpression expression) {
+        Predicate leftPredicate = expression.getLeft().accept(this);
+        Predicate rightPredicate = expression.getRight().accept(this);
+        return t -> leftPredicate.and(rightPredicate).test(t);
+    }
+
+    @Override
+    public Predicate visitOrExpression(OrFilterExpression expression) {
+        Predicate leftPredicate = expression.getLeft().accept(this);
+        Predicate rightPredicate = expression.getRight().accept(this);
+        return t -> leftPredicate.or(rightPredicate).test(t);
+    }
+
+    @Override
+    public Predicate visitNotExpression(NotFilterExpression expression) {
+        Predicate predicate = expression.getNegated().accept(this);
+        return t -> predicate.negate().test(t);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitor.java
deleted file mode 100644
index 637c502679..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.expression;
-
-import com.yahoo.elide.core.EntityDictionary;
-
-import java.util.function.Predicate;
-
-/**
- * Visitor for in memory filterExpressions
- */
-public class InMemoryFilterVisitor implements Visitor<Predicate> {
-    private final EntityDictionary dictionary;
-
-    public InMemoryFilterVisitor(EntityDictionary dictionary) {
-        this.dictionary = dictionary;
-    }
-
-    @Override
-    public Predicate visitPredicate(com.yahoo.elide.core.filter.Predicate predicate) {
-        return predicate.apply(dictionary);
-    }
-
-    @Override
-    public Predicate visitAndExpression(AndFilterExpression expression) {
-        Predicate leftPredicate = expression.getLeft().accept(this);
-        Predicate rightPredicate = expression.getRight().accept(this);
-        return t -> leftPredicate.and(rightPredicate).test(t);
-    }
-
-    @Override
-    public Predicate visitOrExpression(OrFilterExpression expression) {
-        Predicate leftPredicate = expression.getLeft().accept(this);
-        Predicate rightPredicate = expression.getRight().accept(this);
-        return t -> leftPredicate.or(rightPredicate).test(t);
-    }
-
-    @Override
-    public Predicate visitNotExpression(NotFilterExpression expression) {
-        Predicate predicate = expression.getNegated().accept(this);
-        return t -> predicate.negate().test(t);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/NotFilterExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/NotFilterExpression.java
index de63b97753..6ad1437a53 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/NotFilterExpression.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/NotFilterExpression.java
@@ -21,7 +21,7 @@ public NotFilterExpression(FilterExpression negated) {
 
     }
     @Override
-    public <T> T accept(Visitor<T> visitor) {
+    public <T> T accept(FilterExpressionVisitor<T> visitor) {
         return visitor.visitNotExpression(this);
     }
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/OrFilterExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/OrFilterExpression.java
index a5ac6e3098..a364e28f79 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/OrFilterExpression.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/OrFilterExpression.java
@@ -18,13 +18,40 @@ public class OrFilterExpression implements FilterExpression {
     @Getter private FilterExpression left;
     @Getter private FilterExpression right;
 
+    /**
+     * Returns a new {@link OrFilterExpression} instance with the specified null-able left and right operands.
+     * <p>
+     * The publication rules are
+     * <ol>
+     *     <li> If both left and right are not {@code null}, this method produces the same instance as
+     *          {@link #OrFilterExpression(FilterExpression, FilterExpression)} does,
+     *     <li> If one of them is {@code null}, the other non-null is returned with no modification,
+     *     <li> If both left and right are {@code null}, this method returns
+     *          {@code null}.
+     * </ol>
+     *
+     * @param left  The provided left {@link FilterExpression}
+     * @param right  The provided right {@link FilterExpression}
+     *
+     * @return a new {@link OrFilterExpression} instance or {@code null}
+     */
+    public static FilterExpression fromPair(FilterExpression left, FilterExpression right) {
+        if (left != null && right != null) {
+            return new OrFilterExpression(left, right);
+        }
+        if (left == null) {
+            return right;
+        }
+        return left;
+    }
+
     public OrFilterExpression(FilterExpression left, FilterExpression right) {
         this.left = left;
         this.right = right;
 
     }
     @Override
-    public <T> T accept(Visitor<T> visitor) {
+    public <T> T accept(FilterExpressionVisitor<T> visitor) {
         return visitor.visitOrExpression(this);
     }
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitor.java
index 81fa815c7b..7fca61bf47 100644
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitor.java
@@ -5,42 +5,57 @@
  */
 package com.yahoo.elide.core.filter.expression;
 
-import com.yahoo.elide.core.filter.Predicate;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
 import lombok.Getter;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 
 /**
  * A Visitor which extracts the set of predicates from a filter FilterExpression.
  * Should only be used in Elide 2.0 scope
  */
-public class PredicateExtractionVisitor implements Visitor<Set<Predicate>> {
-    @Getter Set<Predicate> predicates = new HashSet<>();
+public class PredicateExtractionVisitor implements FilterExpressionVisitor<Collection<FilterPredicate>> {
+    @Getter Collection<FilterPredicate> filterPredicates;
+
+    /**
+     * Defaults to extracting a set of predicates.
+     */
+    public PredicateExtractionVisitor() {
+        filterPredicates = new LinkedHashSet<>();
+    }
+
+    /**
+     * Extracts predicates into the provided collection.
+     * @param predicates The collection (list, set, etc) to store the predicates in.
+     */
+    public PredicateExtractionVisitor(Collection<FilterPredicate> predicates) {
+        filterPredicates = predicates;
+    }
 
     @Override
-    public Set<Predicate> visitPredicate(Predicate predicate) {
-        predicates.add(predicate);
-        return predicates;
+    public Collection<FilterPredicate> visitPredicate(FilterPredicate filterPredicate) {
+        filterPredicates.add(filterPredicate);
+        return filterPredicates;
     }
 
     @Override
-    public Set<Predicate> visitAndExpression(AndFilterExpression expression) {
-        predicates.addAll(expression.getLeft().accept(this));
-        predicates.addAll(expression.getRight().accept(this));
-        return predicates;
+    public Collection<FilterPredicate> visitAndExpression(AndFilterExpression expression) {
+        expression.getLeft().accept(this);
+        expression.getRight().accept(this);
+        return filterPredicates;
     }
 
     @Override
-    public Set<Predicate> visitOrExpression(OrFilterExpression expression) {
-        predicates.addAll(expression.getLeft().accept(this));
-        predicates.addAll(expression.getRight().accept(this));
-        return predicates;
+    public Collection<FilterPredicate> visitOrExpression(OrFilterExpression expression) {
+        expression.getLeft().accept(this);
+        expression.getRight().accept(this);
+        return filterPredicates;
     }
 
     @Override
-    public Set<Predicate> visitNotExpression(NotFilterExpression expression) {
-        predicates.addAll(expression.getNegated().accept(this));
-        return predicates;
+    public Collection<FilterPredicate> visitNotExpression(NotFilterExpression expression) {
+        expression.getNegated().accept(this);
+        return filterPredicates;
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/Visitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/Visitor.java
deleted file mode 100644
index a9da80b792..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/filter/expression/Visitor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.expression;
-
-import com.yahoo.elide.core.filter.Predicate;
-
-/**
- * Visitor which walks the filter expression abstract syntax tree.
- * @param <T> The return type of the visitor
- */
-public interface Visitor<T> {
-    public T visitPredicate(Predicate predicate);
-    public T visitAndExpression(AndFilterExpression expression);
-    public T visitOrExpression(OrFilterExpression expression);
-    public T visitNotExpression(NotFilterExpression expression);
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FalsePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FalsePredicate.java
new file mode 100644
index 0000000000..5f7a1e81fc
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FalsePredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * False Predicate class.
+ */
+public class FalsePredicate extends FilterPredicate {
+
+    public FalsePredicate(Path path) {
+        super(path, Operator.FALSE, Collections.emptyList());
+    }
+
+    public FalsePredicate(PathElement pathElement) {
+        this(new Path(Collections.singletonList(pathElement)));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FilterPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FilterPredicate.java
new file mode 100644
index 0000000000..2f9e12fa6c
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/FilterPredicate.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * Predicate class.
+ */
+@EqualsAndHashCode
+public class FilterPredicate implements FilterExpression, Function<RequestScope, Predicate> {
+    private static final String UNDERSCORE = "_";
+    private static final String PERIOD = ".";
+    private static final PathElement[] ELEMENT_ARRAY = new PathElement[0];
+
+    @Getter @NonNull private Path path;
+    @Getter @NonNull private Operator operator;
+    @Getter @NonNull private List<Object> values;
+    @Getter @NonNull private String field;
+    @Getter @NonNull private String fieldPath;
+    @Getter @NonNull private Type fieldType;
+
+    public static boolean toManyInPath(EntityDictionary dictionary, Path path) {
+        return path.getPathElements().stream()
+                .map(element -> dictionary.getRelationshipType(element.getType(), element.getFieldName()))
+                .anyMatch(RelationshipType::isToMany);
+    }
+
+    public static boolean toManyInPathExceptLastPathElement(EntityDictionary dictionary, Path path) {
+        int pathLength = path.getPathElements().size();
+        return path.getPathElements().stream()
+                .limit(pathLength - 1)
+                .map(element -> dictionary.getRelationshipType(element.getType(), element.getFieldName()))
+                .anyMatch(RelationshipType::isToMany);
+    }
+
+    public static boolean isLastPathElementAssignableFrom(EntityDictionary dictionary, Path path, Type<?> clz) {
+        return path.lastElement()
+                .filter(last ->
+                        clz.isAssignableFrom(
+                                dictionary.getType(last.getType(), last.getFieldName())
+                        ))
+                .isPresent();
+    }
+
+    public FilterPredicate(PathElement pathElement, Operator op, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), op, values);
+    }
+
+    public FilterPredicate(FilterPredicate copy) {
+        this(copy.path, copy.operator, copy.values);
+    }
+
+    public FilterPredicate(Path path, Operator op, List<Object> values) {
+        this.operator = op;
+        this.path = new Path(path);
+        this.values = ImmutableList.copyOf(values);
+        this.field = path.lastElement()
+                .map(PathElement::getFieldName)
+                .orElse(null);
+        this.fieldPath = path.getPathElements().stream()
+                .map(PathElement::getFieldName)
+                .collect(Collectors.joining(PERIOD));
+        this.fieldType = path.lastElement()
+                .map(PathElement::getFieldType)
+                .orElse(null);
+    }
+
+    /**
+     * Compute the parameter value/name pairings.
+     * @return the filter parameters for this predicate
+     */
+    public List<FilterParameter> getParameters() {
+        String baseName = String.format("%s_%s_",
+                getFieldPath().replace(PERIOD, UNDERSCORE),
+                Integer.toHexString(hashCode()));
+        return IntStream.range(0, values.size())
+                .mapToObj(idx -> new FilterParameter(String.format("%s%d", baseName, idx), values.get(idx)))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Create a copy of this filter that is scoped by scope. This is used in calculating page totals, we need to
+     * scope this filter in the context of it's parent.
+     *
+     * @param scope the path element to add to the head of the path
+     * @return the scoped filter expression.
+     */
+    public FilterPredicate scopedBy(PathElement scope) {
+        List<PathElement> pathElements = Lists.asList(scope, path.getPathElements().toArray(ELEMENT_ARRAY));
+        return new FilterPredicate(new Path(pathElements), operator, values);
+    }
+
+    public Type getEntityType() {
+        List<PathElement> elements = path.getPathElements();
+        PathElement first = elements.get(0);
+        return first.getType();
+    }
+
+    @Override
+    public <T> T accept(FilterExpressionVisitor<T> visitor) {
+        return visitor.visitPredicate(this);
+    }
+
+    @Override
+    public Predicate apply(RequestScope dictionary) {
+        return operator.contextualize(path, values, dictionary);
+    }
+
+    public boolean isMatchingOperator() {
+        return operator == Operator.INFIX
+                || operator == Operator.INFIX_CASE_INSENSITIVE
+                || operator == Operator.PREFIX
+                || operator == Operator.PREFIX_CASE_INSENSITIVE
+                || operator == Operator.POSTFIX
+                || operator == Operator.POSTFIX_CASE_INSENSITIVE;
+    }
+
+    @Override
+    public String toString() {
+        List<PathElement> elements = path.getPathElements();
+        StringBuilder formattedPath = new StringBuilder();
+        if (!elements.isEmpty()) {
+            formattedPath.append(StringUtils.uncapitalize(EntityDictionary.getSimpleName(elements.get(0).getType())));
+        }
+
+        for (PathElement element : elements) {
+            formattedPath.append(PERIOD).append(element.getFieldName());
+        }
+
+        return formattedPath.append(' ').append(operator).append(' ').append(values).toString();
+    }
+
+    public FilterPredicate negate() {
+        Operator newOp = operator.negate();
+        return new FilterPredicate(this.path, newOp, this.values);
+    }
+
+    /**
+     * A wrapper for filter parameters, for HQL injection.
+     */
+    @AllArgsConstructor
+    public static class FilterParameter {
+        @Getter private String name;
+        @Getter private Object value;
+        private static final Pattern ESCAPE_PATTERN = Pattern.compile("%", Pattern.LITERAL);
+        private static final String ESCAPED = Matcher.quoteReplacement("\\%");
+
+        public String getPlaceholder() {
+            return ":" + name;
+        }
+
+        public String escapeMatching() {
+            return ESCAPE_PATTERN.matcher(value.toString()).replaceAll(ESCAPED);
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GEPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GEPredicate.java
new file mode 100644
index 0000000000..1db0fe04ba
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GEPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * GE Predicate class.
+ */
+public class GEPredicate extends FilterPredicate {
+
+    public GEPredicate(Path path, Object value) {
+        super(path, Operator.GE, Collections.singletonList(value));
+    }
+
+    public GEPredicate(PathElement pathElement, Object value) {
+        this(new Path(Collections.singletonList(pathElement)), value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GTPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GTPredicate.java
new file mode 100644
index 0000000000..e8abd55711
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/GTPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * GT Predicate class.
+ */
+public class GTPredicate extends FilterPredicate {
+
+    public GTPredicate(Path path, Object value) {
+        super(path, Operator.GT, Collections.singletonList(value));
+    }
+
+    public GTPredicate(PathElement pathElement, Object value) {
+        this(new Path(Collections.singletonList(pathElement)), value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InInsensitivePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InInsensitivePredicate.java
new file mode 100644
index 0000000000..76ce69a6b1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InInsensitivePredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * IN Insensitive Predicate class.
+ */
+public class InInsensitivePredicate extends FilterPredicate {
+
+    public InInsensitivePredicate(Path path, List<Object> values) {
+        super(path, Operator.IN_INSENSITIVE, values);
+    }
+
+    @SafeVarargs
+    public <T> InInsensitivePredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public InInsensitivePredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> InInsensitivePredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InPredicate.java
new file mode 100644
index 0000000000..ede2bce7ae
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InPredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * IN Predicate class.
+ */
+public class InPredicate extends FilterPredicate {
+
+    public InPredicate(Path path, List<Object> values) {
+        super(path, Operator.IN, values);
+    }
+
+    @SafeVarargs
+    public <T> InPredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public InPredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> InPredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixInsensitivePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixInsensitivePredicate.java
new file mode 100644
index 0000000000..58690d5da1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixInsensitivePredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * INFIX Insensitive Predicate class.
+ */
+public class InfixInsensitivePredicate extends FilterPredicate {
+
+    public InfixInsensitivePredicate(Path path, List<Object> values) {
+        super(path, Operator.INFIX_CASE_INSENSITIVE, values);
+    }
+
+    @SafeVarargs
+    public <T> InfixInsensitivePredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public InfixInsensitivePredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> InfixInsensitivePredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixPredicate.java
new file mode 100644
index 0000000000..aa6c969b4b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/InfixPredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * INFIX Predicate class.
+ */
+public class InfixPredicate extends FilterPredicate {
+
+    public InfixPredicate(Path path, List<Object> values) {
+        super(path, Operator.INFIX, values);
+    }
+
+    @SafeVarargs
+    public <T> InfixPredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public InfixPredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> InfixPredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsEmptyPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsEmptyPredicate.java
new file mode 100644
index 0000000000..3c3d66d421
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsEmptyPredicate.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * Is Empty Predicate Class.
+ */
+public class IsEmptyPredicate extends FilterPredicate {
+
+    public IsEmptyPredicate(Path path) {
+        super(path, Operator.ISEMPTY, Collections.emptyList());
+    }
+
+    public IsEmptyPredicate(Path.PathElement pathElement) {
+        super(pathElement, Operator.ISEMPTY, Collections.emptyList());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsNullPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsNullPredicate.java
new file mode 100644
index 0000000000..8668913659
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/IsNullPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * ISNULL Predicate class.
+ */
+public class IsNullPredicate extends FilterPredicate {
+
+    public IsNullPredicate(Path path) {
+        super(path, Operator.ISNULL, Collections.emptyList());
+    }
+
+    public IsNullPredicate(PathElement pathElement) {
+        this(new Path(Collections.singletonList(pathElement)));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LEPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LEPredicate.java
new file mode 100644
index 0000000000..a7babd4f9f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LEPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * LE Predicate class.
+ */
+public class LEPredicate extends FilterPredicate {
+
+    public LEPredicate(Path path, Object value) {
+        super(path, Operator.LE, Collections.singletonList(value));
+    }
+
+    public LEPredicate(PathElement pathElement, Object value) {
+        this(new Path(Collections.singletonList(pathElement)), value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LTPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LTPredicate.java
new file mode 100644
index 0000000000..fd9aa7bb4a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/LTPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * LT Predicate class.
+ */
+public class LTPredicate extends FilterPredicate {
+
+    public LTPredicate(Path path, Object value) {
+        super(path, Operator.LT, Collections.singletonList(value));
+    }
+
+    public LTPredicate(PathElement pathElement, Object value) {
+        this(new Path(Collections.singletonList(pathElement)), value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotEmptyPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotEmptyPredicate.java
new file mode 100644
index 0000000000..f82a190cf6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotEmptyPredicate.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * Not Empty Predicate Class.
+ */
+public class NotEmptyPredicate extends FilterPredicate {
+
+    public NotEmptyPredicate(Path path) {
+        super(path, Operator.NOTEMPTY, Collections.emptyList());
+    }
+
+    public NotEmptyPredicate(Path.PathElement pathElement) {
+        super(pathElement, Operator.NOTEMPTY, Collections.emptyList());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInInsensitivePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInInsensitivePredicate.java
new file mode 100644
index 0000000000..63e51a4d1e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInInsensitivePredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * NOT Insensitive Predicate class.
+ */
+public class NotInInsensitivePredicate extends FilterPredicate {
+
+    public NotInInsensitivePredicate(Path path, List<Object> values) {
+        super(path, Operator.NOT_INSENSITIVE, values);
+    }
+
+    @SafeVarargs
+    public <T> NotInInsensitivePredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public NotInInsensitivePredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> NotInInsensitivePredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInPredicate.java
new file mode 100644
index 0000000000..efc16979d8
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotInPredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Not In Predicate class.
+ */
+public class NotInPredicate extends FilterPredicate {
+
+    public NotInPredicate(Path path, List<Object> values) {
+        super(path, Operator.NOT, values);
+    }
+
+    @SafeVarargs
+    public <T> NotInPredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public NotInPredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> NotInPredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotNullPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotNullPredicate.java
new file mode 100644
index 0000000000..ac41c7cd78
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/NotNullPredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * Not NUL Predicate class.
+ */
+public class NotNullPredicate extends FilterPredicate {
+
+    public NotNullPredicate(Path path) {
+        super(path, Operator.NOTNULL, Collections.emptyList());
+    }
+
+    public NotNullPredicate(PathElement pathElement) {
+        this(new Path(Collections.singletonList(pathElement)));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixInsensitivePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixInsensitivePredicate.java
new file mode 100644
index 0000000000..1b74299f06
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixInsensitivePredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POSTFIX Predicate class.
+ */
+public class PostfixInsensitivePredicate extends FilterPredicate {
+
+    public PostfixInsensitivePredicate(Path path, List<Object> values) {
+        super(path, Operator.POSTFIX_CASE_INSENSITIVE, values);
+    }
+
+    @SafeVarargs
+    public <T> PostfixInsensitivePredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public PostfixInsensitivePredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> PostfixInsensitivePredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixPredicate.java
new file mode 100644
index 0000000000..f4a17f8a10
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PostfixPredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POSTFIX Predicate class.
+ */
+public class PostfixPredicate extends FilterPredicate {
+
+    public PostfixPredicate(Path path, List<Object> values) {
+        super(path, Operator.POSTFIX, values);
+    }
+
+    @SafeVarargs
+    public <T> PostfixPredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public PostfixPredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> PostfixPredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixInsensitivePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixInsensitivePredicate.java
new file mode 100644
index 0000000000..f641f6a0d9
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixInsensitivePredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * PREFIX Predicate class.
+ */
+public class PrefixInsensitivePredicate extends FilterPredicate {
+
+    public PrefixInsensitivePredicate(Path path, List<Object> values) {
+        super(path, Operator.PREFIX_CASE_INSENSITIVE, values);
+    }
+
+    @SafeVarargs
+    public <T> PrefixInsensitivePredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public PrefixInsensitivePredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> PrefixInsensitivePredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixPredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixPredicate.java
new file mode 100644
index 0000000000..41ccd2cce5
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/PrefixPredicate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * PREFIX Predicate class.
+ */
+public class PrefixPredicate extends FilterPredicate {
+
+    public PrefixPredicate(Path path, List<Object> values) {
+        super(path, Operator.PREFIX, values);
+    }
+
+    @SafeVarargs
+    public <T> PrefixPredicate(Path path, T... a) {
+        this(path, Arrays.asList(a));
+    }
+
+    public PrefixPredicate(PathElement pathElement, List<Object> values) {
+        this(new Path(Collections.singletonList(pathElement)), values);
+    }
+
+    @SafeVarargs
+    public <T> PrefixPredicate(PathElement pathElement, T... a) {
+        this(pathElement, Arrays.asList(a));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/TruePredicate.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/TruePredicate.java
new file mode 100644
index 0000000000..2583676317
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/predicates/TruePredicate.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.predicates;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.Operator;
+
+import java.util.Collections;
+
+/**
+ * TRUE Predicate class.
+ */
+public class TruePredicate extends FilterPredicate {
+
+    public TruePredicate(Path path) {
+        super(path, Operator.TRUE, Collections.emptyList());
+    }
+
+    public TruePredicate(PathElement pathElement) {
+        this(new Path(Collections.singletonList(pathElement)));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/FilterExpressionCheckEvaluationVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionCheckEvaluationVisitor.java
similarity index 78%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/expression/FilterExpressionCheckEvaluationVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionCheckEvaluationVisitor.java
index 767e2bbcd4..55d21b7a56 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/FilterExpressionCheckEvaluationVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionCheckEvaluationVisitor.java
@@ -4,23 +4,22 @@
  * See LICENSE file in project root for terms.
  */
 
-package com.yahoo.elide.parsers.expression;
+package com.yahoo.elide.core.filter.visitors;
 
-
-import com.yahoo.elide.core.filter.Predicate;
 import com.yahoo.elide.core.filter.expression.AndFilterExpression;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
 import com.yahoo.elide.core.filter.expression.NotFilterExpression;
 import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-import com.yahoo.elide.security.FilterExpressionCheck;
-import com.yahoo.elide.security.RequestScope;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
 
 /**
  * FilterExpressionCheckEvaluationVisitor evaluate a check against fields of a returning object from datastore.
  */
 
-public class FilterExpressionCheckEvaluationVisitor implements Visitor<Boolean> {
+public class FilterExpressionCheckEvaluationVisitor implements FilterExpressionVisitor<Boolean> {
     private final Object object;
     private final FilterExpressionCheck filterExpressionCheck;
     private final RequestScope requestScope;
@@ -33,8 +32,8 @@ public FilterExpressionCheckEvaluationVisitor(Object object,
     }
 
     @Override
-    public Boolean visitPredicate(Predicate predicate) {
-        return filterExpressionCheck.applyPredicateToObject(object, predicate, requestScope);
+    public Boolean visitPredicate(FilterPredicate filterPredicate) {
+        return filterExpressionCheck.applyPredicateToObject(object, filterPredicate, requestScope);
     }
 
     @Override
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionNormalizationVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionNormalizationVisitor.java
new file mode 100644
index 0000000000..57b7fda149
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/FilterExpressionNormalizationVisitor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.visitors;
+
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+
+/**
+ * Expression Visitor.
+ */
+public class FilterExpressionNormalizationVisitor implements FilterExpressionVisitor<FilterExpression> {
+
+    @Override
+    public FilterExpression visitPredicate(FilterPredicate filterPredicate) {
+        return filterPredicate;
+    }
+
+    @Override
+    public FilterExpression visitAndExpression(AndFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        return new AndFilterExpression(left.accept(this), right.accept(this));
+    }
+
+    @Override
+    public FilterExpression visitOrExpression(OrFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        return new OrFilterExpression(left.accept(this), right.accept(this));
+    }
+
+    @Override
+    public FilterExpression visitNotExpression(NotFilterExpression fe) {
+        FilterExpression inner = fe.getNegated();
+        if (inner instanceof AndFilterExpression) {
+            AndFilterExpression and = (AndFilterExpression) inner;
+            FilterExpression left = new NotFilterExpression(and.getLeft()).accept(this);
+            FilterExpression right = new NotFilterExpression(and.getRight()).accept(this);
+            return new OrFilterExpression(left, right);
+        }
+        if (inner instanceof OrFilterExpression) {
+            OrFilterExpression or = (OrFilterExpression) inner;
+            FilterExpression left = new NotFilterExpression(or.getLeft()).accept(this);
+            FilterExpression right = new NotFilterExpression(or.getRight()).accept(this);
+            return new AndFilterExpression(left, right);
+        }
+        if (inner instanceof NotFilterExpression) {
+            NotFilterExpression not = (NotFilterExpression) inner;
+            return (not.getNegated()).accept(this);
+        }
+        if (inner instanceof FilterPredicate) {
+            FilterPredicate filter = (FilterPredicate) inner;
+            return filter.negate();
+        }
+        return inner;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitor.java
new file mode 100644
index 0000000000..141084ed9e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitor.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.visitors;
+
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import io.reactivex.Observable;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Enforce read permission on filter join.
+ */
+public class VerifyFieldAccessFilterExpressionVisitor implements FilterExpressionVisitor<Boolean> {
+    private PersistentResource<?> resource;
+
+    public VerifyFieldAccessFilterExpressionVisitor(PersistentResource<?> resource) {
+        this.resource = resource;
+    }
+
+    /**
+     * Enforce ReadPermission on provided query filter.
+     *
+     * @return true if allowed, false if rejected
+     */
+    @Override
+    public Boolean visitPredicate(FilterPredicate filterPredicate) {
+        RequestScope requestScope = resource.getRequestScope();
+        Set<PersistentResource> val = Collections.singleton(resource);
+
+        PermissionExecutor permissionExecutor = requestScope.getPermissionExecutor();
+
+        ExpressionResult result = permissionExecutor.evaluateFilterJoinUserChecks(resource, filterPredicate);
+
+        if (result == ExpressionResult.UNEVALUATED) {
+            result = evaluateUserChecks(filterPredicate, permissionExecutor);
+        }
+        if (result == ExpressionResult.PASS) {
+            return true;
+        }
+        if (result == ExpressionResult.FAIL) {
+            return false;
+        }
+
+        for (PathElement element : filterPredicate.getPath().getPathElements()) {
+            String fieldName = element.getFieldName();
+
+            if ("this".equals(fieldName)) {
+                continue;
+            }
+
+            try {
+                val = val.stream()
+                        .filter(Objects::nonNull)
+                        .flatMap(x ->
+                                getValueChecked(x, fieldName, requestScope)
+                                        .toList(LinkedHashSet::new)
+                                        .blockingGet()
+                                        .stream())
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toSet());
+            } catch (ForbiddenAccessException e) {
+                result = permissionExecutor.handleFilterJoinReject(filterPredicate, element, e);
+                if (result == ExpressionResult.DEFERRED) {
+                    continue;
+                }
+                // pass or fail
+                return result == ExpressionResult.PASS;
+            }
+        }
+        return true;
+    }
+
+    private Observable<PersistentResource> getValueChecked(PersistentResource<?> resource, String fieldName,
+                                                           RequestScope requestScope) {
+
+        EntityDictionary dictionary = resource.getDictionary();
+
+        // checkFieldAwareReadPermissions
+        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class,
+                fieldName);
+        Object entity = resource.getObject();
+        if (entity == null || resource.getDictionary()
+                .getRelationshipType(resource.getResourceType(), fieldName) == RelationshipType.NONE) {
+            return Observable.empty();
+        }
+
+        Relationship relationship = Relationship.builder()
+                .name(fieldName)
+                .alias(fieldName)
+                .projection(EntityProjection.builder()
+                        .type(dictionary.getParameterizedType(resource.getResourceType(), fieldName))
+                        .build())
+                .build();
+        // use no filter to allow the read directly from loaded resource
+        return resource.getRelationChecked(relationship);
+    }
+
+    /**
+     * Scan the Path for user checks.
+     * <ol>
+     * <li>If all are PASS, return PASS
+     * <li>If any FAIL, return FAIL
+     * <li>Otherwise return DEFERRED
+     * </ol>
+     * @param filterPredicate filterPredicate
+     * @param permissionExecutor permissionExecutor
+     * @return ExpressionResult
+     */
+    private ExpressionResult evaluateUserChecks(FilterPredicate filterPredicate,
+            PermissionExecutor permissionExecutor) {
+        PermissionExecutor executor = resource.getRequestScope().getPermissionExecutor();
+
+        ExpressionResult ret = ExpressionResult.PASS;
+        for (PathElement element : filterPredicate.getPath().getPathElements()) {
+            ExpressionResult result;
+            try {
+                result = executor.checkUserPermissions(
+                        element.getType(),
+                        ReadPermission.class,
+                        element.getFieldName());
+            } catch (ForbiddenAccessException e) {
+                result = permissionExecutor.handleFilterJoinReject(filterPredicate, element, e);
+            }
+
+            if (result == ExpressionResult.FAIL) {
+                return ExpressionResult.FAIL;
+            }
+
+            if (result != ExpressionResult.PASS) {
+                ret = ExpressionResult.DEFERRED;
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public Boolean visitAndExpression(AndFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // are both allowed
+        return left.accept(this) && right.accept(this);
+    }
+
+    @Override
+    public Boolean visitOrExpression(OrFilterExpression expression) {
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // are both allowed
+        return left.accept(this) && right.accept(this);
+    }
+
+    @Override
+    public Boolean visitNotExpression(NotFilterExpression expression) {
+        // is negated expression allowed
+        return expression.getNegated().accept(this);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/CRUDEvent.java b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/CRUDEvent.java
new file mode 100644
index 0000000000..110f32312f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/CRUDEvent.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.lifecycle;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.DELETE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PersistentResource;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Optional;
+
+/**
+ * Captures all the bits related to a CRUD operation on a model.
+ */
+@Data
+@AllArgsConstructor
+public class CRUDEvent {
+    private LifeCycleHookBinding.Operation eventType;
+    private PersistentResource resource;
+    private String fieldName;
+    private Optional<ChangeSpec> changes;
+
+    public boolean isCreateEvent() {
+        return eventType == CREATE;
+    }
+
+    public boolean isUpdateEvent() {
+        return eventType == UPDATE;
+    }
+
+    public boolean isDeleteEvent() {
+        return eventType == DELETE;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifeCycleHook.java b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifeCycleHook.java
new file mode 100644
index 0000000000..286dc021a9
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifeCycleHook.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+
+import java.util.Optional;
+
+/**
+ * Function which will be invoked for Elide lifecycle triggers.
+ * @param <T> The elide entity type associated with this callback.
+ */
+@FunctionalInterface
+public interface LifeCycleHook<T> {
+    /**
+     * Run for a lifecycle event.
+     * @param operation CREATE, READ, UPDATE, or DELETE
+     * @param phase PRESECURITY, PRECOMMIT or POSTCOMMIT
+     * @param elideEntity The entity that triggered the event
+     * @param requestScope The request scope
+     * @param changes Optionally, the changes that were made to the entity
+     */
+    void execute(LifeCycleHookBinding.Operation operation,
+                 LifeCycleHookBinding.TransactionPhase phase,
+                 T elideEntity,
+                 RequestScope requestScope,
+                 Optional<ChangeSpec> changes);
+
+    /**
+     * Base method of life cycle hook invoked by Elide.  Includes access to the underlying
+     * CRUDEvent and the PersistentResource.
+     * @param operation CREATE, READ, UPDATE, or DELETE
+     * @param phase PRESECURITY, PRECOMMIT or POSTCOMMIT
+     * @param event The CRUD Event that triggered this hook.
+     */
+    default void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            CRUDEvent event) {
+        this.execute(
+                operation,
+                phase,
+                (T) event.getResource().getObject(),
+                event.getResource().getRequestScope(),
+                event.getChanges());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifecycleHookInvoker.java b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifecycleHookInvoker.java
new file mode 100644
index 0000000000..8ffbc70b2f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/lifecycle/LifecycleHookInvoker.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+
+import java.util.ArrayList;
+
+/**
+ * RX Java Observer which invokes a lifecycle hook function.
+ */
+public class LifecycleHookInvoker {
+
+    private EntityDictionary dictionary;
+    private LifeCycleHookBinding.Operation op;
+    private LifeCycleHookBinding.TransactionPhase phase;
+
+    public LifecycleHookInvoker(EntityDictionary dictionary,
+                                LifeCycleHookBinding.Operation op,
+                                LifeCycleHookBinding.TransactionPhase phase) {
+        this.dictionary = dictionary;
+        this.op = op;
+        this.phase = phase;
+    }
+
+    public void onNext(CRUDEvent event) {
+        ArrayList<LifeCycleHook> hooks = new ArrayList<>();
+
+        //Collect all the hooks that are keyed on a specific field.
+        hooks.addAll(dictionary.getTriggers(event.getResource().getResourceType(), op, phase, event.getFieldName()));
+
+        //Collect all the hooks that are keyed on any field.
+        if (!event.getFieldName().isEmpty()) {
+            hooks.addAll(dictionary.getTriggers(event.getResource().getResourceType(), op, phase));
+        }
+
+        //Invoke all the hooks
+        hooks.forEach(hook ->
+            hook.execute(this.op, this.phase, event)
+        );
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/pagination/Pagination.java b/elide-core/src/main/java/com/yahoo/elide/core/pagination/Pagination.java
deleted file mode 100644
index 7388281ad0..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/pagination/Pagination.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.pagination;
-
-import com.yahoo.elide.annotation.Paginate;
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-import lombok.Getter;
-import lombok.ToString;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * Encapsulates the pagination strategy.
- */
-
-@ToString
-public class Pagination {
-
-    /**
-     * Denotes the internal field names for paging.
-     */
-    public enum PaginationKey { offset, number, size, limit, totals }
-
-    public static final int DEFAULT_OFFSET = 0;
-    public static final int DEFAULT_PAGE_LIMIT = 500;
-    public static final int MAX_PAGE_LIMIT = 10000;
-
-    // For specifying which page of records is to be returned in the response
-    public static final String PAGE_NUMBER_KEY = "page[number]";
-
-    // For specifying the page size - essentially an alias for page[limit]
-    public static final String PAGE_SIZE_KEY = "page[size]";
-
-    // For specifying the first row to be returned in the response
-    public static final String PAGE_OFFSET_KEY = "page[offset]";
-
-    // For limiting the number of records returned
-    public static final String PAGE_LIMIT_KEY = "page[limit]";
-
-    // For requesting total pages/records be included in the response page meta data
-    public static final String PAGE_TOTALS_KEY = "page[totals]";
-
-    public static final Map<String, PaginationKey> PAGE_KEYS = new HashMap<>();
-    static {
-        PAGE_KEYS.put(PAGE_NUMBER_KEY, PaginationKey.number);
-        PAGE_KEYS.put(PAGE_SIZE_KEY, PaginationKey.size);
-        PAGE_KEYS.put(PAGE_OFFSET_KEY, PaginationKey.offset);
-        PAGE_KEYS.put(PAGE_LIMIT_KEY, PaginationKey.limit);
-        PAGE_KEYS.put(PAGE_TOTALS_KEY, PaginationKey.totals);
-    }
-
-    private static final String PAGE_KEYS_CSV = PAGE_KEYS.keySet().stream().collect(Collectors.joining(", "));
-
-    // For holding the page query parameters until they can be evaluated
-    private Map<PaginationKey, Integer> pageData;
-
-    @Getter
-    private int offset;
-
-    @Getter
-    private int limit;
-
-    @Getter
-    private boolean generateTotals;
-
-
-    private Pagination(Map<PaginationKey, Integer> pageData) {
-        this.pageData = pageData;
-    }
-
-    /**
-     * Given json-api paging params, generate page and pageSize values from query params.
-     *
-     * @param queryParams The page queryParams (ImmuatableMultiValueMap).
-     * @return The new Page object.
-     */
-    public static Pagination parseQueryParams(final MultivaluedMap<String, String> queryParams)
-            throws InvalidValueException {
-        final Map<PaginationKey, Integer> pageData = new HashMap<>();
-        queryParams.entrySet()
-                .forEach(paramEntry -> {
-                    final String queryParamKey = paramEntry.getKey();
-                    if (PAGE_KEYS.containsKey(queryParamKey)) {
-                        PaginationKey paginationKey = PAGE_KEYS.get(queryParamKey);
-                        if (paginationKey.equals(PaginationKey.totals)) {
-                            // page[totals] is a valueless parameter, use value of 0 just so that its presence can
-                            // be recorded in the map
-                            pageData.put(paginationKey, 0);
-                        } else {
-                            final String value = paramEntry.getValue().get(0);
-                            try {
-                                int intValue = Integer.parseInt(value, 10);
-                                pageData.put(paginationKey, intValue);
-                            } catch (NumberFormatException e) {
-                                throw new InvalidValueException("page values must be integers");
-                            }
-                        }
-                    } else if (queryParamKey.startsWith("page[")) {
-                        throw new InvalidValueException("Invalid Pagination Parameter. Accepted values are "
-                                + PAGE_KEYS_CSV);
-                    }
-                });
-        return new Pagination(pageData).evaluate(DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT);
-    }
-
-    /**
-     * Evaluates the pagination variables for default limits
-     *
-     * @param defaultLimit
-     * @param maxLimit
-     */
-    public Pagination evaluate(int defaultLimit, int maxLimit) {
-
-        if (pageData.containsKey(PaginationKey.size) || pageData.containsKey(PaginationKey.number)) {
-            // Page-based pagination strategy
-
-            if (pageData.containsKey(PaginationKey.limit) || pageData.containsKey(PaginationKey.offset)) {
-                throw new InvalidValueException("Invalid usage of pagination parameters.");
-            }
-
-            limit = pageData.containsKey(PaginationKey.size) ? pageData.get(PaginationKey.size) : defaultLimit;
-            if (limit > maxLimit) {
-                throw new InvalidValueException(
-                        "page[size] value must be less than or equal to " + maxLimit);
-            } else if (limit < 0) {
-                throw new InvalidValueException("page[size] must contain a positive value.");
-            }
-
-            int pageNumber = pageData.containsKey(PaginationKey.number) ? pageData.get(PaginationKey.number) : 1;
-            if (pageNumber < 1) {
-                throw new InvalidValueException("page[number] must contain a positive value.");
-            }
-
-            offset = pageNumber > 0 ? (pageNumber - 1) * limit : 0;
-        } else if (pageData.containsKey(PaginationKey.limit) || pageData.containsKey(PaginationKey.offset)) {
-
-            // Offset-based pagination strategy
-            limit = pageData.containsKey(PaginationKey.limit)
-                    ? pageData.get(PaginationKey.limit) : defaultLimit;
-            if (limit > maxLimit) {
-                throw new InvalidValueException("page[limit] value must be less than or equal to " + maxLimit);
-            }
-
-            offset = pageData.containsKey(PaginationKey.offset) ? pageData.get(PaginationKey.offset) : 0;
-
-            if (limit < 0 || offset < 0) {
-                throw new InvalidValueException("page[offset] and page[limit] must contain positive values.");
-            }
-
-        } else {
-            limit = defaultLimit;
-            offset = 0;
-        }
-
-        generateTotals = pageData.containsKey(PaginationKey.totals);
-
-        return this;
-    }
-
-    /**
-     * Evaluates the pagination variables. Uses the Paginate annotation if it has been set for the entity to be
-     * queried.
-     *
-     * @param entityClass
-     */
-    public Pagination evaluate(final Class entityClass) {
-        Paginate paginate =
-                entityClass != null ? (Paginate) entityClass.getAnnotation(Paginate.class) : null;
-
-        int defaultLimit = paginate != null ? paginate.defaultLimit() : DEFAULT_PAGE_LIMIT;
-        int maxLimit = paginate != null ? paginate.maxLimit() : MAX_PAGE_LIMIT;
-
-        evaluate(defaultLimit, maxLimit);
-
-        generateTotals = generateTotals && (paginate == null || paginate.countable());
-
-        return this;
-    }
-
-    /**
-     * Know if this is the default instance.
-     * @return The default pagination values.
-     */
-    public boolean isDefaultInstance() {
-        return pageData.isEmpty();
-    }
-
-    /**
-     * Alias for isDefault.
-     * @return true if there are no pagination rules
-     */
-    public boolean isEmpty() {
-        return isDefaultInstance();
-    }
-
-    /**
-     * Default Instance.
-     * @return The default instance.
-     */
-    public static Pagination getDefaultPagination() {
-        Pagination defaultPagination = new Pagination(new HashMap<>());
-        defaultPagination.offset = DEFAULT_OFFSET;
-        defaultPagination.limit = DEFAULT_PAGE_LIMIT;
-        return defaultPagination;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java b/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java
new file mode 100644
index 0000000000..6ebfd7d3c7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.pagination;
+
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.annotation.Paginate;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableMap;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Holds state associated with pagination.
+ */
+@ToString
+@EqualsAndHashCode
+public class PaginationImpl implements Pagination {
+    /**
+     * Denotes the internal field names for paging.
+     */
+    public enum PaginationKey { offset, number, size, limit, totals }
+
+    // For specifying which page of records is to be returned in the response
+    public static final String PAGE_NUMBER_KEY = "page[number]";
+
+    // For specifying the page size - essentially an alias for page[limit]
+    public static final String PAGE_SIZE_KEY = "page[size]";
+
+    // For specifying the first row to be returned in the response
+    public static final String PAGE_OFFSET_KEY = "page[offset]";
+
+    // For limiting the number of records returned
+    public static final String PAGE_LIMIT_KEY = "page[limit]";
+
+    // For requesting total pages/records be included in the response page meta data
+    public static final String PAGE_TOTALS_KEY = "page[totals]";
+
+    public static final Map<String, PaginationKey> PAGE_KEYS = ImmutableMap.of(
+            PAGE_NUMBER_KEY, PaginationKey.number,
+            PAGE_SIZE_KEY, PaginationKey.size,
+            PAGE_OFFSET_KEY, PaginationKey.offset,
+            PAGE_LIMIT_KEY, PaginationKey.limit,
+            PAGE_TOTALS_KEY, PaginationKey.totals);
+
+    @Getter
+    @Setter
+    private Long pageTotals = 0L;
+
+    private static final String PAGE_KEYS_CSV = PAGE_KEYS.keySet().stream().collect(Collectors.joining(", "));
+
+    @Getter
+    private final int offset;
+
+    @Getter
+    private final int limit;
+
+    private final boolean generateTotals;
+
+    @Getter
+    private final boolean defaultInstance;
+
+    @Getter
+    private final Type<?> entityClass;
+
+    /**
+     * Constructor.
+     * @param entityClass The type of collection we are paginating.
+     * @param clientOffset The client requested offset or null if not provided.
+     * @param clientLimit The client requested limit or null if not provided.
+     * @param systemDefaultLimit The system default limit (in terms of records).
+     * @param systemMaxLimit The system max limit (in terms of records).
+     * @param generateTotals Whether to return the total number of records.
+     * @param pageByPages Whether to page by pages or records.
+     */
+    public PaginationImpl(Class<?> entityClass,
+                          Integer clientOffset,
+                          Integer clientLimit,
+                          int systemDefaultLimit,
+                          int systemMaxLimit,
+                          Boolean generateTotals,
+                          Boolean pageByPages) {
+        this(ClassType.of(entityClass), clientOffset, clientLimit,
+                systemDefaultLimit, systemMaxLimit, generateTotals, pageByPages);
+    }
+
+    /**
+     * Constructor.
+     * @param entityClass The type of collection we are paginating.
+     * @param clientOffset The client requested offset or null if not provided.
+     * @param clientLimit The client requested limit or null if not provided.
+     * @param systemDefaultLimit The system default limit (in terms of records).
+     * @param systemMaxLimit The system max limit (in terms of records).
+     * @param generateTotals Whether to return the total number of records.
+     * @param pageByPages Whether to page by pages or records.
+     */
+    public PaginationImpl(Type<?> entityClass,
+                           Integer clientOffset,
+                           Integer clientLimit,
+                           int systemDefaultLimit,
+                           int systemMaxLimit,
+                           Boolean generateTotals,
+                           Boolean pageByPages) {
+
+        this.entityClass = entityClass;
+        this.defaultInstance = (clientOffset == null && clientLimit == null && generateTotals == null);
+
+        Paginate paginate = entityClass != null ? (Paginate) entityClass.getAnnotation(Paginate.class) : null;
+
+        this.limit = clientLimit != null
+                ? clientLimit
+                : (paginate != null ? paginate.defaultLimit() : systemDefaultLimit);
+
+        int maxLimit = paginate != null ? paginate.maxLimit() : systemMaxLimit;
+
+        String pageSizeLabel = pageByPages ? "size" : "limit";
+
+        if (limit > maxLimit && !defaultInstance) {
+            throw new InvalidValueException("Pagination "
+                    + pageSizeLabel + " must be less than or equal to " + maxLimit);
+        }
+        if (limit < 1) {
+            throw new InvalidValueException("Pagination "
+                    + pageSizeLabel + " must contain a positive, non-zero value.");
+        }
+
+        this.generateTotals = generateTotals != null && generateTotals && (paginate == null || paginate.countable());
+
+        if (pageByPages) {
+            int pageNumber = clientOffset != null ? clientOffset : 1;
+            if (pageNumber < 1) {
+                throw new InvalidValueException("Pagination number must be a positive, non-zero value.");
+            }
+            this.offset = (pageNumber - 1) * limit;
+        } else {
+            this.offset = clientOffset != null ? clientOffset : 0;
+
+            if (offset < 0) {
+                throw new InvalidValueException("Pagination offset must contain a positive value.");
+            }
+        }
+    }
+
+    /**
+     * Whether or not the client requested to return page totals.
+     * @return true if page totals should be returned.
+     */
+    @Override
+    public boolean returnPageTotals() {
+        return generateTotals;
+    }
+
+    /**
+     * Given json-api paging params, generate page and pageSize values from query params.
+     *
+     * @param entityClass The collection type.
+     * @param queryParams The page queryParams.
+     * @param elideSettings Elide settings containing pagination default limits
+     * @return The new Pagination object.
+     * @throws InvalidValueException invalid query parameter
+     */
+    public static PaginationImpl parseQueryParams(Type<?> entityClass,
+                                                  final MultivaluedMap<String, String> queryParams,
+                                                  ElideSettings elideSettings)
+            throws InvalidValueException {
+
+        if (queryParams.isEmpty()) {
+            return getDefaultPagination(entityClass, elideSettings);
+        }
+
+        final Map<PaginationKey, Integer> pageData = new HashMap<>();
+        queryParams.entrySet()
+                .forEach(paramEntry -> {
+                    final String queryParamKey = paramEntry.getKey();
+                    if (PAGE_KEYS.containsKey(queryParamKey)) {
+                        PaginationKey paginationKey = PAGE_KEYS.get(queryParamKey);
+                        if (paginationKey.equals(PaginationKey.totals)) {
+                            // page[totals] is a valueless parameter, use value of 0 just so that its presence can
+                            // be recorded in the map
+                            pageData.put(paginationKey, 0);
+                        } else {
+                            final String value = paramEntry.getValue().get(0);
+                            try {
+                                int intValue = Integer.parseInt(value, 10);
+                                pageData.put(paginationKey, intValue);
+                            } catch (NumberFormatException e) {
+                                throw new InvalidValueException("page values must be integers");
+                            }
+                        }
+                    } else if (queryParamKey.startsWith("page[")) {
+                        throw new InvalidValueException("Invalid Pagination Parameter. Accepted values are "
+                                + PAGE_KEYS_CSV);
+                    }
+                });
+        return getPagination(entityClass, pageData, elideSettings);
+    }
+
+
+    /**
+     * Construct a pagination object from page data and elide settings.
+     *
+     * @param entityClass The collection type.
+     * @param pageData Map containing pagination information
+     * @param elideSettings Settings containing pagination defaults
+     * @return Pagination object
+     */
+    private static PaginationImpl getPagination(Type<?> entityClass, Map<PaginationKey, Integer> pageData,
+                                                ElideSettings elideSettings) {
+        if (hasInvalidCombination(pageData)) {
+            throw new InvalidValueException("Invalid usage of pagination parameters.");
+        }
+
+        boolean pageByPages = false;
+        Integer offset = pageData.getOrDefault(PaginationKey.offset, null);
+        Integer limit = pageData.getOrDefault(PaginationKey.limit, null);
+
+        if (pageData.containsKey(PaginationKey.size) || pageData.containsKey(PaginationKey.number)) {
+            pageByPages = true;
+            offset = pageData.getOrDefault(PaginationKey.number, null);
+            limit = pageData.getOrDefault(PaginationKey.size, null);
+        }
+
+        return new PaginationImpl(entityClass,
+                offset,
+                limit,
+                elideSettings.getDefaultPageSize(),
+                elideSettings.getDefaultMaxPageSize(),
+                pageData.containsKey(PaginationKey.totals) ? true : null,
+                pageByPages);
+    }
+
+    private static boolean hasInvalidCombination(Map<PaginationKey, Integer> pageData) {
+        return (pageData.containsKey(PaginationKey.size) || pageData.containsKey(PaginationKey.number))
+                && (pageData.containsKey(PaginationKey.limit) || pageData.containsKey(PaginationKey.offset));
+    }
+
+
+    /**
+     * Default Instance.
+     * @param elideSettings general Elide settings
+     * @return The default instance.
+     */
+    public static PaginationImpl getDefaultPagination(Type<?> entityClass, ElideSettings elideSettings) {
+        return new PaginationImpl(
+                entityClass,
+                null,
+                null,
+                elideSettings.getDefaultPageSize(),
+                elideSettings.getDefaultMaxPageSize(),
+                null,
+                false);
+    }
+
+    /**
+     * Default Instance.
+     * @return The default instance.
+     */
+    public static PaginationImpl getDefaultPagination(Type<?> entityClass) {
+        return new PaginationImpl(
+                entityClass,
+                null,
+                null,
+                DEFAULT_PAGE_LIMIT,
+                MAX_PAGE_LIMIT,
+                null,
+                false);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/Argument.java b/elide-core/src/main/java/com/yahoo/elide/core/request/Argument.java
new file mode 100644
index 0000000000..472d323687
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/Argument.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Represents an argument passed to an attribute.
+ */
+@Value
+@Builder
+public class Argument {
+
+    // square brackets having non-empty argument name and  encoded agument value separated by ':'
+    // eg: [grain:month] , [foo:bar][blah:Encoded+Value]
+    public static final Pattern ARGUMENTS_PATTERN = Pattern.compile("\\[(\\w+):([^\\]]+)\\]");
+
+    @NonNull
+    String name;
+
+    Object value;
+
+    /**
+     * Returns the argument type.
+     * @return the argument type.
+     */
+    public Class<?> getType() {
+        return value.getClass();
+    }
+
+    /**
+     * Parses input string and returns a set of {@link Argument}.
+     *
+     * @param argsString String to parse for arguments.
+     * @return A Set of {@link Argument}.
+     * @throws UnsupportedEncodingException
+     */
+    public static Set<Argument> getArgumentsFromString(String argsString) throws UnsupportedEncodingException {
+        Set<Argument> arguments = new HashSet<>();
+
+        if (!isEmpty(argsString)) {
+
+            Matcher matcher = ARGUMENTS_PATTERN.matcher(argsString);
+            while (matcher.find()) {
+                arguments.add(Argument.builder()
+                                .name(matcher.group(1))
+                                .value(URLDecoder.decode(matcher.group(2), StandardCharsets.UTF_8.name()))
+                                .build());
+            }
+        }
+
+        return arguments;
+    }
+
+    /**
+     * Converts Set of {@link Argument} into Map.
+     * @param arguments Set of {@link Argument}.
+     * @return a Map of {@link Argument}.
+     */
+    public static Map<String, Argument> getArgumentMapFromArgumentSet(Set<Argument> arguments) {
+        return arguments.stream()
+                        .collect(Collectors.toMap(Argument::getName, Function.identity()));
+    }
+
+    /**
+     * Parses input string and returns a Map of {@link Argument}.
+     *
+     * @param argsString String to parse for arguments.
+     * @return a Map of {@link Argument}.
+     * @throws UnsupportedEncodingException
+     */
+    public static Map<String, Argument> getArgumentMapFromString(String argsString)
+                    throws UnsupportedEncodingException {
+        return getArgumentMapFromArgumentSet(getArgumentsFromString(argsString));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/Attribute.java b/elide-core/src/main/java/com/yahoo/elide/core/request/Attribute.java
new file mode 100644
index 0000000000..4e664e0591
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/Attribute.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.Singular;
+import lombok.ToString;
+
+import java.util.Set;
+
+/**
+ * Represents an attribute on an Elide entity.  Attributes can take arguments.
+ */
+@Data
+@Builder
+public class Attribute {
+    @NonNull
+    @ToString.Exclude
+    private Type<?> type;
+
+    @NonNull
+    private String name;
+
+    @ToString.Exclude
+    private String alias;
+
+    @Singular
+    @ToString.Exclude
+    private Set<Argument> arguments;
+
+    private Attribute(@NonNull Type<?> type, @NonNull String name, String alias, Set<Argument> arguments) {
+        this.type = type;
+        this.name = name;
+        this.alias = alias == null ? name : alias;
+        this.arguments = arguments;
+    }
+
+    public static class AttributeBuilder {
+
+        public Attribute.AttributeBuilder type(Type<?> type) {
+            this.type = type;
+            return this;
+        }
+
+        public Attribute.AttributeBuilder type(Class<?> type) {
+            this.type = ClassType.of(type);
+            return this;
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/EntityProjection.java b/elide-core/src/main/java/com/yahoo/elide/core/request/EntityProjection.java
new file mode 100644
index 0000000000..46f5d2eddf
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/EntityProjection.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Streams;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.ToString;
+
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Represents a client data request against a subgraph of the entity relationship graph.
+ */
+@Data
+@Builder
+@AllArgsConstructor
+public class EntityProjection {
+    @NonNull
+    private Type<?> type;
+
+    private Set<Attribute> attributes;
+
+    private Set<Relationship> relationships;
+
+    private FilterExpression filterExpression;
+
+    private Sorting sorting;
+
+    private Pagination pagination;
+    //TODO: Remove this exclude
+    @ToString.Exclude
+    private Set<Argument> arguments;
+
+    public Set<String> getRequestedFields() {
+        return Streams.concat(
+                attributes.stream().map(Attribute::getName),
+                relationships.stream().map(Relationship::getName)
+        ).collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Creates a builder initialized as a copy of this collection.
+     * @return The new builder
+     */
+    public EntityProjectionBuilder copyOf() {
+        return EntityProjection.builder()
+                .type(this.type)
+                .attributes(new LinkedHashSet<>(attributes))
+                .relationships(new LinkedHashSet<>(this.relationships))
+                .filterExpression(this.filterExpression)
+                .sorting(this.sorting)
+                .pagination(this.pagination)
+                .arguments(new LinkedHashSet<>(this.arguments));
+    }
+
+    public Set<String> getIncludedRelationsName() {
+        return getRelationships().stream()
+                .map(relationship -> relationship.getName()).collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns a relationship subgraph by name.
+     * @param name The name of the relationship.
+     * @return
+     */
+    public Optional<Relationship> getRelationship(String name) {
+        return relationships.stream()
+                .filter((relationship) -> relationship.getName().equalsIgnoreCase(name))
+                .findFirst();
+    }
+
+    /**
+     * Returns a relationship subgraph by name.
+     * @param name The name of the relationship.
+     * @param name The alias of the relationship.
+     * @return
+     */
+    public Optional<Relationship> getRelationship(String name, String alias) {
+        return relationships.stream()
+                .filter((relationship) -> relationship.getName().equalsIgnoreCase(name))
+                .filter((relationship) -> relationship.getAlias().equalsIgnoreCase(alias))
+                .findFirst();
+    }
+
+    /**
+     * Recursively merges two EntityProjections.
+     * @param toMerge The projection to merge
+     * @return A newly created and merged EntityProjection.
+     */
+    public EntityProjection merge(EntityProjection toMerge) {
+        EntityProjectionBuilder merged = copyOf();
+
+        for (Relationship relationship: toMerge.getRelationships()) {
+            EntityProjection theirs = relationship.getProjection();
+
+            Relationship ourRelationship =  getRelationship(relationship.getName(),
+                    relationship.getAlias()).orElse(null);
+
+            if (ourRelationship != null) {
+                merged.relationships.remove(ourRelationship);
+                merged.relationships.add((Relationship.builder()
+                        .name(relationship.getName())
+                        .alias(relationship.getAlias())
+                        .projection(ourRelationship.getProjection().merge(theirs))
+                        .build()));
+            } else {
+                merged.relationships.add((relationship));
+            }
+        }
+        if (toMerge.getPagination() != null) {
+            merged.pagination = toMerge.getPagination();
+        }
+
+        if (toMerge.getSorting() != null) {
+            merged.sorting = toMerge.getSorting();
+        }
+
+        if (toMerge.getFilterExpression() != null) {
+            merged.filterExpression = toMerge.getFilterExpression();
+        }
+
+        merged.attributes.addAll(toMerge.attributes);
+
+        merged.arguments.addAll(toMerge.arguments);
+
+        return merged.build();
+    }
+
+    /**
+     * Customizes the lombok builder to our needs.
+     */
+    public static class EntityProjectionBuilder {
+        @Getter
+        private Type<?> type;
+
+        private Set<Relationship> relationships = new LinkedHashSet<>();
+
+        @Getter
+        private Set<Attribute> attributes = new LinkedHashSet<>();
+
+        @Getter
+        private Set<Argument> arguments = new LinkedHashSet<>();
+
+        @Getter
+        private FilterExpression filterExpression;
+
+        @Getter
+        private Sorting sorting;
+
+        @Getter
+        private Pagination pagination;
+
+        public EntityProjectionBuilder type(Type<?> type) {
+            this.type = type;
+            return this;
+        }
+
+        public EntityProjectionBuilder type(Class<?> cls) {
+            this.type = ClassType.of(cls);
+            return this;
+        }
+
+        public EntityProjectionBuilder relationships(Set<Relationship> relationships) {
+            this.relationships = relationships;
+            return this;
+        }
+
+        public EntityProjectionBuilder attributes(Set<Attribute> attributes) {
+            this.attributes = attributes;
+            return this;
+        }
+
+        public EntityProjectionBuilder arguments(Set<Argument> arguments) {
+            this.arguments = arguments;
+            return this;
+        }
+
+        public EntityProjectionBuilder relationship(String name, EntityProjection projection) {
+            return relationship(Relationship.builder()
+                    .alias(name)
+                    .name(name)
+                    .projection(projection)
+                    .build());
+        }
+
+        /**
+         * Add a new argument into this project or merge an existing argument that has same name.
+         *
+         * argument argument new argument to add
+         * @return this builder after adding the argument
+         */
+        public EntityProjectionBuilder argument(Argument argument) {
+            String argumentName = argument.getName();
+
+            Argument existing = arguments.stream()
+                    .filter(a -> a.getName().equals(argumentName))
+                    .findFirst().orElse(null);
+
+            if (existing != null) {
+                arguments.remove(existing);
+            }
+            arguments.add(argument);
+
+            return this;
+        }
+
+        /**
+         * Add a new relationship into this project or merge an existing relationship that has same field name
+         * and alias as this relationship. If there exists another attribute/relationship of different field that is
+         * using the same alias, it would throw exception because that's ambiguous.
+         *
+         * @param relationship new relationship to add
+         * @return this builder after adding the relationship
+         */
+        public EntityProjectionBuilder relationship(Relationship relationship) {
+            String relationshipName = relationship.getName();
+            String relationshipAlias = relationship.getAlias();
+
+            Relationship existing = relationships.stream()
+                    .filter(r -> r.getName().equals(relationshipName) && r.getAlias().equals(relationshipAlias))
+                    .findFirst().orElse(null);
+
+            if (existing != null) {
+                relationships.remove(existing);
+                relationships.add(Relationship.builder()
+                        .name(relationshipName)
+                        .alias(relationshipAlias)
+                        .projection(existing.getProjection().merge(relationship.getProjection()))
+                        .build());
+            } else {
+                if (isAmbiguous(relationshipName, relationshipAlias)) {
+                    throw new BadRequestException(
+                            String.format("Alias {%s}.{%s} is ambiguous.", type, relationshipAlias)
+                    );
+                }
+                relationships.add(relationship);
+            }
+
+            return this;
+        }
+
+        /**
+         * Add a new attribute into this project or merge an existing attribute that has same field name
+         * and alias as this attribute. If there exists another attribute/relationship of different field that is
+         * using the same alias, it would throw exception because that's ambiguous.
+         *
+         * @param attribute new attribute to add
+         * @return this builder after adding the attribute
+         */
+        public EntityProjectionBuilder attribute(Attribute attribute) {
+            String attributeName = attribute.getName();
+            String attributeAlias = attribute.getAlias();
+
+            Attribute existing = attributes.stream()
+                    .filter(a -> a.getName().equals(attributeName) && a.getAlias().equals(attributeAlias))
+                    .findFirst().orElse(null);
+
+            if (existing != null) {
+                attributes.remove(existing);
+                attributes.add(Attribute.builder()
+                        .type(attribute.getType())
+                        .name(attributeName)
+                        .alias(attributeAlias)
+                        .arguments(Sets.union(attribute.getArguments(), existing.getArguments()))
+                        .build());
+            } else {
+                if (isAmbiguous(attributeName, attributeAlias)) {
+                    throw new BadRequestException(
+                            String.format("Alias {%s}.{%s} is ambiguous.", type, attributeAlias)
+                    );
+                }
+                attributes.add(attribute);
+            }
+
+            return this;
+        }
+
+        /**
+         * Get an attribute by alias.
+         *
+         * @param attributeAlias alias to refer to an attribute field
+         * @return found attribute or null
+         */
+        public Attribute getAttributeByAlias(String attributeAlias) {
+            return attributes.stream()
+                    .filter(attribute -> attribute.getAlias().equals(attributeAlias))
+                    .findAny()
+                    .orElse(null);
+        }
+
+        /**
+         * Check whether a field alias is ambiguous.
+         *
+         * @param fieldName field that the alias is bound to
+         * @param alias an field alias
+         * @return whether new alias would cause ambiguous
+         */
+        private boolean isAmbiguous(String fieldName, String alias) {
+            return attributes.stream().anyMatch(a -> !fieldName.equals(a.getName()) && alias.equals(a.getAlias()))
+                    || relationships.stream().anyMatch(
+                            r -> !fieldName.equals(r.getName()) && alias.equals(r.getAlias()));
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/Pagination.java b/elide-core/src/main/java/com/yahoo/elide/core/request/Pagination.java
new file mode 100644
index 0000000000..b62e9fe6a3
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/Pagination.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+/**
+ * Represents a client request to paginate a collection.
+ */
+public interface Pagination {
+
+    /**
+     * Default offset (in records) it client does not provide one.
+     */
+    int DEFAULT_OFFSET = 0;
+
+    /**
+     * Default page limit (in records) it client does not provide one.
+     */
+    int DEFAULT_PAGE_LIMIT = 500;
+
+    /**
+     * Maximum allowable page limit (in records).
+     */
+    int MAX_PAGE_LIMIT = 10000;
+
+    /**
+     * Get the page offset.
+     * @return record offset.
+     */
+    int getOffset();
+
+    /**
+     * Get the page limit.
+     * @return record limit.
+     */
+    int getLimit();
+
+    /**
+     * Whether or not to fetch the collection size or not.
+     * @return true if the client wants the total size of the collection.
+     */
+    boolean returnPageTotals();
+
+    /**
+     * Get the total size of the collection.
+     * @return total record count.
+     */
+    Long getPageTotals();
+
+    /**
+     * Set the total size of the collection.
+     * @param pageTotals the total size.
+     */
+    void setPageTotals(Long pageTotals);
+
+    /**
+     * Is this the default instance (not present).
+     * @return true if pagination wasn't requested.  False otherwise.
+     */
+    boolean isDefaultInstance();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/Relationship.java b/elide-core/src/main/java/com/yahoo/elide/core/request/Relationship.java
new file mode 100644
index 0000000000..4cd05e7d69
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/Relationship.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * Represents a relationship on an Elide entity.
+ */
+@Data
+@Builder
+public class Relationship {
+
+    public RelationshipBuilder copyOf() {
+        return Relationship.builder()
+                .alias(alias)
+                .name(name)
+                .projection(projection);
+    }
+
+    @NonNull
+    private String name;
+
+    private String alias;
+
+    @NonNull
+    private EntityProjection projection;
+
+    private Relationship(@NonNull String name, String alias, @NonNull EntityProjection projection) {
+        this.name = name;
+        this.alias = alias == null ? name : alias;
+        this.projection = projection;
+    }
+
+    public Relationship merge(Relationship toMerge) {
+        return Relationship.builder()
+                .name(name)
+                .alias(alias)
+                .projection(projection.merge(toMerge.projection))
+                .build();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/request/Sorting.java b/elide-core/src/main/java/com/yahoo/elide/core/request/Sorting.java
new file mode 100644
index 0000000000..d4fcb389a4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/request/Sorting.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.request;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.type.Type;
+
+import java.util.Map;
+
+/**
+ * Represents a client request to sort a collection.
+ */
+public interface Sorting {
+
+   /**
+    * Denotes the intended sort direction (ascending or descending).
+    */
+    public enum SortOrder { asc, desc }
+
+    /**
+     * Return an ordered map of paths and their sort order.
+     * @param <T> The type to sort.
+     * @return An ordered map of paths and their sort order.
+     */
+    public <T> Map<Path, SortOrder> getSortingPaths();
+
+    /**
+     * Get the type of the collection to sort.
+     * @return the collection type.
+     */
+    public Type<?> getType();
+
+    /**
+     * Is this sorting the default instance (not present).
+     * @return true if sorting wasn't requested.  False otherwise.
+     */
+    public boolean isDefaultInstance();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/ChangeSpec.java b/elide-core/src/main/java/com/yahoo/elide/core/security/ChangeSpec.java
new file mode 100644
index 0000000000..0fb2fcc863
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/ChangeSpec.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * ChangeSpec for a particular field.
+ */
+@AllArgsConstructor
+public class ChangeSpec {
+    @Getter private final PersistentResource resource;
+    @Getter private final String fieldName;
+    @Getter private final Object original;
+    @Getter private final Object modified;
+
+    @Override
+    public String toString() {
+        return String.format("ChangeSpec { resource=%s, field=%s, original=%s, modified=%s}",
+                safe(resource),
+                fieldName,
+                safe(original),
+                safe(modified));
+    }
+
+    private String safe(Object object) {
+        try {
+            return String.valueOf(object);
+        } catch (Exception e) {
+            return e.toString();
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/PermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/PermissionExecutor.java
new file mode 100644
index 0000000000..ae5d0e4ff5
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/PermissionExecutor.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.VerifyFieldAccessFilterExpressionVisitor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.Type;
+
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Interface describing classes responsible for managing the life-cycle and execution of checks.
+ *
+ * Checks are expected to throw exceptions upon failures.
+ */
+public interface PermissionExecutor {
+    /**
+     * Check permission on class.
+     *
+     * @param <A> type parameter
+     * @param annotationClass annotation class
+     * @param resource resource
+     * @see com.yahoo.elide.annotation.CreatePermission
+     * @see com.yahoo.elide.annotation.ReadPermission
+     * @see com.yahoo.elide.annotation.UpdatePermission
+     * @see com.yahoo.elide.annotation.DeletePermission
+     * @return the results of evaluating the permission
+     */
+    default <A extends Annotation> ExpressionResult checkPermission(
+            Class<A> annotationClass,
+            PersistentResource resource
+    ) {
+        return checkPermission(annotationClass, resource, null);
+    }
+
+    /**
+     * Check permission on class.
+     *
+     * @param <A> type parameter
+     * @param annotationClass annotation class
+     * @param resource resource
+     * @param requestedFields the list of requested fields
+     * @see com.yahoo.elide.annotation.CreatePermission
+     * @see com.yahoo.elide.annotation.ReadPermission
+     * @see com.yahoo.elide.annotation.UpdatePermission
+     * @see com.yahoo.elide.annotation.DeletePermission
+     * @return the results of evaluating the permission
+     */
+    <A extends Annotation> ExpressionResult checkPermission(
+            Class<A> annotationClass,
+            PersistentResource resource,
+            Set<String> requestedFields
+    );
+
+    /**
+     * Check for permissions on a specific field.
+     *
+     * @param <A> type parameter
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     * @return the results of evaluating the permission
+     */
+    <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
+            ChangeSpec changeSpec,
+            Class<A> annotationClass,
+            String field);
+
+    /**
+     * Check for permissions on a specific field deferring all checks.
+     *
+     * @param <A> type parameter
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     * @return the results of evaluating the permission
+     */
+    <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
+            ChangeSpec changeSpec,
+            Class<A> annotationClass,
+            String field);
+
+    /**
+     * Check strictly user permissions on an entity.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param requestedFields The list of client requested fields
+     * @return the results of evaluating the permission
+     */
+    <A extends Annotation> ExpressionResult checkUserPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> requestedFields
+    );
+
+    /**
+     * Check strictly user permissions on an entity field.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param field The entity field
+     */
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+            Class<A> annotationClass,
+            String field);
+
+    /**
+     * Get the read filter, if defined.
+     *
+     * @param resourceClass the class to check for a filter
+     * @param requestedFields the set of requested fields
+     * @return the an optional containg the filter
+     */
+    Optional<FilterExpression> getReadPermissionFilter(Type<?> resourceClass, Set<String> requestedFields);
+
+    /**
+     * Execute commit checks.
+     */
+    void executeCommitChecks();
+
+    /**
+     * Logs useful information about the check evaluation.
+     *
+     */
+    default void logCheckStats() {
+    }
+
+    /**
+     * Whether or not the permission executor will return verbose logging to the requesting user in the response.
+     *
+     * @return True if verbose, false otherwise.
+     */
+    default boolean isVerbose() {
+        return false;
+    }
+
+    /**
+     * Evaluate filterPredicate for a provided resource, or return PASS or FAIL.
+     * Return UNEVALUATED for default handling.
+     * Return DEFERRED to skip default user check handling.
+     * @see VerifyFieldAccessFilterExpressionVisitor#visitPredicate
+     *
+     * @param resource resource
+     * @param filterPredicate filterPredicate
+     * @return PASS, FAIL or UNEVALUATED
+     */
+    default ExpressionResult evaluateFilterJoinUserChecks(PersistentResource<?> resource,
+            FilterPredicate filterPredicate) {
+        return ExpressionResult.UNEVALUATED;
+    }
+
+    /**
+     * Allow customized enforcement of ReadPermission for filter joins in VerifyFieldAccessFilterExpressionVisitor
+     * Return PASS to allow filtering on the unreadable element and stop evaluating the path.
+     * Return DEFERRED to allow filtering on the the unreadable element and continue checking the path.
+     * Return FAILED to reject filtering on the unreadable field.  This is the default.
+     * @see VerifyFieldAccessFilterExpressionVisitor#visitPredicate
+     *
+     * @param filterPredicate filterPredicate
+     * @param pathElement pathElement
+     * @param reason ForbiddenAccessException
+     * @return PASS, FAIL or DEFERRED
+     */
+    default ExpressionResult handleFilterJoinReject(
+            FilterPredicate filterPredicate,
+            PathElement pathElement,
+            ForbiddenAccessException reason) {
+        return ExpressionResult.FAIL;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/PersistentResource.java b/elide-core/src/main/java/com/yahoo/elide/core/security/PersistentResource.java
new file mode 100644
index 0000000000..46bddfb2ec
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/PersistentResource.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import com.yahoo.elide.core.type.Type;
+
+import java.util.Optional;
+
+/**
+ * The persistent resource interface passed to change specs.
+ * @param <T> resource type
+ */
+public interface PersistentResource<T> {
+
+    boolean matchesId(String id);
+
+    Optional<String> getUUID();
+    String getId();
+    String getTypeName();
+
+    T getObject();
+    Type<T> getResourceType();
+    RequestScope getRequestScope();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/RequestScope.java b/elide-core/src/main/java/com/yahoo/elide/core/security/RequestScope.java
new file mode 100644
index 0000000000..fb57d3588a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/RequestScope.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The request scope interface passed to checks.
+ */
+public interface RequestScope {
+    User getUser();
+    String getApiVersion();
+    String getRequestHeaderByName(String headerName);
+    String getBaseUrlEndPoint();
+    Map<String, List<String>> getQueryParams();
+    DataStoreTransaction getTransaction();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/User.java b/elide-core/src/main/java/com/yahoo/elide/core/security/User.java
new file mode 100644
index 0000000000..a5496a8e44
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/User.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import lombok.Getter;
+
+import java.security.Principal;
+
+/**
+ * Wrapper for opaque user passed in every request.
+ */
+public class User {
+    @Getter private final Principal principal;
+
+    public User(Principal principal) {
+        this.principal = principal;
+    }
+
+    public String getName() {
+        return principal != null ? principal.getName() : null;
+    }
+
+    public boolean isInRole(String role) {
+        return false;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/Check.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/Check.java
new file mode 100644
index 0000000000..96d6a548d7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/Check.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.checks;
+/**
+ * Custom security access that verifies whether a user belongs to a role.
+ * Permissions are assigned as a set of checks that grant access to the permission.
+ */
+public interface Check {
+
+    /**
+     * Should the check forced to be run at transaction commit or not.
+     *
+     * @return true to run at transaction commit
+     */
+    default boolean runAtCommit() {
+        return false;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/FilterExpressionCheck.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/FilterExpressionCheck.java
new file mode 100644
index 0000000000..6f5eec2908
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/FilterExpressionCheck.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.checks;
+
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.FilterExpressionCheckEvaluationVisitor;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.type.Type;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+/**
+ * Check for FilterExpression. This is a super class for user defined FilterExpression check. The subclass should
+ * override getFilterExpression function and return a FilterExpression which will be passed down to datastore.
+ *
+ * @param <T> Type of class
+ */
+@Slf4j
+public abstract class FilterExpressionCheck<T> extends OperationCheck<T> {
+
+    /**
+     * Returns a FilterExpression from FilterExpressionCheck.
+     *
+     * @param entityClass entity type
+     * @param requestScope Request scope object
+     * @return FilterExpression for FilterExpressionCheck.
+     */
+    public abstract FilterExpression getFilterExpression(Type<?> entityClass, RequestScope requestScope);
+
+    /**
+     * The filter expression is evaluated in memory if it cannot be pushed to the data store by elide for any reason.
+     *
+     * @param object object returned from datastore
+     * @param requestScope Request scope object
+     * @param changeSpec Summary of modifications
+     * @return true if the object pass evaluation against FilterExpression.
+     */
+    @Override
+    public final boolean ok(T object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+        EntityDictionary dictionary = coreScope(requestScope).getDictionary();
+        Type<?> entityClass = dictionary.lookupBoundClass(EntityDictionary.getType(object));
+        FilterExpression filterExpression = getFilterExpression(entityClass, requestScope);
+        return filterExpression.accept(new FilterExpressionCheckEvaluationVisitor(object, this, requestScope));
+    }
+
+    /**
+     * Applies a filter predicate to the object in question.
+     *
+     * @param object object returned from datastore
+     * @param filterPredicate A predicate from filterExpressionCheck
+     * @param requestScope Request scope object
+     * @return true if the object pass evaluation against Predicate.
+     */
+    public boolean applyPredicateToObject(T object, FilterPredicate filterPredicate, RequestScope requestScope) {
+        try {
+            com.yahoo.elide.core.RequestScope scope = coreScope(requestScope);
+            Predicate<T> fn = filterPredicate.getOperator()
+                    .contextualize(filterPredicate.getPath(), filterPredicate.getValues(), scope);
+            return fn.test(object);
+        } catch (Exception e) {
+            log.error("Failed to apply predicate {}", filterPredicate, e);
+            return false;
+        }
+    }
+
+    @Override
+    public final boolean runAtCommit() {
+        return false;
+    }
+
+    /**
+     * Converts FieldExpressionPath value to corresponding list of Predicates.
+     *
+     * @param type         entity
+     * @param requestScope request scope
+     * @param method       associated check method name containing FieldExpressionPath
+     * @param defaultPath  path to use if no FieldExpressionPath defined
+     * @return Predicates
+     */
+    protected Path getFieldPath(Type<?> type, RequestScope requestScope, String method, String defaultPath) {
+        EntityDictionary dictionary = coreScope(requestScope).getDictionary();
+        try {
+            FilterExpressionPath fep = getFilterExpressionPath(type, method, dictionary);
+            return new Path(type, dictionary, fep == null ? defaultPath : fep.value());
+        } catch (NoSuchMethodException | SecurityException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static FilterExpressionPath getFilterExpressionPath(
+            Type<?> type,
+            String method,
+            EntityDictionary dictionary) throws NoSuchMethodException {
+        FilterExpressionPath path = dictionary.lookupBoundClass(type)
+                .getMethod(method)
+                .getAnnotation(FilterExpressionPath.class);
+        return path;
+    }
+
+    protected static com.yahoo.elide.core.RequestScope coreScope(RequestScope requestScope) {
+        return (com.yahoo.elide.core.RequestScope) requestScope;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/OperationCheck.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/OperationCheck.java
new file mode 100644
index 0000000000..d4d6068e08
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/OperationCheck.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.checks;
+
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+
+import java.util.Optional;
+
+/**
+ * Operation check interface.
+ * @see Check
+ *
+ * Operation checks are run in-line (i.e. as soon as objects are first encountered).
+ *
+ * <b>NOTE:</b> For <em>non-Read</em> operations, the object passed to this interface is not guaranteed to be complete
+ *              as it will run _BEFORE_ changes are made to the object.
+ *
+ * @param <T> Type parameter
+ */
+public abstract class OperationCheck<T> implements Check {
+    /**
+     * Determines whether the user can access the resource.
+     *
+     * @param object Fully modified object
+     * @param requestScope Request scope object
+     * @param changeSpec Summary of modifications
+     * @return true if security check passed
+     */
+    public abstract boolean ok(T object, RequestScope requestScope, Optional<ChangeSpec> changeSpec);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/UserCheck.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/UserCheck.java
new file mode 100644
index 0000000000..58b5b1f1c8
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/UserCheck.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.checks;
+
+import com.yahoo.elide.core.security.User;
+
+/**
+ * Custom security access that verifies whether a user belongs to a role.
+ * Permissions are assigned as a set of checks that grant access to the permission.
+ */
+public abstract class UserCheck implements Check {
+    /**
+     * Method reserved for user checks.
+     *
+     * @param user User to check
+     * @return True if user check passes, false otherwise
+     */
+    public abstract boolean ok(User user);
+
+    @Override
+    public final boolean runAtCommit() {
+        return false;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Collections.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Collections.java
new file mode 100644
index 0000000000..a9cda4c94e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Collections.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.checks.prefab;
+
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Checks to ensure that collections are only modified in a prescribed manner.
+ */
+public class Collections {
+
+    private static Predicate<? super ChangeSpec> changeSpecIsCollection = c -> c.getModified() instanceof Collection;
+
+    // Suppresses default constructor, ensuring non-instantiability.
+    private Collections() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Use changeSpec to enforce that values were exclusively added to the collection.
+     *
+     * @param <T> type collection to be validated
+     */
+    public static class AppendOnly<T> extends OperationCheck<T> {
+
+        @Override
+        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec
+                    .filter(changeSpecIsCollection)
+                    .filter(c -> collectionIsSuperset(c::getOriginal, c::getModified))
+                    .isPresent();
+        }
+    }
+
+    /**
+     * Use changeSpec to enforce that values were exclusively removed from the collection.
+     *
+     * @param <T> type parameter
+     */
+    public static class RemoveOnly<T> extends OperationCheck<T> {
+
+        @Override
+        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec
+                    .filter(changeSpecIsCollection)
+                    .filter(c -> collectionIsSuperset(c::getModified, c::getOriginal))
+                    .isPresent();
+        }
+
+    }
+
+    private static boolean collectionIsSuperset(Supplier<?> base, Supplier<?> potential) {
+        Collection<?> baseCollection = (Collection<?>) base.get();
+        Collection<?> potentialSuperset = (Collection<?>) potential.get();
+        return potentialSuperset.size() >= baseCollection.size()
+                && potentialSuperset.containsAll(baseCollection);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Common.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Common.java
new file mode 100644
index 0000000000..55c5643373
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Common.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.checks.prefab;
+
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.util.Optional;
+
+/**
+ * Checks that are generally applicable.
+ */
+public class Common {
+    /**
+     * A generic check which denies any mutation that sets a field value to anything other than null.
+     * The check is handy in case where we want to prevent the sharing of the child entity with a different parent
+     * but at the same time allows the removal of the child from the relationship with the existing parent
+     * @param <T> the type of object that this check guards
+     */
+    public static class FieldSetToNull<T> extends OperationCheck<T> {
+        @Override
+        public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec.filter(c -> c.getModified() == null).isPresent();
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Role.java b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Role.java
new file mode 100644
index 0000000000..28308bc551
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/checks/prefab/Role.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.checks.prefab;
+
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.UserCheck;
+
+/**
+ * Simple checks to always grant or deny.
+ */
+public class Role {
+    public static final String NONE_ROLE = "NONE";
+    public static final String ALL_ROLE = "ALL";
+    /**
+     * Check which always grants.
+     */
+    public static class ALL extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return true;
+        }
+    }
+
+    /**
+     * Check which always denies.
+     */
+    public static class NONE extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return false;
+        }
+    }
+
+    /**
+     * Check which verifies if the user is a member of a particular role.
+     */
+    public static class RoleMemberCheck extends UserCheck {
+        private String role;
+
+        public RoleMemberCheck(String role) {
+            this.role = role;
+        }
+        @Override
+        public boolean ok(User user) {
+            return user.isInRole(role);
+        }
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AbstractPermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AbstractPermissionExecutor.java
new file mode 100644
index 0000000000..91ed24bf1c
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AbstractPermissionExecutor.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.executors;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.ExpressionResultCache;
+import com.yahoo.elide.core.security.permissions.PermissionExpressionBuilder;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableSet;
+import org.apache.commons.lang3.tuple.Triple;
+import org.slf4j.Logger;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Abstract Permission Executor with common permission executor functionalities.
+ */
+public abstract class AbstractPermissionExecutor implements PermissionExecutor {
+    private final Logger log;
+    protected final Queue<AbstractPermissionExecutor.QueuedCheck> commitCheckQueue = new LinkedBlockingQueue<>();
+
+    protected final RequestScope requestScope;
+    protected final PermissionExpressionBuilder expressionBuilder;
+    protected final Map<Triple<Class<? extends Annotation>, Type, ImmutableSet<String>>, ExpressionResult>
+            userPermissionCheckCache;
+    protected final Map<String, Long> checkStats;
+
+    public AbstractPermissionExecutor(Logger log, RequestScope requestScope) {
+        ExpressionResultCache cache = new ExpressionResultCache();
+        this.log = log;
+        this.requestScope = requestScope;
+        this.expressionBuilder = new PermissionExpressionBuilder(cache, requestScope.getDictionary());
+        userPermissionCheckCache = new HashMap<>();
+        checkStats = new HashMap<>();
+    }
+
+    /**
+     * Execute commmit checks.
+     */
+    @Override
+    public void executeCommitChecks() {
+        commitCheckQueue.forEach((expr) -> {
+            Expression expression = expr.getExpression();
+            ExpressionResult result = expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+            if (result == FAIL) {
+                ForbiddenAccessException e = new ForbiddenAccessException(
+                        expr.getAnnotationClass(), expression, Expression.EvaluationMode.ALL_CHECKS);
+                if (log.isTraceEnabled()) {
+                    log.trace("{}", e.getLoggedMessage());
+                }
+                throw e;
+            }
+        });
+        commitCheckQueue.clear();
+    }
+
+    /**
+     * First attempts to check user permissions (by looking in the cache and if not present by executing user
+     * permissions).  If user permissions don't short circuit the check, run the provided expression executor.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     * @param expressionExecutor Evaluates the expression (post user check evaluation)
+     */
+    protected <A extends Annotation> ExpressionResult checkPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier,
+            Optional<Function<Expression, ExpressionResult>> expressionExecutor) {
+
+        // If the user check has already been evaluated before, return the result directly and save the building cost
+        ImmutableSet<String> immutableFields = fields == null ? null : ImmutableSet.copyOf(fields);
+        ExpressionResult expressionResult
+                = userPermissionCheckCache.get(Triple.of(annotationClass, resourceClass, immutableFields));
+
+        if (expressionResult == PASS) {
+            return expressionResult;
+        }
+
+        Expression expression = expressionSupplier.get();
+
+        if (expressionResult == null) {
+            expressionResult = executeExpressions(
+                    expression,
+                    annotationClass,
+                    Expression.EvaluationMode.USER_CHECKS_ONLY);
+
+            userPermissionCheckCache.put(
+                    Triple.of(annotationClass, resourceClass, immutableFields), expressionResult);
+
+            if (expressionResult == PASS) {
+                return expressionResult;
+            }
+        }
+
+        return expressionExecutor
+                .map(executor -> executor.apply(expression))
+                .orElse(expressionResult);
+    }
+
+    /**
+     * Only executes user permissions.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     */
+    protected <A extends Annotation> ExpressionResult checkOnlyUserPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier) {
+
+        return checkPermissions(
+                resourceClass,
+                annotationClass,
+                fields,
+                expressionSupplier,
+                Optional.empty()
+        );
+    }
+
+    /**
+     * First attempts to check user permissions (by looking in the cache and if not present by executing user
+     * permissions).  If user permissions don't short circuit the check, run the provided expression executor.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     * @param expressionExecutor Evaluates the expression (post user check evaluation)
+     */
+    protected <A extends Annotation> ExpressionResult checkPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier,
+            Function<Expression, ExpressionResult> expressionExecutor) {
+
+        return checkPermissions(
+                resourceClass,
+                annotationClass,
+                fields,
+                expressionSupplier,
+                Optional.of(expressionExecutor)
+        );
+    }
+
+    /**
+     * Execute expressions.
+     *
+     * @param expression The expression to evaluate.
+     * @param annotationClass The permission associated with the expression.
+     * @param mode The evaluation mode of the expression.
+     */
+    protected ExpressionResult executeExpressions(final Expression expression,
+                                                final Class<? extends Annotation> annotationClass,
+                                                Expression.EvaluationMode mode) {
+
+        ExpressionResult result = expression.evaluate(mode);
+
+        // Record the check
+        if (log.isTraceEnabled()) {
+            String checkKey = expression.toString();
+            Long checkOccurrences = checkStats.getOrDefault(checkKey, 0L) + 1;
+            checkStats.put(checkKey, checkOccurrences);
+        }
+
+        if (result == DEFERRED) {
+
+            /*
+             * Checking user checks only are an optimization step.  We don't need to defer these checks because
+             * INLINE_ONLY checks will be evaluated later.  Also, the user checks don't have
+             * the correct context to evaluate as COMMIT checks later.
+             */
+            if (mode == Expression.EvaluationMode.USER_CHECKS_ONLY) {
+                return DEFERRED;
+            }
+
+
+            if (isInlineOnlyCheck(annotationClass)) {
+                // Force evaluation of checks that can only be executed inline.
+                result = expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+                if (result == FAIL) {
+                    ForbiddenAccessException e = new ForbiddenAccessException(
+                            annotationClass,
+                            expression,
+                            Expression.EvaluationMode.ALL_CHECKS);
+                    if (log.isTraceEnabled()) {
+                        log.trace("{}", e.getLoggedMessage());
+                    }
+                    throw e;
+                }
+                return result;
+            }
+            commitCheckQueue.add(new AbstractPermissionExecutor.QueuedCheck(expression, annotationClass));
+            return DEFERRED;
+        }
+        if (result == FAIL) {
+            ForbiddenAccessException e = new ForbiddenAccessException(annotationClass, expression, mode);
+            if (log.isTraceEnabled()) {
+                log.trace("{}", e.getLoggedMessage());
+            }
+            throw e;
+        }
+
+        return result;
+    }
+
+    /**
+     * Check whether or not this check can only be run inline or not.
+     *
+     * @param annotationClass annotation class
+     * @return True if check can only be run inline, false otherwise.
+     */
+    private boolean isInlineOnlyCheck(final Class<? extends Annotation> annotationClass) {
+        return ReadPermission.class.isAssignableFrom(annotationClass)
+                || DeletePermission.class.isAssignableFrom(annotationClass);
+    }
+
+    /**
+     * Information container about queued checks.
+     */
+    @AllArgsConstructor
+    private static class QueuedCheck {
+        @Getter
+        private final Expression expression;
+        @Getter private final Class<? extends Annotation> annotationClass;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/executors/ActivePermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/ActivePermissionExecutor.java
new file mode 100644
index 0000000000..0ee5efdc56
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/ActivePermissionExecutor.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.executors;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.NonTransferable;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.ExpressionResultCache;
+import com.yahoo.elide.core.security.permissions.PermissionExpressionBuilder;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableSet;
+import org.apache.commons.lang3.tuple.Triple;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Default permission executor.
+ * This executor executes all security checks as outlined in the documentation.
+ */
+@Slf4j
+public class ActivePermissionExecutor implements PermissionExecutor {
+    private final Queue<QueuedCheck> commitCheckQueue = new LinkedBlockingQueue<>();
+
+    private final RequestScope requestScope;
+    private final PermissionExpressionBuilder expressionBuilder;
+    private final Map<Triple<Class<? extends Annotation>, Type, ImmutableSet<String>>, ExpressionResult>
+            userPermissionCheckCache;
+    private final Map<String, Long> checkStats;
+    private final boolean verbose;
+
+    /**
+     * Constructor.
+     *
+     * @param requestScope Request scope
+     */
+    public ActivePermissionExecutor(final RequestScope requestScope) {
+        this(false, requestScope);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param verbose True if executor should produce verbose output to caller
+     * @param requestScope Request scope
+     */
+    public ActivePermissionExecutor(boolean verbose, final RequestScope requestScope) {
+        ExpressionResultCache cache = new ExpressionResultCache();
+
+        this.requestScope = requestScope;
+        this.expressionBuilder = new PermissionExpressionBuilder(cache, requestScope.getDictionary());
+        userPermissionCheckCache = new HashMap<>();
+        checkStats = new HashMap<>();
+        this.verbose = verbose;
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkPermission(
+            Class<A> annotationClass,
+            PersistentResource resource,
+            Set<String> requestedFields
+
+    ) {
+        Supplier<Expression> expressionSupplier = () -> {
+            if (NonTransferable.class == annotationClass) {
+                if (requestScope.getDictionary().isTransferable(resource.getResourceType())) {
+                    return expressionBuilder.buildAnyFieldExpressions(resource, ReadPermission.class,
+                            requestedFields, null);
+                }
+                return PermissionExpressionBuilder.FAIL_EXPRESSION;
+            }
+            return expressionBuilder.buildAnyFieldExpressions(resource, annotationClass, requestedFields, null);
+        };
+
+        Function<Expression, ExpressionResult> expressionExecutor = (expression) -> {
+            // for newly created object in PatchRequest limit to User checks
+            if (resource.isNewlyCreated()) {
+                return executeUserChecksDeferInline(annotationClass, expression);
+            }
+            return executeExpressions(expression, annotationClass, Expression.EvaluationMode.INLINE_CHECKS_ONLY);
+        };
+
+        return checkPermissions(
+                resource.getResourceType(),
+                annotationClass,
+                requestedFields,
+                expressionSupplier,
+                expressionExecutor);
+    }
+
+    /**
+     * We will only run User checks during patch extension for newly created objects because relationships are not yet
+     * complete. The inline checks may fail (relationships are not yet fixed up). If the user checks return deferred, we
+     * will defer all of the inline checks to commit phase.
+     */
+    private <A extends Annotation> ExpressionResult executeUserChecksDeferInline(Class<A> annotationClass,
+            Expression expression) {
+        ExpressionResult result =
+                executeExpressions(expression, annotationClass, Expression.EvaluationMode.USER_CHECKS_ONLY);
+        if (result == DEFERRED) {
+            commitCheckQueue.add(new QueuedCheck(expression, annotationClass));
+        }
+        return result;
+    }
+
+    /**
+     * Check for permissions on a specific field.
+     *
+     * @param <A> type parameter
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
+                                                                                 ChangeSpec changeSpec,
+                                                                                 Class<A> annotationClass,
+                                                                                 String field) {
+        Supplier<Expression> expressionSupplier = () ->
+            expressionBuilder.buildSpecificFieldExpressions(resource, annotationClass, field, changeSpec);
+
+        Function<Expression, ExpressionResult> expressionExecutor = expression ->
+            executeExpressions(expression, annotationClass, Expression.EvaluationMode.INLINE_CHECKS_ONLY);
+
+        return checkPermissions(
+                resource.getResourceType(),
+                annotationClass,
+                Collections.singleton(field),
+                expressionSupplier,
+                expressionExecutor);
+    }
+
+    /**
+     * Check for permissions on a specific field deferring all checks.
+     *
+     * @param <A> type parameter
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
+                                                                                         ChangeSpec changeSpec,
+                                                                                         Class<A> annotationClass,
+                                                                                         String field) {
+        //We would want to evaluate the expression in the CreatePermission in case of
+        // update checks on newly created entities
+        Class expressionAnnotation = annotationClass.isAssignableFrom(UpdatePermission.class)
+                && requestScope.getNewResources().contains(resource)
+                ? CreatePermission.class
+                : annotationClass;
+
+        Supplier<Expression> expressionSupplier = () ->
+                expressionBuilder.buildSpecificFieldExpressions(
+                        resource,
+                        expressionAnnotation,
+                        field,
+                        changeSpec);
+
+        Function<Expression, ExpressionResult> expressionExecutor = (expression) -> {
+            if (requestScope.getNewPersistentResources().contains(resource)) {
+                return executeUserChecksDeferInline(expressionAnnotation, expression);
+            }
+            return executeExpressions(expression, expressionAnnotation, Expression.EvaluationMode.INLINE_CHECKS_ONLY);
+        };
+
+        return checkPermissions(
+                resource.getResourceType(),
+                expressionAnnotation,
+                Collections.singleton(field),
+                expressionSupplier,
+                expressionExecutor);
+    }
+
+    /**
+     * Check strictly user permissions on an entity.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        Set<String> requestedFields) {
+        Supplier<Expression> expressionSupplier = () ->
+            expressionBuilder.buildUserCheckAnyExpression(
+                    resourceClass,
+                    annotationClass,
+                    requestedFields,
+                    requestScope);
+
+        return checkOnlyUserPermissions(
+                resourceClass,
+                annotationClass,
+                requestedFields,
+                expressionSupplier);
+    }
+
+    /**
+     * First attempts to check user permissions (by looking in the cache and if not present by executing user
+     * permissions).  If user permissions don't short circuit the check, run the provided expression executor.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     * @param expressionExecutor Evaluates the expression (post user check evaluation)
+     */
+    protected <A extends Annotation> ExpressionResult checkPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier,
+            Optional<Function<Expression, ExpressionResult>> expressionExecutor) {
+
+        // If the user check has already been evaluated before, return the result directly and save the building cost
+        ImmutableSet<String> immutableFields = fields == null ? null : ImmutableSet.copyOf(fields);
+        ExpressionResult expressionResult
+                = userPermissionCheckCache.get(Triple.of(annotationClass, resourceClass, immutableFields));
+
+        if (expressionResult == PASS) {
+            return expressionResult;
+        }
+
+        Expression expression = expressionSupplier.get();
+
+        if (expressionResult == null) {
+            expressionResult = executeExpressions(
+                    expression,
+                    annotationClass,
+                    Expression.EvaluationMode.USER_CHECKS_ONLY);
+
+            userPermissionCheckCache.put(
+                    Triple.of(annotationClass, resourceClass, immutableFields), expressionResult);
+
+            if (expressionResult == PASS) {
+                return expressionResult;
+            }
+        }
+
+        return expressionExecutor
+                .map(executor -> executor.apply(expression))
+                .orElse(expressionResult);
+    }
+
+    /**
+     * Only executes user permissions.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     */
+    protected <A extends Annotation> ExpressionResult checkOnlyUserPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier) {
+
+        return checkPermissions(
+                resourceClass,
+                annotationClass,
+                fields,
+                expressionSupplier,
+                Optional.empty()
+        );
+    }
+
+    /**
+     * First attempts to check user permissions (by looking in the cache and if not present by executing user
+     * permissions).  If user permissions don't short circuit the check, run the provided expression executor.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param fields Set of all field names that is being accessed
+     * @param expressionSupplier Builds a permission expression.
+     * @param expressionExecutor Evaluates the expression (post user check evaluation)
+     */
+    protected <A extends Annotation> ExpressionResult checkPermissions(
+            Type<?> resourceClass,
+            Class<A> annotationClass,
+            Set<String> fields,
+            Supplier<Expression> expressionSupplier,
+            Function<Expression, ExpressionResult> expressionExecutor) {
+
+        return checkPermissions(
+                resourceClass,
+                annotationClass,
+                fields,
+                expressionSupplier,
+                Optional.of(expressionExecutor)
+        );
+    }
+
+
+    /**
+     * Get permission filter on an entity.
+     *
+     * @param resourceClass Resource class
+     * @param requestedFields The set of requested fields
+     * @return the filter expression for the class, if any
+     */
+    @Override
+    public Optional<FilterExpression> getReadPermissionFilter(Type<?> resourceClass, Set<String> requestedFields) {
+        FilterExpression filterExpression =
+                expressionBuilder.buildAnyFieldFilterExpression(resourceClass, requestScope, requestedFields);
+
+        return Optional.ofNullable(filterExpression);
+    }
+
+    /**
+     * Execute commmit checks.
+     */
+    @Override
+    public void executeCommitChecks() {
+        commitCheckQueue.forEach((expr) -> {
+            Expression expression = expr.getExpression();
+            ExpressionResult result = expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+            if (result == FAIL) {
+                ForbiddenAccessException e = new ForbiddenAccessException(
+                        expr.getAnnotationClass(), expression, Expression.EvaluationMode.ALL_CHECKS);
+                if (log.isTraceEnabled()) {
+                    log.trace("{}", e.getLoggedMessage());
+                }
+                throw e;
+            }
+        });
+        commitCheckQueue.clear();
+    }
+
+    /**
+     * Execute expressions.
+     *
+     * @param expression The expression to evaluate.
+     * @param annotationClass The permission associated with the expression.
+     * @param mode The evaluation mode of the expression.
+     */
+    private ExpressionResult executeExpressions(final Expression expression,
+                                                final Class<? extends Annotation> annotationClass,
+                                                Expression.EvaluationMode mode) {
+
+        ExpressionResult result = expression.evaluate(mode);
+
+        // Record the check
+        if (log.isTraceEnabled()) {
+            String checkKey = expression.toString();
+            Long checkOccurrences = checkStats.getOrDefault(checkKey, 0L) + 1;
+            checkStats.put(checkKey, checkOccurrences);
+        }
+
+        if (result == DEFERRED) {
+
+            /*
+             * Checking user checks only are an optimization step.  We don't need to defer these checks because
+             * INLINE_ONLY checks will be evaluated later.  Also, the user checks don't have
+             * the correct context to evaluate as COMMIT checks later.
+             */
+            if (mode == Expression.EvaluationMode.USER_CHECKS_ONLY) {
+                return DEFERRED;
+            }
+
+
+            if (isInlineOnlyCheck(annotationClass)) {
+                // Force evaluation of checks that can only be executed inline.
+                result = expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+                if (result == FAIL) {
+                    ForbiddenAccessException e = new ForbiddenAccessException(
+                        annotationClass,
+                        expression,
+                        Expression.EvaluationMode.ALL_CHECKS);
+                    if (log.isTraceEnabled()) {
+                        log.trace("{}", e.getLoggedMessage());
+                    }
+                    throw e;
+                }
+                return result;
+            }
+            commitCheckQueue.add(new QueuedCheck(expression, annotationClass));
+            return DEFERRED;
+        }
+        if (result == FAIL) {
+            ForbiddenAccessException e = new ForbiddenAccessException(annotationClass, expression, mode);
+            if (log.isTraceEnabled()) {
+                log.trace("{}", e.getLoggedMessage());
+            }
+            throw e;
+        }
+
+        return result;
+    }
+
+    /**
+     * Check whether or not this check can only be run inline or not.
+     *
+     * @param annotationClass annotation class
+     * @return True if check can only be run inline, false otherwise.
+     */
+    private boolean isInlineOnlyCheck(final Class<? extends Annotation> annotationClass) {
+        return ReadPermission.class.isAssignableFrom(annotationClass)
+                || DeletePermission.class.isAssignableFrom(annotationClass);
+    }
+
+    /**
+     * Information container about queued checks.
+     */
+    @AllArgsConstructor
+    private static class QueuedCheck {
+        @Getter private final Expression expression;
+        @Getter private final Class<? extends Annotation> annotationClass;
+    }
+
+    /**
+     * Logs the permission check statistics.
+     *
+     */
+    @Override
+    public void logCheckStats() {
+        if (log.isTraceEnabled()) {
+            StringBuilder sb = new StringBuilder("Permission Check Statistics:\n");
+            checkStats.entrySet().stream()
+                    .sorted(Map.Entry.comparingByValue())
+                    .forEachOrdered(e -> sb.append(e.getKey() + ": " + e.getValue() + "\n"));
+            String stats = sb.toString();
+            log.trace(stats);
+        }
+    }
+
+    @Override
+    public boolean isVerbose() {
+        return verbose;
+    }
+
+    /**
+     * Check strictly user permissions on an entity field.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param field The entity field
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        String field) {
+        Supplier<Expression> expressionSupplier = () ->
+            expressionBuilder.buildUserCheckFieldExpressions(
+                    resourceClass,
+                    requestScope,
+                    annotationClass,
+                    field);
+
+        return checkOnlyUserPermissions(
+                resourceClass,
+                annotationClass,
+                Collections.singleton(field),
+                expressionSupplier);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AggregationStorePermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AggregationStorePermissionExecutor.java
new file mode 100644
index 0000000000..97fdc690c3
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/AggregationStorePermissionExecutor.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.executors;
+
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.type.Type;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+
+/**
+ * Permission Executor for all models managed by aggregation datastore.
+ */
+@Slf4j
+public class AggregationStorePermissionExecutor extends AbstractPermissionExecutor {
+
+    public AggregationStorePermissionExecutor(RequestScope requestScope) {
+        super(log, requestScope);
+    }
+
+    /**
+     * Checks user checks for the requested fields.
+     * expression = (field1Rule OR field2Rule ... OR fieldNRule)
+     * @param annotationClass annotation class
+     * @param resource resource
+     * @param requestedFields the list of requested fields
+     * @param <A>
+     * @return ExpressionResult - result of the above any field expression
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
+                                                                   PersistentResource resource,
+                                                                   Set<String> requestedFields) {
+        if (!annotationClass.equals(ReadPermission.class)) {
+            return ExpressionResult.FAIL;
+        }
+
+        Supplier<Expression> expressionSupplier = () ->
+                expressionBuilder.buildUserCheckAnyFieldOnlyExpression(
+                        resource.getResourceType(),
+                        annotationClass,
+                        requestedFields,
+                        requestScope);
+
+        return checkOnlyUserPermissions(
+                resource.getResourceType(),
+                annotationClass,
+                requestedFields,
+                expressionSupplier);
+    }
+
+
+    /**
+     * Evaluates user check permission on specific field
+     * Aggregation Datastore model can only have user checks at field level permission expression.
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     * @param <A>
+     * @return
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
+                                                                                 ChangeSpec changeSpec,
+                                                                                 Class<A> annotationClass,
+                                                                                 String field) {
+        if (!annotationClass.equals(ReadPermission.class)) {
+            return ExpressionResult.FAIL;
+        }
+        return checkUserPermissions(resource.getResourceType(), annotationClass, field);
+    }
+
+    /**
+     * Not supported in aggregation datastore.
+     * @param resource resource
+     * @param changeSpec changepsec
+     * @param annotationClass annotation class
+     * @param field field to check
+     * @param <A>
+     * @return
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
+                                                                                         ChangeSpec changeSpec,
+                                                                                         Class<A> annotationClass,
+                                                                                         String field) {
+        return checkSpecificFieldPermissions(resource, changeSpec, annotationClass, field);
+    }
+
+    /**
+     * Check strictly user permissions on an entity and any of the requested field. Evaluates
+     * expression = (entityRule AND (field1Rule OR field2Rule ... OR fieldNRule))
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        Set<String> requestedFields) {
+        if (!annotationClass.equals(ReadPermission.class)) {
+            return ExpressionResult.FAIL;
+        }
+
+        Expression expression = expressionBuilder.buildUserCheckEntityAndAnyFieldExpression(
+                        resourceClass,
+                        annotationClass,
+                        requestedFields,
+                        requestScope);
+
+        // Skips userPermissionCheckCache and directly executes the expression.
+        // Cache is used by checkPermission() which is called for every resource returned.
+        // Cache cannot be shared b/w checkUserPermissions and checkPermissions because of difference in computation.
+        return executeExpressions(expression, annotationClass, Expression.EvaluationMode.USER_CHECKS_ONLY);
+    }
+
+    /**
+     * Check strictly user permissions on an entity field.
+     *
+     * @param <A> type parameter
+     * @param resourceClass Resource class
+     * @param annotationClass Annotation class
+     * @param field The entity field
+     */
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        String field) {
+        if (!annotationClass.equals(ReadPermission.class)) {
+            return ExpressionResult.FAIL;
+        }
+
+        Supplier<Expression> expressionSupplier = () ->
+                expressionBuilder.buildUserCheckFieldExpressions(
+                        resourceClass,
+                        requestScope,
+                        annotationClass,
+                        field,
+                        false);
+
+
+        return checkOnlyUserPermissions(
+                resourceClass,
+                annotationClass,
+                Collections.singleton(field),
+                expressionSupplier);
+    }
+
+    @Override
+    public Optional<FilterExpression> getReadPermissionFilter(Type<?> resourceClass, Set<String> requestedFields) {
+        FilterExpression filterExpression = expressionBuilder.buildEntityFilterExpression(resourceClass, requestScope);
+        return Optional.ofNullable(filterExpression);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/executors/BypassPermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/BypassPermissionExecutor.java
new file mode 100644
index 0000000000..01d88b77f1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/BypassPermissionExecutor.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.executors;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.Type;
+
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Permission executor intended to bypass all security checks. I.e. this is effectively a no-op.
+ */
+public class BypassPermissionExecutor implements PermissionExecutor {
+    @Override
+    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
+                                                                   PersistentResource resource,
+                                                                   Set<String> requestedFields) {
+        return ExpressionResult.PASS;
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(
+            PersistentResource<?> resource, ChangeSpec changeSpec, Class<A> annotationClass, String field) {
+        return ExpressionResult.PASS;
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(
+            PersistentResource<?> resource, ChangeSpec changeSpec, Class<A> annotationClass, String field) {
+        return ExpressionResult.PASS;
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        Set<String> requestedFields) {
+        return ExpressionResult.PASS;
+    }
+
+    @Override
+    public Optional<FilterExpression> getReadPermissionFilter(Type<?> resourceClass, Set<String> requestedFields) {
+        return Optional.empty();
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        String field) {
+        return ExpressionResult.PASS;
+    }
+
+    @Override
+    public void executeCommitChecks() {
+
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/executors/MultiplexPermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/MultiplexPermissionExecutor.java
new file mode 100644
index 0000000000..bb4635c3b6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/MultiplexPermissionExecutor.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.executors;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.Type;
+import lombok.AllArgsConstructor;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * MultiplexPermissionExecutor manages Model to permssion executor mapping.
+ * All method call to multiple permission executor will be delegated
+ *  to the underlying permission executor based on resource type.
+ */
+@AllArgsConstructor
+public class MultiplexPermissionExecutor implements PermissionExecutor {
+
+    private Map<Type<?>, PermissionExecutor> permissionExecutorMap;
+    private PermissionExecutor defaultPermissionExecutor;
+    private EntityDictionary dictionary;
+
+    public PermissionExecutor getPermissionExecutor(Type<?> cls) {
+        return permissionExecutorMap.getOrDefault(dictionary.lookupBoundClass(cls), defaultPermissionExecutor);
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
+                                                                   PersistentResource resource,
+                                                                   Set<String> requestedFields) {
+        return getPermissionExecutor(resource.getResourceType())
+                .checkPermission(annotationClass, resource, requestedFields);
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
+                                                                                 ChangeSpec changeSpec,
+                                                                                 Class<A> annotationClass,
+                                                                                 String field) {
+        return getPermissionExecutor(resource.getResourceType())
+                .checkSpecificFieldPermissions(resource, changeSpec, annotationClass, field);
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
+                                                                                         ChangeSpec changeSpec,
+                                                                                         Class<A> annotationClass,
+                                                                                         String field) {
+        return getPermissionExecutor(resource.getResourceType())
+                .checkSpecificFieldPermissionsDeferred(resource, changeSpec, annotationClass, field);
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        Set<String> requestedFields) {
+        return getPermissionExecutor(resourceClass)
+                .checkUserPermissions(resourceClass, annotationClass, requestedFields);
+    }
+
+    @Override
+    public <A extends Annotation> ExpressionResult checkUserPermissions(Type<?> resourceClass,
+                                                                        Class<A> annotationClass,
+                                                                        String field) {
+        return getPermissionExecutor(resourceClass)
+                .checkUserPermissions(resourceClass, annotationClass, field);
+    }
+
+    @Override
+    public Optional<FilterExpression> getReadPermissionFilter(Type<?> resourceClass, Set<String> requestedFields) {
+        return getPermissionExecutor(resourceClass).getReadPermissionFilter(resourceClass, requestedFields);
+    }
+
+    @Override
+    public void executeCommitChecks() {
+        defaultPermissionExecutor.executeCommitChecks();
+        permissionExecutorMap.values().forEach(PermissionExecutor::executeCommitChecks);
+    }
+
+    @Override
+    public void logCheckStats() {
+        defaultPermissionExecutor.logCheckStats();
+        permissionExecutorMap.values().forEach(PermissionExecutor::logCheckStats);
+    }
+
+    @Override
+    public boolean isVerbose() {
+        return defaultPermissionExecutor.isVerbose();
+    }
+
+    @Override
+    public ExpressionResult evaluateFilterJoinUserChecks(PersistentResource<?> resource,
+                                                         FilterPredicate filterPredicate) {
+        return getPermissionExecutor(resource.getResourceType())
+                .evaluateFilterJoinUserChecks(resource, filterPredicate);
+    }
+
+    @Override
+    public ExpressionResult handleFilterJoinReject(FilterPredicate filterPredicate,
+                                                   Path.PathElement pathElement,
+                                                   ForbiddenAccessException reason) {
+        return getPermissionExecutor(pathElement.getType())
+                .handleFilterJoinReject(filterPredicate, pathElement, reason);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/executors/VerbosePermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/VerbosePermissionExecutor.java
similarity index 92%
rename from elide-core/src/main/java/com/yahoo/elide/security/executors/VerbosePermissionExecutor.java
rename to elide-core/src/main/java/com/yahoo/elide/core/security/executors/VerbosePermissionExecutor.java
index 4f32b1db32..e835274be8 100644
--- a/elide-core/src/main/java/com/yahoo/elide/security/executors/VerbosePermissionExecutor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/executors/VerbosePermissionExecutor.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.security.executors;
+package com.yahoo.elide.core.security.executors;
 
 import com.yahoo.elide.core.RequestScope;
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResult.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResult.java
similarity index 93%
rename from elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResult.java
rename to elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResult.java
index cd997ab220..2a2357694f 100644
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResult.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResult.java
@@ -3,11 +3,10 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.security.permissions;
-
-import org.fusesource.jansi.Ansi;
+package com.yahoo.elide.core.security.permissions;
 
 import static org.fusesource.jansi.Ansi.ansi;
+import org.fusesource.jansi.Ansi;
 
 /**
  * Expression results.
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResultCache.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResultCache.java
similarity index 79%
rename from elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResultCache.java
rename to elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResultCache.java
index 7ed2123a82..46f8e3207c 100644
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/ExpressionResultCache.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/ExpressionResultCache.java
@@ -3,10 +3,10 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.security.permissions;
+package com.yahoo.elide.core.security.permissions;
 
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.checks.Check;
+import com.yahoo.elide.core.security.PersistentResource;
+import com.yahoo.elide.core.security.checks.Check;
 
 import java.util.HashMap;
 import java.util.IdentityHashMap;
@@ -29,12 +29,8 @@ public boolean hasStoredResultFor(Class<? extends Check> checkClass, PersistentR
     }
 
     public void putResultFor(Class<? extends Check> checkClass, PersistentResource resource, ExpressionResult result) {
-        Map<PersistentResource, ExpressionResult> cache = computedResults.get(checkClass);
-        if (cache == null) {
-            cache = new IdentityHashMap<>();
-            computedResults.put(checkClass, cache);
-        }
-
+        Map<PersistentResource, ExpressionResult> cache = computedResults.computeIfAbsent(checkClass,
+                unused -> new IdentityHashMap<>());
         cache.put(resource, result);
     }
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionCondition.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionCondition.java
new file mode 100644
index 0000000000..68125bf21a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionCondition.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.permissions;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.NonTransferable;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.PersistentResource;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.collect.ImmutableMap;
+import lombok.Getter;
+
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+
+/**
+ * Describes the state when a permission is evaluated.
+ */
+public class PermissionCondition {
+    @Getter final Class<? extends Annotation> permission;
+    @Getter final Type<?> entityClass;
+    @Getter final Optional<PersistentResource> resource;
+    @Getter final Optional<ChangeSpec> changes;
+    @Getter final Optional<String> field;
+
+    private static final ImmutableMap<Class<? extends Annotation>, String> PERMISSION_TO_NAME = ImmutableMap.of(
+            ReadPermission.class, "READ",
+            UpdatePermission.class, "UPDATE",
+            DeletePermission.class, "DELETE",
+            CreatePermission.class, "CREATE",
+            NonTransferable.class, "NO TRANSFER");
+
+    /**
+     * This function attempts to create the appropriate {@link PermissionCondition} based on parameters that may or may
+     * not be null. This is a temporary workaround given that the caller functions duplicate data in their
+     * signatures and pass nulls.  The calling code needs to be cleaned up - and then this function can be disposed of.
+     *
+     * @param permission the permission to inspect
+     * @param resource the resource to evalute the permission on
+     * @param field the name of the field to be checked
+     * @param changes the changes that happened
+     * @return a {@link PermissionCondition} if one can be created, null otherwise
+     */
+    public static PermissionCondition create(
+            Class<? extends Annotation> permission,
+            PersistentResource resource,
+            String field,
+            ChangeSpec changes
+    ) {
+        if (resource != null) {
+            if (changes != null) {
+                /* Tests do this - not sure if this is real */
+                if (field != null && changes.getFieldName() == null) {
+                    return new PermissionCondition(permission, resource, field);
+                }
+                return new PermissionCondition(permission, resource, changes);
+            }
+            if (field == null) {
+                return new PermissionCondition(permission, resource);
+            }
+            return new PermissionCondition(permission, resource, field);
+        }
+        throw new IllegalArgumentException("Resource cannot be null");
+    }
+
+    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource) {
+        this.permission = permission;
+        this.resource = Optional.of(resource);
+        this.entityClass = resource.getResourceType();
+        this.changes = Optional.empty();
+        this.field = Optional.empty();
+    }
+
+    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource, ChangeSpec changes) {
+        this.permission = permission;
+        this.resource = Optional.of(resource);
+        this.entityClass = resource.getResourceType();
+        this.changes = Optional.of(changes);
+        this.field = Optional.ofNullable(changes.getFieldName());
+    }
+
+    PermissionCondition(Class<? extends Annotation> permission, Type<?> entityClass) {
+        this.permission = permission;
+        this.resource = Optional.empty();
+        this.entityClass = entityClass;
+        this.changes = Optional.empty();
+        this.field = Optional.empty();
+    }
+
+    PermissionCondition(Class<? extends Annotation> permission, Type<?> entityClass, String field) {
+        this.permission = permission;
+        this.resource = Optional.empty();
+        this.entityClass = entityClass;
+        this.changes = Optional.empty();
+        this.field = Optional.of(field);
+    }
+
+    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource, String field) {
+        this.permission = permission;
+        this.resource = Optional.of(resource);
+        this.entityClass = resource.getResourceType();
+        this.changes = Optional.empty();
+        this.field = Optional.of(field);
+    }
+
+    @Override
+    public String toString() {
+        Object entity = ((Optional) resource).orElse(entityClass);
+
+        String withClause = changes.map(c -> String.format("WITH CHANGES %s", c))
+                .orElseGet(() -> field.map(f -> String.format("WITH FIELD %s", f))
+                .orElse(""));
+
+        return String.format(
+                "%s PERMISSION WAS INVOKED ON %s %s",
+                PERMISSION_TO_NAME.get(permission),
+                entity,
+                withClause);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilder.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilder.java
new file mode 100644
index 0000000000..ae69fe7f89
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilder.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions;
+
+import static com.yahoo.elide.core.security.permissions.expressions.Expression.Results.FAILURE;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.TRUE_USER_CHECK_EXPRESSION;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.permissions.expressions.AndExpression;
+import com.yahoo.elide.core.security.permissions.expressions.AnyFieldExpression;
+import com.yahoo.elide.core.security.permissions.expressions.CheckExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.permissions.expressions.OrExpression;
+import com.yahoo.elide.core.security.permissions.expressions.SpecificFieldExpression;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionNormalizationVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor;
+import com.yahoo.elide.core.type.Type;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Expression builder to parse annotations and express the result as the Expression AST.
+ */
+public class PermissionExpressionBuilder {
+    private final EntityDictionary entityDictionary;
+    private final ExpressionResultCache cache;
+
+    private static final Expression SUCCESSFUL_EXPRESSION = OrExpression.SUCCESSFUL_EXPRESSION;
+    public static final Expression FAIL_EXPRESSION = OrExpression.FAILURE_EXPRESSION;
+
+    /**
+     * Constructor.
+     *
+     * @param cache Cache
+     * @param dictionary EntityDictionary
+     */
+    public PermissionExpressionBuilder(ExpressionResultCache cache, EntityDictionary dictionary) {
+        this.cache = cache;
+        this.entityDictionary = dictionary;
+    }
+
+    /**
+     * Build an expression that checks a specific field.
+     *
+     * @param resource        Resource
+     * @param annotationClass Annotation class
+     * @param field           Field
+     * @param changeSpec      Change spec
+     * @param <A>             Type parameter
+     * @return Commit and operation expressions
+     */
+    public <A extends Annotation> Expression buildSpecificFieldExpressions(final PersistentResource resource,
+                                                                           final Class<A> annotationClass,
+                                                                           final String field,
+                                                                           final ChangeSpec changeSpec) {
+
+        Type<?> resourceClass = resource.getResourceType();
+        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
+            return SUCCESSFUL_EXPRESSION;
+        }
+
+        final Function<Check, Expression> leafBuilderFn = leafBuilder(resource, changeSpec);
+
+        final Function<Function<Check, Expression>, Expression> buildExpressionFn =
+                (checkFn) -> buildSpecificFieldExpression(
+                        PermissionCondition.create(annotationClass, resource, field, changeSpec),
+                        checkFn,
+                        true
+                );
+
+        return buildExpressionFn.apply(leafBuilderFn);
+    }
+
+    /**
+     * Build an expression that checks any field on a bean.
+     *
+     * @param resource        Resource
+     * @param annotationClass annotation class
+     * @param changeSpec      change spec
+     * @param <A>             type parameter
+     * @return Commit and operation expressions
+     */
+    public <A extends Annotation> Expression buildAnyFieldExpressions(final PersistentResource resource,
+                                                                       final Class<A> annotationClass,
+                                                                       Set<String> requestedFields,
+                                                                       final ChangeSpec changeSpec) {
+
+
+        Type<?> resourceClass = resource.getResourceType();
+        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
+            return SUCCESSFUL_EXPRESSION;
+        }
+
+        final Function<Check, Expression> leafBuilderFn = leafBuilder(resource, changeSpec);
+
+        final Function<Function<Check, Expression>, Expression> expressionFunction =
+                (checkFn) -> buildAnyFieldExpression(
+                        PermissionCondition.create(annotationClass, resource, (String) null, changeSpec),
+                        checkFn,
+                        requestedFields,
+                        resource.getRequestScope()
+                );
+
+        return expressionFunction.apply(leafBuilderFn);
+    }
+
+    /**
+     * Build an expression that strictly evaluates UserCheck's and ignores other checks for a specific field.
+     * <p>
+     * NOTE: This method returns _NO_ commit checks.
+     *
+     * @param resourceClass   Resource Class
+     * @param scope           The request scope.
+     * @param annotationClass Annotation class
+     * @param field           Field to check (if null only check entity-level)
+     * @param <A>             type parameter
+     * @return User check expression to evaluate
+     */
+    public <A extends Annotation> Expression buildUserCheckFieldExpressions(final Type<?> resourceClass,
+                                                                             final RequestScope scope,
+                                                                             final Class<A> annotationClass,
+                                                                             final String field) {
+        return buildUserCheckFieldExpressions(resourceClass, scope, annotationClass, field, true);
+    }
+
+    /**
+     * Build an expression that strictly evaluates UserCheck's and ignores other checks for a specific field.
+     * <p>
+     * NOTE: This method returns _NO_ commit checks.
+     *
+     * @param resourceClass   Resource Class
+     * @param scope           The request scope.
+     * @param annotationClass Annotation class
+     * @param field           Field to check (if null only check entity-level)
+     * @param includeEntityPermission whether entity permission needs to be evaluated in the absence of field permission
+     * @param <A>             type parameter
+     * @return User check expression to evaluate
+     */
+    public <A extends Annotation> Expression buildUserCheckFieldExpressions(final Type<?> resourceClass,
+                                                                            final RequestScope scope,
+                                                                            final Class<A> annotationClass,
+                                                                            final String field,
+                                                                            final boolean includeEntityPermission) {
+        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
+            return SUCCESSFUL_EXPRESSION;
+        }
+
+        final Function<Check, Expression> leafBuilderFn = (check) ->
+                new CheckExpression(check, null, scope, null, cache);
+
+        return buildSpecificFieldExpression(new PermissionCondition(annotationClass, resourceClass, field),
+                leafBuilderFn, includeEntityPermission);
+    }
+
+    /**
+     * Build an expression that strictly evaluates UserCheck's and ignores other checks for an entity.
+     * expression = (field1Rule OR field2Rule ... OR fieldNRule)
+     * <p>
+     * NOTE: This method returns _NO_ commit checks.
+     *
+     * @param resourceClass   Resource class
+     * @param annotationClass Annotation class
+     * @param requestScope    Request scope
+     * @param <A>             type parameter
+     * @return User check expression to evaluate
+     */
+    public <A extends Annotation> Expression buildUserCheckAnyExpression(final Type<?> resourceClass,
+                                                                         final Class<A> annotationClass,
+                                                                         Set<String> requestedFields,
+                                                                         final RequestScope requestScope) {
+
+        final Function<Check, Expression> leafBuilderFn = (check) ->
+                new CheckExpression(check, null, requestScope, null, cache);
+
+        return buildAnyFieldExpression(
+                        new PermissionCondition(annotationClass, resourceClass), leafBuilderFn,
+                requestedFields, requestScope);
+    }
+
+    /**
+     * Build an expression that strictly evaluates UserCheck's and ignores other checks for an entity.
+     * expression = (field1Rule OR field2Rule ... OR fieldNRule)
+     * <p>
+     * NOTE: This method returns _NO_ commit checks.
+     *
+     * @param resourceClass   Resource class
+     * @param annotationClass Annotation class
+     * @param requestScope    Request scope
+     * @param <A>             type parameter
+     * @return User check expression to evaluate
+     */
+    public <A extends Annotation> Expression buildUserCheckAnyFieldOnlyExpression(final Type<?> resourceClass,
+                                                                                  final Class<A> annotationClass,
+                                                                                  Set<String> requestedFields,
+                                                                                  final RequestScope requestScope) {
+
+        final Function<Check, Expression> leafBuilderFn = (check) ->
+                new CheckExpression(check, null, requestScope, null, cache);
+
+        return buildAnyFieldOnlyExpression(
+                new PermissionCondition(annotationClass, resourceClass), leafBuilderFn, requestedFields);
+    }
+
+    /**
+     * Build an expression that strictly evaluates UserCheck's and ignores other checks for an entity.
+     * expression = (entityRule AND (field1Rule OR field2Rule ... OR fieldNRule))
+     * <p>
+     * NOTE: This method returns _NO_ commit checks.
+     *
+     * @param resourceClass   Resource class
+     * @param annotationClass Annotation class
+     * @param scope    Request scope
+     * @param <A>             type parameter
+     * @return User check expression to evaluate
+     */
+    public <A extends Annotation> Expression buildUserCheckEntityAndAnyFieldExpression(final Type<?> resourceClass,
+                                                                                       final Class<A> annotationClass,
+                                                                                       Set<String> requestedFields,
+                                                                                       final RequestScope scope) {
+
+        final Function<Check, Expression> leafBuilderFn = (check) ->
+                new CheckExpression(check, null, scope, null, cache);
+
+        ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
+        Expression entityExpression = normalizedExpressionFromParseTree(classPermissions, leafBuilderFn);
+
+        Expression anyFieldExpression = buildAnyFieldOnlyExpression(
+                new PermissionCondition(annotationClass, resourceClass), leafBuilderFn,
+                requestedFields);
+
+        if (entityExpression == null) {
+            return anyFieldExpression;
+        }
+
+        return new AndExpression(entityExpression, anyFieldExpression);
+    }
+
+    /**
+     * Builder for specific field expressions.
+     *
+     * @param condition       The condition which triggered this permission expression check
+     * @param checkFn         Operation check function
+     * @param includeEntityPermission whether entity permission needs to be evaluated in the absence of field permission
+     * @return Expressions representing specific field
+     */
+    private Expression buildSpecificFieldExpression(final PermissionCondition condition,
+            final Function<Check, Expression> checkFn,
+            boolean includeEntityPermission) {
+        Type<?> resourceClass = condition.getEntityClass();
+        Class<? extends Annotation> annotationClass = condition.getPermission();
+        String field = condition.getField().orElse(null);
+
+        ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
+
+        if (includeEntityPermission) {
+            ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
+            return new SpecificFieldExpression(condition,
+                    normalizedExpressionFromParseTree(classPermissions, checkFn),
+                    normalizedExpressionFromParseTree(fieldPermissions, checkFn)
+            );
+        }
+        return new SpecificFieldExpression(condition,
+                null,
+                normalizedExpressionFromParseTree(fieldPermissions, checkFn)
+        );
+    }
+
+    /**
+     * Build an expression representing any field on an entity.
+     *
+     * @param condition       The condition which triggered this permission expression check
+     * @param checkFn         check function
+     * @param scope           RequestScope
+     * @param requestedFields The list of requested fields
+     * @return Expressions
+     */
+    private Expression buildAnyFieldExpression(final PermissionCondition condition,
+            final Function<Check, Expression> checkFn,
+            final Set<String> requestedFields,
+            final RequestScope scope) {
+
+        Type<?> resourceClass = condition.getEntityClass();
+        Class<? extends Annotation> annotationClass = condition.getPermission();
+
+        ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
+        Expression entityExpression = normalizedExpressionFromParseTree(classPermissions, checkFn);
+
+        OrExpression allFieldsExpression = new OrExpression(FAILURE, null);
+        List<String> fields = entityDictionary.getAllExposedFields(resourceClass);
+
+        boolean entityExpressionUsed = false;
+        boolean fieldExpressionUsed = false;
+
+        for (String field : fields) {
+            if (requestedFields != null && !requestedFields.contains(field)) {
+                continue;
+            }
+
+            ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
+            Expression fieldExpression = normalizedExpressionFromParseTree(fieldPermissions, checkFn);
+
+            if (fieldExpression == null) {
+
+                if (entityExpressionUsed) {
+                    continue;
+                }
+
+                if (entityExpression == null) {
+                    //One field had no permissions set - so we allow the action.
+                    return SUCCESSFUL_EXPRESSION;
+                }
+
+                fieldExpression = entityExpression;
+                entityExpressionUsed = true;
+            } else {
+                fieldExpressionUsed = true;
+            }
+
+            allFieldsExpression = new OrExpression(allFieldsExpression, fieldExpression);
+        }
+
+        if (! fieldExpressionUsed) {
+            //If there are no permissions, allow access...
+            if (entityExpression == null) {
+                return SUCCESSFUL_EXPRESSION;
+            }
+            return new AnyFieldExpression(condition, entityExpression);
+        }
+
+        return new AnyFieldExpression(condition, allFieldsExpression);
+    }
+
+    /**
+     * Builds disjunction of permission expression of all requested fields.
+     * If the field permission is null, then return default SUCCESSFUL_EXPRESSION.
+     * expression = (field1Rule OR field2Rule ... OR fieldNRule)
+     * @param condition The condition which triggered this permission expression check
+     * @param checkFn check function
+     * @param requestedFields The list of requested fields
+     * @return Expression
+     */
+    private Expression buildAnyFieldOnlyExpression(final PermissionCondition condition,
+                                                   final Function<Check, Expression> checkFn,
+                                                   final Set<String> requestedFields) {
+        Type<?> resourceClass = condition.getEntityClass();
+        Class<? extends Annotation> annotationClass = condition.getPermission();
+
+        OrExpression allFieldsExpression = new OrExpression(FAILURE, null);
+        List<String> fields = entityDictionary.getAllExposedFields(resourceClass);
+
+        boolean fieldExpressionUsed = false;
+
+        for (String field : fields) {
+            if (requestedFields != null && !requestedFields.contains(field)) {
+                continue;
+            }
+
+            ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
+            Expression fieldExpression = normalizedExpressionFromParseTree(fieldPermissions, checkFn);
+
+            if (fieldExpression == null) {
+                return SUCCESSFUL_EXPRESSION;
+            }
+            fieldExpressionUsed = true;
+
+            allFieldsExpression = new OrExpression(allFieldsExpression, fieldExpression);
+        }
+
+        if (!fieldExpressionUsed) {
+            return SUCCESSFUL_EXPRESSION;
+        }
+
+        return new AnyFieldExpression(condition, allFieldsExpression);
+    }
+
+
+    /**
+     * Build an expression representing any field on an entity.
+     *
+     * @param forType   Resource class
+     * @param requestScope requestScope
+     * @return Expressions
+     */
+    public FilterExpression buildAnyFieldFilterExpression(
+            Type<?> forType,
+            RequestScope requestScope,
+            Set<String> requestedFields
+    ) {
+
+        Class<? extends Annotation> annotationClass = ReadPermission.class;
+        ParseTree classPermissions = entityDictionary.getPermissionsForClass(forType, annotationClass);
+        FilterExpression entityFilter = filterExpressionFromParseTree(classPermissions, forType, requestScope);
+
+        //case where the permissions does not have ANY filterExpressionCheck
+        if (entityFilter == FALSE_USER_CHECK_EXPRESSION
+                || entityFilter == NO_EVALUATION_EXPRESSION
+                || entityFilter == TRUE_USER_CHECK_EXPRESSION) {
+            entityFilter = null;
+        }
+
+        FilterExpression allFieldsFilterExpression = entityFilter;
+        List<String> fields = entityDictionary.getAllExposedFields(forType).stream()
+                .filter(field -> requestedFields == null || requestedFields.contains(field))
+                .collect(Collectors.toList());
+
+        for (String field : fields) {
+            ParseTree fieldPermissions = entityDictionary.getPermissionsForField(forType, field, annotationClass);
+            FilterExpression fieldExpression = filterExpressionFromParseTree(fieldPermissions, forType, requestScope);
+
+            if (fieldExpression == null && entityFilter == null) {
+                // When the class FilterExpression and the field FilterExpression are null because at least
+                // this field will be visible across all instances
+                return null;
+            }
+
+            if (fieldExpression == null || fieldExpression == FALSE_USER_CHECK_EXPRESSION) {
+                // When the expression is null no permissions have been defined for this field
+                // When the expression is FALSE_USER_CHECK_EXPRESSION this field is not accessible to the user
+                // In either case this field is not useful for filtering when loading records
+                continue;
+            }
+
+            if (fieldExpression == NO_EVALUATION_EXPRESSION || fieldExpression == TRUE_USER_CHECK_EXPRESSION) {
+                // When the expression is NO_EVALUATION_EXPRESSION we must evaluate check in memory across all instances
+                // When the expression is TRUE_USER_CHECK_EXPRESSION all records can be loaded
+                return null;
+            }
+
+            if (allFieldsFilterExpression != null) {
+                allFieldsFilterExpression = new OrFilterExpression(allFieldsFilterExpression, fieldExpression);
+            } else {
+                allFieldsFilterExpression = fieldExpression;
+            }
+        }
+
+        return allFieldsFilterExpression;
+    }
+
+    /**
+     * Build a filter expression for entity permission alone
+     * @param forType Resource class
+     * @param requestScope Request Scope
+     * @return
+     */
+    public FilterExpression buildEntityFilterExpression(Type<?> forType, RequestScope requestScope) {
+        ParseTree classPermissions = entityDictionary.getPermissionsForClass(forType, ReadPermission.class);
+        FilterExpression entityFilter = filterExpressionFromParseTree(classPermissions, forType, requestScope);
+        //case where the permissions does not have ANY filterExpressionCheck
+        if (entityFilter == FALSE_USER_CHECK_EXPRESSION
+                || entityFilter == NO_EVALUATION_EXPRESSION
+                || entityFilter == TRUE_USER_CHECK_EXPRESSION) {
+            return null;
+        }
+        return entityFilter;
+    }
+
+    private Expression normalizedExpressionFromParseTree(ParseTree permissions, Function<Check, Expression> checkFn) {
+        if (permissions == null) {
+            return null;
+        }
+
+        return permissions
+                .accept(new PermissionExpressionVisitor(entityDictionary, checkFn))
+                .accept(new PermissionExpressionNormalizationVisitor());
+    }
+
+    private FilterExpression filterExpressionFromParseTree(ParseTree permissions, Type type, RequestScope scope) {
+        if (permissions == null) {
+            return null;
+        }
+        final Function<Check, Expression> checkFn = (check) ->
+                new CheckExpression(check, null, scope, null, cache);
+
+        return normalizedExpressionFromParseTree(permissions, checkFn)
+                .accept(new PermissionToFilterExpressionVisitor(entityDictionary, scope, type));
+    }
+
+    private Function<Check, Expression> leafBuilder(PersistentResource resource, ChangeSpec changeSpec) {
+        final Function<Check, Expression> leafBuilderFn = (check) -> new CheckExpression(
+                check,
+                resource,
+                resource.getRequestScope(),
+                changeSpec,
+                cache
+        );
+        return leafBuilderFn;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AndExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AndExpression.java
new file mode 100644
index 0000000000..23f78d47ab
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AndExpression.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import lombok.Getter;
+
+/**
+ * Representation for an "And" expression.
+ */
+public class AndExpression implements Expression {
+    @Getter
+    private final Expression left;
+    @Getter
+    private final Expression right;
+
+    /**
+     * Constructor.
+     *
+     * @param left Left expression
+     * @param right Right expression
+     */
+    public AndExpression(final Expression left, final Expression right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        ExpressionResult leftStatus = left.evaluate(mode);
+
+        // Short-circuit
+        if (leftStatus == FAIL) {
+            return leftStatus;
+        }
+
+        ExpressionResult rightStatus = (right == null) ? PASS : right.evaluate(mode);
+
+        if (rightStatus == FAIL) {
+            return rightStatus;
+        }
+
+        if (leftStatus == PASS && rightStatus == PASS) {
+            return PASS;
+        }
+
+        return DEFERRED;
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitAndExpression(this);
+    }
+
+    @Override
+    public String toString() {
+        if (right == null) {
+            return String.format("%s", left);
+
+        }
+        return String.format("(%s) AND (%s)", left, right);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AnyFieldExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AnyFieldExpression.java
new file mode 100644
index 0000000000..c34d1123b6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/AnyFieldExpression.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.PermissionCondition;
+
+/**
+ * This check determines if an entity is accessible to the current user.
+ *
+ * An entity is considered to be accessible if there exists an annotation at _any_ level of the object that
+ * Grants access. This means that if access is permitted to any field of the object then the object
+ * is accessible, regardless of what any class or package level permissions would permit.
+ */
+public class AnyFieldExpression implements Expression {
+    private final Expression expression;
+    private final PermissionCondition condition;
+
+    public AnyFieldExpression(final PermissionCondition condition,
+                              final Expression expression) {
+        this.condition = condition;
+        this.expression = expression;
+    }
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        return expression.evaluate(mode);
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitExpression(this);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s FOR EXPRESSION [%s]",
+                condition, expression);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/CheckExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/CheckExpression.java
new file mode 100644
index 0000000000..82369a51b7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/CheckExpression.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.UNEVALUATED;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.ExpressionResultCache;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Optional;
+
+/**
+ * An expression in the security evaluation AST that wraps an actual check.
+ */
+@Slf4j
+public class CheckExpression implements Expression {
+
+    @Getter
+    protected final Check check;
+    protected final PersistentResource resource;
+    protected final RequestScope requestScope;
+    protected final ExpressionResultCache cache;
+    protected ExpressionResult result;
+
+    private final Optional<ChangeSpec> changeSpec;
+
+    /**
+     * Constructor.
+     *
+     * @param check The check to be evaluated by this expression
+     * @param resource The resource to pass to the check
+     * @param requestScope The requestScope to pass to the check
+     * @param changeSpec The changeSpec to pass to the check
+     * @param cache The cache of previous expression results
+     */
+    public CheckExpression(final Check check,
+                           final PersistentResource resource,
+                           final RequestScope requestScope,
+                           final ChangeSpec changeSpec,
+                           final ExpressionResultCache cache) {
+        this.check = check;
+        this.requestScope = requestScope;
+        this.changeSpec = Optional.ofNullable(changeSpec);
+        this.cache = cache;
+        this.result = UNEVALUATED;
+
+        // UserCheck does not use resource
+        this.resource = (check instanceof UserCheck) ? null : resource;
+    }
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        log.trace("Evaluating check: {} in mode {}", check, mode);
+
+        /* Result evaluation is sticky once evaluated to PASS or FAIL */
+        if (result == PASS || result == FAIL) {
+            return result;
+        }
+
+        if (mode == EvaluationMode.USER_CHECKS_ONLY && ! (check instanceof UserCheck)) {
+            result = DEFERRED;
+            return result;
+        }
+
+        if (mode == EvaluationMode.INLINE_CHECKS_ONLY && (resource != null && resource.isNewlyCreated())) {
+            result = DEFERRED;
+            return result;
+        }
+
+        if (mode == EvaluationMode.INLINE_CHECKS_ONLY && check.runAtCommit()) {
+            result = DEFERRED;
+            return result;
+        }
+
+        // If we have a valid change spec, do not cache the result or look for a cached result.
+        if (changeSpec.isPresent()) {
+            log.trace("-- Check has changespec: {}", changeSpec);
+            result = computeCheck();
+            log.trace("-- Check returned with result: {}", result);
+            return result;
+        }
+
+        // Otherwise, search the cache and use value if found. Otherwise, evaluate and add it to the cache.
+        log.trace("-- Check does NOT have changespec");
+        Class<? extends Check> checkClass = check.getClass();
+
+        if (cache.hasStoredResultFor(checkClass, resource)) {
+            result = cache.getResultFor(checkClass, resource);
+        } else {
+            result = computeCheck();
+            cache.putResultFor(checkClass, resource, result);
+            log.trace("-- Check computed result: {}", result);
+        }
+
+        log.trace("-- Check returned with result: {}", result);
+        return result;
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitCheckExpression(this);
+    }
+
+    /**
+     * Actually compute the result of the check without caching concerns.
+     *
+     * @return Expression result from the check.
+     */
+    private ExpressionResult computeCheck() {
+        Object entity = (resource == null) ? null : resource.getObject();
+
+        if (check instanceof UserCheck) {
+            result = ((UserCheck) check).ok(requestScope.getUser()) ? PASS : FAIL;
+        } else {
+            result = ((OperationCheck) check).ok(entity, requestScope, changeSpec) ? PASS : FAIL;
+        }
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        EntityDictionary dictionary = ((com.yahoo.elide.core.RequestScope) requestScope).getDictionary();
+        return String.format("(%s %s)", dictionary.getCheckIdentifier(check.getClass()), result);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/Expression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/Expression.java
new file mode 100644
index 0000000000..7ea6e20d29
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/Expression.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static org.fusesource.jansi.Ansi.ansi;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import org.fusesource.jansi.Ansi;
+
+/**
+ * Interface describing an expression.
+ */
+public interface Expression {
+
+    /**
+     * Different modes of evaluating security expressions.
+     */
+    public enum EvaluationMode {
+        USER_CHECKS_ONLY,   /* Only the user checks are evaluated */
+        INLINE_CHECKS_ONLY, /* Only the inline checks are evaluated */
+        ALL_CHECKS          /* Everything is evaluated */
+    }
+
+    /**
+     * Evaluate an expression.
+     *
+     * @param mode mode for evaluating security expressions
+     * @return The result of the fully evaluated expression.
+     */
+    ExpressionResult evaluate(EvaluationMode mode);
+
+    public <T> T accept(ExpressionVisitor<T> visitor);
+
+    /**
+     * Static Expressions that return PASS or FAIL.
+     */
+    public static class Results {
+        public static final Expression SUCCESS = new Expression() {
+            @Override
+            public ExpressionResult evaluate(EvaluationMode ignored) {
+                return ExpressionResult.PASS;
+            }
+
+            @Override
+            public <T> T accept(ExpressionVisitor<T> visitor) {
+                return visitor.visitExpression(this);
+            }
+
+            @Override
+            public String toString() {
+                return ansi().fg(Ansi.Color.GREEN).a("SUCCESS").reset().toString();
+            }
+        };
+        public static final Expression FAILURE = new Expression() {
+            @Override
+            public ExpressionResult evaluate(EvaluationMode ignored) {
+                return ExpressionResult.FAIL;
+            }
+
+            @Override
+            public <T> T accept(ExpressionVisitor<T> visitor) {
+                return visitor.visitExpression(this);
+            }
+
+            @Override
+            public String toString() {
+                return ansi().fg(Ansi.Color.RED).a("FAILURE").reset().toString();
+            }
+        };
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/ExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/ExpressionVisitor.java
new file mode 100644
index 0000000000..a3d48fa6bd
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/ExpressionVisitor.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.permissions.expressions;
+
+/**
+ * Visitor which walks the permission expression abstract syntax tree.
+ * @param <T> The return type of the visitor
+ */
+public interface ExpressionVisitor<T> {
+    T visitExpression(Expression expression);
+    T visitCheckExpression(CheckExpression checkExpression);
+    T visitAndExpression(AndExpression andExpression);
+    T visitOrExpression(OrExpression orExpression);
+    T visitNotExpression(NotExpression notExpression);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/NotExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/NotExpression.java
new file mode 100644
index 0000000000..4402489727
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/NotExpression.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import lombok.Getter;
+
+/**
+ * Representation of a "not" expression.
+ */
+public class NotExpression implements Expression {
+    @Getter
+    private final Expression logical;
+
+    /**
+     * Constructor.
+     *
+     * @param logical Unary expression
+     */
+    public NotExpression(final Expression logical) {
+        this.logical = logical;
+    }
+
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        ExpressionResult result = logical.evaluate(mode);
+
+        if (result == FAIL) {
+            return PASS;
+        }
+
+        if (result == PASS) {
+            return FAIL;
+        }
+
+        return DEFERRED;
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitNotExpression(this);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("NOT (%s)", logical);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/OrExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/OrExpression.java
new file mode 100644
index 0000000000..b6b2643f9e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/OrExpression.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.DEFERRED;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.FAIL;
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import lombok.Getter;
+
+/**
+ * Representation of an "or" expression.
+ */
+public class OrExpression implements Expression {
+    @Getter
+    private final Expression left;
+    @Getter
+    private final Expression right;
+
+    public static final OrExpression SUCCESSFUL_EXPRESSION = new OrExpression(Results.SUCCESS, null);
+    public static final OrExpression FAILURE_EXPRESSION = new OrExpression(Results.FAILURE, null);
+
+    /**
+     * Constructor.
+     *
+     * @param left Left expression
+     * @param right Right expression.
+     */
+    public OrExpression(final Expression left, final Expression right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        ExpressionResult leftResult = left.evaluate(mode);
+
+        // Short-circuit
+        if (leftResult == PASS) {
+            return PASS;
+        }
+
+        ExpressionResult rightResult = (right == null) ? leftResult : right.evaluate(mode);
+
+        if (leftResult == FAIL && rightResult == FAIL) {
+            return leftResult;
+        }
+
+        if (rightResult == PASS) {
+            return PASS;
+        }
+
+        return DEFERRED;
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitOrExpression(this);
+    }
+
+    @Override
+    public String toString() {
+        if (right == null || right.equals(Results.FAILURE)) {
+            return String.format("%s", left);
+        }
+        return String.format("(%s) OR (%s)", left, right);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/SpecificFieldExpression.java b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/SpecificFieldExpression.java
new file mode 100644
index 0000000000..802c68c9eb
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/permissions/expressions/SpecificFieldExpression.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions.expressions;
+
+import static com.yahoo.elide.core.security.permissions.ExpressionResult.PASS;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.PermissionCondition;
+import lombok.Getter;
+
+import java.util.Optional;
+
+/**
+ * Expression for joining specific fields.
+ *
+ * That is, this evaluates security while giving precedence to the annotation on a particular field over
+ * the annotation at the entity- or package-level.
+ */
+public class SpecificFieldExpression implements Expression {
+    private final Expression entityExpression;
+    private final Optional<Expression> fieldExpression;
+    @Getter private final PermissionCondition condition;
+
+    public SpecificFieldExpression(final PermissionCondition condition,
+                                   final Expression entityExpression,
+                                   final Expression fieldExpression) {
+        this.condition = condition;
+        this.entityExpression = entityExpression;
+        this.fieldExpression = Optional.ofNullable(fieldExpression);
+    }
+
+    @Override
+    public ExpressionResult evaluate(EvaluationMode mode) {
+        if (!fieldExpression.isPresent()) {
+            return (entityExpression == null) ? PASS : entityExpression.evaluate(mode);
+        }
+        return fieldExpression.get().evaluate(mode);
+    }
+
+    @Override
+    public <T> T accept(ExpressionVisitor<T> visitor) {
+        return visitor.visitExpression(this);
+    }
+
+
+    @Override
+    public String toString() {
+        return fieldExpression
+                .map(fe -> String.format("%s FOR EXPRESSION [FIELD(%s)]", condition, fe))
+                .orElseGet(() -> {
+                    if (entityExpression == null) {
+                        return String.format("%s FOR EXPRESSION []", condition);
+                    }
+                    return String.format("%s FOR EXPRESSION [ENTITY(%s)]", condition, entityExpression);
+                });
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/CanPaginateVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/CanPaginateVisitor.java
new file mode 100644
index 0000000000..3dad96a4e9
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/CanPaginateVisitor.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.visitors;
+
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
+import com.yahoo.elide.generated.parsers.ExpressionParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Walks a permission expression to determine if any part of the expression must be evaluated in memory.
+ * If part of the expression must be evaluated in memory, the data store cannot paginate the result.
+ *
+ * Here are some examples of what the expected behavior is for combining user and filter expression checks:
+ *
+ * User Check (TRUE) OR Filter Expression (TRUE)
+ *  - Elide will not push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The entire result set will be paginated.
+ *  - The entire result set will be returned.
+ *
+ * User Check (TRUE) OR Filter Expression (FALSE)
+ *  - Elide will not push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The entire result set will be paginated.
+ *  - The entire result set will be returned.
+ *
+ * User Check (FALSE) OR Filter Expression (TRUE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered result set will be paginated.
+ *  - The filtered result set will be returned.
+ *
+ * User Check (FALSE) OR Filter Expression (FALSE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The empty result set will be paginated.
+ *  - The empty result set will be returned.
+ *
+ * User Check (TRUE) AND Filter Expression (TRUE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered result set will be paginated.
+ *  - The filtered result set will be returned.
+ *
+ * User Check (TRUE) AND Filter Expression (FALSE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The empty result set will be paginated.
+ *  - The empty result set will be returned.
+ *
+ * User Check (FALSE) AND Filter Expression (TRUE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered result set will be paginated.
+ *  - The empty result set will be returned.
+ *
+ * User Check (FALSE) AND Filter Expression (FALSE)
+ *  - Elide will push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The empty result set will be paginated.
+ *  - The empty result set will be returned.
+ *
+ * More Complex Scenarios:
+ *
+ * (User Check (TRUE) OR Filter Expression 1 (FALSE)) AND Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (2) result set will be paginated.
+ *  - The filtered (2) result set will be returned.
+ *
+ * (User Check (TRUE) OR Filter Expression 1 (TRUE)) AND Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (2) result set will be paginated.
+ *  - The filtered (2) result set will be returned.
+ *
+ * (User Check (FALSE) OR Filter Expression 1 (TRUE)) AND Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (1 and 2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (1 and 2) result set will be paginated.
+ *  - The filtered (1 and 2) result set will be returned.
+ *
+ * (User Check (FALSE) OR Filter Expression 1 (FALSE)) AND Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (1 and 2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The empty result set will be paginated.
+ *  - The empty result set will be returned.
+ *
+ * (User Check (TRUE) AND Filter Expression 1 (FALSE)) OR Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (1 or 2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (2) result set will be paginated.
+ *  - The filtered (2) result set will be returned.
+ *
+ * (User Check (TRUE) AND Filter Expression 1 (TRUE)) OR Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (1 or 2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (1 or 2) result set will be paginated.
+ *  - The filtered (1 or 2) result set will be returned.
+ *
+ * (User Check (FALSE) AND Filter Expression 1 (TRUE)) OR Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (2) result set will be paginated.
+ *  - The filtered (2) result set will be returned
+ *
+ * (User Check (FALSE) AND Filter Expression 1 (FALSE)) OR Filter Expression 2 (TRUE)
+ *  - Elide WILL push the filter predicate (2) to the data store.
+ *  - Elide will allow pagination.
+ *  - The filtered (2) result set will be paginated.
+ *  - The filtered (2) result set will be returned
+ *
+ */
+public class CanPaginateVisitor
+        extends ExpressionBaseVisitor<CanPaginateVisitor.PaginationStatus> {
+
+    /**
+     *  All states except for CANNOT_PAGINATE allow for pagination.
+     */
+      public enum PaginationStatus {
+        CAN_PAGINATE,
+        USER_CHECK_FALSE,
+        USER_CHECK_TRUE,
+        CANNOT_PAGINATE
+    };
+
+    private final EntityDictionary dictionary;
+    private final RequestScope scope;
+    private Set<String> requestedFields;
+
+
+    public CanPaginateVisitor(EntityDictionary dictionary, RequestScope scope, Set<String> requestedFields) {
+        this.dictionary = dictionary;
+        this.scope = scope;
+        this.requestedFields = requestedFields;
+    }
+
+    @Override
+    public PaginationStatus visitNOT(ExpressionParser.NOTContext ctx) {
+        PaginationStatus status = visit(ctx.expression());
+        if (status == PaginationStatus.USER_CHECK_FALSE) {
+            return PaginationStatus.USER_CHECK_TRUE;
+        }
+
+        if (status == PaginationStatus.USER_CHECK_TRUE) {
+            return PaginationStatus.USER_CHECK_FALSE;
+        }
+
+        /*
+         * Pagination status really only depends on whether the check runs in memory or in the DB.  NOT has not bearing
+         * on that.
+         */
+        return status;
+    }
+
+    @Override
+    public PaginationStatus visitOR(ExpressionParser.ORContext ctx) {
+        PaginationStatus lhs = visit(ctx.left);
+        PaginationStatus rhs = visit(ctx.right);
+
+        if (lhs == PaginationStatus.USER_CHECK_TRUE || rhs == PaginationStatus.USER_CHECK_TRUE) {
+            return PaginationStatus.USER_CHECK_TRUE;
+        }
+
+        if (rhs == PaginationStatus.CANNOT_PAGINATE || lhs == PaginationStatus.CANNOT_PAGINATE) {
+            return PaginationStatus.CANNOT_PAGINATE;
+        }
+
+        return PaginationStatus.CAN_PAGINATE;
+    }
+
+    @Override
+    public PaginationStatus visitAND(ExpressionParser.ANDContext ctx) {
+        PaginationStatus lhs = visit(ctx.left);
+        PaginationStatus rhs = visit(ctx.right);
+
+        if (lhs == PaginationStatus.USER_CHECK_FALSE || rhs == PaginationStatus.USER_CHECK_FALSE) {
+            return PaginationStatus.USER_CHECK_FALSE;
+        }
+
+        if (rhs == PaginationStatus.CANNOT_PAGINATE || lhs == PaginationStatus.CANNOT_PAGINATE) {
+            return PaginationStatus.CANNOT_PAGINATE;
+        }
+
+        return PaginationStatus.CAN_PAGINATE;
+    }
+
+    @Override
+    public PaginationStatus visitPAREN(ExpressionParser.PARENContext ctx) {
+        return visit(ctx.expression());
+    }
+
+    @Override
+    public PaginationStatus visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
+        Check check = dictionary.getCheckInstance(ctx.getText());
+
+        //Filter expression checks can always be pushed to the DataStore so pagination is possible
+        if (check instanceof FilterExpressionCheck) {
+            return PaginationStatus.CAN_PAGINATE;
+        }
+        if (check instanceof UserCheck) {
+            if (((UserCheck) check).ok(scope.getUser())) {
+                return PaginationStatus.USER_CHECK_TRUE;
+            }
+            return PaginationStatus.USER_CHECK_FALSE;
+        }
+        //Any in memory check will alter (incorrectly) the paginated result
+        return PaginationStatus.CANNOT_PAGINATE;
+    }
+
+    /**
+     * Determines whether a data store can correctly paginate a collection of resources of a given
+     * class for a requested set of fields.
+     * @param resourceClass The class of resources that will be paginated
+     * @param dictionary Used to look up permissions
+     * @param scope Contains the user object.
+     * @param requestedFields Contains the request info including any sparse fields that were requested
+     * @return true if the data store can paginate.  false otherwise.
+     */
+    public static boolean canPaginate(
+            Type<?> resourceClass,
+            EntityDictionary dictionary,
+            RequestScope scope,
+            Set<String> requestedFields
+    ) {
+        CanPaginateVisitor visitor = new CanPaginateVisitor(dictionary, scope, requestedFields);
+
+        Class<? extends Annotation> annotationClass = ReadPermission.class;
+        ParseTree classPermissions = dictionary.getPermissionsForClass(resourceClass, annotationClass);
+        PaginationStatus canPaginateClass = PaginationStatus.CAN_PAGINATE;
+
+        if (classPermissions != null) {
+            canPaginateClass = visitor.visit(classPermissions);
+        }
+
+        List<String> fields = dictionary.getAllExposedFields(resourceClass);
+
+        boolean canPaginate = true;
+        for (String field : fields) {
+            if (! requestedFields.isEmpty() && ! requestedFields.contains(field)) {
+                continue;
+            }
+
+            PaginationStatus canPaginateField = canPaginateClass;
+            ParseTree fieldPermissions = dictionary.getPermissionsForField(resourceClass, field, annotationClass);
+            if (fieldPermissions != null) {
+                canPaginateField = visitor.visit(fieldPermissions);
+            }
+
+            /*
+             * If any of the fields can always be seen by the user, the user can see the entire
+             * collection of entities (absent any fields which they cannot see).
+             */
+            if (canPaginateField == PaginationStatus.USER_CHECK_TRUE) {
+                return true;
+            }
+
+            /*
+             * Except for true user checks above, any field which cannot be paginated means the entire
+             * collection cannot be paginated.  If one field has a filter expression check and the other has
+             * an in memory check, both checks must be evaluated in memory (effectively any in memory check makes
+             * all other checks in memory).
+             */
+            if (canPaginateField == PaginationStatus.CANNOT_PAGINATE) {
+                canPaginate = false;
+            }
+        }
+        return canPaginate;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionNormalizationVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionNormalizationVisitor.java
new file mode 100644
index 0000000000..06529a7fc1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionNormalizationVisitor.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.visitors;
+
+import com.yahoo.elide.core.security.permissions.expressions.AndExpression;
+import com.yahoo.elide.core.security.permissions.expressions.CheckExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.permissions.expressions.ExpressionVisitor;
+import com.yahoo.elide.core.security.permissions.expressions.NotExpression;
+import com.yahoo.elide.core.security.permissions.expressions.OrExpression;
+
+/**
+ * Expression Visitor to normalize Permission expression.
+ */
+public class PermissionExpressionNormalizationVisitor implements ExpressionVisitor<Expression> {
+    @Override
+    public Expression visitExpression(Expression expression) {
+        return expression;
+    }
+
+    @Override
+    public Expression visitCheckExpression(CheckExpression checkExpression) {
+        return checkExpression;
+    }
+
+    @Override
+    public Expression visitAndExpression(AndExpression andExpression) {
+        Expression left = andExpression.getLeft();
+        Expression right = andExpression.getRight();
+        return new AndExpression(left.accept(this), right.accept(this));
+    }
+
+    @Override
+    public Expression visitOrExpression(OrExpression orExpression) {
+        Expression left = orExpression.getLeft();
+        Expression right = orExpression.getRight();
+        return new OrExpression(left.accept(this), right.accept(this));
+    }
+
+    @Override
+    public Expression visitNotExpression(NotExpression notExpression) {
+        Expression inner = notExpression.getLogical();
+        if (inner instanceof AndExpression) {
+            AndExpression and = (AndExpression) inner;
+            Expression left = new NotExpression(and.getLeft()).accept(this);
+            Expression right = new NotExpression(and.getRight()).accept(this);
+            return new OrExpression(left, right);
+        }
+        if (inner instanceof OrExpression) {
+            OrExpression or = (OrExpression) inner;
+            Expression left = new NotExpression(or.getLeft()).accept(this);
+            Expression right = new NotExpression(or.getRight()).accept(this);
+            return new AndExpression(left, right);
+        }
+        if (inner instanceof NotExpression) {
+            NotExpression not = (NotExpression) inner;
+            return (not.getLogical()).accept(this);
+        }
+        return notExpression;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionVisitor.java
new file mode 100644
index 0000000000..5c28fb87a6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionExpressionVisitor.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.visitors;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.permissions.expressions.AndExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.permissions.expressions.NotExpression;
+import com.yahoo.elide.core.security.permissions.expressions.OrExpression;
+import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
+import com.yahoo.elide.generated.parsers.ExpressionParser;
+
+import java.util.function.Function;
+
+/**
+ * Expression Visitor.
+ */
+public class PermissionExpressionVisitor extends ExpressionBaseVisitor<Expression> {
+    private final EntityDictionary dictionary;
+    private final Function<Check, Expression> expressionGenerator;
+
+
+    public PermissionExpressionVisitor(EntityDictionary dictionary, Function<Check, Expression> expressionGenerator) {
+        this.dictionary = dictionary;
+        this.expressionGenerator = expressionGenerator;
+    }
+
+
+    @Override
+    public Expression visitNOT(ExpressionParser.NOTContext ctx) {
+        // Create a not expression
+        return new NotExpression(visit(ctx.expression()));
+    }
+
+    @Override
+    public Expression visitOR(ExpressionParser.ORContext ctx) {
+        return new OrExpression(visit(ctx.left), visit(ctx.right));
+    }
+
+    @Override
+    public Expression visitAND(ExpressionParser.ANDContext ctx) {
+        Expression left = visit(ctx.left);
+        Expression right = visit(ctx.right);
+        return new AndExpression(left, right);
+    }
+
+    @Override
+    public Expression visitPAREN(ExpressionParser.PARENContext ctx) {
+        return visit(ctx.expression());
+    }
+
+    @Override
+    public Expression visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
+        Check check = dictionary.getCheckInstance(ctx.getText());
+
+        return expressionGenerator.apply(check);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionToFilterExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionToFilterExpressionVisitor.java
new file mode 100644
index 0000000000..503a74eb46
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/security/visitors/PermissionToFilterExpressionVisitor.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security.visitors;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.permissions.expressions.AndExpression;
+import com.yahoo.elide.core.security.permissions.expressions.CheckExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.permissions.expressions.ExpressionVisitor;
+import com.yahoo.elide.core.security.permissions.expressions.NotExpression;
+import com.yahoo.elide.core.security.permissions.expressions.OrExpression;
+import com.yahoo.elide.core.type.Type;
+
+import java.util.Objects;
+
+
+/**
+ * PermissionToFilterExpressionVisitor parses a permission parseTree and returns the corresponding FilterExpression
+ * representation of it. This allows passing a security permission predicate down to datastore level to reduce
+ * in-memory permission verification workload.
+ * A few cases is not allow and will throw exception:
+ *      1. User define FilterExpressionCheck which returns null in getFilterExpression function.
+ *      2. User put a FilterExpressionCheck with a non-userCheck type check in OR relation.
+ */
+public class PermissionToFilterExpressionVisitor implements ExpressionVisitor<FilterExpression> {
+    private final EntityDictionary dictionary;
+    private final Type entityClass;
+    private final RequestScope requestScope;
+
+    /**
+     * This is a constant that represents a check that we cannot evaluate at extraction time.
+     * Usually this is an inline or commit-time check.
+     */
+    public static final FilterExpression NO_EVALUATION_EXPRESSION = new FilterExpression() {
+        @Override
+        public <T> T accept(FilterExpressionVisitor<T> visitor) {
+            return (T) this;
+        }
+        @Override
+        public String toString() {
+            return "NO_EVALUATION_EXPRESSION";
+        }
+    };
+
+    /**
+     * This represents a user check that has evaluated to false.
+     */
+    public static final FilterExpression FALSE_USER_CHECK_EXPRESSION = new FilterExpression() {
+        @Override
+        public <T> T accept(FilterExpressionVisitor<T> visitor) {
+            return (T) this;
+        }
+        @Override
+        public String toString() {
+            return "FALSE_USER_CHECK_EXPRESSION";
+        }
+    };
+
+    /**
+     * This represents a user check that has evaluated to true.
+     */
+    public static final FilterExpression TRUE_USER_CHECK_EXPRESSION = new FilterExpression() {
+        @Override
+        public <T> T accept(FilterExpressionVisitor<T> visitor) {
+            return (T) this;
+        }
+        @Override
+        public String toString() {
+            return "TRUE_USER_EXPRESSION";
+        }
+    };
+
+    public PermissionToFilterExpressionVisitor(EntityDictionary dictionary, RequestScope requestScope,
+            Type entityClass) {
+        this.dictionary = dictionary;
+        this.requestScope = requestScope;
+        this.entityClass = entityClass;
+    }
+
+    @Override
+    public FilterExpression visitNotExpression(NotExpression notExpression) {
+        FilterExpression expression = notExpression.getLogical().accept(this);
+        if (Objects.equals(expression, TRUE_USER_CHECK_EXPRESSION)) {
+            return FALSE_USER_CHECK_EXPRESSION;
+        }
+        if (Objects.equals(expression, FALSE_USER_CHECK_EXPRESSION)) {
+            return TRUE_USER_CHECK_EXPRESSION;
+        }
+        if (Objects.equals(expression, NO_EVALUATION_EXPRESSION)) {
+            return NO_EVALUATION_EXPRESSION;
+        }
+        if (expression instanceof FilterPredicate) {
+            return ((FilterPredicate) expression).negate();
+        }
+        return new NotFilterExpression(expression);
+    }
+
+    @Override
+    public FilterExpression visitOrExpression(OrExpression orExpression) {
+        FilterExpression left = orExpression.getLeft().accept(this);
+        FilterExpression right = orExpression.getRight().accept(this);
+
+        if (expressionWillNotFilter(left)) {
+            return left;
+        }
+
+        if (expressionWillNotFilter(right)) {
+            return right;
+        }
+
+        boolean leftFails = expressionWillFail(left);
+        boolean rightFails = expressionWillFail(right);
+        if (leftFails && rightFails) {
+            return FALSE_USER_CHECK_EXPRESSION;
+        }
+        if (leftFails) {
+            return right;
+        }
+        if (rightFails) {
+            return left;
+        }
+
+        return new OrFilterExpression(left, right);
+    }
+
+    @Override
+    public FilterExpression visitAndExpression(AndExpression andExpression) {
+        FilterExpression left = andExpression.getLeft().accept(this);
+        FilterExpression right = andExpression.getRight().accept(this);
+
+        // (FALSE_USER_CHECK_EXPRESSION AND FilterExpression) => FALSE_USER_CHECK_EXPRESSION
+        // (FALSE_USER_CHECK_EXPRESSION AND NO_EVALUATION_EXPRESSION) => FALSE_USER_CHECK_EXPRESSION
+        if (expressionWillFail(left) || expressionWillFail(right)) {
+            return FALSE_USER_CHECK_EXPRESSION;
+        }
+
+        if (expressionWillNotFilter(left)) {
+            return right;
+        }
+
+        if (expressionWillNotFilter(right)) {
+            return left;
+        }
+
+        return new AndFilterExpression(left, right);
+    }
+
+    private boolean expressionWillFail(FilterExpression expression) {
+        return Objects.equals(expression, FALSE_USER_CHECK_EXPRESSION) || operator(expression) == Operator.FALSE;
+    }
+
+    private boolean expressionWillNotFilter(FilterExpression expression) {
+        return Objects.equals(expression, NO_EVALUATION_EXPRESSION)
+                || Objects.equals(expression, TRUE_USER_CHECK_EXPRESSION)
+                || operator(expression) == Operator.TRUE;
+    }
+
+    @Override
+    public FilterExpression visitCheckExpression(CheckExpression checkExpression) {
+        Check check = checkExpression.getCheck();
+        if (check instanceof FilterExpressionCheck) {
+            FilterExpressionCheck filterCheck = (FilterExpressionCheck) check;
+            FilterExpression filterExpression = filterCheck.getFilterExpression(entityClass, requestScope);
+
+            if (filterExpression == null) {
+                throw new IllegalStateException("FilterCheck#getFilterExpression must not return null.");
+            }
+
+            return filterExpression;
+        }
+
+        if (check instanceof UserCheck) {
+            boolean userCheckResult = ((UserCheck) check).ok(requestScope.getUser());
+            return userCheckResult ? TRUE_USER_CHECK_EXPRESSION : FALSE_USER_CHECK_EXPRESSION;
+        }
+
+        return NO_EVALUATION_EXPRESSION;
+    }
+
+    private Operator operator(FilterExpression expression) {
+        return expression instanceof FilterPredicate
+                ? ((FilterPredicate) expression).getOperator()
+                : null;
+    }
+
+    @Override
+    public FilterExpression visitExpression(Expression expression) {
+        return NO_EVALUATION_EXPRESSION;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/sort/Sorting.java b/elide-core/src/main/java/com/yahoo/elide/core/sort/Sorting.java
deleted file mode 100644
index ff2479183e..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/core/sort/Sorting.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.sort;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-import lombok.ToString;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Generates a simple wrapper around the sort fields from the JSON-API GET Query.
- */
-@ToString
-public class Sorting {
-
-    /**
-     * Denotes the intended sort type from json-api field.
-     */
-    public enum SortOrder { asc, desc }
-
-    private final Map<String, SortOrder> sortRules = new LinkedHashMap<>();
-    private static final Sorting DEFAULT_EMPTY_INSTANCE = new Sorting(null);
-
-    /**
-     * Constructs a new Sorting instance.
-     * @param sortingRules The map of sorting rules
-     */
-    public Sorting(final Map<String, SortOrder> sortingRules) {
-        if (sortingRules != null) {
-            sortRules.putAll(sortingRules);
-        }
-    }
-
-    /**
-     * Checks to see if the sorting rules are valid for the given JPA class.
-     * @param entityClass The target jpa entity
-     * @param dictionary The elide entity dictionary
-     * @param <T> The Type of the target entity
-     * @return The validity of the sorting rules on the target class
-     * @throws InvalidValueException when sorting values are not valid for the jpa entity
-     */
-    public <T> boolean hasValidSortingRules(final Class<T> entityClass,
-                                        final EntityDictionary dictionary) throws InvalidValueException {
-
-        final List<String> entities = dictionary.getAttributes(entityClass);
-        sortRules.keySet().stream().forEachOrdered(sortRule -> {
-            if (!entities.contains(sortRule)) {
-                throw new InvalidValueException(entityClass.getSimpleName()
-                        + " doesn't contain the field " + sortRule);
-            }
-        });
-        return true;
-    }
-
-    /**
-     * Given the sorting rules validate sorting rules against the entities bound to the entityClass.
-     * @param entityClass  The root class for sorting (eg. /book?sort=-title this would be package.Book)
-     * @param dictionary The elide entity dictionary
-     * @param <T> The entityClass
-     * @return The valid sorting rules - validated through the entity dictionary, or empty dictionary
-     * @throws InvalidValueException when sorting values are not valid for the jpa entity
-     */
-    public <T> Map<String, SortOrder> getValidSortingRules(final Class<T> entityClass,
-                                                           final EntityDictionary dictionary)
-            throws InvalidValueException {
-        hasValidSortingRules(entityClass, dictionary);
-        return sortRules;
-    }
-
-    /**
-     * @return Fetches the base rules, ignoring validation against an entity class.
-     */
-    public Map<String, SortOrder> getSortingRules() {
-        return this.sortRules;
-    }
-
-    /**
-     * Informs if the structure is default instance.
-     * @return true if this instance is empty - no sorting rules
-     */
-    public boolean isDefaultInstance() {
-        return this.sortRules.isEmpty();
-    }
-
-    /**
-     * Given the query params on the GET request, collect possible sorting rules.
-     * @param queryParams The query params on the request.
-     * @return The Sorting instance (default or specific).
-     */
-    public static Sorting parseQueryParams(final MultivaluedMap<String, String> queryParams) {
-        final Map<String, SortOrder> sortingRules = new LinkedHashMap<>();
-        queryParams.entrySet().stream()
-                .filter(entry -> entry.getKey().equals("sort"))
-                .forEachOrdered(entry -> {
-                    String sortRule = entry.getValue().get(0);
-                    if (sortRule.contains(",")) {
-                        for (String sortRuleSplit : sortRule.split(",")) {
-                            parseSortRule(sortRuleSplit, sortingRules);
-                        }
-                    } else {
-                        parseSortRule(sortRule, sortingRules);
-                    }
-                });
-        return sortingRules.isEmpty() ? DEFAULT_EMPTY_INSTANCE : new Sorting(sortingRules);
-    }
-
-    /**
-     * Internal helper method to parse sorting rule strings.
-     * @param sortRule The string from the queryParams
-     * @param sortingRules The final shared reference to the sortingRules map
-     */
-    private static void parseSortRule(String sortRule, final Map<String, SortOrder> sortingRules) {
-        boolean isDesc = false;
-        char firstCharacter = sortRule.charAt(0);
-        if (firstCharacter == '-') {
-            isDesc = true;
-            sortRule = sortRule.substring(1);
-        }
-        if (firstCharacter == '+') {
-            // json-api spec supports asc by default, there is no need to explicitly support +
-            sortRule = sortRule.substring(1);
-        }
-        sortingRules.put(sortRule, isDesc ? SortOrder.desc : SortOrder.asc);
-    }
-
-    /**
-     * Get the default final empty instance.
-     * @return The default empty instance.
-     */
-    public static Sorting getDefaultEmptyInstance() {
-        return DEFAULT_EMPTY_INSTANCE;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/sort/SortingImpl.java b/elide-core/src/main/java/com/yahoo/elide/core/sort/SortingImpl.java
new file mode 100644
index 0000000000..63927c8730
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/sort/SortingImpl.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.sort;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Generates a simple wrapper around the sort fields from the JSON-API GET Query.
+ */
+@ToString
+@EqualsAndHashCode
+public class SortingImpl implements Sorting {
+
+    private final Map<String, SortOrder> sortRules = new LinkedHashMap<>();
+    private static final SortingImpl DEFAULT_EMPTY_INSTANCE = null;
+    private static final String JSONAPI_ID_KEYWORD = "id";
+
+    @Getter
+    private Type<?> type;
+
+    @Getter
+    private Map<Path, SortOrder> sortingPaths;
+
+    private Set<Attribute> attributes;
+
+    /**
+     * Constructs a new Sorting instance.
+     * @param sortingRules The map of sorting rules
+     * @param type The model being sorted
+     * @param dictionary The entity dictionary
+     */
+    public SortingImpl(final Map<String, SortOrder> sortingRules, Type<?> type, EntityDictionary dictionary) {
+        this(sortingRules, type, Collections.emptySet(), dictionary);
+    }
+
+    /**
+     * Constructs a new Sorting instance.
+     * @param sortingRules The map of sorting rules
+     * @param type The model being sorted
+     * @param dictionary The entity dictionary
+     */
+    public SortingImpl(final Map<String, SortOrder> sortingRules, Class<?> type, EntityDictionary dictionary) {
+        this(sortingRules, ClassType.of(type), dictionary);
+    }
+
+    /**
+     * Constructs a new Sorting instance.
+     * @param sortingRules The map of sorting rules
+     * @param type The model being sorted
+     * @param attributes The set of attributes being requested
+     * @param dictionary The entity dictionary
+     */
+    public SortingImpl(final Map<String, SortOrder> sortingRules, Type<?> type,
+                       Set<Attribute> attributes, EntityDictionary dictionary) {
+        if (sortingRules != null) {
+            sortRules.putAll(sortingRules);
+        }
+
+        this.attributes = attributes;
+        this.type = type;
+        sortingPaths = getValidSortingRules(type, attributes, dictionary);
+    }
+
+    /**
+     * Given the sorting rules validate sorting rules against the entities bound to the entityClass.
+     * @param entityClass  The root class for sorting (eg. /book?sort=-title this would be package.Book)
+     * @param attributes  The attributes that are being requested for the sorted model
+     * @param dictionary The elide entity dictionary
+     * @param <T> The entityClass
+     * @return The valid sorting rules - validated through the entity dictionary, or empty dictionary
+     * @throws InvalidValueException when sorting values are not valid for the jpa entity
+     */
+    private <T> Map<Path, SortOrder> getValidSortingRules(final Type<T> entityClass,
+                                                          final Set<Attribute> attributes,
+                                                          final EntityDictionary dictionary)
+            throws InvalidValueException {
+        Map<Path, SortOrder> returnMap = new LinkedHashMap<>();
+        for (Map.Entry<String, SortOrder> entry : replaceIdRule(dictionary.getIdFieldName(entityClass)).entrySet()) {
+            String dotSeparatedPath = entry.getKey();
+            SortOrder order = entry.getValue();
+
+            Path path;
+            if (dotSeparatedPath.contains(".")) {
+                //Creating a path validates that the dot separated path is valid.
+                path = new Path(entityClass, dictionary, dotSeparatedPath);
+            } else {
+                Attribute attribute = attributes.stream().filter(attr -> attr.getName().equals(dotSeparatedPath)
+                        || attr.getAlias().equals(dotSeparatedPath))
+                        .findFirst().orElse(null);
+
+                if (attribute == null) {
+                    path = new Path(entityClass, dictionary, dotSeparatedPath);
+                } else {
+                    path = new Path(entityClass, dictionary, attribute.getName(),
+                            attribute.getAlias(), attribute.getArguments());
+                }
+            }
+
+            if (! isValidSortRulePath(path, dictionary)) {
+                throw new InvalidValueException("Cannot sort across a to-many relationship: " + path.getFieldPath());
+            }
+
+            returnMap.put(path, order);
+        }
+
+        return returnMap;
+    }
+
+    /**
+     * Validates that none of the provided path's relationships are to-many.
+     * @param path The path to validate
+     * @param dictionary The elide entity dictionary
+     * @return True if the path is valid. False otherwise.
+     */
+    protected static boolean isValidSortRulePath(Path path, EntityDictionary dictionary) {
+        //Validate that none of the relationships are to-many
+        for (Path.PathElement pathElement : path.getPathElements()) {
+            if (! dictionary.isRelation(pathElement.getType(), pathElement.getFieldName())) {
+                continue;
+            }
+
+            if (dictionary.getRelationshipType(pathElement.getType(), pathElement.getFieldName()).isToMany()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Informs if the structure is default instance.
+     * @return true if this instance is empty - no sorting rules
+     */
+    @Override
+    public boolean isDefaultInstance() {
+        return this.sortRules.isEmpty();
+    }
+
+    /**
+     * Given the query params on the GET request, collect possible sorting rules.
+     * @param queryParams The query params on the request.
+     * @return The Sorting instance (default or specific).
+     */
+    public static Sorting parseQueryParams(final MultivaluedMap<String, String> queryParams,
+                                           Type<?> type, EntityDictionary dictionary) {
+
+        if (queryParams.isEmpty()) {
+            return DEFAULT_EMPTY_INSTANCE;
+        }
+
+        List<String> sortRules = queryParams.entrySet().stream()
+                .filter(entry -> entry.getKey().equals("sort"))
+                .map(entry -> entry.getValue().get(0))
+                .collect(Collectors.toList());
+        return parseSortRules(sortRules, type, Collections.emptySet(), dictionary);
+    }
+
+    /**
+     * Parse a raw sort rule.
+     * @param sortRule Sorting string to parse
+     * @param type The model to sort
+     * @param dictionary The entity dictionary
+     * @return Sorting object.
+     */
+    public static Sorting parseSortRule(String sortRule, Type<?> type, EntityDictionary dictionary) {
+        return parseSortRules(Arrays.asList(sortRule), type, Collections.emptySet(), dictionary);
+    }
+
+    /**
+     * Parse a raw sort rule.
+     * @param sortRule Sorting string to parse
+     * @param type The model to sort
+     * @param attributes The requested attributes of the model
+     * @param dictionary The entity dictionary
+     * @return Sorting object.
+     */
+    public static Sorting parseSortRule(String sortRule, Type<?> type,
+                                        Set<Attribute> attributes, EntityDictionary dictionary) {
+        return parseSortRules(Arrays.asList(sortRule), type, attributes, dictionary);
+    }
+
+    /**
+     * Internal helper to parse list of sorting rules.
+     * @param sortRules Sorting rules to parse
+     * @param type The model to sort
+     * @param attributes The requested attributes of the model
+     * @param dictionary The entity dictionary
+     * @return Sorting object containing parsed sort rules
+     */
+    private static SortingImpl parseSortRules(List<String> sortRules,
+                                              Type<?> type,
+                                              Set<Attribute> attributes,
+                                              EntityDictionary dictionary) {
+        final Map<String, SortOrder> sortingRules = new LinkedHashMap<>();
+        for (String sortRule : sortRules) {
+            if (sortRule.contains(",")) {
+                for (String sortRuleSplit : sortRule.split(",")) {
+                    parseSortRule(sortRuleSplit, sortingRules);
+                }
+            } else {
+                parseSortRule(sortRule, sortingRules);
+            }
+        }
+        return sortingRules.isEmpty()
+                ? DEFAULT_EMPTY_INSTANCE
+                : new SortingImpl(sortingRules, type, attributes, dictionary);
+    }
+
+    /**
+     * Internal helper method to parse sorting rule strings.
+     * @param sortRule The string from the queryParams
+     * @param sortingRules The final shared reference to the sortingRules map
+     */
+    private static void parseSortRule(String sortRule, final Map<String, SortOrder> sortingRules) {
+        boolean isDesc = false;
+        char firstCharacter = sortRule.charAt(0);
+        if (firstCharacter == '-') {
+            isDesc = true;
+            sortRule = sortRule.substring(1);
+        }
+        if (firstCharacter == '+') {
+            // json-api spec supports asc by default, there is no need to explicitly support +
+            sortRule = sortRule.substring(1);
+        }
+        sortingRules.put(sortRule, isDesc ? SortOrder.desc : SortOrder.asc);
+    }
+
+    /**
+     * Replace id with proper field for object.
+     *
+     * @param idFieldName Name of the object's id field.
+     * @return Sort rules with id field name replaced
+     */
+    private LinkedHashMap<String, SortOrder> replaceIdRule(String idFieldName) {
+        LinkedHashMap<String, SortOrder> result = new LinkedHashMap<>();
+        for (Map.Entry<String, SortOrder> entry : sortRules.entrySet()) {
+            String key = entry.getKey();
+            SortOrder value = entry.getValue();
+            if (JSONAPI_ID_KEYWORD.equals(key)) {
+                result.put(idFieldName, value);
+            } else {
+                result.put(key, value);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Get the default final empty instance.
+     * @return The default empty instance.
+     */
+    public static Sorting getDefaultEmptyInstance() {
+        return DEFAULT_EMPTY_INSTANCE;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/AccessibleObject.java b/elide-core/src/main/java/com/yahoo/elide/core/type/AccessibleObject.java
new file mode 100644
index 0000000000..bbf951ffba
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/AccessibleObject.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Base interface for fields and methods.
+ */
+public interface AccessibleObject extends Member {
+
+    /**
+     * The name of the field or method.
+     * @return the name.
+     */
+    String getName();
+
+    /**
+     * Changes whether the field or method is accessible.
+     * @param flag true or false.
+     */
+    default void setAccessible(boolean flag) {
+        //NOOP
+    }
+
+    /**
+     * Determines whether the member is synthetic.
+     * @return True or false.
+     */
+    default boolean isSynthetic() {
+        return false;
+    }
+
+    /**
+     * @param annotationClass The annotation to search for.
+     * @return True or false.
+     */
+    boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
+
+    /**
+     * Searches for a specific annotation.
+     * @param annotationClass The annotation to search for.
+     * @param <T> The annotation type to search for.
+     * @return The annotation or null.
+     */
+    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
+
+    /**
+     * Searches for a specific annotation.
+     * @param annotationClass The annotation to search for.
+     * @param <T> The annotation type to search for.
+     * @return A list of annotations or null.
+     */
+    <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass);
+
+    /**
+     * Returns all annotations ignoring inherited ones.
+     * @return A list of annotations or null.
+     */
+    Annotation[] getDeclaredAnnotations();
+
+    /**
+     * Returns all annotations.
+     * @return A list of annotations or null.
+     */
+    Annotation[] getAnnotations();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/ClassType.java b/elide-core/src/main/java/com/yahoo/elide/core/type/ClassType.java
new file mode 100644
index 0000000000..ac02fc28d6
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/ClassType.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import com.google.common.collect.ImmutableList;
+import lombok.Getter;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * An elide type that wraps a Java class.
+ * @param <T> The Java class.
+ */
+public class ClassType<T> implements Type<T> {
+    public static final List<Method> OBJ_METHODS = ImmutableList.copyOf(
+            Arrays.stream(Object.class.getMethods()).map(ClassType::constructMethod).collect(Collectors.toList()));
+
+    public static final ClassType<Map> MAP_TYPE = ClassType.of(Map.class);
+    public static final ClassType<Collection> COLLECTION_TYPE = ClassType.of(Collection.class);
+    public static final ClassType<String> STRING_TYPE = ClassType.of(String.class);
+    public static final ClassType<Boolean> BOOLEAN_TYPE = ClassType.of(Boolean.class);
+    public static final ClassType<Long> LONG_TYPE = ClassType.of(Long.class);
+    public static final ClassType<BigDecimal> BIGDECIMAL_TYPE = ClassType.of(BigDecimal.class);
+    public static final ClassType<Number> NUMBER_TYPE = ClassType.of(Number.class);
+    public static final ClassType<Date> DATE_TYPE = ClassType.of(Date.class);
+    public static final ClassType<Object> OBJECT_TYPE = ClassType.of(Object.class);
+    public static final ClassType<Class> CLASS_TYPE = ClassType.of(Class.class);
+    public static final ClassType<Integer> INTEGER_TYPE = ClassType.of(Integer.class);
+
+    @Getter
+    private Class<T> cls;
+
+    /**
+     * Constructor.
+     * @param cls The underlying java class.
+     */
+    public ClassType(Class<T> cls) {
+        this.cls = cls;
+    }
+
+    @Override
+    public String getCanonicalName() {
+        return cls.getCanonicalName();
+    }
+
+    @Override
+    public String getSimpleName() {
+        return cls.getSimpleName();
+    }
+
+    @Override
+    public String getName() {
+        return cls.getName();
+    }
+
+    @Override
+    public Type<T> getSuperclass() {
+        Class<?> superClass = cls.getSuperclass();
+        if (superClass == null) {
+            return null;
+        }
+
+        return new ClassType(superClass);
+    }
+
+    @Override
+    public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationClass) {
+        return cls.getAnnotationsByType(annotationClass);
+    }
+
+    @Override
+    public Field[] getFields() {
+        return Arrays.stream(cls.getFields())
+                .map(ClassType::constructField).toArray(Field[]::new);
+    }
+
+    @Override
+    public Field[] getDeclaredFields() {
+        return Arrays.stream(cls.getDeclaredFields())
+                .map(ClassType::constructField).toArray(Field[]::new);
+    }
+
+    @Override
+    public Field getDeclaredField(String name) throws NoSuchFieldException {
+        return constructField(cls.getDeclaredField(name));
+    }
+
+    @Override
+    public Method[] getConstructors() {
+        return Arrays.stream(cls.getConstructors())
+                .map(ClassType::constructMethod).toArray(Method[]::new);
+    }
+
+    @Override
+    public boolean isParameterized() {
+        return (cls.getGenericSuperclass() instanceof ParameterizedType);
+    }
+
+    @Override
+    public boolean hasSuperType() {
+        return cls != null && cls != Object.class;
+    }
+
+    @Override
+    public T newInstance() throws InstantiationException, IllegalAccessException {
+        return cls.newInstance();
+    }
+
+    @Override
+    public Package getPackage() {
+        return constructPackage(cls.getPackage());
+    }
+
+    @Override
+    public Method[] getMethods() {
+        return Arrays.stream(cls.getMethods())
+                .map(ClassType::constructMethod).toArray(Method[]::new);
+    }
+
+    @Override
+    public Method[] getDeclaredMethods() {
+        return Arrays.stream(cls.getDeclaredMethods())
+                .map(ClassType::constructMethod).toArray(Method[]::new);
+    }
+
+    @Override
+    public boolean isAssignableFrom(Type other) {
+        Optional<Class<?>> clazz = other.getUnderlyingClass();
+
+        return clazz.filter(cls::isAssignableFrom).isPresent();
+    }
+
+    @Override
+    public boolean isPrimitive() {
+        return cls.isPrimitive();
+    }
+
+    @Override
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        return cls.getAnnotation(annotationClass);
+    }
+
+    @Override
+    public <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass) {
+        return cls.getDeclaredAnnotation(annotationClass);
+    }
+
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return getAnnotation(annotationClass) != null;
+    }
+
+    @Override
+    public Method getMethod(String name, Type<?>... parameterTypes) throws NoSuchMethodException {
+        Class<?>[] typeParams = Arrays.stream(parameterTypes)
+                .map(ClassType.class::cast)
+                .map(classType -> (classType == null) ? null : classType.getCls())
+                .toArray(Class[]::new);
+
+        return constructMethod(cls.getMethod(name, typeParams));
+    }
+
+    private static Field constructField(java.lang.reflect.Field field) {
+        if (field == null) {
+            return null;
+        }
+
+        return new FieldType(field);
+    }
+
+    private static Method constructMethod(java.lang.reflect.Executable method) {
+        if (method == null) {
+            return null;
+        }
+
+        return new MethodType(method);
+    }
+
+    private static Package constructPackage(java.lang.Package pkg) {
+        if (pkg == null) {
+            return null;
+        }
+
+        return new Package() {
+            @Override
+            public <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass) {
+                return pkg.getDeclaredAnnotation(annotationClass);
+            }
+
+            @Override
+            public String getName() {
+                return pkg.getName();
+            }
+
+            @Override
+            public Package getParentPackage() {
+                String name = pkg.getName();
+                int idx = name.lastIndexOf('.');
+                return idx == -1 ? null : constructPackage(java.lang.Package.getPackage(name.substring(0, idx)));
+            }
+        };
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ClassType<?> classType = (ClassType<?>) o;
+        return Objects.equals(cls, classType.cls);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(cls);
+    }
+
+    @Override
+    public String toString() {
+        return "ClassType{" + "cls=" + cls + '}';
+    }
+
+    @Override
+    public boolean isEnum() {
+        return cls.isEnum();
+    }
+
+    @Override
+    public T[] getEnumConstants() {
+        return cls.getEnumConstants();
+    }
+
+    @Override
+    public Optional<Class<T>> getUnderlyingClass() {
+        return Optional.of(getCls());
+    }
+
+    /**
+     * Construction helper.
+     * @param <T> class type
+     * @param cls The underlying java class.
+     * @return wrapped Type
+     */
+    public static <T> ClassType<T> of(Class<T> cls) {
+        return cls == null ? null : new ClassType<>(cls);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Dynamic.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Dynamic.java
new file mode 100644
index 0000000000..0c0461e6cb
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Dynamic.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+/**
+ * All objects created or loaded by a DataStore that are not associated with a ClassType
+ * must inherit from this interface.
+ */
+public interface Dynamic {
+
+    /**
+     * Get the underlying Elide type associated with this object.
+     * @return The Elide type.
+     */
+    Type getType();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Field.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Field.java
new file mode 100644
index 0000000000..ac191e6bb2
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Field.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import java.util.Optional;
+
+/**
+ * A field in an Elide type.
+ */
+public interface Field extends AccessibleObject {
+
+    /**
+     * Get the value of the field.
+     * @param obj The object to access.
+     * @return The field value.
+     * @throws IllegalArgumentException
+     * @throws IllegalAccessException if the field cannot be accessed.
+     */
+    Object get(Object obj) throws IllegalArgumentException, IllegalAccessException;
+
+    /**
+     * Get the Elide type associated with the field.
+     * @return
+     */
+    Type<?> getType();
+
+    /**
+     * Returns the Elide type of a specific parameter of a parameterized type.
+     * @param parentType The parameterized type.
+     * @param index Which parameter should be retrieved.
+     * @return The parameter type.
+     */
+    Type<?> getParameterizedType(Type<?> parentType, Optional<Integer> index);
+
+    /**
+     * Changes the value of the field.
+     * @param obj The object containing the field.
+     * @param value The new value.
+     * @throws IllegalArgumentException
+     * @throws IllegalAccessException If the field cannot be accessed.
+     */
+    void set(Object obj, Object value) throws IllegalArgumentException, IllegalAccessException;
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/FieldType.java b/elide-core/src/main/java/com/yahoo/elide/core/type/FieldType.java
new file mode 100644
index 0000000000..b758b55b2e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/FieldType.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.type;
+
+import org.apache.commons.lang3.reflect.TypeUtils;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.util.Optional;
+
+/**
+ * Elide field that wraps a Java field.
+ */
+@AllArgsConstructor
+@EqualsAndHashCode
+public class FieldType implements Field {
+
+    private java.lang.reflect.Field field;
+
+    @Override
+    public void setAccessible(boolean flag) {
+        field.setAccessible(flag);
+    }
+
+    @Override
+    public boolean isSynthetic() {
+        return field.isSynthetic();
+    }
+
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return field.isAnnotationPresent(annotationClass);
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        return field.getAnnotation(annotationClass);
+    }
+
+    @Override
+    public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+        return field.getAnnotationsByType(annotationClass);
+    }
+
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        return field.getDeclaredAnnotations();
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return field.getAnnotations();
+    }
+
+    @Override
+    public int getModifiers() {
+        return field.getModifiers();
+    }
+
+    @Override
+    public String getName() {
+        return field.getName();
+    }
+
+    @Override
+    public Object get(Object obj) throws IllegalArgumentException, IllegalAccessException {
+        return field.get(obj);
+    }
+
+    @Override
+    public Type<?> getType() {
+        return ClassType.of(field.getType());
+    }
+
+    @Override
+    public Type<?> getParameterizedType(Type<?> parentType, Optional<Integer> index) {
+        if (parentType instanceof Dynamic) {
+            return getType();
+        }
+
+        java.lang.reflect.Type type = field.getGenericType();
+
+        if (type instanceof ParameterizedType && index.isPresent()) {
+            return ClassType.of(
+                    TypeUtils.getRawType(
+                        ((ParameterizedType) type).getActualTypeArguments()[index.get().intValue()],
+                        ((ClassType) parentType).getCls()
+                    )
+            );
+        }
+        return ClassType.of(TypeUtils.getRawType(type, ((ClassType) parentType).getCls()));
+    }
+
+    @Override
+    public void set(Object obj, Object value) throws IllegalArgumentException, IllegalAccessException {
+        field.set(obj, value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Member.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Member.java
new file mode 100644
index 0000000000..e1afbeab41
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Member.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+/**
+ * Base class of fields and methods.
+ */
+public interface Member {
+
+    /**
+     * Get the permission modifiers of the field/method.
+     * @return The permission modifiers.
+     */
+    int getModifiers();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Method.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Method.java
new file mode 100644
index 0000000000..e2ef9fafb0
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Method.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+
+/**
+ * A method belonging to an Elide type.
+ */
+public interface Method extends AccessibleObject {
+
+    /**
+     * Get the number of parameters the method takes.
+     * @return The parameter count.
+     */
+    int getParameterCount();
+
+    /**
+     * Invokes the method.
+     * @param obj The object containing the method.
+     * @param args The parameters
+     * @return The return value of the method.
+     * @throws IllegalAccessException If the method cannot be accessed.
+     * @throws IllegalArgumentException
+     * @throws InvocationTargetException If the object doesn't contain this method.
+     */
+    Object invoke(Object obj, Object... args) throws IllegalAccessException,
+            IllegalArgumentException, InvocationTargetException;
+
+    /**
+     * Gets the return type of the method.
+     * @return The return type.
+     */
+    Type<?> getReturnType();
+
+    /**
+     * Gets a parameter type if the return type is parameterized.
+     * @param parentType The return type.
+     * @param index Which parameter type to return.
+     * @return The parameter type.
+     */
+    Type<?> getParameterizedReturnType(Type<?> parentType, Optional<Integer> index);
+
+    /**
+     * Returns all the parameter types.
+     * @return All the parameter types.
+     */
+    Class<?>[] getParameterTypes();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/MethodType.java b/elide-core/src/main/java/com/yahoo/elide/core/type/MethodType.java
new file mode 100644
index 0000000000..4eb8873521
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/MethodType.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.type;
+
+import org.apache.commons.lang3.reflect.TypeUtils;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+import java.util.Optional;
+
+/**
+ * Elide Method that wraps a Java Method.
+ */
+@AllArgsConstructor
+@EqualsAndHashCode
+public class MethodType implements Method {
+
+    private java.lang.reflect.Executable method;
+
+    @Override
+    public int getModifiers() {
+        return method.getModifiers();
+    }
+
+    @Override
+    public void setAccessible(boolean flag) {
+        method.setAccessible(flag);
+    }
+
+    @Override
+    public boolean isSynthetic() {
+        return method.isSynthetic();
+    }
+
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotation) {
+        return method.isAnnotationPresent(annotation);
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        return method.getAnnotation(annotationClass);
+    }
+
+    @Override
+    public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+        return method.getAnnotationsByType(annotationClass);
+    }
+
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        return method.getDeclaredAnnotations();
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return method.getAnnotations();
+    }
+
+    @Override
+    public String getName() {
+        return method.getName();
+    }
+
+    @Override
+    public int getParameterCount() {
+        return method.getParameterCount();
+    }
+
+    @Override
+    public Object invoke(Object obj, Object... args) throws IllegalAccessException,
+            IllegalArgumentException, InvocationTargetException {
+        if (! (method instanceof java.lang.reflect.Method)) {
+            throw new UnsupportedOperationException("Constructors cannot be invoked");
+        }
+        return ((java.lang.reflect.Method) method).invoke(obj, args);
+    }
+
+    @Override
+    public Type<?> getReturnType() {
+        if (! (method instanceof java.lang.reflect.Method)) {
+            throw new UnsupportedOperationException("Constructors cannot be invoked");
+        }
+        return ClassType.of(((java.lang.reflect.Method) method).getReturnType());
+    }
+
+    @Override
+    public Type<?> getParameterizedReturnType(Type<?> parentType, Optional<Integer> index) {
+        if (! (method instanceof java.lang.reflect.Method)) {
+            throw new UnsupportedOperationException("Constructors cannot be invoked");
+        }
+
+        if (parentType instanceof Dynamic) {
+            return getReturnType();
+        }
+
+        java.lang.reflect.Type type = ((java.lang.reflect.Method) method).getGenericReturnType();
+
+        if (type instanceof ParameterizedType && index.isPresent()) {
+            return ClassType.of(
+                    TypeUtils.getRawType(
+                            ((ParameterizedType) type).getActualTypeArguments()[index.get().intValue()],
+                            ((ClassType) parentType).getCls()
+                    )
+            );
+        }
+        return ClassType.of(TypeUtils.getRawType(type, ((ClassType) parentType).getCls()));
+    }
+
+    @Override
+    public Class<?>[] getParameterTypes() {
+        return method.getParameterTypes();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Package.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Package.java
new file mode 100644
index 0000000000..b7e7db0ccf
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Package.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Elide package for one or more types.
+ */
+public interface Package {
+
+    /**
+     * Gets the annotations of a specific type.
+     * @param annotationClass The annotation to search for.
+     * @param <A> The annotation to search for.
+     * @return The annotation if found or null.
+     */
+    <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass);
+
+    /**
+     * Returns the name of the package.
+     * @return the package name.
+     */
+    String getName();
+
+    /**
+     * Returns the name of the parent package.
+     * @return the parent package.
+     */
+    Package getParentPackage();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedAttribute.java b/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedAttribute.java
new file mode 100644
index 0000000000..f031aa4cd7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedAttribute.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import com.yahoo.elide.core.request.Argument;
+
+import java.util.Set;
+
+/**
+ * An elide attribute that supports parameters.
+ */
+@FunctionalInterface
+public interface ParameterizedAttribute {
+
+    /**
+     * Fetch the attribute value with the specified parameters.
+     * @param arguments The attribute arguments.
+     * @param <T> The return type of the attribute.
+     * @return The attribute value.
+     */
+    public <T> T invoke(Set<Argument> arguments);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedModel.java b/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedModel.java
new file mode 100644
index 0000000000..a76d1c89fd
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/ParameterizedModel.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.core.exceptions.InvalidParameterizedAttributeException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Base class that contains one or more parameterized attributes.
+ */
+public abstract class ParameterizedModel {
+
+    @Exclude
+    protected Map<Attribute, ParameterizedAttribute> parameterizedAttributes;
+
+    public ParameterizedModel() {
+        this(new HashMap<>());
+    }
+
+    public ParameterizedModel(Map<Attribute, ParameterizedAttribute> attributes) {
+        this.parameterizedAttributes = attributes;
+    }
+
+    public <T> void addAttributeValue(Attribute attribute, T value) {
+        parameterizedAttributes.put(attribute,
+            new ParameterizedAttribute() {
+                @Override
+                public <T> T invoke(Set<Argument> arguments) {
+                    return (T) value;
+                }
+            });
+    }
+
+    /**
+     * Fetch the attribute value with the specified parameters.
+     * @param attribute The attribute to fetch.
+     * @param <T> The return type of the attribute.
+     * @return The attribute value.
+     */
+    public <T> T invoke(Attribute attribute) {
+        return parameterizedAttributes.entrySet().stream()
+
+                //Only filter by alias required.  (Filtering by type may not work with inheritance).
+                .filter(entry -> attribute.getAlias().equals(entry.getKey().getAlias()))
+                .findFirst()
+                .map(Map.Entry::getValue)
+                .orElseThrow(() -> new InvalidParameterizedAttributeException(attribute))
+                .invoke(attribute.getArguments());
+    }
+
+    /**
+     * Fetch the attribute value by name.
+     * @param alias The field name to fetch.
+     * @param defaultValue Returned if the field name is not found
+     * @param <T> The return type of the attribute.
+     * @return The attribute value or the provided default value.
+     */
+    public <T> T fetch(String alias, T defaultValue) {
+        Optional<ParameterizedAttribute> match = parameterizedAttributes.entrySet().stream()
+
+                //Only filter by alias required.  (Filtering by type may not work with inheritance).
+                .filter(entry -> alias.equals(entry.getKey().getAlias()))
+                .findFirst()
+                .map(Map.Entry::getValue);
+
+        if (! match.isPresent()) {
+            return defaultValue;
+        }
+
+        return match.get().invoke(new HashSet<>());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/type/Type.java b/elide-core/src/main/java/com/yahoo/elide/core/type/Type.java
new file mode 100644
index 0000000000..46f9a38a12
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/type/Type.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+
+/**
+ * Elide type for models and their attributes.
+ * @param <T> The underlying Java class.
+ */
+public interface Type<T> extends java.lang.reflect.Type {
+
+    /**
+     * Gets the canonical name of the class containing no $ symbols.
+     * @return The canonical name.
+     */
+    String getCanonicalName();
+
+    /**
+     * Gets the simple name of the class without package prefix.
+     * @return The simple name.
+     */
+    String getSimpleName();
+
+
+    /**
+     * Get the name of the class including package prefix.
+     * @return The name of the class.
+     */
+    String getName();
+
+    /**
+     * Returns a method belonging to a type.
+     * @param name The method name.
+     * @param parameterTypes The parameter types.
+     * @return The method.
+     * @throws NoSuchMethodException if no matching method is found.
+     */
+    Method getMethod(String name, Type<?>... parameterTypes) throws NoSuchMethodException;
+
+    /**
+     * Gets the super class associated with the type.
+     * @return Super class type or null.
+     */
+    Type<?> getSuperclass();
+
+    /**
+     * Returns all the annotations of a given type.
+     * @param annotationClass The annotation type to search for.
+     * @param <A> The annotation class.
+     * @return An array of found annotations.
+     */
+    <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationClass);
+
+    /**
+     * Gets a specific annotation ignoring inherited annotations.
+     * @param annotationClass The class to search for.
+     * @param <A> The class to search for.
+     * @return The declared annotation or null.
+     */
+    <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass);
+
+    /**
+     * Gets a specific annotation including inherited annotations.
+     * @param annotationClass The class to search for.
+     * @param <A> The class to search for.
+     * @return The declared annotation or null.
+     */
+    <A extends Annotation> A getAnnotation(Class<A> annotationClass);
+
+    /**
+     * Searches for a specific annotation including inherited annotations.
+     * @param annotationClass The class to search for.
+     * @return true or false.
+     */
+    boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
+
+    /**
+     * Can this type be assigned to another type.
+     * @param cls The type to assign to.
+     * @return true or false.
+     */
+    boolean isAssignableFrom(Type<?> cls);
+
+    /**
+     * Is this type a Java primitive?
+     * @return true or false.
+     */
+    boolean isPrimitive();
+
+    /**
+     * Gets the package this type belongs to.
+     * @return the package.
+     */
+    Package getPackage();
+
+    /**
+     * Gets all the methods found in this type.
+     * @return Any array of methods.
+     */
+    Method[] getMethods();
+
+    /**
+     * Gets all the methods found in this type.
+     * @return Any array of methods.
+     */
+    Method[] getDeclaredMethods();
+
+    /**
+     * Gets all the fields found in this type.
+     * @return Any array of fields.
+     */
+    Field[] getFields();
+
+    /**
+     * Gets all the fields found in this type ignoring inherited fields.
+     * @return Any array of fields.
+     */
+    Field[] getDeclaredFields();
+
+    /**
+     * Gets a specific field found in this type ignoring inherited fields.
+     * @param name The name of the field to find.
+     * @return The found field.
+     * @throws NoSuchFieldException if the field is not found.
+     */
+    Field getDeclaredField(String name) throws NoSuchFieldException;
+
+    /**
+     * Returns the full list of type constructors.
+     * @return An array of type constructors.
+     */
+    Method[] getConstructors();
+
+    /**
+     * Whether or not this type is parameterized.
+     * @return true or false.
+     */
+    default boolean isParameterized() {
+        return false;
+    }
+
+    /**
+     * Whether or not this type inherits from another type.
+     * @return true or false.
+     */
+    boolean hasSuperType();
+
+    /**
+     * Constructs a new instance of the type.
+     * @return Thew newly construct instance.
+     * @throws InstantiationException If construction failed.
+     * @throws IllegalAccessException If the constructor could not be called.
+     */
+    T newInstance() throws InstantiationException, IllegalAccessException;
+
+    /**
+     * If this type represents an enumeration.
+     * @return true or false.
+     */
+    boolean isEnum();
+
+    /**
+     * Returns the list of enumeration constants this type represents.
+     * @return An array of enumeration constants.
+     */
+    T[] getEnumConstants();
+
+    /**
+     * If this type represents a static Java Class, return the underlying class.
+     * @return The Java class or empty.
+     */
+    Optional<Class<T>> getUnderlyingClass();
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/ClassScanner.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/ClassScanner.java
new file mode 100644
index 0000000000..8fa63ead14
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/ClassScanner.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Scans a package for classes by looking at files in the classpath.
+ */
+public interface ClassScanner {
+
+    /**
+     * Scans all classes accessible from the context class loader which belong to the given package and subpackages.
+     *
+     * @param toScan package to scan
+     * @param annotation Annotation to search
+     * @return The classes
+     */
+    Set<Class<?>> getAnnotatedClasses(Package toScan, Class<? extends Annotation> annotation);
+
+    /**
+     * Scans all classes accessible from the context class loader which belong to the given package and subpackages.
+     *
+     * @param packageName package name to scan.
+     * @param annotation Annotation to search
+     * @return The classes
+     */
+    Set<Class<?>> getAnnotatedClasses(String packageName, Class<? extends Annotation> annotation);
+
+    /**
+     * Scans all classes accessible from the context class loader which belong to the current class loader.
+     * Filters the final output based on expression.
+     * @param annotations  One or more annotation to search for
+     * @param filter  filter expression to include the final results in the output.
+     * @return The classes
+     */
+    Set<Class<?>> getAnnotatedClasses(List<Class<? extends Annotation>> annotations, FilterExpression filter);
+
+    /**
+     * Scans all classes accessible from the context class loader which belong to the current class loader.
+     *
+     * @param annotations  One or more annotation to search for
+     * @return The classes
+     */
+    Set<Class<?>> getAnnotatedClasses(List<Class<? extends Annotation>> annotations);
+
+    Set<Class<?>> getAnnotatedClasses(Class<? extends Annotation> ...annotations);
+
+    /**
+     * Returns all classes within a package.
+     * @param packageName The root package to search.
+     * @return All the classes within a package.
+     */
+    Set<Class<?>> getAllClasses(String packageName);
+
+    /**
+     * Function which will be invoked for deciding to include the class in final results.
+     */
+    @FunctionalInterface
+    interface FilterExpression {
+        boolean include(Class clazz);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/DefaultClassScanner.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/DefaultClassScanner.java
new file mode 100644
index 0000000000..92e1bf9dcc
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/DefaultClassScanner.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ScanResult;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Scans a package for classes by looking at files in the classpath.
+ */
+public class DefaultClassScanner implements ClassScanner {
+
+    /**
+     * Class Scanning is terribly costly for service boot, so we do all the scanning up front once to
+     * save on startup costs.  All Annotations Elide scans for must be listed here:
+     */
+    private static final String [] CACHE_ANNOTATIONS  = {
+            //Elide Core Annotations
+            Include.class.getCanonicalName(),
+            SecurityCheck.class.getCanonicalName(),
+            ElideTypeConverter.class.getCanonicalName(),
+
+            //GraphQL annotations.  Strings here to avoid dependency.
+            "com.yahoo.elide.graphql.subscriptions.annotations.Subscription",
+
+            //Aggregation Store Annotations.  Strings here to avoid dependency.
+            "com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable",
+            "com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery",
+            "org.hibernate.annotations.Subselect",
+
+            //JPA
+            "javax.persistence.Entity",
+            "javax.persistence.Table"
+    };
+
+    private final Map<String, Set<Class<?>>> startupCache;
+
+    /**
+     * Primarily for tests so builds don't take forever.
+     */
+    private static DefaultClassScanner _instance;
+
+    /**
+     * For use within a container where class scanning happens at compile time.
+     * @param startupCache Maps annotations (in CACHE_ANNOTATIONS) to classes.
+     */
+    public DefaultClassScanner(Map<String, Set<Class<?>>> startupCache) {
+        this.startupCache = startupCache;
+    }
+
+    /**
+     * For use within a container where class scanning happens at boot time.
+     */
+    public DefaultClassScanner() {
+        this.startupCache = new HashMap<>();
+        try (ScanResult scanResult = new ClassGraph().enableClassInfo().enableAnnotationInfo().scan()) {
+            for (String annotationName : CACHE_ANNOTATIONS) {
+                startupCache.put(annotationName, scanResult.getClassesWithAnnotation(annotationName)
+                        .stream()
+                        .map(ClassInfo::loadClass)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
+
+            }
+        }
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedClasses(Package toScan, Class<? extends Annotation> annotation) {
+        return getAnnotatedClasses(toScan.getName(), annotation);
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedClasses(String packageName, Class<? extends Annotation> annotation) {
+        return startupCache.get(annotation.getCanonicalName()).stream()
+                .filter(clazz ->
+                        clazz.getPackage().getName().equals(packageName)
+                                || clazz.getPackage().getName().startsWith(packageName + "."))
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedClasses(List<Class<? extends Annotation>> annotations,
+            FilterExpression filter) {
+        Set<Class<?>> result = new LinkedHashSet<>();
+
+        for (Class<? extends Annotation> annotation : annotations) {
+            result.addAll(startupCache.get(annotation.getCanonicalName()).stream()
+                    .filter(filter::include)
+                    .collect(Collectors.toCollection(LinkedHashSet::new)));
+        }
+
+        return result;
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedClasses(List<Class<? extends Annotation>> annotations) {
+        return getAnnotatedClasses(annotations, clazz -> true);
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedClasses(Class<? extends Annotation> ...annotations) {
+        return getAnnotatedClasses(Arrays.asList(annotations));
+    }
+
+    @Override
+    public Set<Class<?>> getAllClasses(String packageName) {
+        try (ScanResult scanResult = new ClassGraph()
+                .enableClassInfo().whitelistPackages(packageName).scan()) {
+            return scanResult.getAllClasses().stream()
+                    .map((ClassInfo::loadClass))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        }
+    }
+
+    /**
+     * Primarily for tests to only create a single instance of this to reduce build times.  Production code
+     * will use DI to accomplish the same.
+     * @return The single instance.
+     */
+    public static synchronized DefaultClassScanner getInstance() {
+        if (_instance == null) {
+            _instance = new DefaultClassScanner();
+        }
+        return _instance;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/TimedFunction.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/TimedFunction.java
new file mode 100644
index 0000000000..2fc5e965d4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/TimedFunction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.utils;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.Supplier;
+
+/**
+ * Wraps a function and logs how long it took to run (in millis).
+ * @param <R> The function return type.
+ */
+@Slf4j
+@Data
+public class TimedFunction<R> implements Supplier<R> {
+
+    public TimedFunction(Supplier<R> toRun, String logMessage) {
+        this.toRun = toRun;
+        this.logMessage = logMessage;
+    }
+
+    private Supplier<R> toRun;
+    private String logMessage;
+
+    @Override
+    public R get() {
+        long start = System.currentTimeMillis();
+        R ret = toRun.get();
+        long end = System.currentTimeMillis();
+
+        log.debug(logMessage + "\tTime spent: {}", end - start);
+
+        return ret;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/TypeHelper.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/TypeHelper.java
new file mode 100644
index 0000000000..e84f4ad767
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/TypeHelper.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.utils;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Dynamic;
+import com.yahoo.elide.core.type.Type;
+
+import com.google.common.collect.Sets;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Utilities for handling types and aliases.
+ */
+public class TypeHelper {
+    private static final String UNDERSCORE = "_";
+    private static final String PERIOD = ".";
+    private static final Set<Class<?>> PRIMITIVE_NUMBER_TYPES = Sets
+            .newHashSet(short.class, int.class, long.class, float.class, double.class);
+    private static final Set<Class<?>> NUMBER_TYPES = Sets
+            .newHashSet(short.class, int.class, long.class, float.class, double.class,
+                    Short.class, Integer.class, Long.class, Float.class, Double.class);
+
+    /**
+     * Determine whether a type is primitive number type
+     *
+     * @param type type to check
+     * @return True is the type is primitive number type
+     */
+    public static boolean isPrimitiveNumberType(Type<?> type) {
+        if (type instanceof Dynamic) {
+            return false;
+        }
+
+        return PRIMITIVE_NUMBER_TYPES.contains(((ClassType) type).getCls());
+    }
+
+    /**
+     * Determine whether a type is number type
+     *
+     * @param type type to check
+     * @return True is the type is number type
+     */
+    public static boolean isNumberType(Class<?> type) {
+        return NUMBER_TYPES.contains(type);
+    }
+
+    /**
+     * Extend an type alias to the final type of an extension path
+     *
+     * @param alias      type alias to be extended, e.g. <code>a_b</code>
+     * @param extension  path extension from aliased type, e.g. <code>[b.c]/[c.d]</code>
+     * @param dictionary The entity dictionary
+     * @return extended type alias, e.g. <code>a_b_c</code>
+     */
+    public static String extendTypeAlias(String alias, Path extension, EntityDictionary dictionary) {
+        String result = alias;
+        List<Path.PathElement> elements = extension.getPathElements();
+
+        for (int i = 0; i < elements.size() - 1; i++) {
+            Path.PathElement next = elements.get(i);
+            if (dictionary.isComplexAttribute(next.getType(), next.getFieldName())) {
+                result = result + "." + next.getFieldName();
+            } else {
+                result = appendAlias(result, elements.get(i).getFieldName());
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Generate alias for representing a relationship path which dose not include the last field name.
+     * The path would start with the class alias of the first element, and then each field would append "_fieldName" to
+     * the result.
+     * The last field would not be included as that's not a part of the relationship path.
+     *
+     * @param path       path that represents a relationship chain
+     * @param dictionary The entity dictionary
+     * @return relationship path alias, i.e. <code>foo.bar.baz</code> would be <code>foo_bar</code>
+     */
+    public static String getPathAlias(Path path, EntityDictionary dictionary) {
+        return extendTypeAlias(getTypeAlias(path.getPathElements().get(0).getType()), path, dictionary);
+    }
+
+    /**
+     * Append a new field to a parent alias to get new alias.
+     *
+     * @param parentAlias parent path alias
+     * @param fieldName   field name
+     * @return alias for the field
+     */
+    public static String appendAlias(String parentAlias, String fieldName) {
+        return isEmpty(parentAlias)
+                ? fieldName
+                : isEmpty(fieldName)
+                ? parentAlias
+                : parentAlias + UNDERSCORE + fieldName;
+    }
+
+    /**
+     * Build an query friendly alias for a class.
+     *
+     * @param type The type to alias
+     * @return type name alias that will likely not conflict with other types or with reserved keywords.
+     */
+    public static String getTypeAlias(Type<?> type) {
+        return type.getCanonicalName().replace(PERIOD, UNDERSCORE);
+    }
+
+    /**
+     * Get alias for the final field of a path.
+     *
+     * @param path       path to the field
+     * @param fieldName  physical field name
+     * @param dictionary the entity dictionary
+     * @return combined alias
+     */
+    public static String getFieldAlias(Path path, String fieldName, EntityDictionary dictionary) {
+        return getFieldAlias(getPathAlias(path, dictionary), fieldName);
+    }
+
+    /**
+     * Get alias for the final field of a path.
+     *
+     * @param tableAlias alias for table that contains the field
+     * @param fieldName  physical field name
+     * @return combined alias
+     */
+    public static String getFieldAlias(String tableAlias, String fieldName) {
+        return isEmpty(tableAlias) ? fieldName : tableAlias + PERIOD + fieldName;
+    }
+
+    /**
+     * Converts a Set of classes to a set of types.
+     * @param cls The set of classes.
+     * @return A new set of types.
+     */
+    public static Set<Type<?>> getClassType(Set<Class<?>> cls) {
+        return cls.stream()
+                .map(ClassType::of)
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBean.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBean.java
new file mode 100644
index 0000000000..0c661a47fe
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBean.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce;
+
+import org.apache.commons.beanutils.ConvertUtilsBean;
+import org.apache.commons.beanutils.Converter;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Allows registration based on source and target type (rather than just the target type).
+ */
+public class BidirectionalConvertUtilBean extends ConvertUtilsBean {
+    protected Map<Pair<Class<?>, Class<?>>, Converter> bidirectionalConverters = new HashMap<>();
+
+    public void register(Class<?> sourceType, Class<?> targetType, Converter converter) {
+        Pair<Class<?>, Class<?>> key = Pair.of(sourceType, targetType);
+
+        bidirectionalConverters.put(key, converter);
+    }
+
+    @Override
+    public Converter lookup(Class<?> sourceType, Class<?> targetType) {
+        Pair<Class<?>, Class<?>> key = Pair.of(sourceType, targetType);
+
+        if (bidirectionalConverters.containsKey(key)) {
+            return bidirectionalConverters.get(key);
+        }
+
+        return super.lookup(sourceType, targetType);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/CoerceUtil.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/CoerceUtil.java
new file mode 100644
index 0000000000..5b5585558c
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/CoerceUtil.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce;
+
+import static com.yahoo.elide.core.utils.TypeHelper.isNumberType;
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.converters.FromMapConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.core.utils.coerce.converters.ToEnumConverter;
+import com.yahoo.elide.core.utils.coerce.converters.ToUUIDConverter;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.MapMaker;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.ConversionException;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.Converter;
+
+import java.lang.reflect.Array;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Class for coercing a value to a target class.
+ */
+public class CoerceUtil {
+
+    private static final ToEnumConverter TO_ENUM_CONVERTER = new ToEnumConverter();
+    private static final ToUUIDConverter TO_UUID_CONVERTER = new ToUUIDConverter();
+    private static final FromMapConverter FROM_MAP_CONVERTER = new FromMapConverter();
+    private static final Map<Class<?>, Serde<?, ?>> SERDES = new LinkedHashMap<>();
+    private static final BeanUtilsBean BEAN_UTILS_BEAN_INSTANCE = setup();
+    private static final Set<ClassLoader> INITIALIZED_CLASSLOADERS =
+            Collections.newSetFromMap(new MapMaker().weakKeys().makeMap());
+
+    public static <T> T coerce(Object value, Type<T> type) {
+        Preconditions.checkState(type instanceof ClassType);
+        Class<T> cls = ((ClassType) type).getCls();
+        return coerce(value, cls);
+    }
+
+    /**
+     * Convert value to target class.
+     *
+     * @param <T> type
+     * @param value value to convert
+     * @param cls   class to convert to
+     * @return coerced value
+     */
+    public static <T> T coerce(Object value, Class<T> cls) {
+        initializeCurrentClassLoaderIfNecessary();
+
+        // null value of number type would be converted to 0, as 'null' would cause exception for primitive
+        // number classes
+        if (value == null && isNumberType(cls)) {
+            return (T) Array.get(Array.newInstance(cls, 1), 0);
+        }
+
+        if (value == null || cls == null || cls.isInstance(value)) {
+            return (T) value;
+        }
+
+        try {
+            return (T) ConvertUtils.convert(value, cls);
+        } catch (ConversionException | InvalidAttributeException | IllegalArgumentException e) {
+            throw new InvalidValueException(value, e.getMessage());
+        }
+    }
+
+    public static <S, T> void register(Class<T> targetType, Serde<S, T> serde) {
+        initializeCurrentClassLoaderIfNecessary();
+
+        SERDES.put(targetType, serde);
+        ConvertUtils.register(new Converter() {
+
+            @Override
+            public <T> T convert(Class<T> aClass, Object o) {
+                return (T) serde.deserialize((S) o);
+            }
+
+        }, targetType);
+    }
+
+    public static <S, T> Serde<S, T> lookup(Class<T> targetType) {
+        return (Serde<S, T>) SERDES.getOrDefault(targetType, null);
+    }
+
+    public static Map<Class<?>, Serde<?, ?>> getSerdes() {
+        return Collections.unmodifiableMap(SERDES);
+    }
+
+    /**
+     * Perform CoerceUtil setup.
+     */
+    private static BeanUtilsBean setup() {
+        return new BeanUtilsBean(new BidirectionalConvertUtilBean() {
+            {
+                // https://github.com/yahoo/elide/issues/260
+                // enable throwing exceptions when conversion fails
+                register(true, false, 0);
+                register(TO_UUID_CONVERTER, UUID.class);
+            }
+
+            @Override
+            /*
+             * Overriding lookup to execute enum converter if target is enum
+             * or map convert if source is map
+             */
+            public Converter lookup(Class<?> sourceType, Class<?> targetType) {
+                if (targetType.isEnum()) {
+                    return TO_ENUM_CONVERTER;
+                }
+                if (Map.class.isAssignableFrom(sourceType)) {
+                    return FROM_MAP_CONVERTER;
+                }
+                return super.lookup(sourceType, targetType);
+            }
+        });
+    }
+
+    /**
+     * Initialize this classloader if necessary
+     */
+    private static void initializeCurrentClassLoaderIfNecessary() {
+        ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+        if (INITIALIZED_CLASSLOADERS.contains(currentClassLoader)) {
+            return;
+        }
+        BeanUtilsBean.setInstance(BEAN_UTILS_BEAN_INSTANCE);
+        markClassLoaderAsInitialized(currentClassLoader);
+    }
+
+    /**
+     * Mark the current class loader as initialized.
+     * @param currentClassLoader current ClassLoader
+     */
+    private static void markClassLoaderAsInitialized(ClassLoader currentClassLoader) {
+        INITIALIZED_CLASSLOADERS.add(currentClassLoader);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ElideTypeConverter.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ElideTypeConverter.java
new file mode 100644
index 0000000000..fd43aa6c49
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ElideTypeConverter.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ElideTypeConverter {
+    Class<?> type();
+    String name();
+    String description() default "Custom Elide type";
+    Class<?> [] subTypes() default {};
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/EpochToDateConverter.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/EpochToDateConverter.java
new file mode 100644
index 0000000000..6bdf071bfa
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/EpochToDateConverter.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
+import org.apache.commons.beanutils.Converter;
+import org.apache.commons.lang3.ClassUtils;
+
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Date;
+
+
+/**
+ * Convert epoch(in string or long) to Date.
+ * @param <T> Date Type
+ */
+public class EpochToDateConverter<T extends Date> implements Converter, Serde<Object, T> {
+
+    private Class<T> targetType;
+
+    public EpochToDateConverter(Class<T> targetType) {
+        this.targetType = targetType;
+    }
+
+    @Override
+    public <T> T convert(Class<T> cls, Object value) {
+        try {
+            if (ClassUtils.isAssignable(value.getClass(), String.class)) {
+                return stringToDate(cls, (String) value);
+            }
+            if (ClassUtils.isAssignable(value.getClass(), Number.class, true)) {
+                return numberToDate(cls, (Number) value);
+            }
+            throw new UnsupportedOperationException(value.getClass().getSimpleName() + " is not a valid epoch");
+        } catch (IndexOutOfBoundsException | UnsupportedOperationException | IllegalArgumentException e) {
+            throw new InvalidAttributeException("Unknown " + cls.getSimpleName() + " value " + value, e);
+        }
+    }
+
+    @Override
+    public T deserialize(Object val) {
+        return convert(targetType, val);
+    }
+
+    @Override
+    public Object serialize(T val) {
+        return val.getTime();
+    }
+
+    private static <T> T numberToDate(Class<T> cls, Number epoch) {
+        if (ClassUtils.isAssignable(cls, java.sql.Date.class)) {
+            return cls.cast(new java.sql.Date(epoch.longValue()));
+        }
+        if (ClassUtils.isAssignable(cls, Timestamp.class)) {
+            return cls.cast(new Timestamp(epoch.longValue()));
+        }
+        if (ClassUtils.isAssignable(cls, Time.class)) {
+            return cls.cast(new Time(epoch.longValue()));
+        }
+        if (ClassUtils.isAssignable(cls, Date.class)) {
+            return cls.cast(new Date(epoch.longValue()));
+        }
+        throw new UnsupportedOperationException("Cannot convert to " + cls.getSimpleName());
+    }
+
+    private static <T> T stringToDate(Class<T> cls, String epoch) {
+        return numberToDate(cls, Long.parseLong(epoch));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverter.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverter.java
new file mode 100644
index 0000000000..095c996cf4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.beanutils.Converter;
+
+/**
+ * Uses Jackson to Convert from Map to target object.
+ */
+public class FromMapConverter implements Converter {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    /**
+     * Convert value from map to target object.
+     *
+     * @param cls class to convert to
+     * @param value value to convert
+     * @param <T> object type
+     * @return converted object
+     */
+    @Override
+    public <T> T convert(Class<T> cls, Object value) {
+        return MAPPER.convertValue(value, cls);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerde.java
new file mode 100644
index 0000000000..2d7a356a51
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerde.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * Serializes ISO8601 Dates to Strings and vice versa.
+ */
+public class ISO8601DateSerde implements Serde<Object, Date> {
+
+    protected FastDateFormat df;
+    protected Class<? extends Date> targetType;
+
+    public ISO8601DateSerde(SimpleDateFormat df) {
+        this(df, Date.class);
+    }
+
+    public ISO8601DateSerde(SimpleDateFormat df, Class<? extends Date> targetType) {
+        this(df.toPattern(), df.getTimeZone(), targetType);
+    }
+
+    public ISO8601DateSerde(String formatString, TimeZone tz) {
+        this(formatString, tz, Date.class);
+    }
+
+    public ISO8601DateSerde(String formatString, TimeZone tz, Class<? extends Date> targetType) {
+        this.df = FastDateFormat.getInstance(formatString, tz);
+        this.targetType = targetType;
+    }
+
+    public ISO8601DateSerde() {
+        this ("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"));
+    }
+
+    @Override
+    public Date deserialize(Object val) {
+        Date date;
+
+        try {
+            if (val instanceof Date) {
+                date = (Date) val;
+            }
+            else {
+                date = df.parse(val.toString());
+            }
+        } catch (java.text.ParseException e) {
+            throw new IllegalArgumentException("Date strings must be formatted as " + df.getPattern());
+        }
+
+        if (ClassUtils.isAssignable(targetType, java.sql.Date.class)) {
+            return new java.sql.Date(date.getTime());
+        }
+        if (ClassUtils.isAssignable(targetType, java.sql.Timestamp.class)) {
+            return new java.sql.Timestamp(date.getTime());
+        }
+        if (ClassUtils.isAssignable(targetType, java.sql.Time.class)) {
+            return new java.sql.Time(date.getTime());
+        }
+        return date;
+    }
+
+    @Override
+    public String serialize(Date val) {
+        return df.format(val);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerde.java
new file mode 100644
index 0000000000..2e43310457
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerde.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+/**
+ * Convert an Instant to/from an ISO-8601 string representation.
+ *
+ * Uses the semantics of {@link java.time.format.DateTimeFormatter#ISO_INSTANT}
+ */
+public class InstantSerde implements Serde<String, Instant> {
+    @Override
+    public Instant deserialize(final String value) {
+        try {
+            return Instant.from(
+                // NB. ideally we would use ISO_INSTANT here but there is a bug in JDK-8 that
+                // means that parsing an ISO offset time doesn't work :-(
+                // https://bugs.openjdk.java.net/browse/JDK-8166138
+                DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(value)
+            );
+        } catch (final DateTimeParseException ex) {
+            // Translate parsing exception to something CoerceUtil will handle appropriately
+            throw new IllegalArgumentException(ex);
+        }
+    }
+
+    @Override
+    public String serialize(final Instant value) {
+        return DateTimeFormatter.ISO_INSTANT.format(value);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeSerde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeSerde.java
new file mode 100644
index 0000000000..65a2d248bc
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeSerde.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+/**
+ * Serde class for bidirectional conversion from OffsetDateTime type to String.
+ */
+public class OffsetDateTimeSerde implements Serde<String, OffsetDateTime> {
+
+    @Override
+    public OffsetDateTime deserialize(String val) {
+        try {
+            return OffsetDateTime.parse(val, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        } catch (final DateTimeParseException ex) {
+            // Translate parsing exception to something CoerceUtil will handle appropriately
+            throw new IllegalArgumentException(ex);
+        }
+    }
+
+    @Override
+    public String serialize(OffsetDateTime val) {
+        return val.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/Serde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/Serde.java
new file mode 100644
index 0000000000..daf0fb4bf7
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/Serde.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+/**
+ * Bidirectional conversion from one type to another.
+ * @param <S> The serialized type
+ * @param <T> The deserialized type
+ */
+public interface Serde<S, T> {
+    /**
+     * Deserialize an instance of type S to type T.
+     * @param val The thing to deserialize
+     * @return The deserialized value
+     */
+    T deserialize(S val);
+
+    /**
+     * Serializes an instance of type T as type S.
+     * @param val The thing to serialize
+     * @return The serialized value
+     */
+    S serialize(T val);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneSerde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneSerde.java
new file mode 100644
index 0000000000..21aea0fba4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneSerde.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import java.util.TimeZone;
+
+/**
+ * Serde class for bidirectional conversion from TimeZone type to String.
+ */
+public class TimeZoneSerde implements Serde<String, TimeZone> {
+
+    @Override
+    public TimeZone deserialize(String val) {
+        return TimeZone.getTimeZone(val);
+    }
+
+    @Override
+    public String serialize(TimeZone val) {
+        return val.getDisplayName(false, TimeZone.SHORT);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverter.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverter.java
similarity index 81%
rename from elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverter.java
rename to elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverter.java
index da3a3f9133..c11d4f8d46 100644
--- a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverter.java
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverter.java
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.utils.coerce.converters;
+package com.yahoo.elide.core.utils.coerce.converters;
 
 import com.yahoo.elide.core.exceptions.InvalidAttributeException;
 import org.apache.commons.beanutils.Converter;
@@ -27,11 +27,14 @@ public <T> T convert(Class<T> cls, Object value) {
         try {
             if (ClassUtils.isAssignable(value.getClass(), String.class)) {
                 return stringToEnum(cls, (String) value);
-            } else if (ClassUtils.isAssignable(value.getClass(), Integer.class, true)) {
+            }
+            if (ClassUtils.isAssignable(value.getClass(), Integer.class, true)) {
                 return intToEnum(cls, (Integer) value);
-            } else {
-               throw new UnsupportedOperationException(value.getClass().getSimpleName() + " to Enum no supported");
             }
+            if (ClassUtils.isAssignable(value.getClass(), Long.class, true)) {
+                return intToEnum(cls, ((Long) value).intValue());
+            }
+            throw new UnsupportedOperationException(value.getClass().getSimpleName() + " to Enum no supported");
         } catch (IndexOutOfBoundsException | ReflectiveOperationException
                 | UnsupportedOperationException | IllegalArgumentException e) {
             throw new InvalidAttributeException("Unknown " + cls.getSimpleName() + " value " + value, e);
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToUUIDConverter.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToUUIDConverter.java
new file mode 100644
index 0000000000..935b66979c
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/ToUUIDConverter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import org.apache.commons.beanutils.Converter;
+
+import java.util.UUID;
+
+/**
+ * Converter to UUID.
+ */
+public class ToUUIDConverter implements Converter {
+    /**
+     * Convert value to UUID.
+     *
+     * @param cls class to convert to
+     * @param value value to convert
+     * @param <T> object type
+     * @return converted object
+     */
+    @Override
+    public <T> T convert(Class<T> cls, Object value) {
+        if (cls == UUID.class) {
+            return (T) UUID.fromString(String.valueOf(value));
+        }
+        throw new UnsupportedOperationException("Cannot convert to " + cls.getSimpleName());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/URLSerde.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/URLSerde.java
new file mode 100644
index 0000000000..2038a96166
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/core/utils/coerce/converters/URLSerde.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class URLSerde implements Serde<String, URL> {
+
+    @Override
+    public URL deserialize(String val) {
+        URL url;
+        try {
+            url = new URL(val);
+        } catch (MalformedURLException e) {
+            throw new InvalidValueException("Invalid URL " + val);
+        }
+        return url;
+    }
+
+    @Override
+    public String serialize(URL val) {
+        return val.toString();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/extensions/PatchRequestScope.java b/elide-core/src/main/java/com/yahoo/elide/extensions/PatchRequestScope.java
deleted file mode 100644
index c0c017154c..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/extensions/PatchRequestScope.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.extensions;
-
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.jsonapi.JsonApiMapper;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.SecurityMode;
-import com.yahoo.elide.security.User;
-
-import java.util.function.Function;
-
-/**
- * Special request scope for Patch Extension.
- */
-public class PatchRequestScope extends RequestScope {
-
-    /**
-     * Outer RequestScope constructor for use by Patch Extension.
-     *
-     * @param path the URL path
-     * @param transaction current database transaction
-     * @param user        request user
-     * @param dictionary  entity dictionary
-     * @param mapper      Json API mapper
-     * @param auditLogger      the logger
-     */
-    public PatchRequestScope(
-            String path,
-            DataStoreTransaction transaction,
-            User user,
-            EntityDictionary dictionary,
-            JsonApiMapper mapper,
-            AuditLogger auditLogger,
-            Function<RequestScope, PermissionExecutor> permissionExecutorGenerator) {
-        super(path, null, transaction, user, dictionary, mapper, auditLogger, SecurityMode.SECURITY_ACTIVE,
-                permissionExecutorGenerator);
-    }
-
-    /**
-     * Inner RequestScope copy constructor for use by Patch Extension actions.
-     *
-     * @param jsonApiDocument document
-     * @param scope           outer request scope
-     */
-    public PatchRequestScope(String path, JsonApiDocument jsonApiDocument, PatchRequestScope scope) {
-        super(path, jsonApiDocument, scope);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/EntityProjectionMaker.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/EntityProjectionMaker.java
new file mode 100644
index 0000000000..26120ca26a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/EntityProjectionMaker.java
@@ -0,0 +1,448 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.jsonapi;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidCollectionException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.generated.parsers.CoreBaseVisitor;
+import com.yahoo.elide.generated.parsers.CoreParser;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+import com.google.common.collect.Sets;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Converts a JSON-API request (URL and query parameters) into an EntityProjection.
+ */
+public class EntityProjectionMaker
+        extends CoreBaseVisitor<Function<Type<?>, EntityProjectionMaker.NamedEntityProjection>> {
+
+    /**
+     * An entity projection labeled with the class name or relationship name it is associated with.
+     */
+    @Data
+    @Builder
+    public static class NamedEntityProjection {
+        private String name;
+        private EntityProjection projection;
+    }
+
+    public static final String INCLUDE = "include";
+
+    private EntityDictionary dictionary;
+    private MultivaluedMap<String, String> queryParams;
+    private Map<String, Set<String>> sparseFields;
+    private RequestScope scope;
+
+    public EntityProjectionMaker(EntityDictionary dictionary, RequestScope scope) {
+        this.dictionary = dictionary;
+        this.queryParams = scope.getQueryParams();
+        sparseFields = RequestScope.parseSparseFields(queryParams);
+        this.scope = scope;
+    }
+
+    public EntityProjection parsePath(String path) {
+        return visit(JsonApiParser.parse(path)).apply(null).projection;
+    }
+
+    public EntityProjection parseInclude(Type<?> entityClass) {
+        return EntityProjection.builder()
+                .type(entityClass)
+                .arguments(getDefaultEntityArguments(entityClass))
+                .relationships(toRelationshipSet(getIncludedRelationships(entityClass)))
+                .build();
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitRootCollectionLoadEntities(
+            CoreParser.RootCollectionLoadEntitiesContext ctx) {
+        return visitTerminalCollection(ctx.term(), true);
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitSubCollectionReadCollection(
+            CoreParser.SubCollectionReadCollectionContext ctx) {
+        return visitTerminalCollection(ctx.term(), false);
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitRootCollectionSubCollection(
+            CoreParser.RootCollectionSubCollectionContext ctx) {
+        return visitEntityWithSubCollection(ctx.entity(), ctx.subCollection());
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitSubCollectionSubCollection(
+            CoreParser.SubCollectionSubCollectionContext ctx) {
+        return visitEntityWithSubCollection(ctx.entity(), ctx.subCollection());
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitRootCollectionRelationship(
+            CoreParser.RootCollectionRelationshipContext ctx) {
+        return visitEntityWithRelationship(ctx.entity(), ctx.relationship());
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitSubCollectionRelationship(
+            CoreParser.SubCollectionRelationshipContext ctx) {
+        return visitEntityWithRelationship(ctx.entity(), ctx.relationship());
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitRootCollectionLoadEntity(
+            CoreParser.RootCollectionLoadEntityContext ctx) {
+        return unused -> ctx.entity().accept(this).apply(null);
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitSubCollectionReadEntity(
+            CoreParser.SubCollectionReadEntityContext ctx) {
+        return parentClass -> ctx.entity().accept(this).apply(parentClass);
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitRelationship(CoreParser.RelationshipContext ctx) {
+        return (parentClass) -> {
+            String entityName = ctx.term().getText();
+
+            Type<?> entityClass = getEntityClass(parentClass, entityName);
+            FilterExpression filter = scope.getExpressionForRelation(parentClass, entityName).orElse(null);
+
+            Sorting sorting = SortingImpl.parseQueryParams(scope.getQueryParams(), entityClass, dictionary);
+            Pagination pagination = PaginationImpl.parseQueryParams(entityClass,
+                    scope.getQueryParams(), scope.getElideSettings());
+
+            return NamedEntityProjection.builder()
+                    .name(entityName)
+                    .projection(EntityProjection.builder()
+                        .filterExpression(filter)
+                        .sorting(sorting)
+                        .pagination(pagination)
+                        .arguments(getDefaultEntityArguments(entityClass))
+                        .type(entityClass)
+                        .build()
+                    ).build();
+        };
+    }
+
+    @Override
+    public Function<Type<?>, NamedEntityProjection> visitEntity(CoreParser.EntityContext ctx) {
+        return (parentClass) -> {
+            String entityName = ctx.term().getText();
+
+            Type<?> entityClass = getEntityClass(parentClass, entityName);
+
+            return NamedEntityProjection.builder()
+                    .name(entityName)
+                    .projection(EntityProjection.builder()
+                        .type(entityClass)
+                        .arguments(getDefaultEntityArguments(entityClass))
+                        .attributes(getSparseAttributes(entityClass))
+                        .relationships(toRelationshipSet(getRequiredRelationships(entityClass)))
+                        .build()
+                    ).build();
+        };
+    }
+
+    @Override
+    protected Function<Type<?>, NamedEntityProjection> aggregateResult(
+            Function<Type<?>, NamedEntityProjection> aggregate,
+            Function<Type<?>, NamedEntityProjection> nextResult) {
+
+        if (aggregate == null) {
+            return nextResult;
+        }
+        return aggregate;
+    }
+
+    public EntityProjection visitIncludePath(Path path) {
+        Path.PathElement pathElement = path.getPathElements().get(0);
+        int size = path.getPathElements().size();
+
+        Type<?> entityClass = pathElement.getFieldType();
+
+        if (size > 1) {
+            Path nextPath = new Path(path.getPathElements().subList(1, size));
+            EntityProjection relationshipProjection = visitIncludePath(nextPath);
+
+            return EntityProjection.builder()
+                .relationships(toRelationshipSet(getSparseRelationships(entityClass)))
+                .relationship(nextPath.getPathElements().get(0).getFieldName(), relationshipProjection)
+                .attributes(getSparseAttributes(entityClass))
+                .filterExpression(scope.getFilterExpressionByType(entityClass).orElse(null))
+                .type(entityClass)
+                .arguments(getDefaultEntityArguments(entityClass))
+                .build();
+        }
+
+        return EntityProjection.builder()
+                .relationships(toRelationshipSet(getSparseRelationships(entityClass)))
+                .attributes(getSparseAttributes(entityClass))
+                .type(entityClass)
+                .arguments(getDefaultEntityArguments(entityClass))
+                .filterExpression(scope.getFilterExpressionByType(entityClass).orElse(null))
+                .build();
+    }
+
+    private Function<Type<?>, NamedEntityProjection> visitEntityWithSubCollection(CoreParser.EntityContext entity,
+                                                            CoreParser.SubCollectionContext subCollection) {
+        return (parentClass) -> {
+            String entityName = entity.term().getText();
+
+            Type<?> entityClass = getEntityClass(parentClass, entityName);
+
+            NamedEntityProjection projection = subCollection.accept(this).apply(entityClass);
+
+            return NamedEntityProjection.builder()
+                    .name(entityName)
+                    .projection(EntityProjection.builder()
+                        .type(entityClass)
+                        .arguments(getDefaultEntityArguments(entityClass))
+                        .relationship(projection.name, projection.projection)
+                        .build()
+                    ).build();
+        };
+    }
+
+    private Function<Type<?>, NamedEntityProjection> visitEntityWithRelationship(CoreParser.EntityContext entity,
+                                                         CoreParser.RelationshipContext relationship) {
+        return (parentClass) -> {
+            String entityName = entity.term().getText();
+
+            Type<?> entityClass = getEntityClass(parentClass, entityName);
+
+            String relationshipName = relationship.term().getText();
+            NamedEntityProjection relationshipProjection = relationship.accept(this).apply(entityClass);
+
+            FilterExpression filter = scope.getFilterExpressionByType(entityClass).orElse(null);
+
+            return NamedEntityProjection.builder()
+                    .name(entityName)
+                    .projection(EntityProjection.builder()
+                        .type(entityClass)
+                        .arguments(getDefaultEntityArguments(entityClass))
+                        .filterExpression(filter)
+                        .relationships(toRelationshipSet(getRequiredRelationships(entityClass)))
+                        .relationship(relationshipName, relationshipProjection.projection)
+                        .build()
+                    ).build();
+        };
+    }
+
+    private Function<Type<?>, NamedEntityProjection> visitTerminalCollection(CoreParser.TermContext collectionName,
+                                                                              boolean isRoot) {
+        return (parentClass) -> {
+            String collectionNameText = collectionName.getText();
+
+            Type<?> entityClass = getEntityClass(parentClass, collectionNameText);
+
+            if (isRoot && !dictionary.isRoot(entityClass)) {
+                throw new InvalidCollectionException(collectionNameText);
+            }
+
+            FilterExpression filter;
+            if (parentClass == null) {
+                filter = scope.getLoadFilterExpression(entityClass).orElse(null);
+            } else {
+                filter = scope.getExpressionForRelation(parentClass, collectionNameText).orElse(null);
+            }
+
+            Sorting sorting = SortingImpl.parseQueryParams(scope.getQueryParams(), entityClass, dictionary);
+            Pagination pagination = PaginationImpl.parseQueryParams(entityClass,
+                    scope.getQueryParams(), scope.getElideSettings());
+
+            return NamedEntityProjection.builder()
+                    .name(collectionNameText)
+                    .projection(EntityProjection.builder()
+                        .filterExpression(filter)
+                        .sorting(sorting)
+                        .pagination(pagination)
+                        .relationships(toRelationshipSet(getRequiredRelationships(entityClass)))
+                        .attributes(getSparseAttributes(entityClass))
+                        .arguments(getDefaultEntityArguments(entityClass))
+                        .type(entityClass)
+                        .build()
+                    ).build();
+        };
+    }
+
+    private Type<?> getEntityClass(Type<?> parentClass, String entityLabel) {
+
+            //entityLabel represents a root collection.
+            if (parentClass == null) {
+
+                Type<?> entityClass = dictionary.getEntityClass(entityLabel, scope.getApiVersion());
+
+                if (entityClass != null) {
+                    return entityClass;
+                }
+
+
+            //entityLabel represents a relationship.
+            } else if (dictionary.isRelation(parentClass, entityLabel)) {
+                return dictionary.getParameterizedType(parentClass, entityLabel);
+            }
+
+            throw new InvalidCollectionException(entityLabel);
+    }
+
+    private Map<String, EntityProjection> getIncludedRelationships(Type<?> entityClass) {
+        Set<Path> includePaths = getIncludePaths(entityClass);
+
+        Map<String, EntityProjection> relationships = includePaths.stream()
+                .map((path) -> Pair.of(path.getPathElements().get(0).getFieldName(), visitIncludePath(path)))
+                .collect(Collectors.toMap(
+                        Pair::getKey,
+                        Pair::getValue,
+                        EntityProjection::merge
+                ));
+
+        return relationships;
+    }
+
+    private Set<Argument> getDefaultAttributeArguments(Type<?> entityClass, String attributeName) {
+        return dictionary.getAttributeArguments(entityClass, attributeName)
+                .stream()
+                .map(argumentType -> {
+                    return Argument.builder()
+                            .name(argumentType.getName())
+                            .value(argumentType.getDefaultValue())
+                            .build();
+                })
+                .collect(Collectors.toSet());
+    }
+
+    private Set<Argument> getDefaultEntityArguments(Type<?> entityClass) {
+        return dictionary.getEntityArguments(entityClass)
+                .stream()
+                .map(argumentType -> {
+                    return Argument.builder()
+                            .name(argumentType.getName())
+                            .value(argumentType.getDefaultValue())
+                            .build();
+                })
+                .collect(Collectors.toSet());
+    }
+
+    private Set<Attribute> getSparseAttributes(Type<?> entityClass) {
+        Set<String> allAttributes = new LinkedHashSet<>(dictionary.getAttributes(entityClass));
+
+        Set<String> sparseFieldsForEntity = sparseFields.get(dictionary.getJsonAliasFor(entityClass));
+        if (CollectionUtils.isEmpty(sparseFieldsForEntity)) {
+            sparseFieldsForEntity = allAttributes;
+        } else {
+            Set<String> allRelationships = new LinkedHashSet<>(dictionary.getRelationships(entityClass));
+            validateSparseFields(sparseFieldsForEntity, allAttributes, allRelationships, entityClass);
+            sparseFieldsForEntity = Sets.intersection(allAttributes, sparseFieldsForEntity);
+        }
+
+        return sparseFieldsForEntity.stream()
+                .map(attributeName -> Attribute.builder()
+                    .name(attributeName)
+                    .type(dictionary.getType(entityClass, attributeName))
+                    .arguments(getDefaultAttributeArguments(entityClass, attributeName))
+                    .build())
+                .collect(Collectors.toSet());
+    }
+
+    private Map<String, EntityProjection> getSparseRelationships(Type<?> entityClass) {
+        Set<String> allRelationships = new LinkedHashSet<>(dictionary.getRelationships(entityClass));
+        Set<String> sparseFieldsForEntity = sparseFields.get(dictionary.getJsonAliasFor(entityClass));
+
+        if (CollectionUtils.isEmpty(sparseFieldsForEntity)) {
+            sparseFieldsForEntity = allRelationships;
+        } else {
+            Set<String> allAttributes = new LinkedHashSet<>(dictionary.getAttributes(entityClass));
+            validateSparseFields(sparseFieldsForEntity, allAttributes, allRelationships, entityClass);
+            sparseFieldsForEntity = Sets.intersection(allRelationships, sparseFieldsForEntity);
+        }
+
+        return sparseFieldsForEntity.stream()
+                .collect(Collectors.toMap(
+                        Function.identity(),
+                        (relationshipName) -> {
+                            FilterExpression filter = scope.getExpressionForRelation(entityClass, relationshipName)
+                                    .orElse(null);
+
+                            return EntityProjection.builder()
+                                    .type(dictionary.getParameterizedType(entityClass, relationshipName))
+                                    .arguments(getDefaultEntityArguments(entityClass))
+                                    .filterExpression(filter)
+                                    .build();
+                        }
+                ));
+    }
+
+    private void validateSparseFields(Set<String> sparseFieldsForEntity, Set<String> allAttributes,
+                    Set<String> allRelationships, Type<?> entityClass) {
+        String unknownSparseFields = sparseFieldsForEntity.stream()
+                        .filter(field -> !(allAttributes.contains(field) || allRelationships.contains(field)))
+                        .collect(Collectors.joining(", "));
+
+        if (!unknownSparseFields.isEmpty()) {
+            throw new InvalidValueException(String.format("%s does not contain the fields: [%s]",
+                            dictionary.getJsonAliasFor(entityClass), unknownSparseFields));
+        }
+    }
+
+    private Map<String, EntityProjection> getRequiredRelationships(Type<?> entityClass) {
+        return Stream.concat(
+                getIncludedRelationships(entityClass).entrySet().stream(),
+                getSparseRelationships(entityClass).entrySet().stream()
+        ).collect(Collectors.toMap(
+                Map.Entry::getKey,
+                Map.Entry::getValue,
+                EntityProjection::merge
+        ));
+    }
+
+    private Set<Path> getIncludePaths(Type<?> entityClass) {
+        if (queryParams.get(INCLUDE) != null) {
+            return queryParams.get(INCLUDE).stream()
+                    .flatMap(param -> Arrays.stream(param.split(",")))
+                    .map(pathString -> new Path(entityClass, dictionary, pathString))
+                    .collect(Collectors.toSet());
+        }
+
+        return new LinkedHashSet<>();
+    }
+
+    private Set<Relationship> toRelationshipSet(Map<String, EntityProjection> relationships) {
+        return relationships.entrySet().stream()
+                .map(entry -> Relationship.builder()
+                        .name(entry.getKey())
+                        .alias(entry.getKey())
+                        .projection(entry.getValue())
+                        .build())
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiMapper.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiMapper.java
index 9b3c0edcd3..0d0f16427e 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiMapper.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiMapper.java
@@ -5,13 +5,12 @@
  */
 package com.yahoo.elide.jsonapi;
 
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Patch;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Patch;
 
 import java.io.IOException;
 import java.util.List;
@@ -23,24 +22,21 @@ public class JsonApiMapper {
     private final ObjectMapper mapper;
 
     /**
-     * Instantiates a new JSON API OBJECT_MAPPER.
-     *
-     * @param dictionary the dictionary
+     * Instantiates a new Json Api Mapper.
      */
-    public JsonApiMapper(EntityDictionary dictionary) {
-        mapper = new ObjectMapper();
-        mapper.registerModule(JsonApiSerializer.getModule(dictionary));
+    public JsonApiMapper() {
+        this.mapper = new ObjectMapper();
+        mapper.registerModule(JsonApiSerializer.getModule());
     }
 
     /**
      * Instantiates a new Json Api Mapper.
      *
-     * @param dictionary the dictionary
      * @param mapper Custom object mapper to use internally for serializing/deserializing
      */
-    public JsonApiMapper(EntityDictionary dictionary, ObjectMapper mapper) {
+    public JsonApiMapper(ObjectMapper mapper) {
         this.mapper = mapper;
-        mapper.registerModule(JsonApiSerializer.getModule(dictionary));
+        mapper.registerModule(JsonApiSerializer.getModule());
     }
 
     /**
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiSerializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiSerializer.java
index 3d4c3e3d74..bc1e8d65c2 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiSerializer.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/JsonApiSerializer.java
@@ -11,7 +11,6 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.yahoo.elide.core.EntityDictionary;
 
 import java.io.IOException;
 import java.util.Set;
@@ -25,14 +24,14 @@ public class JsonApiSerializer<T> extends StdSerializer<T> {
 
     private final Class<T> type;
 
-    JsonApiSerializer(Class<T> type, EntityDictionary dictionary) {
+    JsonApiSerializer(Class<T> type) {
         super(type);
         this.type = type;
     }
 
-    public static Module getModule(EntityDictionary dictionary) {
+    public static Module getModule() {
         SimpleModule jsonApiModule = new SimpleModule("JsonApiModule", new Version(1, 0, 0, null, null, null));
-        jsonApiModule.addSerializer(new JsonApiSerializer<>(Set.class, dictionary));
+        jsonApiModule.addSerializer(new JsonApiSerializer<>(Set.class));
         return jsonApiModule;
     }
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/DocumentProcessor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/DocumentProcessor.java
index e7a131a21b..6c8c442c51 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/DocumentProcessor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/DocumentProcessor.java
@@ -8,9 +8,7 @@
 import com.yahoo.elide.core.PersistentResource;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 
-import java.util.Optional;
 import java.util.Set;
-
 import javax.ws.rs.core.MultivaluedMap;
 
 /**
@@ -28,7 +26,7 @@ public interface DocumentProcessor {
      * @param queryParams the query params
      */
     void execute(JsonApiDocument jsonApiDocument, PersistentResource resource,
-                 Optional<MultivaluedMap<String, String>> queryParams);
+                 MultivaluedMap<String, String> queryParams);
 
     /**
      * A method for making transformations to the JsonApiDocument.
@@ -38,7 +36,7 @@ void execute(JsonApiDocument jsonApiDocument, PersistentResource resource,
      * @param queryParams the query params
      */
     void execute(JsonApiDocument jsonApiDocument, Set<PersistentResource> resources,
-                 Optional<MultivaluedMap<String, String>> queryParams);
+                 MultivaluedMap<String, String> queryParams);
 
     //TODO Possibly add a something like a 'afterExecute' method to process after the first round of execution
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessor.java
index 085d176e56..0f1283d93f 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessor.java
@@ -5,16 +5,20 @@
  */
 package com.yahoo.elide.jsonapi.document.processors;
 
-import com.google.common.collect.Lists;
 import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.jsonapi.EntityProjectionMaker;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.google.common.collect.Lists;
 
-import javax.ws.rs.core.MultivaluedMap;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
+import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * A Document Processor that add requested relations to the include block of the JsonApiDocument.
@@ -30,9 +34,9 @@ public class IncludedProcessor implements DocumentProcessor {
      */
     @Override
     public void execute(JsonApiDocument jsonApiDocument, PersistentResource resource,
-                        Optional<MultivaluedMap<String, String>> queryParams) {
+                        MultivaluedMap<String, String> queryParams) {
         if (isPresent(queryParams, INCLUDE)) {
-            addIncludedResources(jsonApiDocument, resource, queryParams.get().get(INCLUDE));
+            addIncludedResources(jsonApiDocument, resource, queryParams.get(INCLUDE));
         }
     }
 
@@ -42,12 +46,12 @@ public void execute(JsonApiDocument jsonApiDocument, PersistentResource resource
      */
     @Override
     public void execute(JsonApiDocument jsonApiDocument, Set<PersistentResource> resources,
-                        Optional<MultivaluedMap<String, String>> queryParams) {
+                        MultivaluedMap<String, String> queryParams) {
         if (isPresent(queryParams, INCLUDE)) {
 
             // Process include for each resource
             resources.forEach(resource ->
-                    addIncludedResources(jsonApiDocument, resource, queryParams.get().get(INCLUDE)));
+                    addIncludedResources(jsonApiDocument, resource, queryParams.get(INCLUDE)));
         }
     }
 
@@ -56,13 +60,16 @@ public void execute(JsonApiDocument jsonApiDocument, Set<PersistentResource> res
      */
     private void addIncludedResources(JsonApiDocument jsonApiDocument, PersistentResource rec,
             List<String> requestedRelationPaths) {
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(rec.getDictionary(), rec.getRequestScope());
+        EntityProjection projection = maker.parseInclude(rec.getResourceType());
         // Process each include relation path
         requestedRelationPaths.forEach(pathParam -> {
             List<String> pathList = Arrays.asList(pathParam.split(RELATION_PATH_SEPARATOR));
 
             pathList.forEach(requestedRelationPath -> {
                 List<String> relationPath = Lists.newArrayList(requestedRelationPath.split(RELATION_PATH_DELIMITER));
-                addResourcesForPath(jsonApiDocument, rec, relationPath);
+                addResourcesForPath(jsonApiDocument, rec, relationPath, projection);
             });
         });
     }
@@ -72,23 +79,34 @@ private void addIncludedResources(JsonApiDocument jsonApiDocument, PersistentRes
      * JsonApiDocument.
      */
     private void addResourcesForPath(JsonApiDocument jsonApiDocument, PersistentResource<?> rec,
-                                     List<String> relationPath) {
+                                     List<String> relationPath,
+                                     EntityProjection projection) {
 
         //Pop off a relation of relation path
         String relation = relationPath.remove(0);
 
-        rec.getRelationCheckedFiltered(relation).forEach(resource -> {
+        Set<PersistentResource> collection;
+        Relationship relationship = projection.getRelationship(relation).orElseThrow(IllegalStateException::new);
+        try {
+            collection = rec.getRelationCheckedFiltered(relationship).toList(LinkedHashSet::new).blockingGet();
+
+        } catch (ForbiddenAccessException e) {
+            return;
+        }
+
+        collection.forEach(resource -> {
             jsonApiDocument.addIncluded(resource.toResource());
 
             //If more relations left in the path, process a level deeper
             if (!relationPath.isEmpty()) {
                 //Use a copy of the relationPath to preserve the path for remaining branches of the relationship tree
-                addResourcesForPath(jsonApiDocument, resource, new ArrayList<>(relationPath));
+                addResourcesForPath(jsonApiDocument, resource, new ArrayList<>(relationPath),
+                        relationship.getProjection());
             }
         });
     }
 
-    private static boolean isPresent(Optional<MultivaluedMap<String, String>> queryParams, String key) {
-        return queryParams.isPresent() && queryParams.get().get(key) != null;
+    private static boolean isPresent(MultivaluedMap<String, String> queryParams, String key) {
+        return queryParams != null && queryParams.get(key) != null;
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/SortProcessor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/SortProcessor.java
deleted file mode 100644
index 26d90abe64..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/document/processors/SortProcessor.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.jsonapi.document.processors;
-
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Resource;
-import com.google.common.collect.Ordering;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.core.MultivaluedMap;
-
-/**
- * Implementation for JSON API 'sort' query param.
- *
- * Sorts a JsonApiDocument's data field based on attributes specified in query param.
- * If an attribute is not found, it will be ignored for sorting.
- * Null values are sorted first.
- *
- * Supports sort by multiple fields by separating them with ','
- * Supports descending sorts by prefixing the field with '-'
- * Does not support sorting by a relationship's field (ex: author.name)
- *
- * Example:
- *  /posts?sort=title,-created
- */
-public class SortProcessor implements DocumentProcessor {
-
-    /**
-     * The constant SORT_PARAM.
-     */
-    public static final String SORT_PARAM = "sort";
-
-    /**
-     * The constant DESCENDING_TOKEN.
-     */
-    public static final char DESCENDING_TOKEN = '-';
-
-    /**
-     * Sorts a JsonApiDocument's data field based on attributes specified in the 'sort' query param.
-     * This method is a no-op as a single record is already sorted.
-     *
-     * @param jsonApiDocument the json api document
-     * @param resource the resource
-     * @param queryParams the query params
-     */
-    @Override
-    public void execute(JsonApiDocument jsonApiDocument, PersistentResource resource,
-                        Optional<MultivaluedMap<String, String>> queryParams) {
-        // NO-OP
-    }
-
-    /**
-     * Sorts a JsonApiDocument's data field based on attributes specified in the 'sort' query param.
-     *
-     * @param jsonApiDocument the json api document
-     * @param resources the resources
-     * @param queryParams the query params
-     */
-    @Override
-    public void execute(JsonApiDocument jsonApiDocument, Set<PersistentResource> resources,
-                        Optional<MultivaluedMap<String, String>> queryParams) {
-
-        // Only sort if requested by query param
-        queryParams.filter(params -> params.containsKey(SORT_PARAM)).ifPresent(params -> {
-            List<String> sortFields = params.get(SORT_PARAM);
-
-            // Sort the json api document's data property based on the requested sort fields
-            sort(jsonApiDocument.getData(), sortFields);
-        });
-
-    }
-
-    /**
-     * Sort data based on provided sort field list.
-     *
-     * @param data resource data to sort
-     * @param sortFields - attribute fields within the data to sort by
-     */
-    private void sort(Data<Resource> data, List<String> sortFields) {
-        List<Comparator<Resource>> comparisonFunctions = buildComparisonFunctions(sortFields);
-
-        data.sort((a, b) ->
-
-            // Apply comparison functions in order until one returns a non-zero value
-            Ordering.compound(comparisonFunctions).compare(a, b)
-        );
-    }
-
-    /**
-     * Build list of comparators.
-     *
-     * @param sortFields attribute fields within the data to sort by
-     * @return list of comparators to do the sorting
-     */
-    private List<Comparator<Resource>> buildComparisonFunctions(List<String> sortFields) {
-        // Convert sort fields to comparisons
-        return sortFields.stream()
-                .map(this::comparisonForField)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Field comparator.
-     *
-     * @param field name of attribute field to compare, prefix with '-' to specify descending order
-     * @return a comparison between resources for the given attribute field
-     */
-    private Comparator<Resource> comparisonForField(String field) {
-        // Determine if ascending or descending
-        if (field.charAt(0) == DESCENDING_TOKEN) {
-            // Remove descending token to get field name
-            String parsedField = field.substring(1);
-            return Ordering.from(attributeComparison(parsedField)).nullsFirst().reverse();
-        } else {
-            return Ordering.from(attributeComparison(field)).nullsFirst();
-        }
-    }
-
-    /**
-     * Attribute comparator.
-     *
-     * @param field - name of attribute field to compare
-     * @return a comparison between resources for the given attribute field
-     */
-    private Comparator<Resource> attributeComparison(String field) {
-        return (a, b) ->
-            // Compare requested attribute using an object comparison
-            Ordering.from(this::compareObjects)
-                .nullsFirst()
-                .compare(
-                        a.getAttributes().get(field),
-                        b.getAttributes().get(field)
-                );
-    }
-
-    /**
-     * Compare objects.
-     *
-     * @param a first object to compare
-     * @param b second object to compare
-     * @return negative number if a < b
-     *         positive number if b > a
-     *         0 if a == b
-     *         0 if a comparison for the given object class cannot be made
-     */
-    private int compareObjects(Object a, Object b) {
-        if (a instanceof Comparable) {
-            return ((Comparable) a).compareTo(b);
-        }
-
-        // Can't compare objects without Comparable implementation
-        return 0;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/extensions/JsonApiPatch.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/JsonApiPatch.java
similarity index 79%
rename from elide-core/src/main/java/com/yahoo/elide/extensions/JsonApiPatch.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/JsonApiPatch.java
index 24879e1a25..0379847a43 100644
--- a/elide-core/src/main/java/com/yahoo/elide/extensions/JsonApiPatch.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/JsonApiPatch.java
@@ -1,32 +1,34 @@
 /*
- * Copyright 2015, Yahoo Inc.
+ * Copyright 2018, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.extensions;
+package com.yahoo.elide.jsonapi.extensions;
 
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.HttpStatus;
 import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.JsonPatchExtensionException;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.exceptions.HttpStatus;
 import com.yahoo.elide.core.exceptions.HttpStatusException;
 import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.exceptions.JsonPatchExtensionException;
 import com.yahoo.elide.jsonapi.models.Data;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 import com.yahoo.elide.jsonapi.models.Patch;
 import com.yahoo.elide.jsonapi.models.Resource;
-import com.yahoo.elide.parsers.DeleteVisitor;
-import com.yahoo.elide.parsers.PatchVisitor;
-import com.yahoo.elide.parsers.PostVisitor;
-
+import com.yahoo.elide.jsonapi.parser.DeleteVisitor;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+import com.yahoo.elide.jsonapi.parser.PatchVisitor;
+import com.yahoo.elide.jsonapi.parser.PostVisitor;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.owasp.encoder.Encode;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -62,7 +64,7 @@ public void postProcess(PatchRequestScope requestScope) {
                     // Only update relationships
                     clearAllExceptRelationships(doc);
                     PatchVisitor visitor = new PatchVisitor(new PatchRequestScope(path, doc, requestScope));
-                    visitor.visit(Elide.parse(path));
+                    visitor.visit(JsonApiParser.parse(path));
                 } catch (HttpStatusException e) {
                     cause = e;
                     throw e;
@@ -95,14 +97,17 @@ public void postProcess(PatchRequestScope requestScope) {
      * @param patchDoc the patch doc
      * @param requestScope request scope
      * @return pair
-     * @throws IOException the iO exception
      */
     public static Supplier<Pair<Integer, JsonNode>> processJsonPatch(DataStore dataStore,
             String uri,
             String patchDoc,
-            PatchRequestScope requestScope)
-            throws IOException {
-        List<Patch> actions = requestScope.getMapper().readJsonApiPatchExtDoc(patchDoc);
+            PatchRequestScope requestScope) {
+        List<Patch> actions;
+        try {
+            actions = requestScope.getMapper().readJsonApiPatchExtDoc(patchDoc);
+        } catch (IOException e) {
+            throw new InvalidEntityBodyException(patchDoc);
+        }
         JsonApiPatch processor = new JsonApiPatch(dataStore, actions, uri, requestScope);
         return processor.processActions(requestScope);
     }
@@ -133,20 +138,17 @@ private Supplier<Pair<Integer, JsonNode>> processActions(PatchRequestScope reque
 
             postProcessRelationships(requestScope);
 
-            // Avoid any lazy loading issues
-            results.forEach(Supplier::get);
-
             return () -> {
                 try {
                     return Pair.of(HttpStatus.SC_OK, mergeResponse(results));
                 } catch (HttpStatusException e) {
-                    throwErrorResponse(e, requestScope.getPermissionExecutor().isVerbose());
+                    throwErrorResponse();
                     // NOTE: This should never be called. throwErrorResponse should _always_ throw an exception
                     return null;
                 }
             };
         } catch (HttpStatusException e) {
-            throwErrorResponse(e, requestScope.getPermissionExecutor().isVerbose());
+            throwErrorResponse();
             // NOTE: This should never be called. throwErrorResponse should _always_ throw an exception
             return () -> null;
         }
@@ -162,6 +164,11 @@ private List<Supplier<Pair<Integer, JsonNode>>> handleActions(PatchRequestScope
         return actions.stream().map(action -> {
             Supplier<Pair<Integer, JsonNode>> result;
             try {
+                String path = action.patch.getPath();
+                if (path == null) {
+                    throw new InvalidEntityBodyException("Patch extension requires all objects "
+                            + "to have an assigned path");
+                }
                 String[] combined = ArrayUtils.addAll(rootUri.split("/"), action.patch.getPath().split("/"));
                 String fullPath = String.join("/", combined).replace("/-", "");
                 switch (action.patch.getOperation()) {
@@ -169,7 +176,7 @@ private List<Supplier<Pair<Integer, JsonNode>>> handleActions(PatchRequestScope
                         result = handleAddOp(fullPath, action.patch.getValue(), requestScope, action);
                         break;
                     case REPLACE:
-                        result = handleReplaceOp(fullPath, action.patch.getValue(), requestScope);
+                        result = handleReplaceOp(fullPath, action.patch.getValue(), requestScope, action);
                         break;
                     case REMOVE:
                         result = handleRemoveOp(fullPath, action.patch.getValue(), requestScope);
@@ -197,9 +204,15 @@ private Supplier<Pair<Integer, JsonNode>> handleAddOp(
             if (data == null || data.get() == null) {
                 throw new InvalidEntityBodyException("Expected an entity body but received none.");
             }
+
             Collection<Resource> resources = data.get();
             if (!path.contains("relationships")) { // Reserved key for relationships
                 String id = getSingleResource(resources).getId();
+
+                if (StringUtils.isEmpty(id)) {
+                    throw new InvalidEntityBodyException("Patch extension requires all objects to have an assigned "
+                            + "ID (temporary or permanent) when assigning relationships.");
+                }
                 String fullPath = path + "/" + id;
                 // Defer relationship updating until the end
                 getSingleResource(resources).setRelationships(null);
@@ -209,7 +222,7 @@ private Supplier<Pair<Integer, JsonNode>> handleAddOp(
                 action.isPostProcessing = true;
             }
             PostVisitor visitor = new PostVisitor(new PatchRequestScope(path, value, requestScope));
-            return visitor.visit(Elide.parse(path));
+            return visitor.visit(JsonApiParser.parse(path));
         } catch (HttpStatusException e) {
             action.cause = e;
             throw e;
@@ -222,12 +235,23 @@ private Supplier<Pair<Integer, JsonNode>> handleAddOp(
      * Replace data via patch extension.
      */
     private Supplier<Pair<Integer, JsonNode>> handleReplaceOp(
-            String path, JsonNode patchVal, PatchRequestScope requestScope) {
+            String path, JsonNode patchVal, PatchRequestScope requestScope, PatchAction action) {
         try {
             JsonApiDocument value = requestScope.getMapper().readJsonApiPatchExtValue(patchVal);
+
+            if (!path.contains("relationships")) { // Reserved
+                Data<Resource> data = value.getData();
+                Collection<Resource> resources = data.get();
+                // Defer relationship updating until the end
+                getSingleResource(resources).setRelationships(null);
+                // Reparse since we mangle it first
+                action.doc = requestScope.getMapper().readJsonApiPatchExtValue(patchVal);
+                action.path = path;
+                action.isPostProcessing = true;
+            }
             // Defer relationship updating until the end
             PatchVisitor visitor = new PatchVisitor(new PatchRequestScope(path, value, requestScope));
-            return visitor.visit(Elide.parse(path));
+            return visitor.visit(JsonApiParser.parse(path));
         } catch (IOException e) {
             throw new InvalidEntityBodyException("Could not parse patch extension value: " + patchVal);
         }
@@ -256,7 +280,7 @@ private Supplier<Pair<Integer, JsonNode>> handleRemoveOp(String path,
             }
             DeleteVisitor visitor = new DeleteVisitor(
                 new PatchRequestScope(path, value, requestScope));
-            return visitor.visit(Elide.parse(fullPath));
+            return visitor.visit(JsonApiParser.parse(fullPath));
         } catch (IOException e) {
             throw new InvalidEntityBodyException("Could not parse patch extension value: " + patchValue);
         }
@@ -279,38 +303,47 @@ private void postProcessRelationships(PatchRequestScope requestScope) {
     /**
      * Turn an exception into a proper error response from patch extension.
      */
-    private void throwErrorResponse(HttpStatusException e, boolean isVerbose) {
-        if (e.getStatus() == HttpStatus.SC_FORBIDDEN) {
-            throw new JsonPatchExtensionException(isVerbose ? e.getVerboseErrorResponse() : e.getErrorResponse());
+    private void throwErrorResponse() {
+        ArrayNode errorContainer = getErrorContainer();
+
+        boolean failed = false;
+        for (PatchAction action : actions) {
+            failed = processAction(errorContainer, failed, action);
         }
 
-        ObjectNode errorContainer = getErrorContainer();
-        ArrayNode errorList = (ArrayNode) errorContainer.get("errors");
+        JsonPatchExtensionException failure =
+                new JsonPatchExtensionException(HttpStatus.SC_BAD_REQUEST, errorContainer);
 
-        boolean failed = false;
+        // attach error causes to exception
         for (PatchAction action : actions) {
-            failed = processAction(errorList, failed, action);
+            if (action.cause != null) {
+                failure.addSuppressed(action.cause);
+            }
         }
-        throw new JsonPatchExtensionException(HttpStatus.SC_BAD_REQUEST, errorContainer);
+
+        throw failure;
     }
 
-    private ObjectNode getErrorContainer() {
-        ObjectNode container = JsonNodeFactory.instance.objectNode();
-        container.set("errors", JsonNodeFactory.instance.arrayNode());
-        return container;
+    private ArrayNode getErrorContainer() {
+        return JsonNodeFactory.instance.arrayNode();
     }
 
     private boolean processAction(ArrayNode errorList, boolean failed, PatchAction action) {
+        ObjectNode container = JsonNodeFactory.instance.objectNode();
+        ArrayNode errors = JsonNodeFactory.instance.arrayNode();
+        container.set("errors", errors);
+        errorList.add(container);
+
         if (action.cause != null) {
             // this is the failed operation
-            errorList.add(toErrorNode(action.cause.getMessage(), action.cause.getStatus()));
+            errors.add(toErrorNode(action.cause.getMessage(), action.cause.getStatus()));
             failed = true;
         } else if (!failed) {
             // this operation succeeded
-            errorList.add(ERR_NODE_ERR_IN_SUBSEQUENT_OPERATION);
+            errors.add(ERR_NODE_ERR_IN_SUBSEQUENT_OPERATION);
         } else {
             // this operation never ran
-            errorList.add(ERR_NODE_OPERATION_NOT_RUN);
+            errors.add(ERR_NODE_OPERATION_NOT_RUN);
         }
         return failed;
     }
@@ -341,9 +374,9 @@ private static void clearAllExceptRelationships(Resource resource) {
      */
     private static JsonNode toErrorNode(String detail, Integer status) {
         ObjectNode formattedError = JsonNodeFactory.instance.objectNode();
-        formattedError.set("detail", JsonNodeFactory.instance.textNode(detail));
+        formattedError.set("detail", JsonNodeFactory.instance.textNode(Encode.forHtml(detail)));
         if (status != null) {
-            formattedError.set("status", JsonNodeFactory.instance.numberNode(status));
+            formattedError.set("status", JsonNodeFactory.instance.textNode(status.toString()));
         }
         return formattedError;
     }
@@ -375,7 +408,7 @@ public static boolean isPatchExtension(String header) {
         }
 
         // Find ext=jsonpatch
-        return Arrays.asList(header.split(";")).stream()
+        return Arrays.stream(header.split(";"))
             .map(key -> key.split("="))
             .filter(value -> value.length == 2)
             .anyMatch(value -> value[0].trim().equals("ext") && value[1].trim().equals("jsonpatch"));
@@ -385,6 +418,6 @@ private static Resource getSingleResource(Collection<Resource> resources) {
         if (resources == null || resources.size() != 1) {
             throw new InvalidEntityBodyException("Expected single resource.");
         }
-        return resources.iterator().next();
+        return IterableUtils.first(resources);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/PatchRequestScope.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/PatchRequestScope.java
new file mode 100644
index 0000000000..3310757f72
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/PatchRequestScope.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.extensions;
+
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.EntityProjectionMaker;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Special request scope for Patch Extension.
+ */
+public class PatchRequestScope extends RequestScope {
+
+    /**
+     * Outer RequestScope constructor for use by Patch Extension.
+     *
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param path the URL path
+     * @param apiVersion client requested API version
+     * @param transaction current database transaction
+     * @param user        request user
+     * @param requestId   request ID
+     * @param queryParams request query parameters
+     * @param requestHeaders request headers
+     * @param elideSettings Elide settings object
+     */
+    public PatchRequestScope(
+            String baseUrlEndPoint,
+            String path,
+            String apiVersion,
+            DataStoreTransaction transaction,
+            User user,
+            UUID requestId,
+            MultivaluedMap<String, String> queryParams,
+            Map<String, List<String>> requestHeaders,
+            ElideSettings elideSettings) {
+        super(
+                baseUrlEndPoint,
+                path,
+                apiVersion,
+                (JsonApiDocument) null,
+                transaction,
+                user,
+                queryParams,
+                requestHeaders,
+                requestId,
+                elideSettings
+        );
+    }
+
+    /**
+     * Inner RequestScope copy constructor for use by Patch Extension actions.
+     *
+     * @param path the URL path
+     * @param jsonApiDocument document
+     * @param scope           outer request scope
+     */
+    public PatchRequestScope(String path, JsonApiDocument jsonApiDocument, PatchRequestScope scope) {
+        super(path, scope.getApiVersion(), jsonApiDocument, scope);
+        this.setEntityProjection(new EntityProjectionMaker(dictionary, this).parsePath(path));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/DefaultJSONApiLinks.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/DefaultJSONApiLinks.java
new file mode 100644
index 0000000000..647214314e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/DefaultJSONApiLinks.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.links;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.ResourceLineage;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/***
+ * Default API links populate provide 'self' and 'related' links.
+ * To add custom links, Override `getResourceLevelLinks` and `getRelationshipLinks`.
+ * Ad the subclass object in ElideAutoConfiguration.
+ */
+public class DefaultJSONApiLinks implements JSONApiLinks {
+
+    private final String baseUrl;
+
+    public DefaultJSONApiLinks() {
+        this("");
+    }
+
+    public DefaultJSONApiLinks(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    @Override
+    public Map<String, String> getResourceLevelLinks(PersistentResource resource) {
+        return ImmutableMap.of("self", getResourceUrl(resource));
+    }
+
+    @Override
+    public Map<String, String> getRelationshipLinks(PersistentResource resource, String field) {
+        String resourceUrl = getResourceUrl(resource);
+        return ImmutableMap.of(
+                "self", String.join("/", resourceUrl, "relationships", field),
+                "related", String.join("/", resourceUrl, field));
+    }
+
+    /**
+     * Creates the link from resources path.
+     * @param resource
+     * @return
+     */
+    protected String getResourceUrl(PersistentResource resource) {
+        StringBuilder result = new StringBuilder();
+
+        if (StringUtils.isEmpty(baseUrl)) {
+            if (resource.getRequestScope().getBaseUrlEndPoint() != null) {
+                result.append(resource.getRequestScope().getBaseUrlEndPoint());
+                String jsonApiPath = resource.getRequestScope().getElideSettings().getJsonApiPath();
+                if (StringUtils.isNotEmpty(jsonApiPath)) {
+                    result.append(jsonApiPath);
+                }
+                result.append("/");
+            }
+        } else {
+            result.append(baseUrl);
+        }
+
+        List<ResourceLineage.LineagePath> path = resource.getLineage().getResourcePath();
+        if (CollectionUtils.isNotEmpty(path)) {
+            result.append(String.join("/", getPathSegment(path), resource.getId()));
+        } else {
+            result.append(String.join("/", resource.getTypeName(), resource.getId()));
+        }
+
+        return result.toString();
+    }
+
+    private String getPathSegment(List<ResourceLineage.LineagePath> path) {
+        StringBuilder result = new StringBuilder();
+
+        int pathSegmentCount = 0;
+        for (ResourceLineage.LineagePath pathElement : path) {
+            PersistentResource resource = pathElement.getResource();
+            if (pathSegmentCount > 0) {
+                result.append("/");
+                result.append(String.join("/",
+                        resource.getId(), pathElement.getRelationship()));
+            } else {
+                result.append(String.join("/",
+                        resource.getTypeName(), resource.getId(), pathElement.getRelationship()));
+            }
+            pathSegmentCount++;
+        }
+
+        return result.toString();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/JSONApiLinks.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/JSONApiLinks.java
new file mode 100644
index 0000000000..b3c0f2c7e1
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/links/JSONApiLinks.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.links;
+
+import com.yahoo.elide.core.PersistentResource;
+
+import java.util.Map;
+
+public interface JSONApiLinks {
+    /**
+     * Links to be used in the Respose Entity.
+     * @param resource
+     * @return
+     */
+    Map<String, String> getResourceLevelLinks(PersistentResource resource);
+
+    /**
+     * Links to be used in Relationships of the Response Entity.
+     * @param resource
+     * @return
+     */
+    Map<String, String> getRelationshipLinks(PersistentResource resource, String field);
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Data.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Data.java
index 866b8ba72f..9ab6213aa6 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Data.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Data.java
@@ -5,20 +5,16 @@
  */
 package com.yahoo.elide.jsonapi.models;
 
-import com.yahoo.elide.core.RelationshipType;
+import com.yahoo.elide.core.dictionary.RelationshipType;
 import com.yahoo.elide.jsonapi.serialization.DataDeserializer;
 import com.yahoo.elide.jsonapi.serialization.DataSerializer;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
+import io.reactivex.Observable;
 import lombok.ToString;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Container for different representations of top-level data in JSON API.
@@ -29,7 +25,7 @@
 @JsonDeserialize(using = DataDeserializer.class)
 @ToString
 public class Data<T> {
-    private final Collection<T> values;
+    private final Observable<T> values;
     private final RelationshipType relationshipType;
 
     /**
@@ -38,7 +34,11 @@ public class Data<T> {
      * @param value singleton resource
      */
     public Data(T value) {
-        this.values = new SingleElementSet<>(value);
+        if (value == null) {
+            this.values = Observable.empty();
+        } else {
+            this.values = Observable.fromArray(value);
+        }
         this.relationshipType = RelationshipType.MANY_TO_ONE; // Any "toOne"
     }
 
@@ -47,9 +47,39 @@ public Data(T value) {
      *
      * @param values List of resources
      */
-    public Data(Collection<T> values) {
+    public Data(Observable<T> values) {
+        this(values, RelationshipType.MANY_TO_MANY);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param values List of resources
+     * @param relationshipType toOne or toMany
+     */
+    public Data(Observable<T> values, RelationshipType relationshipType) {
         this.values = values;
-        this.relationshipType = RelationshipType.MANY_TO_MANY; // Any "toMany"
+        this.relationshipType = relationshipType;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param values List of resources
+     */
+    public Data(Collection<T> values) {
+        this(values, RelationshipType.MANY_TO_MANY);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param values List of resources
+     * @param relationshipType toOne or toMany
+     */
+    public Data(Collection<T> values, RelationshipType relationshipType) {
+        this.values = Observable.fromIterable(values);
+        this.relationshipType = relationshipType;
     }
 
     /**
@@ -58,18 +88,11 @@ public Data(Collection<T> values) {
      * @param sortFunction comparator to sort data with
      */
     public void sort(Comparator<T> sortFunction) {
-        if (values instanceof List) {
-            ((List<T>) values).sort(sortFunction);
-        } else {
-            ArrayList<T> sortedList = new ArrayList<>(values);
-            sortedList.sort(sortFunction);
-            values.clear();
-            values.addAll(sortedList);
-        }
+        this.values.sorted(sortFunction);
     }
 
     public Collection<T> get() {
-        return values;
+        return values.toList().blockingGet();
     }
 
     /**
@@ -82,23 +105,25 @@ public boolean isToOne() {
     }
 
     /**
-     * Fetch the item if the data is toOne
+     * Fetch the item if the data is toOne.
      *
      * @return T if toOne
      * @throws IllegalAccessError when the data is not toOne
      */
     public T getSingleValue() {
         if (isToOne()) {
-            return ((SingleElementSet<T>) values).getValue();
+            if (values.isEmpty().blockingGet()) {
+                return null;
+            }
+            return values.blockingSingle();
         }
 
         throw new IllegalAccessError("Data is not toOne");
     }
 
-    @SuppressWarnings("unchecked")
     public Collection<ResourceIdentifier> toResourceIdentifiers() {
-        return ((Collection<Resource>) get()).stream()
-                                             .map(object -> object != null ? object.toResourceIdentifier() : null)
-                                             .collect(Collectors.toList());
+        return values
+                .map(object -> object != null ? ((Resource) object).toResourceIdentifier() : null)
+                .toList().blockingGet();
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/JsonApiDocument.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/JsonApiDocument.java
index 9755a9776c..47c3b8ddcf 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/JsonApiDocument.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/JsonApiDocument.java
@@ -7,15 +7,17 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import lombok.ToString;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import lombok.ToString;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * JSON API Document.
@@ -41,13 +43,9 @@ public JsonApiDocument(Data<Resource> data) {
 
     public void setData(Data<Resource> data) {
         this.data = data;
-        this.meta = null;
     }
 
     public Data<Resource> getData() {
-        if (data == null) {
-            return null;
-        }
         return data;
     }
 
@@ -83,12 +81,11 @@ public void addIncluded(Resource resource) {
 
     @Override
     public int hashCode() {
+        Collection<Resource> resources = data == null ? null : data.get();
         return new HashCodeBuilder(37, 79)
-            .append(data)
-            .append(meta)
-            .append(includedRecs)
+            .append(resources == null ? 0 : resources.stream().mapToInt(Object::hashCode).sum())
             .append(links)
-            .append(included)
+            .append(included == null ? 0 : included.stream().mapToInt(Object::hashCode).sum())
             .build();
     }
 
@@ -98,14 +95,12 @@ public boolean equals(Object obj) {
             return false;
         }
         JsonApiDocument other = (JsonApiDocument) obj;
-        Collection<Resource> resources = data.get();
-        if ((resources == null || other.getData().get() == null) && resources != other.getData().get()) {
+        Collection<Resource> resources = Optional.ofNullable(data).map(Data::get).orElseGet(Collections::emptySet);
+        Collection<Resource> otherResources =
+                Optional.ofNullable(other.data).map(Data::get).orElseGet(Collections::emptySet);
+
+        if (resources.size() != otherResources.size() || !resources.stream().allMatch(otherResources::contains)) {
             return false;
-        } else if (resources != null) {
-            if (resources.size() != other.getData().get().size()
-                || !resources.stream().allMatch(other.getData().get()::contains)) {
-                return false;
-            }
         }
         // TODO: Verify links and meta?
         if (other.getIncluded() == null) {
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Meta.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Meta.java
index 34b57b4f6a..ba26533aad 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Meta.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Meta.java
@@ -5,8 +5,10 @@
  */
 package com.yahoo.elide.jsonapi.models;
 
+import com.yahoo.elide.jsonapi.serialization.MetaDeserializer;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.Map;
 
@@ -14,6 +16,7 @@
  * Model for representing JSON API meta information.
  */
 @JsonAutoDetect
+@JsonDeserialize(using = MetaDeserializer.class)
 public class Meta extends KeyValMap {
 
     /**
@@ -26,7 +29,7 @@ public Meta(Map<String, Object> map) {
     }
 
     /**
-     * Expose the meta map so that it will be included in the returned JSON-API document
+     * Expose the meta map so that it will be included in the returned JSON-API document.
      *
      * @return the meta map
      */
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Relationship.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Relationship.java
index 764edc3f8e..158b100711 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Relationship.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Relationship.java
@@ -9,14 +9,15 @@
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
 import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.collections4.MapUtils;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -40,6 +41,7 @@ public Relationship(@JsonProperty("links") Map<String, String> links,
             } else {
                 this.idData = new Data<>(
                         data.get().stream()
+                            .map(Objects::requireNonNull)
                             .map(Resource::toResourceIdentifier)
                             .collect(Collectors.toList())
                 );
@@ -51,7 +53,7 @@ public Relationship(@JsonProperty("links") Map<String, String> links,
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public Map<String, String> getLinks() {
-        return links == null || links.isEmpty() ? null : links;
+        return MapUtils.isEmpty(links) ? null : links;
     }
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -74,7 +76,7 @@ public Set<PersistentResource> toPersistentResources(RequestScope requestScope)
         if (resources != null) {
             for (Resource resource : resources) {
                 try {
-                    if (data.isToOne() && resource == null) {
+                    if (resource == null) {
                         continue;
                     }
                     res.add(resource.toPersistentResource(requestScope));
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Resource.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Resource.java
index 6284583923..14601068dd 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Resource.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/Resource.java
@@ -5,18 +5,21 @@
  */
 package com.yahoo.elide.jsonapi.models;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yahoo.elide.core.PersistentResource;
 import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
 import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yahoo.elide.core.exceptions.UnknownEntityException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
 import com.yahoo.elide.jsonapi.serialization.KeySerializer;
-import lombok.ToString;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import lombok.ToString;
 
 import java.util.Map;
 import java.util.Objects;
@@ -30,6 +33,9 @@
  */
 @ToString
 public class Resource {
+
+    //Doesn't work currently - https://github.com/FasterXML/jackson-databind/issues/230
+    @JsonProperty(required = true)
     private String type;
     private String id;
     private Map<String, Object> attributes;
@@ -40,6 +46,9 @@ public class Resource {
     public Resource(String type, String id) {
         this.type = type;
         this.id = id;
+        if (id == null) {
+            throw new InvalidObjectIdentifierException(id, type);
+        }
     }
 
     public Resource(@JsonProperty("type") String type,
@@ -57,7 +66,7 @@ public Resource(@JsonProperty("type") String type,
     }
 
     public String getId() {
-        return (id == null) ? null : id;
+        return id;
     }
 
     public void setRelationships(Map<String, Relationship> relationships) {
@@ -66,13 +75,13 @@ public void setRelationships(Map<String, Relationship> relationships) {
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public Map<String, Relationship> getRelationships() {
-        return relationships == null || relationships.isEmpty() ? null : relationships;
+        return MapUtils.isEmpty(relationships) ? null : relationships;
     }
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonSerialize(keyUsing = KeySerializer.class)
     public Map<String, Object> getAttributes() {
-        return attributes == null || attributes.isEmpty() ? null : attributes;
+        return MapUtils.isEmpty(attributes) ? null : attributes;
     }
 
     public void setId(String id) {
@@ -139,12 +148,23 @@ public boolean equals(Object obj) {
         return false;
     }
 
-    public PersistentResource toPersistentResource(RequestScope requestScope)
+    public PersistentResource<?> toPersistentResource(RequestScope requestScope)
         throws ForbiddenAccessException, InvalidObjectIdentifierException {
-        Class<?> cls = requestScope.getDictionary().getEntityClass(type);
+        EntityDictionary dictionary = requestScope.getDictionary();
+
+        Type<?> cls = dictionary.getEntityClass(type, requestScope.getApiVersion());
+
         if (cls == null) {
             throw new UnknownEntityException(type);
         }
-        return PersistentResource.loadRecord(cls, id, requestScope);
+        if (id == null) {
+            throw new InvalidObjectIdentifierException(id, type);
+        }
+
+        EntityProjection projection = EntityProjection.builder()
+            .type(cls)
+            .build();
+
+        return PersistentResource.loadRecord(projection, id, requestScope);
     }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/ResourceIdentifier.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/ResourceIdentifier.java
index f99c58ccc3..658ec64dde 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/ResourceIdentifier.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/ResourceIdentifier.java
@@ -5,14 +5,13 @@
  */
 package com.yahoo.elide.jsonapi.models;
 
-
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
 import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
-import com.yahoo.elide.core.PersistentResource;
-
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yahoo.elide.core.RequestScope;
-
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
@@ -38,8 +37,11 @@ public String getId() {
 
     public PersistentResource toPersistentResource(RequestScope requestScope)
         throws ForbiddenAccessException, InvalidObjectIdentifierException {
-        Class<?> cls = requestScope.getDictionary().getEntityClass(type);
-        return PersistentResource.loadRecord(cls, id, requestScope);
+
+        Type<?> cls = requestScope.getDictionary().getEntityClass(type, requestScope.getApiVersion());
+        return PersistentResource.loadRecord(EntityProjection.builder()
+                .type(cls)
+                .build(), id, requestScope);
     }
 
     public Resource castToResource() {
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/SingleElementSet.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/SingleElementSet.java
deleted file mode 100644
index 0f1a99249b..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/models/SingleElementSet.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.jsonapi.models;
-
-import com.yahoo.elide.jsonapi.serialization.SingletonSerializer;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import java.util.AbstractSet;
-import java.util.Collections;
-import java.util.Iterator;
-
-/**
- * Single object treated as a Set.
- *
- * @param <T>  the type of element to treat as a set
- */
-@JsonSerialize(using = SingletonSerializer.class)
-public class SingleElementSet<T> extends AbstractSet<T> {
-
-    private final T value;
-
-    public SingleElementSet(T v) {
-        value = v;
-    }
-
-    public T getValue() {
-        return value;
-    }
-
-    @Override
-    public int size() {
-        return value == null ? 0 : 1;
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-        return value == null
-                ? Collections.emptyIterator()
-                : Collections.singleton(value).iterator();
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/BaseVisitor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/BaseVisitor.java
similarity index 96%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/BaseVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/BaseVisitor.java
index 02edd9c1cc..40a091885a 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/BaseVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/BaseVisitor.java
@@ -3,9 +3,8 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers;
+package com.yahoo.elide.jsonapi.parser;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.generated.parsers.CoreBaseVisitor;
 import com.yahoo.elide.generated.parsers.CoreParser.EntityContext;
@@ -21,8 +20,9 @@
 import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
 import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
 import com.yahoo.elide.generated.parsers.CoreParser.TermContext;
-import com.yahoo.elide.parsers.state.StartState;
-import com.yahoo.elide.parsers.state.StateContext;
+import com.yahoo.elide.jsonapi.parser.state.StartState;
+import com.yahoo.elide.jsonapi.parser.state.StateContext;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.function.Supplier;
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/DeleteVisitor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/DeleteVisitor.java
similarity index 95%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/DeleteVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/DeleteVisitor.java
index df2415b59c..681e8565ef 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/DeleteVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/DeleteVisitor.java
@@ -3,13 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers;
+package com.yahoo.elide.jsonapi.parser;
 
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.generated.parsers.CoreParser.QueryContext;
-
 import com.fasterxml.jackson.databind.JsonNode;
-
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.function.Supplier;
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/GetVisitor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/GetVisitor.java
similarity index 94%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/GetVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/GetVisitor.java
index 17a8b6ddd8..f5bb77f122 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/GetVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/GetVisitor.java
@@ -3,14 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers;
-
+package com.yahoo.elide.jsonapi.parser;
 
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.generated.parsers.CoreParser.QueryContext;
-
 import com.fasterxml.jackson.databind.JsonNode;
-
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.function.Supplier;
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/JsonApiParser.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/JsonApiParser.java
new file mode 100644
index 0000000000..3084a8fb3e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/JsonApiParser.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser;
+
+import com.yahoo.elide.generated.parsers.CoreLexer;
+import com.yahoo.elide.generated.parsers.CoreParser;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * Parses the REST request.
+ */
+public class JsonApiParser {
+
+    private static final Pattern DUPLICATE_SEPARATOR_PATTERN = Pattern.compile("//+");
+
+    /**
+     * Normalize request path
+     *
+     * @param path request path
+     * @return normalized path string
+     */
+    public static String normalizePath(String path) {
+        String normalizedPath = DUPLICATE_SEPARATOR_PATTERN.matcher(path).replaceAll("/");
+
+        normalizedPath = StringUtils.removeEnd(normalizedPath, "/");
+
+        return StringUtils.removeStart(normalizedPath, "/");
+    }
+
+    /**
+     * Compile request to AST.
+     *
+     * @param path request
+     * @return AST parse tree
+     */
+    public static ParseTree parse(String path) {
+        String normalizedPath = normalizePath(path);
+
+        CharStream is = CharStreams.fromString(normalizedPath);
+        CoreLexer lexer = new CoreLexer(is);
+        lexer.removeErrorListeners();
+        lexer.addErrorListener(new BaseErrorListener() {
+            @Override
+            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+                    int charPositionInLine, String msg, RecognitionException e) {
+                throw new ParseCancellationException(msg, e);
+            }
+        });
+        CoreParser parser = new CoreParser(new CommonTokenStream(lexer));
+        parser.setErrorHandler(new BailErrorStrategy());
+        return parser.start();
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/PatchVisitor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PatchVisitor.java
similarity index 94%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/PatchVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PatchVisitor.java
index 513184e5e4..7b79df4b15 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/PatchVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PatchVisitor.java
@@ -3,13 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers;
+package com.yahoo.elide.jsonapi.parser;
 
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.generated.parsers.CoreParser.QueryContext;
-
 import com.fasterxml.jackson.databind.JsonNode;
-
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.function.Supplier;
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/PostVisitor.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PostVisitor.java
similarity index 94%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/PostVisitor.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PostVisitor.java
index cd3127715a..d909199192 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/PostVisitor.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/PostVisitor.java
@@ -3,13 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers;
+package com.yahoo.elide.jsonapi.parser;
 
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.generated.parsers.CoreParser.QueryContext;
-
 import com.fasterxml.jackson.databind.JsonNode;
-
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.function.Supplier;
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/BaseState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/BaseState.java
new file mode 100644
index 0000000000..1ff16b504f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/BaseState.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntitiesContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntityContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionRelationshipContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionSubCollectionContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadCollectionContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadEntityContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
+import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
+import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
+import com.yahoo.elide.jsonapi.models.Data;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Resource;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.function.Supplier;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Base class for state information.
+ */
+public abstract class BaseState {
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, RootCollectionLoadEntitiesContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, RootCollectionLoadEntityContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, RootCollectionSubCollectionContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle(StateContext state, RootCollectionRelationshipContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, SubCollectionReadCollectionContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, SubCollectionReadEntityContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle (StateContext state, SubCollectionSubCollectionContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+
+    /**
+     * Handle void.
+     *
+     * @param state the state
+     * @param ctx the ctx
+     */
+    public void handle(StateContext state, SubCollectionRelationshipContext ctx) {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * We return a Function because we may have to perform post-commit operations. That is,
+     * we may need to perform extra operations after having closed a transaction. As a result,
+     * this method is invoked after committing a transaction in Elide.java.
+     * @param state the state
+     * @return the supplier
+     * @throws HttpStatusException the http status exception
+     */
+    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) throws HttpStatusException {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle patch.
+     *
+     * @param state the state
+     * @return the supplier
+     * @throws HttpStatusException the http status exception
+     */
+    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) throws HttpStatusException {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle post.
+     *
+     * @param state the state
+     * @return the supplier
+     * @throws HttpStatusException the http status exception
+     */
+    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) throws HttpStatusException {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Handle delete.
+     *
+     * @param state the state
+     * @return the supplier
+     * @throws HttpStatusException the http status exception
+     */
+    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) throws HttpStatusException {
+        throw new UnsupportedOperationException(this.getClass().toString());
+    }
+
+    /**
+     * Construct PATCH response.
+     *
+     * @param record a resource that has been updated
+     * @param stateContext a state that contains reference to request scope where we can get status code for update
+     * @return a supplier of PATH response
+     */
+    protected static Supplier<Pair<Integer, JsonNode>> constructPatchResponse(
+            PersistentResource record,
+            StateContext stateContext) {
+        RequestScope requestScope = stateContext.getRequestScope();
+        int updateStatusCode = requestScope.getUpdateStatusCode();
+        return () -> Pair.of(
+                updateStatusCode,
+                updateStatusCode == HttpStatus.SC_NO_CONTENT ? null : getResponseBody(record, requestScope)
+        );
+    }
+
+    protected static JsonNode getResponseBody(PersistentResource resource, RequestScope requestScope) {
+        MultivaluedMap<String, String> queryParams = requestScope.getQueryParams();
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+
+        //TODO Make this a document processor
+        Data<Resource> data = resource == null ? null : new Data<>(resource.toResource());
+        jsonApiDocument.setData(data);
+
+        //TODO Iterate over set of document processors
+        DocumentProcessor includedProcessor = new IncludedProcessor();
+        includedProcessor.execute(jsonApiDocument, resource, queryParams);
+
+        return requestScope.getMapper().toJsonObject(jsonApiDocument);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/CollectionTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/CollectionTerminalState.java
new file mode 100644
index 0000000000..060c859d2f
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/CollectionTerminalState.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.InternalServerErrorException;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.exceptions.UnknownEntityException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
+import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
+import com.yahoo.elide.jsonapi.models.Data;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Meta;
+import com.yahoo.elide.jsonapi.models.Relationship;
+import com.yahoo.elide.jsonapi.models.Resource;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.base.Preconditions;
+import org.apache.commons.collections4.IterableUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import io.reactivex.Observable;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Collection State.
+ */
+@ToString
+public class CollectionTerminalState extends BaseState {
+    private final Optional<PersistentResource> parent;
+    private final Optional<String> relationName;
+    private final Type<?> entityClass;
+    private PersistentResource newObject;
+    private final EntityProjection parentProjection;
+
+    public CollectionTerminalState(Type<?> entityClass, Optional<PersistentResource> parent,
+                                   Optional<String> relationName, EntityProjection projection) {
+        this.parentProjection = projection;
+        this.parent = parent;
+        this.relationName = relationName;
+        this.entityClass = entityClass;
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+        RequestScope requestScope = state.getRequestScope();
+        MultivaluedMap<String, String> queryParams = requestScope.getQueryParams();
+
+        Set<PersistentResource> collection =
+                getResourceCollection(requestScope).toList(LinkedHashSet::new).blockingGet();
+
+        // Set data
+        jsonApiDocument.setData(getData(collection, requestScope.getDictionary()));
+
+        // Run include processor
+        DocumentProcessor includedProcessor = new IncludedProcessor();
+        includedProcessor.execute(jsonApiDocument, collection, queryParams);
+
+        Pagination pagination = parentProjection.getPagination();
+        if (parent.isPresent()) {
+            pagination = parentProjection.getRelationship(relationName.orElseThrow(IllegalStateException::new))
+                    .get().getProjection().getPagination();
+        }
+
+        // Add pagination meta data
+        if (!pagination.isDefaultInstance()) {
+
+            Map<String, Number> pageMetaData = new HashMap<>();
+            pageMetaData.put("number", (pagination.getOffset() / pagination.getLimit()) + 1);
+            pageMetaData.put("limit", pagination.getLimit());
+
+            // Get total records if it has been requested and add to the page meta data
+            if (pagination.returnPageTotals()) {
+                Long totalRecords = pagination.getPageTotals();
+                pageMetaData.put("totalPages", totalRecords / pagination.getLimit()
+                        + ((totalRecords % pagination.getLimit()) > 0 ? 1 : 0));
+                pageMetaData.put("totalRecords", totalRecords);
+            }
+
+            Map<String, Object> allMetaData = new HashMap<>();
+            allMetaData.put("page", pageMetaData);
+
+            Meta meta = new Meta(allMetaData);
+            jsonApiDocument.setMeta(meta);
+        }
+
+        JsonNode responseBody = requestScope.getMapper().toJsonObject(jsonApiDocument);
+
+        return () -> Pair.of(HttpStatus.SC_OK, responseBody);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
+        RequestScope requestScope = state.getRequestScope();
+        JsonApiMapper mapper = requestScope.getMapper();
+
+        newObject = createObject(requestScope);
+        parent.ifPresent(persistentResource -> persistentResource.addRelation(relationName.get(), newObject));
+        return () -> {
+            JsonApiDocument returnDoc = new JsonApiDocument();
+            returnDoc.setData(new Data<>(newObject.toResource()));
+            JsonNode responseBody = mapper.getObjectMapper().convertValue(returnDoc, JsonNode.class);
+            return Pair.of(HttpStatus.SC_CREATED, responseBody);
+        };
+    }
+
+    private Observable<PersistentResource> getResourceCollection(RequestScope requestScope) {
+        final Observable<PersistentResource> collection;
+        // TODO: In case of join filters, apply pagination after getting records
+        // instead of passing it to the datastore
+
+        if (parent.isPresent()) {
+            collection = parent.get().getRelationCheckedFiltered(
+                    parentProjection.getRelationship(relationName.orElseThrow(IllegalStateException::new))
+                            .orElseThrow(IllegalStateException::new));
+        } else {
+            collection = PersistentResource.loadRecords(
+                parentProjection,
+                new ArrayList<>(), //Empty list of IDs
+                requestScope);
+        }
+
+        return collection;
+    }
+
+    private Data getData(Set<PersistentResource> collection, EntityDictionary dictionary) {
+        Preconditions.checkNotNull(collection);
+        List<Resource> resources = collection.stream().map(PersistentResource::toResource).collect(Collectors.toList());
+
+        if (parent.isPresent()) {
+            Type<?> parentClass = parent.get().getResourceType();
+            String relationshipName = relationName.orElseThrow(IllegalStateException::new);
+            RelationshipType type = dictionary.getRelationshipType(parentClass, relationshipName);
+
+            return new Data<>(resources, type);
+        }
+        return new Data<>(resources);
+    }
+
+    private PersistentResource createObject(RequestScope requestScope)
+        throws ForbiddenAccessException, InvalidObjectIdentifierException {
+        JsonApiDocument doc = requestScope.getJsonApiDocument();
+        JsonApiMapper mapper = requestScope.getMapper();
+
+        if (doc.getData() == null) {
+            throw new InvalidEntityBodyException("Invalid JSON-API document: " + doc);
+        }
+
+        Data<Resource> data = doc.getData();
+        Collection<Resource> resources = data.get();
+
+        Resource resource = (resources.size() == 1) ? IterableUtils.first(resources) : null;
+        if (resource == null) {
+            try {
+                throw new InvalidEntityBodyException(mapper.writeJsonApiDocument(doc));
+            } catch (JsonProcessingException e) {
+                throw new InternalServerErrorException(e);
+            }
+        }
+
+        String id = resource.getId();
+
+        Type<?> newObjectClass = requestScope.getDictionary().getEntityClass(resource.getType(),
+                requestScope.getApiVersion());
+
+        if (newObjectClass == null) {
+            throw new UnknownEntityException("Entity " + resource.getType() + " not found");
+        }
+        if (!entityClass.isAssignableFrom(newObjectClass)) {
+            throw new InvalidValueException("Cannot assign value of type: " + resource.getType()
+                    + " to type: " + entityClass);
+        }
+
+        PersistentResource pResource = PersistentResource.createObject(
+                parent.orElse(null),
+                relationName.orElse(null),
+                newObjectClass,
+                requestScope, Optional.ofNullable(id));
+
+        Map<String, Object> attributes = resource.getAttributes();
+        if (attributes != null) {
+            for (Map.Entry<String, Object> entry : attributes.entrySet()) {
+                String fieldName = entry.getKey();
+                Object val = entry.getValue();
+                pResource.updateAttribute(fieldName, val);
+            }
+        }
+
+        Map<String, Relationship> relationships = resource.getRelationships();
+        if (relationships != null) {
+            for (Map.Entry<String, Relationship> entry : relationships.entrySet()) {
+                String fieldName = entry.getKey();
+                Relationship relationship = entry.getValue();
+                Set<PersistentResource> resourceSet = (relationship == null)
+                                                    ? null
+                                                    : relationship.toPersistentResources(requestScope);
+                pResource.updateRelation(fieldName, resourceSet);
+            }
+        }
+
+        return pResource;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordState.java
new file mode 100644
index 0000000000..3e7e6dc820
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordState.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadCollectionContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadEntityContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
+import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
+import com.google.common.base.Preconditions;
+import io.reactivex.Observable;
+
+import java.util.Optional;
+
+/**
+ * Record Read State.
+ */
+public class RecordState extends BaseState {
+    private final PersistentResource resource;
+
+    /* The projection which loaded this record */
+    private final EntityProjection projection;
+
+    public RecordState(PersistentResource resource, EntityProjection projection) {
+        Preconditions.checkNotNull(resource);
+        this.resource = resource;
+        this.projection = projection;
+    }
+
+    @Override
+    public void handle(StateContext state, SubCollectionReadCollectionContext ctx) {
+        String subCollection = ctx.term().getText();
+        EntityDictionary dictionary = state.getRequestScope().getDictionary();
+
+        Type<?> entityClass;
+        String entityName;
+
+        RelationshipType type = dictionary.getRelationshipType(resource.getObject(), subCollection);
+
+        Type<?> paramType = dictionary.getParameterizedType(resource.getObject(), subCollection);
+
+        entityName = dictionary.getJsonAliasFor(paramType);
+        entityClass = dictionary.getEntityClass(entityName, state.getRequestScope().getApiVersion());
+
+        if (entityClass == null) {
+            throw new IllegalArgumentException("Unknown type " + entityName);
+        }
+        final BaseState nextState;
+        final CollectionTerminalState collectionTerminalState =
+                new CollectionTerminalState(entityClass, Optional.of(resource),
+                        Optional.of(subCollection), projection);
+        Observable<PersistentResource> collection = null;
+        if (type.isToOne()) {
+            collection = resource.getRelationCheckedFiltered(projection.getRelationship(subCollection)
+                    .orElseThrow(IllegalStateException::new));
+            PersistentResource record = PersistentResource.firstOrNullIfEmpty(collection);
+            nextState = new RecordTerminalState(record, collectionTerminalState);
+        } else {
+            nextState = collectionTerminalState;
+        }
+        state.setState(nextState);
+    }
+
+    @Override
+    public void handle(StateContext state, SubCollectionReadEntityContext ctx) {
+        String id = ctx.entity().id().getText();
+        String subCollection = ctx.entity().term().getText();
+
+        PersistentResource nextRecord = resource.getRelation(
+                    projection.getRelationship(subCollection).orElseThrow(IllegalStateException::new), id);
+        state.setState(new RecordTerminalState(nextRecord));
+    }
+
+    @Override
+    public void handle(StateContext state, SubCollectionSubCollectionContext ctx) {
+        String id = ctx.entity().id().getText();
+        String subCollection = ctx.entity().term().getText();
+
+        Relationship relationship = projection.getRelationship(subCollection)
+                    .orElseThrow(IllegalStateException::new);
+
+        state.setState(new RecordState(resource.getRelation(relationship, id), relationship.getProjection()));
+    }
+
+    @Override
+    public void handle(StateContext state, SubCollectionRelationshipContext ctx) {
+        String id = ctx.entity().id().getText();
+        String subCollection = ctx.entity().term().getText();
+        String relationName = ctx.relationship().term().getText();
+
+        PersistentResource childRecord;
+
+        Relationship childRelationship = projection.getRelationship(subCollection)
+                .orElseThrow(IllegalStateException::new);
+
+        childRecord = resource.getRelation(childRelationship , id);
+
+        state.setState(new RelationshipTerminalState(childRecord, relationName, childRelationship.getProjection()));
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordTerminalState.java
new file mode 100644
index 0000000000..5bf89ad565
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RecordTerminalState.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.jsonapi.models.Data;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Relationship;
+import com.yahoo.elide.jsonapi.models.Resource;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.ToString;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+
+/**
+ * Record Found State.
+ */
+@ToString
+public class RecordTerminalState extends BaseState {
+    private final PersistentResource record;
+    private final Optional<CollectionTerminalState> collectionTerminalState;
+
+    public RecordTerminalState(PersistentResource record) {
+        this(record, null);
+    }
+
+    // This constructor is to handle ToOne collection as a Record Terminal State
+    public RecordTerminalState(PersistentResource record, CollectionTerminalState collectionTerminalState) {
+        this.record = record;
+        this.collectionTerminalState = Optional.ofNullable(collectionTerminalState);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
+        ObjectMapper mapper = state.getRequestScope().getMapper().getObjectMapper();
+        return () -> Pair.of(HttpStatus.SC_OK, getResponseBody(record, state.getRequestScope()));
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
+        return collectionTerminalState
+                .orElseThrow(() -> new InvalidOperationException("Cannot POST to a record."))
+                .handlePost(state);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) {
+        JsonApiDocument jsonApiDocument = state.getJsonApiDocument();
+
+        Data<Resource> data = jsonApiDocument.getData();
+
+        if (data == null) {
+            throw new InvalidEntityBodyException("Expected data but found null");
+        }
+
+        if (!data.isToOne()) {
+            throw new InvalidEntityBodyException("Expected single element but found list");
+        }
+
+        Resource resource = data.getSingleValue();
+        if (!record.matchesId(resource.getId())) {
+            throw new InvalidEntityBodyException("Id in response body does not match requested id to update from path");
+        }
+
+        patch(resource, state.getRequestScope());
+        return constructPatchResponse(record, state);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) {
+        record.deleteResource();
+        return () -> Pair.of(HttpStatus.SC_NO_CONTENT, null);
+    }
+
+    private boolean patch(Resource resource, RequestScope requestScope) {
+        boolean isUpdated = false;
+
+        // Update attributes first
+        Map<String, Object> attributes = resource.getAttributes();
+        if (attributes != null) {
+            for (Map.Entry<String, Object> entry : attributes.entrySet()) {
+                String fieldName = entry.getKey();
+                Object newVal = entry.getValue();
+                isUpdated |= record.updateAttribute(fieldName, newVal);
+            }
+        }
+
+        // Relations next
+        Map<String, Relationship> relationships = resource.getRelationships();
+        if (relationships != null) {
+            for (Map.Entry<String, Relationship> entry : relationships.entrySet()) {
+                String fieldName = entry.getKey();
+                Relationship relationship = entry.getValue();
+                Set<PersistentResource> resources = (relationship == null)
+                                                    ? null
+                                                    : relationship.toPersistentResources(requestScope);
+                isUpdated |= record.updateRelation(fieldName, resources);
+            }
+        }
+
+        return isUpdated;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RelationshipTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RelationshipTerminalState.java
new file mode 100644
index 0000000000..c9108aec6a
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/RelationshipTerminalState.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
+import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
+import com.yahoo.elide.jsonapi.models.Data;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Relationship;
+import com.yahoo.elide.jsonapi.models.Resource;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * State to handle relationships.
+ */
+public class RelationshipTerminalState extends BaseState {
+    private final PersistentResource record;
+    private final RelationshipType relationshipType;
+    private final String relationshipName;
+
+    /* The projection which loaded the resource which owns the relationship */
+    private final EntityProjection parentProjection;
+
+    public RelationshipTerminalState(PersistentResource record, String relationshipName,
+                                     EntityProjection parentProjection) {
+        this.record = record;
+        this.parentProjection = parentProjection;
+
+        this.relationshipType = record.getRelationshipType(relationshipName);
+        this.relationshipName = relationshipName;
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
+        JsonApiDocument doc = new JsonApiDocument();
+        RequestScope requestScope = state.getRequestScope();
+        JsonApiMapper mapper = requestScope.getMapper();
+        MultivaluedMap<String, String> queryParams = requestScope.getQueryParams();
+
+        Map<String, Relationship> relationships = record.toResource(parentProjection).getRelationships();
+        if (relationships != null && relationships.containsKey(relationshipName)) {
+            Relationship relationship = relationships.get(relationshipName);
+
+            // Handle valid relationship
+
+            // Set data
+            Data<Resource> data = relationship.getData();
+            doc.setData(data);
+
+            // Run include processor
+            DocumentProcessor includedProcessor = new IncludedProcessor();
+            includedProcessor.execute(doc, record, queryParams);
+
+            return () -> Pair.of(HttpStatus.SC_OK, mapper.toJsonObject(doc));
+        }
+
+        // Handle no data for relationship
+        if (relationshipType.isToMany()) {
+            doc.setData(new Data<>(new ArrayList<>()));
+        } else if (relationshipType.isToOne()) {
+            doc.setData(new Data<>((Resource) null));
+        } else {
+            throw new IllegalStateException("Failed to GET a relationship; relationship is neither toMany nor toOne");
+        }
+        return () -> Pair.of(HttpStatus.SC_OK, mapper.toJsonObject(doc));
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) {
+        return handleRequest(state, this::patch);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
+        return handleRequest(state, this::post);
+    }
+
+    @Override
+    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) {
+        return handleRequest(state, this::delete);
+    }
+
+    /*
+     * Base on the JSON API docs relationship updates MUST return 204 unless the server has made additional modification
+     * to the relationship. http://jsonapi.org/format/#crud-updating-relationship-responses
+     */
+    private Supplier<Pair<Integer, JsonNode>> handleRequest(StateContext state,
+                                                            BiPredicate<Data<Resource>, RequestScope> handler) {
+        Data<Resource> data = state.getJsonApiDocument().getData();
+        handler.test(data, state.getRequestScope());
+        // TODO: figure out if we've made modifications that differ from those requested by client
+        return () -> Pair.of(HttpStatus.SC_NO_CONTENT, null);
+    }
+
+    private boolean patch(Data<Resource> data, RequestScope requestScope) {
+        boolean isUpdated;
+
+        if (relationshipType.isToMany() && data == null) {
+            throw new InvalidEntityBodyException("Expected data but received null");
+        }
+
+        if (relationshipType.isToMany()) {
+            if (data == null) {
+                return false;
+            }
+            Collection<Resource> resources = data.get();
+            if (resources == null) {
+                return false;
+            }
+            if (!resources.isEmpty()) {
+                isUpdated = record.updateRelation(relationshipName,
+                        new Relationship(null, new Data<>(resources)).toPersistentResources(requestScope));
+            } else {
+                isUpdated = record.clearRelation(relationshipName);
+            }
+        } else if (relationshipType.isToOne()) {
+            if (data != null) {
+                Resource resource = data.getSingleValue();
+                Relationship relationship = new Relationship(null, new Data<>(resource));
+                isUpdated = record.updateRelation(relationshipName, relationship.toPersistentResources(requestScope));
+            } else {
+                isUpdated = record.clearRelation(relationshipName);
+            }
+        } else {
+            throw new IllegalStateException("Bad relationship type");
+        }
+
+        return isUpdated;
+    }
+
+    private boolean post(Data<Resource> data, RequestScope requestScope) {
+        if (data == null) {
+            throw new InvalidEntityBodyException("Expected data but received null");
+        }
+
+        Collection<Resource> resources = data.get();
+        if (resources == null) {
+            return false;
+        }
+        resources.stream().forEachOrdered(resource ->
+            record.addRelation(relationshipName, resource.toPersistentResource(requestScope)));
+        return true;
+    }
+
+    private boolean delete(Data<Resource> data, RequestScope requestScope) {
+        if (data == null) {
+            throw new InvalidEntityBodyException("Expected data but received null");
+        }
+
+        Collection<Resource> resources = data.get();
+        if (CollectionUtils.isEmpty(resources)) {
+            // As per: http://jsonapi.org/format/#crud-updating-relationship-responses-403
+            throw new ForbiddenAccessException(UpdatePermission.class);
+        }
+        resources.stream().forEachOrdered(resource ->
+            record.removeRelation(relationshipName, resource.toPersistentResource(requestScope)));
+        return true;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StartState.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StartState.java
new file mode 100644
index 0000000000..a710572058
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StartState.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.parser.state;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidCollectionException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.generated.parsers.CoreParser.EntityContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntitiesContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntityContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionRelationshipContext;
+import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionSubCollectionContext;
+
+import java.util.Optional;
+
+/**
+ * Initial State.
+ */
+public class StartState extends BaseState {
+    @Override
+    public void handle(StateContext state, RootCollectionLoadEntitiesContext ctx) {
+        String entityName = ctx.term().getText();
+        EntityDictionary dictionary = state.getRequestScope().getDictionary();
+
+        Type<?> entityClass = dictionary.getEntityClass(entityName, state.getRequestScope().getApiVersion());
+
+        state.setState(new CollectionTerminalState(entityClass, Optional.empty(), Optional.empty(),
+                state.getRequestScope().getEntityProjection()));
+    }
+
+    @Override
+    public void handle(StateContext state, RootCollectionLoadEntityContext ctx) {
+        PersistentResource record = entityRecord(state, ctx.entity());
+        state.setState(new RecordTerminalState(record));
+    }
+
+    @Override
+    public void handle(StateContext state, RootCollectionSubCollectionContext ctx) {
+        PersistentResource record = entityRecord(state, ctx.entity());
+
+        state.setState(new RecordState(record, state.getRequestScope().getEntityProjection()));
+    }
+
+    @Override
+    public void handle(StateContext state, RootCollectionRelationshipContext ctx) {
+        PersistentResource record = entityRecord(state, ctx.entity());
+
+        EntityProjection projection = state.getRequestScope().getEntityProjection();
+        String relationName = ctx.relationship().term().getText();
+
+        record.getRelationCheckedFiltered(projection.getRelationship(relationName)
+                    .orElseThrow(IllegalStateException::new));
+
+        state.setState(new RelationshipTerminalState(record, relationName, projection));
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getName();
+    }
+
+    private PersistentResource<?> entityRecord(StateContext state, EntityContext entity) {
+        String id = entity.id().getText();
+        String entityName = entity.term().getText();
+        EntityDictionary dictionary = state.getRequestScope().getDictionary();
+        Type<?> entityClass = dictionary.getEntityClass(entityName, state.getRequestScope().getApiVersion());
+
+        if (entityClass == null || !dictionary.isRoot(entityClass)) {
+            throw new InvalidCollectionException(entityName);
+        }
+
+        return PersistentResource.loadRecord(state.getRequestScope().getEntityProjection(),
+                id, state.getRequestScope());
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/StateContext.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StateContext.java
similarity index 98%
rename from elide-core/src/main/java/com/yahoo/elide/parsers/state/StateContext.java
rename to elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StateContext.java
index 57be6943a8..cd3e5d7696 100644
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/StateContext.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/parser/state/StateContext.java
@@ -3,10 +3,9 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.parsers.state;
+package com.yahoo.elide.jsonapi.parser.state;
 
 import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntitiesContext;
 import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntityContext;
 import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionRelationshipContext;
@@ -15,11 +14,10 @@
 import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadEntityContext;
 import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
 import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
-
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 import com.fasterxml.jackson.databind.JsonNode;
-
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Pair;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.function.Supplier;
 
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/JsonApiEndpoint.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/JsonApiEndpoint.java
new file mode 100644
index 0000000000..45833d2850
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/JsonApiEndpoint.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.resources;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.annotation.PATCH;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.utils.HeaderUtils;
+import com.yahoo.elide.utils.ResourceUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * Default endpoint/servlet for using Elide and JSONAPI.
+ */
+@Singleton
+@Produces(JSONAPI_CONTENT_TYPE)
+@Path("/")
+public class JsonApiEndpoint {
+    protected final Elide elide;
+
+    @Inject
+    public JsonApiEndpoint(
+            @Named("elide") Elide elide) {
+        this.elide = elide;
+    }
+
+    /**
+     * Create handler.
+     *
+     * @param path request path
+     * @param uriInfo URI info
+     * @param headers the request headers
+     * @param securityContext security context
+     * @param jsonapiDocument post data as jsonapi document
+     * @return response
+     */
+    @POST
+    @Path("{path:.*}")
+    @Consumes(JSONAPI_CONTENT_TYPE)
+    public Response post(
+        @PathParam("path") String path,
+        @Context UriInfo uriInfo,
+        @Context HttpHeaders headers,
+        @Context SecurityContext securityContext,
+        String jsonapiDocument) {
+        MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+        String apiVersion = HeaderUtils.resolveApiVersion(headers.getRequestHeaders());
+        Map<String, List<String>> requestHeaders =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(headers.getRequestHeaders());
+        User user = new SecurityContextUser(securityContext);
+        return build(elide.post(getBaseUrlEndpoint(uriInfo), path, jsonapiDocument,
+                queryParams, requestHeaders, user, apiVersion, UUID.randomUUID()));
+    }
+
+    /**
+     * Read handler.
+     *
+     * @param path request path
+     * @param uriInfo URI info
+     * @param headers the request headers
+     * @param securityContext security context
+     * @return response
+     */
+    @GET
+    @Path("{path:.*}")
+    public Response get(
+        @PathParam("path") String path,
+        @Context UriInfo uriInfo,
+        @Context HttpHeaders headers,
+        @Context SecurityContext securityContext) {
+        MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+        String apiVersion = HeaderUtils.resolveApiVersion(headers.getRequestHeaders());
+        Map<String, List<String>> requestHeaders =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(headers.getRequestHeaders());
+        User user = new SecurityContextUser(securityContext);
+
+        return build(elide.get(getBaseUrlEndpoint(uriInfo), path, queryParams,
+                               requestHeaders, user, apiVersion, UUID.randomUUID()));
+    }
+
+    /**
+     * Update handler.
+     *
+     * @param contentType document MIME type
+     * @param accept response MIME type
+     * @param path request path
+     * @param uriInfo URI info
+     * @param headers the request headers
+     * @param securityContext security context
+     * @param jsonapiDocument patch data as jsonapi document
+     * @return response
+     */
+    @PATCH
+    @Path("{path:.*}")
+    @Consumes(JSONAPI_CONTENT_TYPE)
+    public Response patch(
+        @HeaderParam("Content-Type") String contentType,
+        @HeaderParam("accept") String accept,
+        @PathParam("path") String path,
+        @Context UriInfo uriInfo,
+        @Context HttpHeaders headers,
+        @Context SecurityContext securityContext,
+        String jsonapiDocument) {
+        MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+        String apiVersion = HeaderUtils.resolveApiVersion(headers.getRequestHeaders());
+        Map<String, List<String>> requestHeaders =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(headers.getRequestHeaders());
+        User user = new SecurityContextUser(securityContext);
+        return build(elide.patch(getBaseUrlEndpoint(uriInfo), contentType, accept, path,
+                                 jsonapiDocument, queryParams, requestHeaders, user, apiVersion, UUID.randomUUID()));
+    }
+
+    /**
+     * Delete relationship handler (expects body with resource ids and types).
+     *
+     * @param path request path
+     * @param uriInfo URI info
+     * @param headers the request headers
+     * @param securityContext security context
+     * @param jsonApiDocument DELETE document
+     * @return response
+     */
+    @DELETE
+    @Path("{path:.*}")
+    @Consumes(JSONAPI_CONTENT_TYPE)
+    public Response delete(
+        @PathParam("path") String path,
+        @Context UriInfo uriInfo,
+        @Context HttpHeaders headers,
+        @Context SecurityContext securityContext,
+        String jsonApiDocument) {
+        MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+        String apiVersion =
+                HeaderUtils.resolveApiVersion(headers.getRequestHeaders());
+        Map<String, List<String>> requestHeaders =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(headers.getRequestHeaders());
+        User user = new SecurityContextUser(securityContext);
+        return build(elide.delete(getBaseUrlEndpoint(uriInfo), path, jsonApiDocument, queryParams, requestHeaders,
+                                  user, apiVersion, UUID.randomUUID()));
+    }
+
+    private static Response build(ElideResponse response) {
+        return Response.status(response.getResponseCode()).entity(response.getBody()).build();
+    }
+
+    protected String getBaseUrlEndpoint(UriInfo uriInfo) {
+        String baseUrl = elide.getElideSettings().getBaseUrl();
+
+        if (StringUtils.isEmpty(baseUrl)) {
+            //UriInfo has full path appended here already.
+            baseUrl = ResourceUtils.resolveBaseUrl(uriInfo);
+        }
+
+        return baseUrl;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/SecurityContextUser.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/SecurityContextUser.java
new file mode 100644
index 0000000000..731caf19d4
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/resources/SecurityContextUser.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.jsonapi.resources;
+
+import com.yahoo.elide.core.security.User;
+
+import javax.ws.rs.core.SecurityContext;
+
+/**
+ * Elide User for JAXRS.
+ */
+public class SecurityContextUser extends User {
+    private SecurityContext ctx;
+
+    public SecurityContextUser(SecurityContext ctx) {
+        super(ctx.getUserPrincipal());
+        this.ctx = ctx;
+    }
+
+    @Override
+    public boolean isInRole(String role) {
+        return ctx.isUserInRole(role);
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataDeserializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataDeserializer.java
index fc3e8c1216..b178dcdb41 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataDeserializer.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataDeserializer.java
@@ -7,10 +7,10 @@
 
 import com.yahoo.elide.jsonapi.models.Data;
 import com.yahoo.elide.jsonapi.models.Resource;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.MappingJsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -23,21 +23,29 @@
  * Custom deserializer for top-level data.
  */
 public class DataDeserializer extends JsonDeserializer<Data<Resource>> {
+    private static final ObjectMapper MAPPER = new MappingJsonFactory().getCodec();
 
     @Override
     public Data<Resource> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
             throws IOException {
         JsonNode node = jsonParser.getCodec().readTree(jsonParser);
-        ObjectMapper mapper = new MappingJsonFactory().getCodec();
         if (node.isArray()) {
             List<Resource> resources = new ArrayList<>();
             for (JsonNode n : node) {
-                Resource r = mapper.convertValue(n, Resource.class);
+                Resource r = MAPPER.convertValue(n, Resource.class);
+                validateResource(jsonParser, r);
                 resources.add(r);
             }
             return new Data<>(resources);
         }
-        Resource resource = mapper.convertValue(node, Resource.class);
+        Resource resource = MAPPER.convertValue(node, Resource.class);
+        validateResource(jsonParser, resource);
         return new Data<>(resource);
     }
+
+    private void validateResource(JsonParser jsonParser, Resource resource) throws IOException {
+        if (resource.getType() == null || resource.getType().isEmpty()) {
+            throw JsonMappingException.from(jsonParser, "Resource 'type' field is missing or empty.");
+        }
+    }
 }
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataSerializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataSerializer.java
index ab41b71882..6ad2055a43 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataSerializer.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/DataSerializer.java
@@ -7,10 +7,11 @@
 
 import com.yahoo.elide.jsonapi.models.Data;
 import com.yahoo.elide.jsonapi.models.Resource;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.IterableUtils;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -26,11 +27,11 @@ public void serialize(Data<Resource> data, JsonGenerator jsonGenerator, Serializ
         throws IOException {
         Collection<Resource> list = data.get();
         if (data.isToOne()) {
-            if (list == null || list.isEmpty()) {
+            if (CollectionUtils.isEmpty(list)) {
                 jsonGenerator.writeObject(null);
                 return;
             }
-            jsonGenerator.writeObject(list.iterator().next());
+            jsonGenerator.writeObject(IterableUtils.first(list));
             return;
         }
         jsonGenerator.writeObject((list == null) ? Collections.emptyList() : list);
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/KeySerializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/KeySerializer.java
index 3fc2e80b8b..b73204d2aa 100644
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/KeySerializer.java
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/KeySerializer.java
@@ -33,8 +33,7 @@ public void serialize(Object value, JsonGenerator jgen, SerializerProvider provi
             str = ((Class<?>) value).getName();
         } else if (cls.isEnum()) {
             str = ((Enum<?>) value).name();
-        }
-        else {
+        } else {
             str = value.toString();
         }
         jgen.writeFieldName(str);
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/MetaDeserializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/MetaDeserializer.java
new file mode 100644
index 0000000000..a03642068b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/MetaDeserializer.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.jsonapi.serialization;
+
+import com.yahoo.elide.jsonapi.models.Meta;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Custom deserializer for top-level meta object.
+ */
+public class MetaDeserializer extends JsonDeserializer<Meta> {
+    private static final ObjectMapper MAPPER = new MappingJsonFactory().getCodec();
+
+    @Override
+    public Meta deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+            throws IOException {
+        JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+        // Optional top-level meta member must be an object
+        return node.isObject() ? new Meta(MAPPER.convertValue(node, Map.class)) : null;
+    }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/SingletonSerializer.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/SingletonSerializer.java
deleted file mode 100644
index 152c40e724..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/jsonapi/serialization/SingletonSerializer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.jsonapi.serialization;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.util.AbstractCollection;
-
-/**
- * Custom serializer for top-level data.
- */
-public class SingletonSerializer extends JsonSerializer<AbstractCollection> {
-
-    @Override
-    public void serialize(AbstractCollection data, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
-        throws IOException {
-        jsonGenerator.writeObject(data.iterator().next());
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/JsonApiParser.java b/elide-core/src/main/java/com/yahoo/elide/parsers/JsonApiParser.java
deleted file mode 100644
index aa6f5ea4c3..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/JsonApiParser.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers;
-
-import com.yahoo.elide.generated.parsers.CoreLexer;
-import com.yahoo.elide.generated.parsers.CoreParser;
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.antlr.v4.runtime.tree.ParseTree;
-
-/**
- * Parses the REST request.
- */
-public class JsonApiParser {
-
-    /**
-     * Compile request to AST.
-     * @param path request
-     * @return AST
-     */
-    public static ParseTree parse(String path) {
-        ANTLRInputStream is = new ANTLRInputStream(path);
-        CoreLexer lexer = new CoreLexer(is);
-        lexer.removeErrorListeners();
-        lexer.addErrorListener(new BaseErrorListener() {
-            @Override
-            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
-                    int charPositionInLine, String msg, RecognitionException e) {
-                throw new ParseCancellationException(e);
-            }
-        });
-        CoreParser parser = new CoreParser(new CommonTokenStream(lexer));
-        parser.setErrorHandler(new BailErrorStrategy());
-        return parser.start();
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CanPaginateVisitor.java b/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CanPaginateVisitor.java
deleted file mode 100644
index 0eae13fd1f..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CanPaginateVisitor.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.parsers.expression;
-
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.core.CheckInstantiator;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
-import com.yahoo.elide.generated.parsers.ExpressionParser;
-import com.yahoo.elide.security.FilterExpressionCheck;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.UserCheck;
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Walks a permission expression to determine if any part of the expression must be evaluated in memory.
- * If part of the expression must be evaluated in memory, the data store cannot paginate the result.
- *
- * Here are some examples of what the expected behavior is for combining user and filter expression checks:
- *
- * User Check (TRUE) OR Filter Expression (TRUE)
- *  - Elide will not push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The entire result set will be paginated.
- *  - The entire result set will be returned.
- *
- * User Check (TRUE) OR Filter Expression (FALSE)
- *  - Elide will not push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The entire result set will be paginated.
- *  - The entire result set will be returned.
- *
- * User Check (FALSE) OR Filter Expression (TRUE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The filtered result set will be paginated.
- *  - The filtered result set will be returned.
- *
- * User Check (FALSE) OR Filter Expression (FALSE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The empty result set will be paginated.
- *  - The empty result set will be returned.
- *
- * User Check (TRUE) AND Filter Expression (TRUE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The filtered result set will be paginated.
- *  - The filtered result set will be returned.
- *
- * User Check (TRUE) AND Filter Expression (FALSE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The empty result set will be paginated.
- *  - The empty result set will be returned.
- *
- * User Check (FALSE) AND Filter Expression (TRUE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The filtered result set will be paginated.
- *  - The empty result set will be returned.
- *
- * User Check (FALSE) AND Filter Expression (FALSE)
- *  - Elide will push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The empty result set will be paginated.
- *  - The empty result set will be returned.
- *
- * More Complex Scenarios:
- *
- * (User Check (TRUE) OR Filter Expression 1 (FALSE)) AND Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (2) result set will be paginated.
- *  - The filtered (2) result set will be returned.
- *
- * (User Check (TRUE) OR Filter Expression 1 (TRUE)) AND Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (2) result set will be paginated.
- *  - The filtered (2) result set will be returned.
- *
- * (User Check (FALSE) OR Filter Expression 1 (TRUE)) AND Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (1 and 2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (1 and 2) result set will be paginated.
- *  - The filtered (1 and 2) result set will be returned.
- *
- * (User Check (FALSE) OR Filter Expression 1 (FALSE)) AND Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (1 and 2) to the data store.
- *  - Elide will allow pagination.
- *  - The empty result set will be paginated.
- *  - The empty result set will be returned.
- *
- * (User Check (TRUE) AND Filter Expression 1 (FALSE)) OR Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (1 or 2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (2) result set will be paginated.
- *  - The filtered (2) result set will be returned.
- *
- * (User Check (TRUE) AND Filter Expression 1 (TRUE)) OR Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (1 or 2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (1 or 2) result set will be paginated.
- *  - The filtered (1 or 2) result set will be returned.
- *
- * (User Check (FALSE) AND Filter Expression 1 (TRUE)) OR Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (2) result set will be paginated.
- *  - The filtered (2) result set will be returned
- *
- * (User Check (FALSE) AND Filter Expression 1 (FALSE)) OR Filter Expression 2 (TRUE)
- *  - Elide WILL push the filter predicate (2) to the data store.
- *  - Elide will allow pagination.
- *  - The filtered (2) result set will be paginated.
- *  - The filtered (2) result set will be returned
- *
- */
-public class CanPaginateVisitor extends ExpressionBaseVisitor<Boolean> implements CheckInstantiator {
-
-    public static final Boolean CAN_PAGINATE = true;
-    public static final Boolean CANNOT_PAGINATE = false;
-
-    private final EntityDictionary dictionary;
-
-
-    public CanPaginateVisitor(EntityDictionary dictionary) {
-        this.dictionary = dictionary;
-    }
-
-
-    @Override
-    public Boolean visitNOT(ExpressionParser.NOTContext ctx) {
-        return visit(ctx.expression());
-    }
-
-    @Override
-    public Boolean visitOR(ExpressionParser.ORContext ctx) {
-        boolean lhs = visit(ctx.left);
-        boolean rhs = visit(ctx.right);
-
-        /* If either side requires in memory filtering, the data store cannot paginate */
-        if (lhs == CANNOT_PAGINATE || rhs == CANNOT_PAGINATE) {
-            return CANNOT_PAGINATE;
-        }
-        return CAN_PAGINATE;
-    }
-
-    @Override
-    public Boolean visitAND(ExpressionParser.ANDContext ctx) {
-        boolean lhs = visit(ctx.left);
-        boolean rhs = visit(ctx.right);
-
-        /* If either side requires in memory filtering, the data store cannot paginate */
-        if (lhs == CANNOT_PAGINATE || rhs == CANNOT_PAGINATE) {
-            return CANNOT_PAGINATE;
-        }
-        return CAN_PAGINATE;
-    }
-
-    @Override
-    public Boolean visitPAREN(ExpressionParser.PARENContext ctx) {
-        return visit(ctx.expression());
-    }
-
-    @Override
-    public Boolean visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
-        Check check = getCheck(dictionary, ctx.getText());
-
-        //Filter expression checks can always be pushed to the DataStore so pagination is possible
-        if (FilterExpressionCheck.class.isAssignableFrom(check.getClass())) {
-            return CAN_PAGINATE;
-
-        //User Checks have no bearing on pagination since they are true or false for every item in the collection
-        } else if (UserCheck.class.isAssignableFrom(check.getClass())) {
-            return CAN_PAGINATE;
-        //Any in memory check will alter (incorrectly) the paginated result
-        } else {
-            return CANNOT_PAGINATE;
-        }
-    }
-
-    /**
-     * Determines whether a data store can correctly paginate a collection of resources of a given
-     * class for a requested set of fields.
-     * @param resourceClass The class of resources that will be paginated
-     * @param dictionary Used to look up permissions
-     * @param scope Contains the request info including any sparse fields that were requested
-     * @return true if the data store can paginate.  false otherwise.
-     */
-    public static boolean canPaginate(Class<?> resourceClass, EntityDictionary dictionary, RequestScope scope) {
-
-        CanPaginateVisitor visitor = new CanPaginateVisitor(dictionary);
-
-        Class<? extends Annotation> annotationClass = ReadPermission.class;
-        ParseTree classPermissions = dictionary.getPermissionsForClass(resourceClass, annotationClass);
-        Boolean canPaginateClass = CAN_PAGINATE;
-        if (classPermissions != null) {
-            canPaginateClass = visitor.visit(classPermissions);
-        }
-
-        List<String> fields = dictionary.getAllFields(resourceClass);
-        String resourceName = dictionary.getJsonAliasFor(resourceClass);
-        Set<String> requestedFields = scope.getSparseFields().getOrDefault(resourceName, Collections.EMPTY_SET);
-
-        for (String field : fields) {
-            if (! requestedFields.isEmpty() && ! requestedFields.contains(field)) {
-                continue;
-            }
-            Boolean canPaginateField = canPaginateClass;
-            ParseTree fieldPermissions = dictionary.getPermissionsForField(resourceClass, field, annotationClass);
-            if (fieldPermissions != null) {
-                canPaginateField = visitor.visit(fieldPermissions);
-            }
-            if (canPaginateField == CANNOT_PAGINATE) {
-                return CANNOT_PAGINATE;
-            }
-        }
-        return CAN_PAGINATE;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CriterionExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CriterionExpressionVisitor.java
deleted file mode 100644
index 6bceccca25..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/CriterionExpressionVisitor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.expression;
-
-import com.yahoo.elide.core.CheckInstantiator;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
-import com.yahoo.elide.generated.parsers.ExpressionParser;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.CriterionCheck;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-
-/**
- * Returns a Criterion (user specified type) from a security expression.
- * @param <T> the return type of the CriterionCheck
- */
-public class CriterionExpressionVisitor<T> extends ExpressionBaseVisitor<T> implements CheckInstantiator {
-
-
-    private final RequestScope requestScope;
-    private final EntityDictionary entityDictionary;
-    private final Function<T, T> criterionNegater;
-    private final BiFunction<T, T, T> orCriterionJoiner;
-    private final BiFunction<T, T, T> andCriterionJoiner;
-
-    public CriterionExpressionVisitor(RequestScope requestScope,
-                                      EntityDictionary entityDictionary,
-                                      Function<T, T> criterionNegater,
-                                      BiFunction<T, T, T> orCriterionJoiner,
-                                      BiFunction<T, T, T> andCriterionJoiner) {
-        this.requestScope = requestScope;
-        this.entityDictionary = entityDictionary;
-
-        this.criterionNegater = criterionNegater;
-        this.orCriterionJoiner = orCriterionJoiner;
-        this.andCriterionJoiner = andCriterionJoiner;
-    }
-
-    @Override
-    public T visitNOT(ExpressionParser.NOTContext ctx) {
-        T criterion = visit(ctx);
-
-        if (criterion != null) {
-            criterion = criterionNegater.apply(criterion);
-        }
-
-        return criterion;
-    }
-
-    @Override
-    public T visitOR(ExpressionParser.ORContext ctx) {
-        return joinSubexpressions(ctx.left, ctx.right, orCriterionJoiner);
-    }
-
-    @Override
-    public T visitAND(ExpressionParser.ANDContext ctx) {
-        return joinSubexpressions(ctx.left, ctx.right, andCriterionJoiner);
-    }
-
-    @Override
-    public T visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
-        CriterionCheck<T, ?> criterionCheck = getCriterionCheck(ctx.getText());
-
-        if (criterionCheck == null) {
-            return null;
-        }
-
-        return criterionCheck.getCriterion(requestScope);
-    }
-
-    private T joinSubexpressions(ExpressionParser.ExpressionContext left,
-                                 ExpressionParser.ExpressionContext right,
-                                 BiFunction<T, T, T> joiner) {
-        T leftCriterion = visit(left);
-        T rightCriterion = visit(right);
-
-        if (leftCriterion == null && rightCriterion == null) {
-            return null;
-
-        } else if (leftCriterion == null) {
-            return rightCriterion;
-
-        } else if (rightCriterion == null) {
-            return leftCriterion;
-        }
-
-        return joiner.apply(leftCriterion, rightCriterion);
-    }
-
-    private CriterionCheck<T, ?> getCriterionCheck(String checkName) {
-        Check check = getCheck(entityDictionary, checkName);
-
-        return check instanceof CriterionCheck
-                ? (CriterionCheck<T, ?>) check
-                : null;
-
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitor.java
deleted file mode 100644
index 98b0e89057..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.parsers.expression;
-
-import com.yahoo.elide.core.CheckInstantiator;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
-import com.yahoo.elide.generated.parsers.ExpressionParser;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.permissions.expressions.AndExpression;
-import com.yahoo.elide.security.permissions.expressions.Expression;
-import com.yahoo.elide.security.permissions.expressions.NotExpression;
-import com.yahoo.elide.security.permissions.expressions.OrExpression;
-
-import java.util.function.Function;
-
-/**
- * Expression Visitor.
- */
-public class PermissionExpressionVisitor extends ExpressionBaseVisitor<Expression> implements CheckInstantiator {
-    private final EntityDictionary dictionary;
-    private final Function<Check, Expression> expressionGenerator;
-
-
-    public PermissionExpressionVisitor(EntityDictionary dictionary, Function<Check, Expression> expressionGenerator) {
-        this.dictionary = dictionary;
-        this.expressionGenerator = expressionGenerator;
-    }
-
-
-    @Override
-    public Expression visitNOT(ExpressionParser.NOTContext ctx) {
-        // Create a not expression
-        return new NotExpression(visit(ctx.expression()));
-    }
-
-    @Override
-    public Expression visitOR(ExpressionParser.ORContext ctx) {
-        return new OrExpression(visit(ctx.left), visit(ctx.right));
-    }
-
-    @Override
-    public Expression visitAND(ExpressionParser.ANDContext ctx) {
-        Expression left = visit(ctx.left);
-        Expression right = visit(ctx.right);
-        return new AndExpression(left, right);
-    }
-
-    @Override
-    public Expression visitPAREN(ExpressionParser.PARENContext ctx) {
-        return visit(ctx.expression());
-    }
-
-    @Override
-    public Expression visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
-        Check check = getCheck(dictionary, ctx.getText());
-
-        return expressionGenerator.apply(check);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitor.java b/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitor.java
deleted file mode 100644
index 78c5f73b29..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.parsers.expression;
-
-import com.yahoo.elide.core.CheckInstantiator;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
-import com.yahoo.elide.generated.parsers.ExpressionParser;
-import com.yahoo.elide.security.FilterExpressionCheck;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.UserCheck;
-
-
-/**
- * PermissionToFilterExpressionVisitor parses a permission parseTree and returns the corresponding FilterExpression
- * representation of it. This allows passing a security permission predicate down to datastore level to reduce
- * in-memory permission verification workload.
- * A few cases is not allow and will throw exception:
- *      1. User define FilterExpressionCheck which returns null in getFilterExpression function.
- *      2. User put a FilterExpressionCheck with a non-userCheck type check in OR relation.
- */
-public class PermissionToFilterExpressionVisitor extends ExpressionBaseVisitor<FilterExpression>
-        implements CheckInstantiator {
-    private final EntityDictionary dictionary;
-    private final RequestScope requestScope;
-
-    public static final FilterExpression NO_EVALUATION_EXPRESSION = new FilterExpression() {
-        @Override
-        public <T> T accept(Visitor<T> visitor) {
-            return null;
-        }
-    };
-
-    public static final FilterExpression FALSE_USER_CHECK_EXPRESSION = new FilterExpression() {
-        @Override
-        public <T> T accept(Visitor<T> visitor) {
-            return null;
-        }
-    };
-
-    public PermissionToFilterExpressionVisitor(EntityDictionary dictionary, RequestScope requestScope) {
-        this.dictionary = dictionary;
-        this.requestScope = requestScope;
-    }
-
-    @Override
-    public FilterExpression visitOR(ExpressionParser.ORContext ctx) {
-        FilterExpression left = visit(ctx.left);
-        FilterExpression right = visit(ctx.right);
-
-        if (left == NO_EVALUATION_EXPRESSION || right == NO_EVALUATION_EXPRESSION) {
-            return NO_EVALUATION_EXPRESSION;
-        }
-
-        if (left == FALSE_USER_CHECK_EXPRESSION) {
-            return right;
-        } else if (right == FALSE_USER_CHECK_EXPRESSION) {
-            return left;
-        }
-
-        return new OrFilterExpression(left, right);
-    }
-
-    @Override
-    public FilterExpression visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
-        Check check = getCheck(dictionary, ctx.getText());
-        if (FilterExpressionCheck.class.isAssignableFrom(check.getClass())) {
-            FilterExpression filterExpression = ((FilterExpressionCheck) check).getFilterExpression(requestScope);
-            if (filterExpression == null) {
-                throw new IllegalStateException("FilterExpression null is not permitted.");
-            }
-            return ((FilterExpressionCheck) check).getFilterExpression(requestScope);
-        } else if (UserCheck.class.isAssignableFrom(check.getClass())) {
-            boolean userCheckResult = check.ok(requestScope.getUser());
-            return userCheckResult ? NO_EVALUATION_EXPRESSION : FALSE_USER_CHECK_EXPRESSION;
-        } else {
-            return NO_EVALUATION_EXPRESSION;
-        }
-    }
-
-    @Override
-    public FilterExpression visitAND(ExpressionParser.ANDContext ctx) {
-        FilterExpression left = visit(ctx.left);
-        FilterExpression right = visit(ctx.right);
-
-        //Case (FALSE_USER_CHECK_EXPRESSION AND FE):  should evaluate to FALSE_USER_CHECK_EXPRESSION
-        //Case (FALSE_USER_CHECK_EXPRESSION AND NO_EVALUATION_EXPRESSION): should also evaluate to
-        // FALSE_USER_CHECK_EXPRESSION
-        if (left == FALSE_USER_CHECK_EXPRESSION || right == FALSE_USER_CHECK_EXPRESSION) {
-            return FALSE_USER_CHECK_EXPRESSION;
-        }
-
-        //Case (NO_EVALUATION_EXPRESSION AND FilterExpression): should ignore NO_EVALUATION_EXPRESSION and return
-        // FilterExpression.
-        //Case (NO_EVALUATION_EXPRESSION AND NO_EVALUATION_EXPRESSION): returns NO_EVALUATION_EXPRESSION.
-        if (left == NO_EVALUATION_EXPRESSION) {
-            return right;
-        }
-
-        if (right == NO_EVALUATION_EXPRESSION) {
-            return left;
-        }
-
-        //Case (FilterExpression AND FilterExpression): should return the AND expression of them.
-        return new AndFilterExpression(left, right);
-    }
-
-    @Override
-    public FilterExpression visitPAREN(ExpressionParser.PARENContext ctx) {
-        return visit(ctx.expression());
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/BaseState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/BaseState.java
deleted file mode 100644
index 7677214d2a..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/BaseState.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.yahoo.elide.core.exceptions.HttpStatusException;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntitiesContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntityContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionRelationshipContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionSubCollectionContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadCollectionContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadEntityContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.function.Supplier;
-
-/**
- * Base class for state information.
- */
-public abstract class BaseState {
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, RootCollectionLoadEntitiesContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, RootCollectionLoadEntityContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, RootCollectionSubCollectionContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle(StateContext state, RootCollectionRelationshipContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, SubCollectionReadCollectionContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, SubCollectionReadEntityContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle (StateContext state, SubCollectionSubCollectionContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-
-    /**
-     * Handle void.
-     *
-     * @param state the state
-     * @param ctx the ctx
-     */
-    public void handle(StateContext state, SubCollectionRelationshipContext ctx) {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * We return a Function because we may have to perform post-commit operations. That is,
-     * we may need to perform extra operations after having closed a transaction. As a result,
-     * this method is invoked after committing a transaction in Elide.java.
-     * @param state the state
-     * @return the supplier
-     * @throws HttpStatusException the http status exception
-     */
-    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) throws HttpStatusException {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle patch.
-     *
-     * @param state the state
-     * @return the supplier
-     * @throws HttpStatusException the http status exception
-     */
-    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) throws HttpStatusException {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle post.
-     *
-     * @param state the state
-     * @return the supplier
-     * @throws HttpStatusException the http status exception
-     */
-    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) throws HttpStatusException {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-
-    /**
-     * Handle delete.
-     *
-     * @param state the state
-     * @return the supplier
-     * @throws HttpStatusException the http status exception
-     */
-    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) throws HttpStatusException {
-        throw new UnsupportedOperationException(this.getClass().toString());
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/CollectionTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/CollectionTerminalState.java
deleted file mode 100644
index 53f91afae3..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/CollectionTerminalState.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.core.exceptions.InternalServerErrorException;
-import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
-import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.jsonapi.JsonApiMapper;
-import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
-import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
-import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Meta;
-import com.yahoo.elide.jsonapi.models.Relationship;
-import com.yahoo.elide.jsonapi.models.Resource;
-import com.yahoo.elide.security.User;
-import lombok.ToString;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Collection State.
- */
-@ToString
-public class CollectionTerminalState extends BaseState {
-    private final Optional<PersistentResource> parent;
-    private final Optional<String> relationName;
-    private final Class<?> entityClass;
-    private PersistentResource newObject;
-
-    public CollectionTerminalState(Class<?> entityClass, Optional<PersistentResource> parent,
-                                   Optional<String> relationName) {
-        this.parent = parent;
-        this.relationName = relationName;
-        this.entityClass = entityClass;
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        RequestScope requestScope = state.getRequestScope();
-        ObjectMapper mapper = requestScope.getMapper().getObjectMapper();
-        Optional<MultivaluedMap<String, String>> queryParams = requestScope.getQueryParams();
-
-        Set<PersistentResource> collection = getResourceCollection(requestScope);
-        // Set data
-        jsonApiDocument.setData(getData(requestScope, collection));
-
-        // Run include processor
-        DocumentProcessor includedProcessor = new IncludedProcessor();
-        includedProcessor.execute(jsonApiDocument, collection, queryParams);
-
-        // Add pagination meta data
-        Pagination pagination = requestScope.getPagination();
-        if (!pagination.isEmpty()) {
-
-            Map<String, Number> pageMetaData = new HashMap<>();
-            pageMetaData.put("number", (pagination.getOffset() / pagination.getLimit()) + 1);
-            pageMetaData.put("limit", pagination.getLimit());
-
-            // Get total records if it has been requested and add to the page meta data
-            if (pagination.isGenerateTotals()) {
-                Long totalRecords = PersistentResource.getTotalRecords(entityClass, requestScope);
-                pageMetaData.put("totalPages", totalRecords / pagination.getLimit()
-                        + ((totalRecords % pagination.getLimit()) > 0 ? 1 : 0));
-                pageMetaData.put("totalRecords", totalRecords);
-            }
-
-            Map<String, Object> allMetaData = new HashMap<>();
-            allMetaData.put("page", pageMetaData);
-
-            Meta meta = new Meta(allMetaData);
-            jsonApiDocument.setMeta(meta);
-        }
-
-        JsonNode responseBody = mapper.convertValue(jsonApiDocument, JsonNode.class);
-
-        return () -> Pair.of(HttpStatus.SC_OK, responseBody);
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
-        RequestScope requestScope = state.getRequestScope();
-        JsonApiMapper mapper = requestScope.getMapper();
-
-        newObject = createObject(requestScope);
-        if (parent.isPresent()) {
-            parent.get().addRelation(relationName.get(), newObject);
-        }
-        return () -> {
-            JsonApiDocument returnDoc = new JsonApiDocument();
-            returnDoc.setData(new Data(newObject.toResource()));
-            JsonNode responseBody = mapper.getObjectMapper().convertValue(returnDoc, JsonNode.class);
-            return Pair.of(HttpStatus.SC_CREATED, responseBody);
-        };
-    }
-
-    private Set<PersistentResource> getResourceCollection(RequestScope requestScope) {
-        final Set<PersistentResource> collection;
-        // TODO: In case of join filters, apply pagination after getting records
-        // instead of passing it to the datastore
-        final boolean hasSortingOrPagination = requestScope.getPagination() != null
-                || requestScope.getSorting() != null;
-        if (parent.isPresent()) {
-            if (hasSortingOrPagination) {
-                collection = parent.get().getRelationCheckedFilteredWithSortingAndPagination(relationName.get());
-            } else {
-                collection = parent.get().getRelationCheckedFiltered(relationName.get());
-            }
-        } else {
-            if (hasSortingOrPagination) {
-                collection = (Set) PersistentResource.loadRecordsWithSortingAndPagination(entityClass, requestScope);
-            } else {
-                collection = (Set) PersistentResource.loadRecords(entityClass, requestScope);
-            }
-        }
-
-        return collection;
-    }
-
-    private Data getData(RequestScope requestScope, Set<PersistentResource> collection) {
-        User user = requestScope.getUser();
-        Preconditions.checkNotNull(collection);
-        Preconditions.checkNotNull(user);
-
-        List<Resource> resources = collection.stream().map(PersistentResource::toResource).collect(Collectors.toList());
-
-        return new Data<>(resources);
-    }
-
-    private PersistentResource createObject(RequestScope requestScope)
-        throws ForbiddenAccessException, InvalidObjectIdentifierException {
-        JsonApiDocument doc = requestScope.getJsonApiDocument();
-        JsonApiMapper mapper = requestScope.getMapper();
-
-        Data<Resource> data = doc.getData();
-        Collection<Resource> resources = data.get();
-
-        Resource resource = (resources.size() == 1) ? resources.iterator().next() : null;
-        if (resource == null) {
-            try {
-                throw new InvalidEntityBodyException(mapper.writeJsonApiDocument(doc));
-            } catch (JsonProcessingException e) {
-                throw new InternalServerErrorException(e);
-            }
-        }
-
-        String id = resource.getId();
-        PersistentResource pResource;
-        if (parent.isPresent()) {
-            pResource = PersistentResource.createObject(parent.get(), entityClass, requestScope, id);
-        } else {
-            pResource = PersistentResource.createObject(entityClass, requestScope, id);
-        }
-
-        assignId(pResource, id);
-
-        Map<String, Object> attributes = resource.getAttributes();
-        if (attributes != null) {
-            for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-                String fieldName = entry.getKey();
-                Object val = entry.getValue();
-                pResource.updateAttribute(fieldName, val);
-            }
-        }
-
-        Map<String, Relationship> relationships = resource.getRelationships();
-        if (relationships != null) {
-            for (Map.Entry<String, Relationship> entry : relationships.entrySet()) {
-                String fieldName = entry.getKey();
-                Relationship relationship = entry.getValue();
-                Set<PersistentResource> resourceSet = (relationship == null)
-                                                    ? null
-                                                    : relationship.toPersistentResources(requestScope);
-                pResource.updateRelation(fieldName, resourceSet);
-            }
-        }
-
-        return pResource;
-    }
-
-    /**
-     * Assign provided id if id field is not generated.
-     *
-     * @param persistentResource resource
-     * @param id resource id
-     */
-    private void assignId(PersistentResource persistentResource, String id) {
-
-        //If id field is not a `@GeneratedValue` persist the provided id
-        if (!persistentResource.isIdGenerated()) {
-            if (id != null && !id.isEmpty()) {
-                persistentResource.setId(id);
-            } else {
-                //If expecting id to persist and id is not present, throw exception
-                throw new InvalidValueException(
-                        persistentResource.toResource(),
-                        "No id provided, cannot persist " + persistentResource.getObject()
-                );
-            }
-        }
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordState.java
deleted file mode 100644
index 6e13a3581f..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordState.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RelationshipType;
-import com.yahoo.elide.core.exceptions.InvalidAttributeException;
-import com.yahoo.elide.core.exceptions.InvalidCollectionException;
-import com.yahoo.elide.jsonapi.models.SingleElementSet;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadCollectionContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionReadEntityContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionRelationshipContext;
-import com.yahoo.elide.generated.parsers.CoreParser.SubCollectionSubCollectionContext;
-
-import com.google.common.base.Preconditions;
-
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Record Read State.
- */
-public class RecordState extends BaseState {
-    private final PersistentResource resource;
-
-    public RecordState(PersistentResource resource) {
-        Preconditions.checkNotNull(resource);
-        this.resource = resource;
-    }
-
-    @Override
-    public void handle(StateContext state, SubCollectionReadCollectionContext ctx) {
-        String subCollection = ctx.term().getText();
-        EntityDictionary dictionary = state.getRequestScope().getDictionary();
-        try {
-            RelationshipType type = dictionary.getRelationshipType(resource.getObject(), subCollection);
-            if (type == RelationshipType.NONE) {
-                throw new InvalidCollectionException(subCollection);
-            }
-            String entityName =
-                    dictionary.getJsonAliasFor(dictionary.getParameterizedType(resource.getObject(), subCollection));
-            Class<?> entityClass = dictionary.getEntityClass(entityName);
-            if (entityClass == null) {
-                throw new IllegalArgumentException("Unknown type " + entityName);
-            }
-            final BaseState nextState;
-            final CollectionTerminalState collectionTerminalState =
-                    new CollectionTerminalState(entityClass, Optional.of(resource), Optional.of(subCollection));
-            Set<PersistentResource> collection = null;
-            if (type.isToOne()) {
-                collection = resource.getRelationCheckedFiltered(subCollection);
-            }
-            if (collection instanceof SingleElementSet) {
-                PersistentResource record = ((SingleElementSet<PersistentResource>) collection).getValue();
-                nextState = new RecordTerminalState(record, collectionTerminalState);
-            } else {
-                nextState = collectionTerminalState;
-            }
-            state.setState(nextState);
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(subCollection);
-        }
-    }
-
-    @Override
-    public void handle(StateContext state, SubCollectionReadEntityContext ctx) {
-        String id = ctx.entity().id().getText();
-        String subCollection = ctx.entity().term().getText();
-
-        try {
-            PersistentResource nextRecord = resource.getRelation(subCollection, id);
-            state.setState(new RecordTerminalState(nextRecord));
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(subCollection);
-        }
-    }
-
-    @Override
-    public void handle(StateContext state, SubCollectionSubCollectionContext ctx) {
-        String id = ctx.entity().id().getText();
-        String subCollection = ctx.entity().term().getText();
-        try {
-            state.setState(new RecordState(resource.getRelation(subCollection, id)));
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(subCollection);
-        }
-    }
-
-    @Override
-    public void handle(StateContext state, SubCollectionRelationshipContext ctx) {
-        String id = ctx.entity().id().getText();
-        String subCollection = ctx.entity().term().getText();
-
-        PersistentResource childRecord;
-        try {
-            childRecord = resource.getRelation(subCollection, id);
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(subCollection);
-        }
-
-        String relationName = ctx.relationship().term().getText();
-        try {
-            childRecord.getRelationCheckedFiltered(relationName);
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(relationName);
-        }
-
-        state.setState(new RelationshipTerminalState(childRecord, relationName));
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordTerminalState.java
deleted file mode 100644
index 83dfffc604..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RecordTerminalState.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
-import com.yahoo.elide.core.exceptions.InvalidOperationException;
-import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
-import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
-import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Relationship;
-import com.yahoo.elide.jsonapi.models.Resource;
-import lombok.ToString;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * Record Found State.
- */
-@ToString
-public class RecordTerminalState extends BaseState {
-    private final PersistentResource record;
-    private final Optional<CollectionTerminalState> collectionTerminalState;
-
-    public RecordTerminalState(PersistentResource record) {
-        this(record, null);
-    }
-
-    // This constructor is to handle ToOne collection as a Record Terminal State
-    public RecordTerminalState(PersistentResource record, CollectionTerminalState collectionTerminalState) {
-        this.record = record;
-        this.collectionTerminalState = Optional.ofNullable(collectionTerminalState);
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
-        ObjectMapper mapper = state.getRequestScope().getMapper().getObjectMapper();
-        return () -> Pair.of(HttpStatus.SC_OK, getResponseBody(record, state.getRequestScope(), mapper));
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
-        if (collectionTerminalState.isPresent()) {
-            return collectionTerminalState.get().handlePost(state);
-        }
-        throw new InvalidOperationException("Cannot POST to a record.");
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) {
-        JsonApiDocument jsonApiDocument = state.getJsonApiDocument();
-
-        Data<Resource> data = jsonApiDocument.getData();
-
-        if (data == null) {
-            throw new InvalidEntityBodyException("Expected data but found null");
-        }
-
-        if (!data.isToOne()) {
-            throw new InvalidEntityBodyException("Expected single element but found list");
-        }
-
-        Resource resource = data.getSingleValue();
-        if (!record.matchesId(resource.getId())) {
-            throw new InvalidEntityBodyException("Id in response body does not match requested id to update from path");
-        }
-
-        patch(resource, state.getRequestScope());
-        return () -> Pair.of(HttpStatus.SC_NO_CONTENT, null);
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) {
-        try {
-            record.deleteResource();
-            return () -> Pair.of(HttpStatus.SC_NO_CONTENT, null);
-        } catch (ForbiddenAccessException e) {
-            return () -> Pair.of(e.getStatus(), null);
-        }
-    }
-
-    private JsonNode getResponseBody(PersistentResource rec, RequestScope requestScope, ObjectMapper mapper) {
-        Optional<MultivaluedMap<String, String>> queryParams = requestScope.getQueryParams();
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-
-        //TODO Make this a document processor
-        Data<Resource> data = rec == null ? null : new Data<>(rec.toResource());
-        jsonApiDocument.setData(data);
-
-        //TODO Iterate over set of document processors
-        DocumentProcessor includedProcessor = new IncludedProcessor();
-        includedProcessor.execute(jsonApiDocument, rec, queryParams);
-
-        return mapper.convertValue(jsonApiDocument, JsonNode.class);
-    }
-
-    private boolean patch(Resource resource, RequestScope requestScope) {
-        boolean isUpdated = false;
-
-        // Update attributes first
-        Map<String, Object> attributes = resource.getAttributes();
-        if (attributes != null) {
-            for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-                String fieldName = entry.getKey();
-                Object newVal = entry.getValue();
-                isUpdated |= record.updateAttribute(fieldName, newVal);
-            }
-        }
-
-        // Relations next
-        Map<String, Relationship> relationships = resource.getRelationships();
-        if (relationships != null) {
-            for (Map.Entry<String, Relationship> entry : relationships.entrySet()) {
-                String fieldName = entry.getKey();
-                Relationship relationship = entry.getValue();
-                Set<PersistentResource> resources = (relationship == null)
-                                                    ? null
-                                                    : relationship.toPersistentResources(requestScope);
-                isUpdated |= record.updateRelation(fieldName, resources);
-            }
-        }
-
-        return isUpdated;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RelationshipTerminalState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/RelationshipTerminalState.java
deleted file mode 100644
index f7eeed6e0d..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/RelationshipTerminalState.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RelationshipType;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
-import com.yahoo.elide.jsonapi.document.processors.DocumentProcessor;
-import com.yahoo.elide.jsonapi.document.processors.IncludedProcessor;
-import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Relationship;
-import com.yahoo.elide.jsonapi.models.Resource;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-
-/**
- * State to handle relationships.
- */
-public class RelationshipTerminalState extends BaseState {
-    private final PersistentResource record;
-    private final RelationshipType relationshipType;
-    private final String relationshipName;
-
-    public RelationshipTerminalState(PersistentResource record, String relationshipName) {
-        this.record = record;
-
-        this.relationshipType = record.getRelationshipType(relationshipName);
-        this.relationshipName = relationshipName;
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handleGet(StateContext state) {
-        JsonApiDocument doc = new JsonApiDocument();
-        RequestScope requestScope = state.getRequestScope();
-        ObjectMapper mapper = requestScope.getMapper().getObjectMapper();
-        Optional<MultivaluedMap<String, String>> queryParams = requestScope.getQueryParams();
-
-        Map<String, Relationship> relationships = record.toResourceWithSortingAndPagination().getRelationships();
-        Relationship relationship = null;
-        if (relationships != null) {
-            relationship = relationships.get(relationshipName);
-        }
-
-        // Handle valid relationship
-        if (relationship != null) {
-
-            // Set data
-            Data<Resource> data = relationship.getData();
-            doc.setData(data);
-
-            // Run include processor
-            DocumentProcessor includedProcessor = new IncludedProcessor();
-            includedProcessor.execute(doc, record, queryParams);
-
-            return () -> Pair.of(HttpStatus.SC_OK, mapper.convertValue(doc, JsonNode.class));
-        }
-
-        // Handle no data for relationship
-        if (relationshipType.isToMany()) {
-            doc.setData(new Data<>(new ArrayList<>()));
-        } else if (relationshipType.isToOne()) {
-            doc.setData(new Data<>((Resource) null));
-        } else {
-            throw new IllegalStateException("Failed to GET a relationship; relationship is neither toMany nor toOne");
-        }
-        return () -> Pair.of(HttpStatus.SC_OK, mapper.convertValue(doc, JsonNode.class));
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handlePatch(StateContext state) {
-        return handleRequest(state, this::patch);
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handlePost(StateContext state) {
-        return handleRequest(state, this::post);
-    }
-
-    @Override
-    public Supplier<Pair<Integer, JsonNode>> handleDelete(StateContext state) {
-        return handleRequest(state, this::delete);
-    }
-
-    private Supplier<Pair<Integer, JsonNode>> handleRequest(StateContext state,
-                                                           BiFunction<Data<Resource>, RequestScope, Boolean> handler) {
-        Data<Resource> data = state.getJsonApiDocument().getData();
-        handler.apply(data, state.getRequestScope());
-        return () -> Pair.of(HttpStatus.SC_NO_CONTENT, null);
-    }
-
-    private boolean patch(Data<Resource> data, RequestScope requestScope) {
-        boolean isUpdated;
-
-        if (relationshipType.isToMany() && data == null) {
-            throw new InvalidEntityBodyException("Expected data but received null");
-        }
-
-        if (relationshipType.isToMany()) {
-            Collection<Resource> resources = data.get();
-            if (resources == null) {
-                return false;
-            }
-            if (!resources.isEmpty()) {
-                isUpdated = record.updateRelation(relationshipName,
-                        new Relationship(null, new Data<>(resources)).toPersistentResources(requestScope));
-            } else {
-                isUpdated = record.clearRelation(relationshipName);
-            }
-        } else if (relationshipType.isToOne()) {
-            if (data != null) {
-                Resource resource = data.getSingleValue();
-                Relationship relationship = new Relationship(null, new Data<>(resource));
-                isUpdated = record.updateRelation(relationshipName, relationship.toPersistentResources(requestScope));
-            } else {
-                isUpdated = record.clearRelation(relationshipName);
-            }
-        } else {
-            throw new IllegalStateException("Bad relationship type");
-        }
-
-        return isUpdated;
-    }
-
-    private boolean post(Data<Resource> data, RequestScope requestScope) {
-        if (data == null) {
-            throw new InvalidEntityBodyException("Expected data but received null");
-        }
-
-        Collection<Resource> resources = data.get();
-        if (resources == null) {
-            return false;
-        }
-        resources.stream().forEachOrdered(resource ->
-            record.addRelation(relationshipName, resource.toPersistentResource(requestScope)));
-        return true;
-    }
-
-    private boolean delete(Data<Resource> data, RequestScope requestScope) {
-        if (data == null) {
-            throw new InvalidEntityBodyException("Expected data but received null");
-        }
-
-        Collection<Resource> resources = data.get();
-        if (resources == null || resources.isEmpty()) {
-            // As per: http://jsonapi.org/format/#crud-updating-relationship-responses-403
-            throw new ForbiddenAccessException("Unknown update");
-        }
-        resources.stream().forEachOrdered(resource ->
-            record.removeRelation(relationshipName, resource.toPersistentResource(requestScope)));
-        return true;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/parsers/state/StartState.java b/elide-core/src/main/java/com/yahoo/elide/parsers/state/StartState.java
deleted file mode 100644
index ab3ec0f6d7..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/parsers/state/StartState.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.parsers.state;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.exceptions.InvalidAttributeException;
-import com.yahoo.elide.core.exceptions.InvalidCollectionException;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntitiesContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionLoadEntityContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionRelationshipContext;
-import com.yahoo.elide.generated.parsers.CoreParser.RootCollectionSubCollectionContext;
-
-import java.util.Optional;
-
-/**
- * Initial State.
- */
-public class StartState extends BaseState {
-    @Override
-    public void handle(StateContext state, RootCollectionLoadEntitiesContext ctx) {
-        String entityName = ctx.term().getText();
-        EntityDictionary dictionary = state.getRequestScope().getDictionary();
-        Class<?> entityClass = dictionary.getEntityClass(entityName);
-        if (entityClass == null || !dictionary.isRoot(entityClass)) {
-            throw new InvalidCollectionException(entityName);
-        }
-        state.setState(new CollectionTerminalState(entityClass, Optional.empty(), Optional.empty()));
-    }
-
-    @Override
-    public void handle(StateContext state, RootCollectionLoadEntityContext ctx) {
-        EntityDictionary dictionary = state.getRequestScope().getDictionary();
-        String entityName = ctx.entity().term().getText();
-        String id = ctx.entity().id().getText();
-        Class<?> entityClass = dictionary.getEntityClass(entityName);
-        if (entityClass == null || !dictionary.isRoot(entityClass)) {
-            throw new InvalidCollectionException(entityName);
-        }
-
-        PersistentResource record = PersistentResource.loadRecord(entityClass, id, state.getRequestScope());
-        state.setState(new RecordTerminalState(record));
-    }
-
-    @Override
-    public void handle(StateContext state, RootCollectionSubCollectionContext ctx) {
-        EntityDictionary dictionary = state.getRequestScope().getDictionary();
-        String entityName = ctx.entity().term().getText();
-        String id = ctx.entity().id().getText();
-
-        Class<?> entityClass = dictionary.getEntityClass(entityName);
-        if (entityClass == null || !dictionary.isRoot(entityClass)) {
-            throw new InvalidCollectionException(entityName);
-        }
-
-        PersistentResource record = PersistentResource.loadRecord(entityClass, id, state.getRequestScope());
-        state.setState(new RecordState(record));
-    }
-
-    @Override
-    public void handle(StateContext state, RootCollectionRelationshipContext ctx) {
-        EntityDictionary dictionary = state.getRequestScope().getDictionary();
-        String entityName = ctx.entity().term().getText();
-        String id = ctx.entity().id().getText();
-        Class<?> entityClass = dictionary.getEntityClass(entityName);
-        if (entityClass == null || !dictionary.isRoot(entityClass)) {
-            throw new InvalidCollectionException(entityName);
-        }
-
-        PersistentResource record = PersistentResource.loadRecord(entityClass, id, state.getRequestScope());
-
-        String relationName = ctx.relationship().term().getText();
-        try {
-            record.getRelationCheckedFiltered(relationName);
-        } catch (InvalidAttributeException e) {
-            throw new InvalidCollectionException(relationName);
-        }
-
-        state.setState(new RelationshipTerminalState(record, relationName));
-    }
-
-    @Override
-    public String toString() {
-        return this.getClass().getName();
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/resources/JsonApiEndpoint.java b/elide-core/src/main/java/com/yahoo/elide/resources/JsonApiEndpoint.java
deleted file mode 100644
index e417ddfa20..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/resources/JsonApiEndpoint.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.resources;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.ElideResponse;
-import com.yahoo.elide.annotation.PATCH;
-
-import java.util.function.Function;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
-/**
- * Default endpoint/servlet for using Elide and JSONAPI.
- */
-@Singleton
-@Produces("application/vnd.api+json")
-@Consumes("application/vnd.api+json")
-@Path("/")
-public class JsonApiEndpoint {
-    protected final Elide elide;
-    protected final Function<SecurityContext, Object> getUser;
-
-    @Inject
-    public JsonApiEndpoint(@Named("elide") Elide elide,
-                           @Named("elideUserExtractionFunction") DefaultOpaqueUserFunction getUser) {
-        this.elide = elide;
-        this.getUser = getUser == null ? v -> null : getUser;
-    }
-
-    /**
-     * Create handler.
-     *
-     * @param path request path
-     * @param securityContext security context
-     * @param jsonapiDocument post data as jsonapi document
-     * @return response
-     */
-    @POST
-    @Path("{path:.*}")
-    public Response post(
-        @PathParam("path") String path,
-        @Context SecurityContext securityContext,
-        String jsonapiDocument) {
-        return build(elide.post(path, jsonapiDocument, getUser.apply(securityContext)));
-    }
-
-    /**
-     * Read handler.
-     *
-     * @param path request path
-     * @param uriInfo URI info
-     * @param securityContext security context
-     * @return response
-     */
-    @GET
-    @Path("{path:.*}")
-    public Response get(
-        @PathParam("path") String path,
-        @Context UriInfo uriInfo,
-        @Context SecurityContext securityContext) {
-        MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
-        return build(elide.get(path, queryParams, getUser.apply(securityContext)));
-    }
-
-    /**
-     * Update handler.
-     *
-     * @param contentType document MIME type
-     * @param accept response MIME type
-     * @param path request path
-     * @param securityContext security context
-     * @param jsonapiDocument patch data as jsonapi document
-     * @return response
-     */
-    @PATCH
-    @Path("{path:.*}")
-    public Response patch(
-        @HeaderParam("Content-Type") String contentType,
-        @HeaderParam("accept") String accept,
-        @PathParam("path") String path,
-        @Context SecurityContext securityContext,
-        String jsonapiDocument) {
-        return build(elide.patch(contentType, accept, path, jsonapiDocument, getUser.apply(securityContext)));
-    }
-
-    /**
-     * Delete handler.
-     *
-     * @param path request path
-     * @param securityContext security context
-     * @param jsonApiDocument DELETE document
-     * @return response
-     */
-    @DELETE
-    @Path("{path:.*}")
-    public Response delete(
-        @PathParam("path") String path,
-        @Context SecurityContext securityContext,
-        String jsonApiDocument) {
-        return build(elide.delete(path, jsonApiDocument, getUser.apply(securityContext)));
-    }
-
-    private static Response build(ElideResponse response) {
-        return Response.status(response.getResponseCode()).entity(response.getBody()).build();
-    }
-
-    /**
-     * Placeholder for injection frameworks.
-     */
-    public interface DefaultOpaqueUserFunction extends Function<SecurityContext, Object> {
-        // Empty
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/FilterExpressionCheck.java b/elide-core/src/main/java/com/yahoo/elide/security/FilterExpressionCheck.java
deleted file mode 100644
index 5a4d68fb85..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/FilterExpressionCheck.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.security;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.parsers.expression.FilterExpressionCheckEvaluationVisitor;
-import com.yahoo.elide.security.checks.InlineCheck;
-
-import java.util.Optional;
-
-/**
- * Check for FilterExpression. This is a super class for user defined FilterExpression check. The subclass should
- * override getFilterExpression function and return a FilterExpression which will be passed down to datastore.
- * @param <T> Type of class
- */
-public abstract class FilterExpressionCheck<T> extends InlineCheck<T> {
-
-    /**
-     * Returns a FilterExpression from FilterExpressionCheck.
-     * @param requestScope Request scope object
-     * @return FilterExpression for FilterExpressionCheck.
-     */
-    public abstract FilterExpression getFilterExpression(RequestScope requestScope);
-
-    /* NOTE: Filter Expression checks and user checks are intended to be _distinct_ */
-    @Override
-    public final boolean ok(User user) {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * The filter expression is evaluated in memory if it cannot be pushed to the data store by elide for any reason.
-     * @param object object returned from datastore
-     * @param requestScope Request scope object
-     * @param changeSpec Summary of modifications
-     * @return true if the object pass evaluation against FilterExpression.
-     */
-    @Override
-    public final boolean ok(T object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        FilterExpression filterExpression = getFilterExpression(requestScope);
-        return filterExpression.accept(new FilterExpressionCheckEvaluationVisitor(object, this, requestScope));
-    }
-
-    /**
-     *
-     * @param object object returned from datastore
-     * @param predicate A predicate from filterExpressionCheck
-     * @param requestScope Request scope object
-     * @return true if the object pass evaluation against Predicate.
-     */
-    public boolean applyPredicateToObject(T object, Predicate predicate, RequestScope requestScope) {
-        Predicate.PathElement path = predicate.getPath().get(predicate.getPath().size() - 1);
-        Class type = path.getType();
-        String fieldName = path.getFieldName();
-        if (fieldName == null) {
-            return false;
-        }
-        EntityDictionary dictionary = ((com.yahoo.elide.core.RequestScope) requestScope).getDictionary();
-        java.util.function.Predicate fn = predicate.getOperator()
-                .contextualize(fieldName, predicate.getValues(), dictionary);
-        return fn.test(object);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/PermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/security/PermissionExecutor.java
deleted file mode 100644
index 5ae695641a..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/PermissionExecutor.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import java.lang.annotation.Annotation;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * Interface describing classes responsible for managing the life-cycle and execution of checks.
- *
- * Checks are expected to throw exceptions upon failures.
- */
-public interface PermissionExecutor {
-    /**
-     * Check permission on class.
-     *
-     * @param <A> type parameter
-     * @param annotationClass annotation class
-     * @param resource resource
-     * @see com.yahoo.elide.annotation.CreatePermission
-     * @see com.yahoo.elide.annotation.ReadPermission
-     * @see com.yahoo.elide.annotation.UpdatePermission
-     * @see com.yahoo.elide.annotation.DeletePermission
-     */
-    <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass, PersistentResource resource);
-
-    /**
-     * Check permission on class.
-     *
-     * @param <A> type parameter
-     * @param annotationClass annotation class
-     * @param resource resource
-     * @param changeSpec ChangeSpec
-     * @see com.yahoo.elide.annotation.CreatePermission
-     * @see com.yahoo.elide.annotation.ReadPermission
-     * @see com.yahoo.elide.annotation.UpdatePermission
-     * @see com.yahoo.elide.annotation.DeletePermission
-     */
-    <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
-                                                            PersistentResource resource,
-                                                            ChangeSpec changeSpec);
-
-    /**
-     * Check for permissions on a specific field.
-     *
-     * @param <A> type parameter
-     * @param resource resource
-     * @param changeSpec changepsec
-     * @param annotationClass annotation class
-     * @param field field to check
-     */
-    <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
-                                                                          ChangeSpec changeSpec,
-                                                                          Class<A> annotationClass,
-                                                                          String field);
-
-    /**
-     * Check for permissions on a specific field deferring all checks.
-     *
-     * @param <A> type parameter
-     * @param resource resource
-     * @param changeSpec changepsec
-     * @param annotationClass annotation class
-     * @param field field to check
-     */
-    <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
-                                                                                  ChangeSpec changeSpec,
-                                                                                  Class<A> annotationClass,
-                                                                                  String field);
-
-    /**
-     * Check strictly user permissions on a specific field and entity.
-     *
-     * @param <A> type parameter
-     * @param resource Resource
-     * @param annotationClass Annotation class
-     * @param field Field
-     */
-    <A extends Annotation> ExpressionResult checkUserPermissions(PersistentResource<?> resource,
-                                                                 Class<A> annotationClass,
-                                                                 String field);
-
-    /**
-     * Check strictly user permissions on an entity.
-     *
-     * @param <A> type parameter
-     * @param resourceClass Resource class
-     * @param annotationClass Annotation class
-     */
-    <A extends Annotation> ExpressionResult checkUserPermissions(Class<?> resourceClass, Class<A> annotationClass);
-
-    Optional<FilterExpression> getReadPermissionFilter(Class<?> resourceClass);
-
-    /**
-     * Execute commmit checks.
-     */
-    void executeCommitChecks();
-
-    /**
-     * Method to build criterion check.
-     *
-     * @param permissions Permissions to visit
-     * @param criterionNegater Function to apply negation to a criterion
-     * @param andCriterionJoiner Function to combine criteria with an and condition
-     * @param orCriterionJoiner Function to combine criteria with an or condition
-     * @param <T> type parameter
-     * @return Built criterion if possible else null. Default always returns null.
-     */
-    default <T> T getCriterion(ParseTree permissions,
-                               Function<T, T> criterionNegater,
-                               BiFunction<T, T, T> andCriterionJoiner,
-                               BiFunction<T, T, T> orCriterionJoiner) {
-        return null;
-    }
-
-    default boolean shouldShortCircuitPermissionChecks(Class<? extends Annotation> annotationClass,
-                                               Class resourceClass, String field) {
-        return false;
-    }
-
-    default String printCheckStats() {
-        return null;
-    }
-
-    /**
-     * Whether or not the permission executor will return verbose logging to the requesting user in the response.
-     *
-     * @return True if verbose, false otherwise.
-     */
-    default boolean isVerbose() {
-        return false;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/executors/ActivePermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/security/executors/ActivePermissionExecutor.java
deleted file mode 100644
index 2229e1ace5..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/executors/ActivePermissionExecutor.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.executors;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.parsers.expression.CriterionExpressionVisitor;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.SecurityMode;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.ExpressionResultCache;
-import com.yahoo.elide.security.permissions.PermissionExpressionBuilder;
-import com.yahoo.elide.security.permissions.PermissionExpressionBuilder.Expressions;
-import com.yahoo.elide.security.permissions.expressions.Expression;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.commons.lang3.tuple.Triple;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * Default permission executor.
- * This executor executes all security checks as outlined in the documentation.
- */
-@Slf4j
-public class ActivePermissionExecutor implements PermissionExecutor {
-    private final Queue<QueuedCheck> commitCheckQueue = new LinkedBlockingQueue<>();
-
-    private final RequestScope requestScope;
-    private final PermissionExpressionBuilder expressionBuilder;
-    private final Set<Triple<Class<? extends Annotation>, Class, String>> expressionResultShortCircuit;
-    private final Map<Triple<Class<? extends Annotation>, Class, String>, ExpressionResult> userPermissionCheckCache;
-    private final Map<String, Long> checkStats;
-
-    /**
-     * Constructor.
-     *
-     * @param requestScope Request scope.
-     */
-    public ActivePermissionExecutor(final com.yahoo.elide.core.RequestScope requestScope) {
-        ExpressionResultCache cache = new ExpressionResultCache();
-
-        this.requestScope = requestScope;
-        this.expressionBuilder = new PermissionExpressionBuilder(cache, requestScope.getDictionary());
-        userPermissionCheckCache = new HashMap<>();
-        expressionResultShortCircuit = new HashSet<>();
-        checkStats = new HashMap<>();
-    }
-
-    /**
-     * Check permission on class.
-     *
-     * @param <A> type parameter
-     * @param annotationClass annotation class
-     * @param resource resource
-     * @see com.yahoo.elide.annotation.CreatePermission
-     * @see com.yahoo.elide.annotation.ReadPermission
-     * @see com.yahoo.elide.annotation.UpdatePermission
-     * @see com.yahoo.elide.annotation.DeletePermission
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkPermission(
-            Class<A> annotationClass, PersistentResource resource) {
-        return checkPermission(annotationClass, resource, null);
-    }
-
-    /**
-     * Check permission on class.
-     *
-     * @param annotationClass annotation class
-     * @param resource resource
-     * @param changeSpec ChangeSpec
-     * @param <A> type parameter
-     * @see com.yahoo.elide.annotation.CreatePermission
-     * @see com.yahoo.elide.annotation.ReadPermission
-     * @see com.yahoo.elide.annotation.UpdatePermission
-     * @see com.yahoo.elide.annotation.DeletePermission
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
-                                                       PersistentResource resource,
-                                                       ChangeSpec changeSpec) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return ExpressionResult.PASS; // Bypass
-        }
-
-        Expressions expressions;
-        if (SharePermission.class == annotationClass) {
-            expressions = expressionBuilder.buildSharePermissionExpressions(resource);
-        } else {
-            ExpressionResult expressionResult = this.checkUserPermissions(resource.getResourceClass(), annotationClass);
-            if (expressionResult == PASS) {
-                return expressionResult;
-            }
-            expressions = expressionBuilder.buildAnyFieldExpressions(resource, annotationClass, changeSpec);
-        }
-        return executeExpressions(expressions, annotationClass);
-    }
-
-    /**
-     * Check for permissions on a specific field.
-     *
-     * @param <A> type parameter
-     * @param resource resource
-     * @param changeSpec changepsec
-     * @param annotationClass annotation class
-     * @param field field to check
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(PersistentResource<?> resource,
-                                                                                 ChangeSpec changeSpec,
-                                                                                 Class<A> annotationClass,
-                                                                                 String field) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return ExpressionResult.PASS; // Bypass
-        }
-
-        ExpressionResult expressionResult = this.checkUserPermissions(resource, annotationClass, field);
-        if (expressionResult == PASS) {
-            return expressionResult;
-        }
-
-        Expressions expressions = expressionBuilder.buildSpecificFieldExpressions(
-                resource,
-                annotationClass,
-                field,
-                changeSpec
-        );
-        return executeExpressions(expressions, annotationClass);
-    }
-
-    /**
-     * Check for permissions on a specific field deferring all checks.
-     *
-     * @param <A> type parameter
-     * @param resource resource
-     * @param changeSpec changepsec
-     * @param annotationClass annotation class
-     * @param field field to check
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(PersistentResource<?> resource,
-                                                                                         ChangeSpec changeSpec,
-                                                                                         Class<A> annotationClass,
-                                                                                         String field) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return ExpressionResult.PASS; // Bypass
-        }
-
-        ExpressionResult expressionResult = this.checkUserPermissions(resource, annotationClass, field);
-        if (expressionResult == PASS) {
-            return expressionResult;
-        }
-
-        Expressions expressions = expressionBuilder.buildSpecificFieldExpressions(
-                resource,
-                annotationClass,
-                field,
-                changeSpec
-        );
-        Expression commitExpression = expressions.getCommitExpression();
-        if (commitExpression != null) {
-            commitCheckQueue.add(new QueuedCheck(commitExpression, annotationClass));
-        }
-        return ExpressionResult.DEFERRED;
-    }
-
-    /**
-     * Check strictly user permissions on a specific field and entity.
-     *
-     * @param <A> type parameter
-     * @param resource Resource
-     * @param annotationClass Annotation class
-     * @param field Field
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkUserPermissions(PersistentResource<?> resource,
-                                                                        Class<A> annotationClass,
-                                                                        String field) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return ExpressionResult.PASS; // Bypass
-        }
-
-        // If the user check has already been evaluated before, return the result directly and save the building cost
-        ExpressionResult expressionResult
-                = userPermissionCheckCache.get(Triple.of(annotationClass, resource.getResourceClass(), field));
-        if (expressionResult != null) {
-            return expressionResult;
-        }
-
-        Expressions expressions = expressionBuilder.buildUserCheckFieldExpressions(resource, annotationClass, field);
-        expressionResult = executeExpressions(expressions, annotationClass);
-
-        userPermissionCheckCache.put(Triple.of(annotationClass, resource.getResourceClass(), field), expressionResult);
-
-        if (expressionResult == PASS) {
-            expressionResultShortCircuit.add(Triple.of(annotationClass, resource.getResourceClass(), field));
-        }
-
-        return expressionResult;
-    }
-
-    /**
-     * Check strictly user permissions on an entity.
-     *
-     * @param <A> type parameter
-     * @param resourceClass Resource class
-     * @param annotationClass Annotation class
-     */
-    @Override
-    public <A extends Annotation> ExpressionResult checkUserPermissions(Class<?> resourceClass,
-                                                                        Class<A> annotationClass) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return ExpressionResult.PASS; // Bypass
-        }
-
-        // If the user check has already been evaluated before, return the result directly and save the building cost
-        ExpressionResult expressionResult
-                = userPermissionCheckCache.get(Triple.of(annotationClass, resourceClass, null));
-        if (expressionResult != null) {
-            return expressionResult;
-        }
-
-        Expressions expressions = expressionBuilder.buildUserCheckAnyExpression(
-                resourceClass,
-                annotationClass,
-                requestScope
-        );
-        expressionResult = executeExpressions(expressions, annotationClass);
-
-        userPermissionCheckCache.put(Triple.of(annotationClass, resourceClass, null), expressionResult);
-
-        if (expressionResult == PASS) {
-            expressionResultShortCircuit.add(Triple.of(annotationClass, resourceClass, null));
-        }
-
-        return expressionResult;
-    }
-
-    /**
-     * Get permission filter on an entity.
-     *
-     * @param resourceClass Resource class
-     */
-    public Optional<FilterExpression> getReadPermissionFilter(Class<?> resourceClass) {
-        if (requestScope.getSecurityMode() == SecurityMode.SECURITY_INACTIVE) {
-            return Optional.empty(); // Bypass
-        }
-        FilterExpression filterExpression =
-                expressionBuilder.buildAnyFieldFilterExpression(resourceClass, requestScope);
-
-        return Optional.ofNullable(filterExpression);
-    }
-
-    /**
-     * Execute commmit checks.
-     */
-    @Override
-    public void executeCommitChecks() {
-        commitCheckQueue.forEach((expr) -> {
-            Expression expression = expr.getExpression();
-            ExpressionResult result = expression.evaluate();
-            if (result == FAIL) {
-                ForbiddenAccessException e = new ForbiddenAccessException(expr.getAnnotationClass().getSimpleName(),
-                        expression);
-                log.trace("{}", e.getLoggedMessage());
-                throw e;
-            }
-        });
-        commitCheckQueue.clear();
-    }
-
-    /**
-     * Build criterion check.
-     *
-     * @param permissions Permissions to visit
-     * @param criterionNegater Function to apply negation to a criterion
-     * @param andCriterionJoiner Function to combine criteria with an and condition
-     * @param orCriterionJoiner Function to combine criteria with an or condition
-     * @param <T> type parameter
-     * @return
-     */
-    @Override
-    public <T> T getCriterion(final ParseTree permissions,
-                              final Function<T, T> criterionNegater,
-                              final BiFunction<T, T, T> andCriterionJoiner,
-                              final BiFunction<T, T, T> orCriterionJoiner) {
-        if (permissions == null) {
-            return null;
-        }
-
-        CriterionExpressionVisitor<T> visitor = new CriterionExpressionVisitor<>(
-                requestScope,
-                requestScope.getDictionary(),
-                criterionNegater,
-                orCriterionJoiner,
-                andCriterionJoiner
-        );
-
-        return visitor.visit(permissions);
-    }
-
-    @Override
-    public boolean shouldShortCircuitPermissionChecks(Class<? extends Annotation> annotationClass,
-                                                      Class resourceClass, String field) {
-        return expressionResultShortCircuit.contains(Triple.of(annotationClass, resourceClass, field));
-    }
-
-    /**
-     * Execute expressions.
-     *
-     * @param expressions expressions to execute
-     */
-    private ExpressionResult executeExpressions(final Expressions expressions,
-                                    final Class<? extends Annotation> annotationClass) {
-        Expression expression = expressions.getOperationExpression();
-        ExpressionResult result = expression.evaluate();
-
-        // Record the check
-        Long checkOccurrences = checkStats.getOrDefault(expression.toString(), 0L) + 1;
-        checkStats.put(expression.toString(), checkOccurrences);
-
-       if (result == DEFERRED) {
-            Expression commitExpression = expressions.getCommitExpression();
-            if (commitExpression != null) {
-                if (isInlineOnlyCheck(annotationClass)) {
-                    // Force evaluation of checks that can only be executed inline.
-                    result = commitExpression.evaluate();
-                    if (result == FAIL) {
-                        ForbiddenAccessException e = new ForbiddenAccessException(
-                                annotationClass.getSimpleName(),
-                                commitExpression);
-                        log.trace("{}", e.getLoggedMessage());
-                        throw e;
-                    }
-                } else {
-                    commitCheckQueue.add(new QueuedCheck(commitExpression, annotationClass));
-                }
-            }
-            return DEFERRED;
-        } else if (result == FAIL) {
-            ForbiddenAccessException e = new ForbiddenAccessException(annotationClass.getSimpleName(), expression);
-            log.trace("{}", e.getLoggedMessage());
-            throw e;
-        }
-
-        return result;
-    }
-
-    /**
-     * Check whether or not this check can only be run inline or not.
-     *
-     * @param annotationClass annotation class
-     * @return True if check can only be run inline, false otherwise.
-     */
-    private boolean isInlineOnlyCheck(final Class<? extends Annotation> annotationClass) {
-        return ReadPermission.class.isAssignableFrom(annotationClass)
-                || DeletePermission.class.isAssignableFrom(annotationClass);
-    }
-
-    /**
-     * Information container about queued checks.
-     */
-    @AllArgsConstructor
-    private static class QueuedCheck {
-        @Getter
-        private final Expression expression;
-        @Getter private final Class<? extends Annotation> annotationClass;
-    }
-
-    /**
-     * Print the permission check statistics
-     * @return the permission check statistics
-     */
-    @Override
-    public String printCheckStats() {
-        StringBuilder sb = new StringBuilder("Permission Check Statistics:\n");
-        checkStats.entrySet().stream()
-                .sorted(Map.Entry.comparingByValue())
-                .forEachOrdered(e -> sb.append(e.getKey() + ": " + e.getValue() + "\n"));
-        String stats = sb.toString();
-        log.trace(stats);
-        return stats;
-    }
-
-    @Override
-    public boolean isVerbose() {
-        return requestScope.getSecurityMode() == SecurityMode.SECURITY_ACTIVE_VERBOSE;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/executors/BypassPermissionExecutor.java b/elide-core/src/main/java/com/yahoo/elide/security/executors/BypassPermissionExecutor.java
deleted file mode 100644
index 0242e6c4e7..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/executors/BypassPermissionExecutor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.executors;
-
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-
-import java.lang.annotation.Annotation;
-import java.util.Optional;
-
-/**
- * Permission executor intended to bypass all security checks. I.e. this is effectively a no-op.
- */
-public class BypassPermissionExecutor implements PermissionExecutor {
-    @Override
-    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
-                                                                   PersistentResource resource) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public <A extends Annotation> ExpressionResult checkPermission(Class<A> annotationClass,
-                                                                   PersistentResource resource,
-                                                                   ChangeSpec changeSpec) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissions(
-            PersistentResource<?> resource, ChangeSpec changeSpec, Class<A> annotationClass, String field) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public <A extends Annotation> ExpressionResult checkSpecificFieldPermissionsDeferred(
-            PersistentResource<?> resource, ChangeSpec changeSpec, Class<A> annotationClass, String field) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public <A extends Annotation> ExpressionResult checkUserPermissions(
-            PersistentResource<?> resource, Class<A> annotationClass, String field) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public <A extends Annotation> ExpressionResult checkUserPermissions(Class<?> resourceClass,
-                                                                        Class<A> annotationClass) {
-        return ExpressionResult.PASS;
-    }
-
-    @Override
-    public Optional<FilterExpression> getReadPermissionFilter(Class<?> resourceClass) {
-        return Optional.empty();
-    }
-
-    @Override
-    public void executeCommitChecks() {
-
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionCondition.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionCondition.java
deleted file mode 100644
index e716e77c3d..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionCondition.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.security.permissions;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import lombok.Getter;
-
-import java.lang.annotation.Annotation;
-import java.util.Optional;
-
-/**
- * Describes the state when a permission is evaluated.
- */
-public class PermissionCondition {
-    @Getter final Class<? extends Annotation> permission;
-    @Getter final Class<?> entityClass;
-    @Getter final Optional<PersistentResource> resource;
-    @Getter final Optional<ChangeSpec> changes;
-    @Getter final Optional<String> field;
-
-    /**
-     * This function attempts to create the appropriate PermissionCondition based on parameters that may or may
-     * not be null. This is a temporary workaround given that the caller functions duplicate data in their
-     * signatures and pass nulls.  The calling code needs to be cleaned up - and then this function can be disposed of.
-     * @param permission
-     * @param resource
-     * @param field
-     * @param changes
-     * @return
-     */
-    public static PermissionCondition create(
-            Class<? extends Annotation> permission,
-            PersistentResource resource,
-            String field,
-            ChangeSpec changes
-    ) {
-        if (resource != null) {
-            if (changes != null) {
-                /* Tests do this - not sure if this is real */
-                if (field != null && changes.getFieldName() == null) {
-                    return new PermissionCondition(permission, resource, field);
-                }
-                return new PermissionCondition(permission, resource, changes);
-            } else if (field == null) {
-                return new PermissionCondition(permission, resource);
-            } else {
-                return new PermissionCondition(permission, resource, field);
-            }
-        }
-        throw new IllegalArgumentException("Resource cannot be null");
-    }
-
-    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource) {
-        this.permission = permission;
-        this.resource = Optional.of(resource);
-        this.entityClass = resource.getResourceClass();
-        this.changes = Optional.empty();
-        this.field = Optional.empty();
-    }
-
-    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource, ChangeSpec changes) {
-        this.permission = permission;
-        this.resource = Optional.of(resource);
-        this.entityClass = resource.getResourceClass();
-        this.changes = Optional.of(changes);
-        this.field = Optional.ofNullable(changes.getFieldName());
-    }
-
-    PermissionCondition(Class<? extends Annotation> permission, Class<?> entityClass) {
-        this.permission = permission;
-        this.resource = Optional.empty();
-        this.entityClass = entityClass;
-        this.changes = Optional.empty();
-        this.field = Optional.empty();
-    }
-
-    PermissionCondition(Class<? extends Annotation> permission, PersistentResource resource, String field) {
-        this.permission = permission;
-        this.resource = Optional.of(resource);
-        this.entityClass = resource.getResourceClass();
-        this.changes = Optional.empty();
-        this.field = Optional.of(field);
-    }
-
-    @Override
-    public String toString() {
-        Object entity = resource.isPresent() ? resource.get() : entityClass;
-
-        String withChanges = changes.isPresent() ? String.format("WITH CHANGES %s", changes.get()) : "";
-        String withField = field.isPresent() ? String.format("WITH FIELD %s", field.get()) : "";
-
-        String withClause = withChanges.isEmpty() ? withField : withChanges;
-
-        return String.format(
-                "%s PERMISSION WAS INVOKED ON %s %s",
-                permission2text(permission),
-                entity,
-                withClause);
-    }
-
-    private static String permission2text(Class<? extends Annotation> permission) {
-        if (permission.equals(ReadPermission.class)) {
-            return "READ";
-        } else if (permission.equals(UpdatePermission.class)) {
-            return "UPDATE";
-        } else if (permission.equals(DeletePermission.class)) {
-            return "DELETE";
-        } else if (permission.equals(CreatePermission.class)) {
-            return "CREATE";
-        } else if (permission.equals(SharePermission.class)) {
-            return "SHARE";
-        } else {
-            throw new IllegalArgumentException("Invalid annotation type");
-        }
-
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilder.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilder.java
deleted file mode 100644
index cfacd5946e..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilder.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions;
-
-import static com.yahoo.elide.parsers.expression.PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION;
-import static com.yahoo.elide.parsers.expression.PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION;
-import static com.yahoo.elide.security.permissions.expressions.Expression.Results.FAILURE;
-
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.core.CheckInstantiator;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.parsers.expression.PermissionExpressionVisitor;
-import com.yahoo.elide.parsers.expression.PermissionToFilterExpressionVisitor;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.permissions.expressions.AnyFieldExpression;
-import com.yahoo.elide.security.permissions.expressions.DeferredCheckExpression;
-import com.yahoo.elide.security.permissions.expressions.Expression;
-import com.yahoo.elide.security.permissions.expressions.ImmediateCheckExpression;
-import com.yahoo.elide.security.permissions.expressions.OrExpression;
-import com.yahoo.elide.security.permissions.expressions.SharePermissionExpression;
-import com.yahoo.elide.security.permissions.expressions.SpecificFieldExpression;
-import com.yahoo.elide.security.permissions.expressions.UserCheckOnlyExpression;
-
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * Expression builder to parse annotations and express the result as the Expression AST.
- */
-public class PermissionExpressionBuilder implements CheckInstantiator {
-    private final EntityDictionary entityDictionary;
-    private final ExpressionResultCache cache;
-
-    private static final Expressions SUCCESSFUL_EXPRESSIONS = new Expressions(
-            OrExpression.SUCCESSFUL_EXPRESSION,
-            OrExpression.SUCCESSFUL_EXPRESSION
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param cache Cache
-     * @param dictionary EntityDictionary
-     */
-    public PermissionExpressionBuilder(ExpressionResultCache cache, EntityDictionary dictionary) {
-        this.cache = cache;
-        this.entityDictionary = dictionary;
-    }
-
-    /**
-     * Build an expression that checks a specific field.
-     *
-     * @param resource        Resource
-     * @param annotationClass Annotation class
-     * @param field           Field
-     * @param changeSpec      Change spec
-     * @param <A>             Type parameter
-     * @return Commit and operation expressions
-     */
-    public <A extends Annotation> Expressions buildSpecificFieldExpressions(final PersistentResource resource,
-                                                                            final Class<A> annotationClass,
-                                                                            final String field,
-                                                                            final ChangeSpec changeSpec) {
-
-        Class<?> resourceClass = resource.getResourceClass();
-        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
-            return SUCCESSFUL_EXPRESSIONS;
-        }
-
-        final Function<Check, Expression> deferredCheckFn = getDeferredExpressionFor(resource, changeSpec);
-        final Function<Check, Expression> immediateCheckFn = getImmediateExpressionFor(resource, changeSpec);
-
-        final Function<Function<Check, Expression>, Expression> buildExpressionFn =
-                (checkFn) -> buildSpecificFieldExpression(
-                        PermissionCondition.create(
-                                annotationClass, resource, field, changeSpec
-                        ),
-                        checkFn
-                );
-
-        return new Expressions(
-                buildExpressionFn.apply(deferredCheckFn),
-                buildExpressionFn.apply(immediateCheckFn)
-        );
-
-    }
-
-    /**
-     * Build an expression that checks share permissions on a bean.
-     *
-     * @param resource        Resource
-     * @return Commit and operation expressions
-     */
-    public <A extends Annotation> Expressions buildSharePermissionExpressions(final PersistentResource resource) {
-
-        PermissionCondition condition = new PermissionCondition(SharePermission.class, resource);
-
-        Class<?> resourceClass = resource.getResourceClass();
-        if (!entityDictionary.entityHasChecksForPermission(resourceClass, SharePermission.class)) {
-            SharePermissionExpression unshared = new SharePermissionExpression(condition);
-            return new Expressions(unshared, unshared);
-        }
-
-        final Function<Check, Expression> deferredCheckFn = getDeferredExpressionFor(resource, null);
-        final Function<Check, Expression> immediateCheckFn = getImmediateExpressionFor(resource, null);
-
-        final Function<Function<Check, Expression>, Expression> expressionFunction =
-                (checkFn) -> {
-                    ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass,
-                            SharePermission.class);
-                    Expression entityExpression = expressionFromParseTree(classPermissions, checkFn);
-                    return new SharePermissionExpression(condition, entityExpression);
-                };
-
-        return new Expressions(
-                expressionFunction.apply(deferredCheckFn),
-                expressionFunction.apply(immediateCheckFn)
-        );
-    }
-
-    /**
-     * Build an expression that checks any field on a bean.
-     *
-     * @param resource        Resource
-     * @param annotationClass annotation class
-     * @param changeSpec      change spec
-     * @param <A>             type parameter
-     * @return Commit and operation expressions
-     */
-    public <A extends Annotation> Expressions buildAnyFieldExpressions(final PersistentResource resource,
-                                                                       final Class<A> annotationClass,
-                                                                       final ChangeSpec changeSpec) {
-
-
-        Class<?> resourceClass = resource.getResourceClass();
-        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
-            return SUCCESSFUL_EXPRESSIONS;
-        }
-
-        final Function<Check, Expression> deferredCheckFn = getDeferredExpressionFor(resource, changeSpec);
-        final Function<Check, Expression> immediateCheckFn = getImmediateExpressionFor(resource, changeSpec);
-
-        final Function<Function<Check, Expression>, Expression> expressionFunction =
-                (checkFn) -> buildAnyFieldExpression(
-                        PermissionCondition.create(
-                                annotationClass,
-                                resource,
-                                (String) null,
-                                changeSpec),
-                        checkFn
-                );
-
-        return new Expressions(
-                expressionFunction.apply(deferredCheckFn),
-                expressionFunction.apply(immediateCheckFn)
-        );
-    }
-
-    /**
-     * Build an expression that strictly evaluates UserCheck's and ignores other checks for a specific field.
-     * <p>
-     * NOTE: This method returns _NO_ commit checks.
-     *
-     * @param resource        Resource
-     * @param annotationClass Annotation class
-     * @param field           Field to check (if null only check entity-level)
-     * @param <A>             type parameter
-     * @return User check expression to evaluate
-     */
-    public <A extends Annotation> Expressions buildUserCheckFieldExpressions(final PersistentResource resource,
-                                                                             final Class<A> annotationClass,
-                                                                             final String field) {
-        Class<?> resourceClass = resource.getResourceClass();
-        if (!entityDictionary.entityHasChecksForPermission(resourceClass, annotationClass)) {
-            return SUCCESSFUL_EXPRESSIONS;
-        }
-
-        final Function<Check, Expression> userCheckFn =
-                (check) -> new UserCheckOnlyExpression(
-                        check,
-                        resource,
-                        resource.getRequestScope(),
-                        (ChangeSpec) null,
-                        cache
-                );
-
-        return new Expressions(
-                buildSpecificFieldExpression(new PermissionCondition(annotationClass, resource, field), userCheckFn),
-                null
-        );
-    }
-
-    /**
-     * Build an expression that strictly evaluates UserCheck's and ignores other checks for an entity.
-     * <p>
-     * NOTE: This method returns _NO_ commit checks.
-     *
-     * @param resourceClass   Resource class
-     * @param annotationClass Annotation class
-     * @param requestScope    Request scope
-     * @param <A>             type parameter
-     * @return User check expression to evaluate
-     */
-    public <A extends Annotation> Expressions buildUserCheckAnyExpression(final Class<?> resourceClass,
-                                                                          final Class<A> annotationClass,
-                                                                          final RequestScope requestScope) {
-        final Function<Check, Expression> userCheckFn =
-                (check) -> new UserCheckOnlyExpression(
-                        check,
-                        (PersistentResource) null,
-                        requestScope,
-                        (ChangeSpec) null,
-                        cache
-                );
-
-        return new Expressions(
-                buildAnyFieldExpression(new PermissionCondition(annotationClass, resourceClass), userCheckFn), null);
-    }
-
-    private Function<Check, Expression> getImmediateExpressionFor(PersistentResource resource, ChangeSpec changeSpec) {
-        return (check) -> new ImmediateCheckExpression(
-                check,
-                resource,
-                resource.getRequestScope(),
-                changeSpec,
-                cache
-        );
-    }
-
-    private Function<Check, Expression> getDeferredExpressionFor(PersistentResource resource, ChangeSpec changeSpec) {
-        return (check) -> new DeferredCheckExpression(
-                check,
-                resource,
-                resource.getRequestScope(),
-                changeSpec,
-                cache
-        );
-    }
-
-    /**
-     * Builder for specific field expressions.
-     *
-     * @param <A>             type parameter
-     * @param condition       The condition which triggered this permission expression check
-     * @param checkFn         Operation check function
-     * @return Expressions representing specific field
-     */
-    private <A extends Annotation> Expression buildSpecificFieldExpression(final PermissionCondition condition,
-                                                                           final Function<Check, Expression> checkFn) {
-        Class<?> resourceClass = condition.getEntityClass();
-        Class<? extends Annotation> annotationClass = condition.getPermission();
-        String field = condition.getField().isPresent() ? condition.getField().get() : null;
-
-        ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
-        ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
-
-        return new SpecificFieldExpression(condition,
-                expressionFromParseTree(classPermissions, checkFn),
-                expressionFromParseTree(fieldPermissions, checkFn)
-        );
-    }
-
-    /**
-     * Build an expression representing any field on an entity.
-     *
-     * @param <A>             type parameter
-     * @param checkFn         check function
-     * @return Expressions
-     */
-    private <A extends Annotation> Expression buildAnyFieldExpression(final PermissionCondition condition,
-                                                                      final Function<Check, Expression> checkFn) {
-
-
-        Class<?> resourceClass = condition.getEntityClass();
-        Class<? extends Annotation> annotationClass = condition.getPermission();
-
-        ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
-        Expression entityExpression = expressionFromParseTree(classPermissions, checkFn);
-
-        OrExpression allFieldsExpression = new OrExpression(FAILURE, null);
-        List<String> fields = entityDictionary.getAllFields(resourceClass);
-        for (String field : fields) {
-            ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
-            Expression fieldExpression = expressionFromParseTree(fieldPermissions, checkFn);
-
-            allFieldsExpression = new OrExpression(allFieldsExpression, fieldExpression);
-        }
-
-        return new AnyFieldExpression(condition, entityExpression, allFieldsExpression);
-    }
-
-    /**
-     * Build an expression representing any field on an entity.
-     *
-     * @param <A>             type parameter
-     * @param resourceClass   Resource class
-     * @param requestScope requestScope
-     * @return Expressions
-     */
-    public <A extends Annotation> FilterExpression buildAnyFieldFilterExpression(Class<?> resourceClass,
-                                                                                 RequestScope requestScope) {
-
-        Class<? extends Annotation> annotationClass = ReadPermission.class;
-        ParseTree classPermissions = entityDictionary.getPermissionsForClass(resourceClass, annotationClass);
-        FilterExpression entityFilterExpression = filterExpressionFromParseTree(classPermissions, requestScope);
-        FilterExpression allFieldsFilterExpression = entityFilterExpression;
-        List<String> fields = entityDictionary.getAllFields(resourceClass);
-        for (String field : fields) {
-            ParseTree fieldPermissions = entityDictionary.getPermissionsForField(resourceClass, field, annotationClass);
-            FilterExpression fieldExpression = filterExpressionFromParseTree(fieldPermissions, requestScope);
-            if (fieldExpression == null) {
-                if (entityFilterExpression == null) {
-                    //If the class FilterExpression is also null, we should just return null to allow the field with
-                    // null FE be able to see all records.
-                    return null;
-                }
-                continue;
-            }
-            if (allFieldsFilterExpression == null) {
-                allFieldsFilterExpression = fieldExpression;
-            } else {
-                allFieldsFilterExpression = new OrFilterExpression(allFieldsFilterExpression, fieldExpression);
-            }
-        }
-        return allFieldsFilterExpression;
-    }
-
-    private Expression expressionFromParseTree(ParseTree permissions, Function<Check, Expression> checkFn) {
-        if (permissions == null) {
-            return null;
-        }
-
-        return new PermissionExpressionVisitor(entityDictionary, checkFn).visit(permissions);
-    }
-
-    private FilterExpression filterExpressionFromParseTree(ParseTree permissions, RequestScope requestScope) {
-        if (permissions == null) {
-            return null;
-        }
-        FilterExpression permissionFilter = new PermissionToFilterExpressionVisitor(entityDictionary,
-                requestScope).visit(permissions);
-        //case where the permissions does not have ANY filterExpressionCheck
-        if (permissionFilter == NO_EVALUATION_EXPRESSION
-                || permissionFilter == FALSE_USER_CHECK_EXPRESSION) {
-            return null;
-        }
-        return permissionFilter;
-    }
-
-    /**
-     * Structure containing operation-time and commit-time expressions.
-     */
-    @AllArgsConstructor
-    public static class Expressions {
-        @Getter private final Expression operationExpression;
-        @Getter private final Expression commitExpression;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AndExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AndExpression.java
deleted file mode 100644
index d37a2c9e96..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AndExpression.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-/**
- * Representation for an "And" expression.
- */
-public class AndExpression implements Expression {
-    private final Expression left;
-    private final Expression right;
-
-    /**
-     * Constructor.
-     *
-     * @param left Left expression
-     * @param right Right expression
-     */
-    public AndExpression(final Expression left, final Expression right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        ExpressionResult leftStatus = left.evaluate();
-
-        // Short-circuit
-        if (leftStatus == FAIL) {
-            return leftStatus;
-        }
-
-        ExpressionResult rightStatus = (right == null) ? PASS : right.evaluate();
-
-        if (rightStatus == FAIL) {
-            return rightStatus;
-        }
-
-        if (leftStatus == PASS && rightStatus == PASS) {
-            return PASS;
-        }
-
-        return DEFERRED;
-    }
-
-    @Override
-    public String toString() {
-        if (right == null) {
-            return String.format("%s", left);
-
-        }
-        return String.format("(%s) AND (%s)", left, right);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AnyFieldExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AnyFieldExpression.java
deleted file mode 100644
index 721dd2241f..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/AnyFieldExpression.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.PermissionCondition;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-/**
- * This check determines if an entity is accessible to the current user.
- *
- * An entity is considered to be accessible if there exists an annotation at _any_ level of the object that
- * Grants access. This means that if access is permitted to any field of the object then the object
- * is accessible, regardless of what any class or package level permissions would permit.
- */
-public class AnyFieldExpression implements Expression {
-    private final Expression entityExpression;
-    private final Expression fieldExpression;
-    private final PermissionCondition condition;
-
-    public AnyFieldExpression(final PermissionCondition condition,
-                              final Expression entityExpression,
-                              final OrExpression fieldExpression) {
-        this.condition = condition;
-        this.entityExpression = entityExpression;
-        this.fieldExpression = fieldExpression;
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        ExpressionResult fieldResult = fieldExpression.evaluate();
-
-        if (fieldResult != FAIL) {
-            return fieldResult;
-        }
-
-        ExpressionResult entityResult = (entityExpression == null) ? PASS : entityExpression.evaluate();
-        return entityResult;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s FOR EXPRESSION [FIELDS(%s) OR ENTITY(%s)]",
-                condition, fieldExpression, entityExpression);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/DeferredCheckExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/DeferredCheckExpression.java
deleted file mode 100644
index 022a5305c0..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/DeferredCheckExpression.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.ExpressionResultCache;
-import lombok.extern.slf4j.Slf4j;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-
-/**
- * Expression for only executing operation checks and skipping commit checks.
- */
-@Slf4j
-public class DeferredCheckExpression extends ImmediateCheckExpression {
-    /**
-     * Constructor.
-     *
-     * @param check Check
-     * @param resource Persistent resource
-     * @param requestScope Request scope
-     * @param changeSpec Change spec
-     * @param cache Cache
-     */
-    public DeferredCheckExpression(final Check check,
-                                   final PersistentResource resource,
-                                   final RequestScope requestScope,
-                                   final ChangeSpec changeSpec,
-                                   final ExpressionResultCache cache) {
-        super(check, resource, requestScope, changeSpec, cache);
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        if (check instanceof CommitCheck) {
-            result = DEFERRED;
-            log.debug("Deferring check: {}", check);
-            return result;
-        }
-        return super.evaluate();
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/Expression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/Expression.java
deleted file mode 100644
index a961642fe4..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/Expression.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import org.fusesource.jansi.Ansi;
-
-import static org.fusesource.jansi.Ansi.ansi;
-
-/**
- * Interface describing an expression.
- */
-public interface Expression {
-    /**
-     * Evaluate an expression.
-     *
-     * @return The result of the fully evaluated expression.
-     */
-    ExpressionResult evaluate();
-
-    /**
-     * Static Expressions that return PASS or FAIL.
-     */
-    public static class Results {
-        public static final Expression SUCCESS = new Expression() {
-            @Override
-            public ExpressionResult evaluate() {
-                return ExpressionResult.PASS;
-            }
-
-            @Override
-            public String toString() {
-                return ansi().fg(Ansi.Color.GREEN).a("SUCCESS").reset().toString();
-            }
-        };
-        public static final Expression FAILURE = new Expression() {
-            @Override
-            public ExpressionResult evaluate() {
-                return ExpressionResult.FAIL;
-            }
-
-            @Override
-            public String toString() {
-                return ansi().fg(Ansi.Color.RED).a("FAILURE").reset().toString();
-            }
-        };
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/ImmediateCheckExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/ImmediateCheckExpression.java
deleted file mode 100644
index 3634ff9870..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/ImmediateCheckExpression.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.UserCheck;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.ExpressionResultCache;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Optional;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-import static com.yahoo.elide.security.permissions.ExpressionResult.UNEVALUATED;
-
-/**
- * Expression for executing all specified checks.
- */
-@Slf4j
-public class ImmediateCheckExpression implements Expression {
-    protected final Check check;
-    protected final PersistentResource resource;
-    protected final RequestScope requestScope;
-    protected final ExpressionResultCache cache;
-    protected ExpressionResult result;
-
-    private final Optional<ChangeSpec> changeSpec;
-
-    /**
-     * Constructor.
-     *
-     * @param check The check to be evaluated by this expression
-     * @param resource The resource to pass to the check
-     * @param requestScope The requestScope to pass to the check
-     * @param changeSpec The changeSpec to pass to the check
-     * @param cache The cache of previous expression results
-     */
-    public ImmediateCheckExpression(final Check check,
-                                    final PersistentResource resource,
-                                    final RequestScope requestScope,
-                                    final ChangeSpec changeSpec,
-                                    final ExpressionResultCache cache) {
-        this.check = check;
-        this.requestScope = requestScope;
-        this.changeSpec = Optional.ofNullable(changeSpec);
-        this.cache = cache;
-        this.result = UNEVALUATED;
-
-        // UserCheck does not use resource
-        this.resource = (check instanceof UserCheck) ? null : resource;
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        log.trace("Evaluating check: {}", check);
-
-        // If we have a valid change spec, do not cache the result or look for a cached result.
-        if (changeSpec.isPresent()) {
-            log.trace("-- Check has changespec: {}", changeSpec);
-            ExpressionResult result = computeCheck();
-            log.trace("-- Check returned with result: {}", result);
-            return result;
-        }
-
-        // Otherwise, search the cache and use value if found. Otherwise, evaluate and add it to the cache.
-        log.trace("-- Check does NOT have changespec");
-        Class<? extends Check> checkClass = check.getClass();
-
-        final ExpressionResult result;
-        if (cache.hasStoredResultFor(checkClass, resource)) {
-            result = cache.getResultFor(checkClass, resource);
-        } else {
-            result = computeCheck();
-            cache.putResultFor(checkClass, resource, result);
-            log.trace("-- Check computed result: {}", result);
-        }
-
-        log.trace("-- Check returned with result: {}", result);
-
-        return result;
-    }
-
-    /**
-     * Actually compute the result of the check without caching concerns.
-     *
-     * @return Expression result from the check.
-     */
-    private ExpressionResult computeCheck() {
-        Object entity = (resource == null) ? null : resource.getObject();
-        result = check.ok(entity, requestScope, changeSpec) ? PASS : FAIL;
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        EntityDictionary dictionary = ((com.yahoo.elide.core.RequestScope) requestScope).getDictionary();
-        return String.format("(%s %s)", dictionary.getCheckIdentifier(check.getClass()), result);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/NotExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/NotExpression.java
deleted file mode 100644
index 526a0eea9f..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/NotExpression.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-/**
- * Representation of a "not" expression.
- */
-public class NotExpression implements Expression {
-    private final Expression logical;
-
-    /**
-     * Constructor.
-     *
-     * @param logical Unary expression
-     */
-    public NotExpression(final Expression logical) {
-        this.logical = logical;
-    }
-
-
-    @Override
-    public ExpressionResult evaluate() {
-        ExpressionResult result = logical.evaluate();
-
-        if (result == FAIL) {
-            return PASS;
-        }
-
-        if (result == PASS) {
-            return FAIL;
-        }
-
-        return DEFERRED;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("NOT (%s)", logical);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/OrExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/OrExpression.java
deleted file mode 100644
index 5f266e7f62..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/OrExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-/**
- * Representation of an "or" expression.
- */
-public class OrExpression implements Expression {
-    private final Expression left;
-    private final Expression right;
-
-    public static final OrExpression SUCCESSFUL_EXPRESSION = new OrExpression(Results.SUCCESS, null);
-
-    /**
-     * Constructor.
-     *
-     * @param left Left expression
-     * @param right Right expression.
-     */
-    public OrExpression(final Expression left, final Expression right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        ExpressionResult leftResult = left.evaluate();
-
-        // Short-circuit
-        if (leftResult == PASS) {
-            return PASS;
-        }
-
-        ExpressionResult rightResult = (right == null) ? leftResult : right.evaluate();
-
-        if (leftResult == FAIL && rightResult == FAIL) {
-            return leftResult;
-        }
-
-        if (rightResult == PASS) {
-            return PASS;
-        }
-
-        return DEFERRED;
-    }
-
-    @Override
-    public String toString() {
-        if (right == null || right.equals(Results.FAILURE)) {
-            return String.format("%s", left);
-        }
-        return String.format("(%s) OR (%s)", left, right);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SharePermissionExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SharePermissionExpression.java
deleted file mode 100644
index 8a9a348698..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SharePermissionExpression.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.PermissionCondition;
-
-import java.util.Optional;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.FAIL;
-
-/**
- * Determines whether a resource is shareable.
- */
-public class SharePermissionExpression implements Expression {
-    private final Optional<Expression> entityExpression;
-    private final PermissionCondition condition;
-
-    public SharePermissionExpression(final PermissionCondition condition,
-                                     final Expression entityExpression) {
-        this.condition = condition;
-        this.entityExpression = Optional.of(entityExpression);
-    }
-
-    public SharePermissionExpression(final PermissionCondition condition) {
-        this.condition = condition;
-        this.entityExpression = Optional.ofNullable(null);
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        PersistentResource resource = condition.getResource().get();
-        EntityDictionary dictionary = ((com.yahoo.elide.core.PersistentResource) resource).getDictionary();
-
-        if (!dictionary.isShareable(resource.getResourceClass()) || !entityExpression.isPresent()) {
-            return FAIL;
-        }
-
-        return entityExpression.get().evaluate();
-    }
-
-    @Override
-    public String toString() {
-        String entityText = entityExpression.isPresent() ? entityExpression.get().toString() : "NOT MARKED SHAREABLE";
-        return String.format("%s FOR EXPRESSION [SHARE ENTITY(%s)]", condition, entityText);
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SpecificFieldExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SpecificFieldExpression.java
deleted file mode 100644
index b9e4fff219..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/SpecificFieldExpression.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.PermissionCondition;
-import lombok.Getter;
-
-import java.util.Optional;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.PASS;
-
-/**
- * Expression for joining specific fields.
- *
- * That is, this evaluates security while giving precedence to the annotation on a particular field over
- * the annotation at the entity- or package-level.
- */
-public class SpecificFieldExpression implements Expression {
-    private final Expression entityExpression;
-    private final Optional<Expression> fieldExpression;
-    @Getter private final PermissionCondition condition;
-
-    public SpecificFieldExpression(final PermissionCondition condition,
-                                   final Expression entityExpression,
-                                   final Expression fieldExpression) {
-        this.condition = condition;
-        this.entityExpression = entityExpression;
-        this.fieldExpression = Optional.ofNullable(fieldExpression);
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        if (!fieldExpression.isPresent()) {
-            ExpressionResult entityResult = (entityExpression == null) ? PASS : entityExpression.evaluate();
-            return entityResult;
-        } else {
-            ExpressionResult fieldResult = fieldExpression.get().evaluate();
-            return fieldResult;
-        }
-    }
-
-
-    @Override
-    public String toString() {
-        if (entityExpression == null && !fieldExpression.isPresent()) {
-            return String.format("%s FOR EXPRESSION []", condition);
-        }
-
-        if (!fieldExpression.isPresent()) {
-             return String.format(
-                    "%s FOR EXPRESSION [ENTITY(%s)]",
-                    condition,
-                    entityExpression);
-        }
-
-        return String.format(
-                    "%s FOR EXPRESSION [FIELD(%s)]",
-                    condition,
-                    fieldExpression.get());
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/UserCheckOnlyExpression.java b/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/UserCheckOnlyExpression.java
deleted file mode 100644
index 8a33a753f4..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/security/permissions/expressions/UserCheckOnlyExpression.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions.expressions;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.UserCheck;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.ExpressionResultCache;
-
-import static com.yahoo.elide.security.permissions.ExpressionResult.DEFERRED;
-
-/**
- * Special expression that only evaluates UserChecks.
- */
-public class UserCheckOnlyExpression extends ImmediateCheckExpression {
-
-    /**
-     * Constructor.
-     *
-     * @param check Check
-     * @param resource Persistent resource
-     * @param requestScope Request scope
-     * @param changeSpec ChangeSpec
-     * @param cache Cache
-     */
-    public UserCheckOnlyExpression(final Check check,
-                                   final PersistentResource resource,
-                                   final RequestScope requestScope,
-                                   final ChangeSpec changeSpec,
-                                   final ExpressionResultCache cache) {
-        super(check, resource, requestScope, changeSpec, cache);
-    }
-
-    @Override
-    public ExpressionResult evaluate() {
-        if (check instanceof UserCheck) {
-            return super.evaluate();
-        }
-        result = DEFERRED;
-        return result;
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/HeaderUtils.java b/elide-core/src/main/java/com/yahoo/elide/utils/HeaderUtils.java
new file mode 100644
index 0000000000..b30b1f6c6b
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/utils/HeaderUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.utils;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * Utility class which modifies request headers
+ */
+public class HeaderUtils {
+
+    /**
+     * Resolve value of api version from request headers.
+     * @param headers HttpHeaders
+     * @return apiVersion
+     */
+
+     public static String resolveApiVersion(Map<String, List<String>> headers) {
+         String apiVersion = NO_VERSION;
+         if (headers != null && headers.get("ApiVersion") != null) {
+             apiVersion = headers.get("ApiVersion").get(0);
+         }
+         return apiVersion;
+     }
+    /**
+     * Remove Authorization and Proxy Authorization headers from request headers.
+     * @param headers HttpHeaders
+     * @return requestHeaders
+     */
+     public static Map<String, List<String>> lowercaseAndRemoveAuthHeaders(Map<String, List<String>> headers) {
+         // HTTP headers should be treated lowercase, but maybe not all libraries consider this
+         Map<String, List<String>> requestHeaders = headers.entrySet().stream()
+                 .collect(Collectors.toMap(entry -> entry.getKey().toLowerCase(Locale.ENGLISH), Map.Entry::getValue));
+
+         if (requestHeaders.get("authorization") != null) {
+             requestHeaders.remove("authorization");
+         }
+         if (requestHeaders.get("proxy-authorization") != null) {
+             requestHeaders.remove("proxy-authorization");
+         }
+         return requestHeaders;
+     }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/ResourceUtils.java b/elide-core/src/main/java/com/yahoo/elide/utils/ResourceUtils.java
new file mode 100644
index 0000000000..bb52787a4e
--- /dev/null
+++ b/elide-core/src/main/java/com/yahoo/elide/utils/ResourceUtils.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.utils;
+
+import java.net.URI;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * Utility class which is shared by Resources/Controllers.
+ */
+public class ResourceUtils {
+
+    /**
+     * Resolve value of base url from UriInfo.
+     * @param uriInfo UriInfo
+     * @return baseUrl
+     */
+     public static String resolveBaseUrl(UriInfo uriInfo) {
+         URI uri = uriInfo.getBaseUri();
+         StringBuilder str = new StringBuilder(uri.getScheme()).append("://").append(uri.getHost());
+         if (uri.getPort() != -1) {
+             str.append(":" + uri.getPort());
+         }
+         return str.toString();
+     }
+}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/CoerceUtil.java b/elide-core/src/main/java/com/yahoo/elide/utils/coerce/CoerceUtil.java
deleted file mode 100644
index 9d7bb2e8e8..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/CoerceUtil.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils.coerce;
-
-import com.yahoo.elide.core.exceptions.InvalidAttributeException;
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-import com.yahoo.elide.utils.coerce.converters.EpochToDateConverter;
-import com.yahoo.elide.utils.coerce.converters.FromMapConverter;
-import com.yahoo.elide.utils.coerce.converters.ToEnumConverter;
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.ConvertUtilsBean;
-import org.apache.commons.beanutils.Converter;
-import org.apache.commons.lang3.ClassUtils;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * Class for coercing a value to a target class.
- */
-public class CoerceUtil {
-
-    private static final ToEnumConverter TO_ENUM_CONVERTER = new ToEnumConverter();
-    private static final FromMapConverter FROM_MAP_CONVERTER = new FromMapConverter();
-    private static final EpochToDateConverter EPOCH_TO_DATE_CONVERTER = new EpochToDateConverter();
-
-    //static block for setup and registering new converters
-    static {
-        setup();
-    }
-
-    /**
-     * Convert value to target class.
-     *
-     * @param value value to convert
-     * @param cls class to convert to
-     * @return coerced value
-     */
-    public static <T> T coerce(Object value, Class<T> cls) {
-        if (value == null || cls == null || cls.isAssignableFrom(value.getClass())) {
-            return (T) value;
-        }
-
-        try {
-            return (T) ConvertUtils.convert(value, cls);
-        } catch (ConversionException | InvalidAttributeException | IllegalArgumentException e) {
-            throw new InvalidValueException(value, e.getMessage());
-        }
-    }
-
-    /**
-     * Perform CoerceUtil setup.
-     */
-    private static void setup() {
-        BeanUtilsBean.setInstance(new BeanUtilsBean(new ConvertUtilsBean() {
-            {
-                // https://github.com/yahoo/elide/issues/260
-                // enable throwing exceptions when conversion fails
-                register(true, false, 0);
-            }
-
-            @Override
-            /*
-             * Overriding lookup to execute enum converter if target is enum
-             * or map convert if source is map
-             */
-            public Converter lookup(Class<?> sourceType, Class<?> targetType) {
-                if (targetType.isEnum()) {
-                    return TO_ENUM_CONVERTER;
-                } else if (Map.class.isAssignableFrom(sourceType)) {
-                    return FROM_MAP_CONVERTER;
-                } else if ((String.class.isAssignableFrom(sourceType) || Long.class.isAssignableFrom(sourceType))
-                        && ClassUtils.isAssignable(targetType, Date.class)) {
-                    return EPOCH_TO_DATE_CONVERTER;
-                } else {
-                    return super.lookup(sourceType, targetType);
-                }
-            }
-        }));
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/EpochToDateConverter.java b/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/EpochToDateConverter.java
deleted file mode 100644
index 2aa777d9c8..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/EpochToDateConverter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils.coerce.converters;
-
-import com.yahoo.elide.core.exceptions.InvalidAttributeException;
-
-import org.apache.commons.beanutils.Converter;
-import org.apache.commons.lang3.ClassUtils;
-
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Date;
-
-/**
- * Convert epoch(in string or long) to Date
- */
-public class EpochToDateConverter implements Converter {
-
-    @Override
-    public <T> T convert(Class<T> cls, Object value) {
-        try {
-            if (ClassUtils.isAssignable(value.getClass(), String.class)) {
-                return stringToDate(cls, (String) value);
-            } else if (ClassUtils.isAssignable(value.getClass(), Long.class, true)) {
-                return longToDate(cls, (Long) value);
-            } else {
-                throw new UnsupportedOperationException(value.getClass().getSimpleName() + " is not a valid epoch");
-            }
-        } catch (IndexOutOfBoundsException | ReflectiveOperationException
-                | UnsupportedOperationException | IllegalArgumentException e) {
-            throw new InvalidAttributeException("Unknown " + cls.getSimpleName() + " value " + value, e);
-        }
-    }
-
-    private static <T> T longToDate(Class<T> cls, Long epoch) throws ReflectiveOperationException {
-        if (ClassUtils.isAssignable(cls, java.sql.Date.class)) {
-            return (T) new java.sql.Date(epoch);
-        } else if (ClassUtils.isAssignable(cls, Timestamp.class)) {
-            return (T) new Timestamp(epoch);
-        } else if (ClassUtils.isAssignable(cls, Time.class)) {
-            return (T) new Time(epoch);
-        } else if (ClassUtils.isAssignable(cls, Date.class)) {
-            return (T) new Date(epoch);
-        } else {
-            throw new UnsupportedOperationException("Cannot convert to " + cls.getSimpleName());
-        }
-    }
-
-    private static <T> T stringToDate(Class<T> cls, String epoch) throws ReflectiveOperationException {
-        return longToDate(cls, Long.parseLong(epoch));
-    }
-}
diff --git a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/FromMapConverter.java b/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/FromMapConverter.java
deleted file mode 100644
index 4df99041e9..0000000000
--- a/elide-core/src/main/java/com/yahoo/elide/utils/coerce/converters/FromMapConverter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils.coerce.converters;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.beanutils.Converter;
-
-/**
- * Uses Jackson to Convert from Map to target object.
- */
-public class FromMapConverter implements Converter {
-    /**
-     * Convert value to Enum.
-     *
-     * @param cls class to convert to
-     * @param value value to convert
-     * @param <T> object type
-     * @return converted object
-     */
-    @Override
-    public <T> T convert(Class<T> cls, Object value) {
-        ObjectMapper mapper = new ObjectMapper();
-        return mapper.convertValue(value, cls);
-    }
-}
diff --git a/elide-core/src/test/groovy/com/yahoo/elide/core/filter/PredicateTest.groovy b/elide-core/src/test/groovy/com/yahoo/elide/core/filter/PredicateTest.groovy
deleted file mode 100644
index 3081415750..0000000000
--- a/elide-core/src/test/groovy/com/yahoo/elide/core/filter/PredicateTest.groovy
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter
-import com.yahoo.elide.core.EntityDictionary
-import com.yahoo.elide.core.exceptions.InvalidPredicateException
-import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor
-import com.yahoo.elide.core.filter.dialect.DefaultFilterDialect
-import com.yahoo.elide.core.filter.dialect.ParseException
-import example.Author
-import example.Book
-import org.testng.Assert
-import org.testng.annotations.BeforeSuite
-import org.testng.annotations.Test
-
-import javax.ws.rs.core.MultivaluedHashMap
-import javax.ws.rs.core.MultivaluedMap
-
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
-/**
- * Predicate test class.
- */
-public class PredicateTest {
-    private DefaultFilterDialect strategy
-
-    @BeforeSuite
-    public void setup() {
-        EntityDictionary entityDictionary = mock(EntityDictionary.class)
-        when(entityDictionary.getJsonAliasFor(String.class)).thenReturn("string")
-        when(entityDictionary.getJsonAliasFor(Book.class)).thenReturn("type1")
-        when(entityDictionary.getJsonAliasFor(Author.class)).thenReturn("type2")
-        when(entityDictionary.getEntityClass("type1")).thenReturn(Book.class)
-        when(entityDictionary.getEntityClass("type2")).thenReturn(Author.class)
-        when(entityDictionary.getParameterizedType(Book.class, "field1")).thenReturn(String.class)
-        when(entityDictionary.getParameterizedType(Book.class, "field2")).thenReturn(String.class)
-        when(entityDictionary.getParameterizedType(Book.class, "intField")).thenReturn(Integer.class)
-        strategy = new DefaultFilterDialect(entityDictionary);
-    }
-
-    private Map<String, Set<Predicate>> parse(MultivaluedMap<String, String> queryParams) {
-        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-
-        def expressionMap;
-        try {
-            expressionMap = strategy.parseTypedExpression("/type1", queryParams);
-        } catch (ParseException e) {
-            throw new InvalidPredicateException(e.getMessage());
-        }
-
-        def returnMap = new HashMap<String, Set<Predicate>>();
-        for (entry in expressionMap) {
-            def typeName = entry.key;
-            def expression = entry.value;
-            if (!returnMap.containsKey(typeName)) {
-                returnMap[typeName] = new HashSet<Predicate>();
-            }
-            returnMap[typeName].addAll(expression.accept(visitor));
-        }
-        return returnMap;
-    }
-
-    @Test
-    public void testSingleFieldSingleValue() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1]", "abc")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.IN)
-        Assert.assertEquals(predicate.getValues(), ["abc"])
-    }
-
-    @Test
-    public void testSingleFieldMultipleValues() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1]", "abc,def")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.IN)
-        Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-    }
-
-    @Test
-    public void testMultipleFieldMultipleValues() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1]", "abc,def")
-        queryParams.add("filter[type1.field2]", "def,jkl")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        for (Predicate predicate : predicates.get("type1")) {
-            switch (predicate.getField()) {
-                case "field1":
-                    Assert.assertEquals(predicate.getOperator(), Operator.IN)
-                    Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-                    break
-                case "field2":
-                    Assert.assertEquals(predicate.getOperator(), Operator.IN)
-                    Assert.assertEquals(predicate.getValues(), ["def", "jkl"])
-                    break
-                default:
-                    Assert.fail(predicate.toString() + " case not covered")
-            }
-        }
-    }
-
-    @Test
-    public void testSingleFieldWithInOperator() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1][in]", "abc,def")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.IN)
-        Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-    }
-
-    @Test
-    public void testSingleFieldWithNotOperator() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1][not]", "abc,def")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.NOT)
-        Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-    }
-
-    @Test
-    public void testSingleFieldWithPrefixOperator() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1][prefix]", "abc")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.PREFIX)
-        Assert.assertEquals(predicate.getValues(), ["abc"])
-    }
-
-    @Test
-    public void testSingleFieldWithPostfixOperator() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1][postfix]", "abc,def")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.POSTFIX)
-        Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-    }
-
-    @Test
-    public void testSingleFieldWithInfixOperator() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.field1][infix]", "abc,def")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "field1")
-        Assert.assertEquals(predicate.getOperator(), Operator.INFIX)
-        Assert.assertEquals(predicate.getValues(), ["abc", "def"])
-    }
-
-    @Test(expectedExceptions = [InvalidPredicateException])
-    public void testMissingType() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[field1]", "abc,def")
-
-        def predicates = parse(queryParams)
-    }
-
-    @Test
-    public void testIntegerFieldType() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.intField]", "1")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "intField")
-        Assert.assertEquals(predicate.getOperator(), Operator.IN)
-        Assert.assertEquals(predicate.getValues(), [1])
-    }
-
-    @Test
-    public void testMultipleIntegerFieldType() {
-        def queryParams = new MultivaluedHashMap<>()
-        queryParams.add("filter[type1.intField]", "1,2,3")
-
-        def predicates = parse(queryParams)
-        Assert.assertTrue(predicates.containsKey("type1"))
-
-        def predicate = predicates.get("type1").iterator().next()
-        Assert.assertEquals(predicate.getField(), "intField")
-        Assert.assertEquals(predicate.getOperator(), Operator.IN)
-        Assert.assertEquals(predicate.getValues(), [1, 2, 3])
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/ElideSettingsBuilderTest.java b/elide-core/src/test/java/com/yahoo/elide/ElideSettingsBuilderTest.java
new file mode 100644
index 0000000000..3d20b7667d
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/ElideSettingsBuilderTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.utils.coerce.converters.InstantSerde;
+import com.yahoo.elide.core.utils.coerce.converters.OffsetDateTimeSerde;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.core.utils.coerce.converters.TimeZoneSerde;
+import com.yahoo.elide.core.utils.coerce.converters.URLSerde;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+
+import java.net.URL;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.util.Map;
+import java.util.TimeZone;
+
+
+class ElideSettingsBuilderTest {
+
+    private ElideSettingsBuilder testInstance;
+
+    @Mock
+    private DataStore dataStore;
+
+    @BeforeEach
+    public void setUp() {
+        testInstance = new ElideSettingsBuilder(dataStore).withEntityDictionary(EntityDictionary.builder().build());
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void shouldBuildSettingsWithDefaultSerdes() {
+        Map<Class, Serde> serdes = testInstance.build().getSerdes();
+
+        assertEquals(InstantSerde.class, serdes.get(Instant.class).getClass());
+        assertEquals(OffsetDateTimeSerde.class, serdes.get(OffsetDateTime.class).getClass());
+        assertEquals(TimeZoneSerde.class, serdes.get(TimeZone.class).getClass());
+        assertEquals(URLSerde.class, serdes.get(URL.class).getClass());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/audit/LogMessageTest.java b/elide-core/src/test/java/com/yahoo/elide/audit/LogMessageTest.java
deleted file mode 100644
index 07f58b6c0c..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/audit/LogMessageTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.audit;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-
-import com.google.common.collect.Sets;
-import example.Child;
-import example.Parent;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Optional;
-import java.util.Random;
-
-public class LogMessageTest {
-    private transient PersistentResource<Child> childRecord;
-    private transient PersistentResource<Child> friendRecord;
-
-    @BeforeTest
-    public void setup() {
-        final EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
-        dictionary.bindEntity(Child.class);
-        dictionary.bindEntity(Parent.class);
-
-        final Child child = new Child();
-        child.setId(5);
-
-        final Parent parent = new Parent();
-        parent.setId(7);
-
-        final Child friend = new Child();
-        friend.setId(9);
-        child.setFriends(Sets.newHashSet(friend));
-
-        final RequestScope requestScope = new RequestScope(
-                null, null, null, null, dictionary, null, new TestAuditLogger());
-
-        final PersistentResource<Parent> parentRecord = new PersistentResource<>(parent, requestScope);
-        childRecord = new PersistentResource<>(parentRecord, child, requestScope);
-        friendRecord = new PersistentResource<>(childRecord, friend, requestScope);
-    }
-
-    @Test
-    public void verifyObjectExpressions() {
-        final String[] expressions = { "${child.id}", "${parent.getId()}" };
-        final LogMessage message = new LogMessage("{0} {1}", childRecord, expressions, 1, Optional.empty());
-        Assert.assertEquals("5 7", message.getMessage(), "JEXL substitution evaluates correctly.");
-        Assert.assertEquals(message.getChangeSpec(), Optional.empty());
-    }
-
-    @Test
-    public void verifyListExpressions() {
-        final String[] expressions = { "${child[0].id}", "${child[1].id}", "${parent.getId()}" };
-        final String[] expressionForDefault = { "${child.id}" };
-        final LogMessage message = new LogMessage("{0} {1} {2}", friendRecord, expressions, 1, Optional.empty());
-        final LogMessage defaultMessage = new LogMessage("{0}", friendRecord, expressionForDefault, 1, Optional.empty());
-        Assert.assertEquals(message.getMessage(), "5 9 7", "JEXL substitution evaluates correctly.");
-        Assert.assertEquals(defaultMessage.getMessage(), "9", "JEXL substitution evaluates correctly.");
-        Assert.assertEquals(message.getChangeSpec(), Optional.empty());
-    }
-
-
-    @Test(expectedExceptions = InvalidSyntaxException.class)
-    public void invalidExpression() {
-        final String[] expressions = { "${child.id}, ${%%%}" };
-        new LogMessage("{0} {1}", childRecord, expressions, 1, Optional.empty()).getMessage();
-    }
-
-    @Test(expectedExceptions = InvalidSyntaxException.class)
-    public void invalidTemplate() {
-        final String[] expressions = { "${child.id}" };
-        new LogMessage("{}", childRecord, expressions, 1, Optional.empty()).getMessage();
-    }
-
-    public static class TestLoggerException extends RuntimeException {
-    }
-
-    private AuditLogger testAuditLogger = new Slf4jLogger();
-
-    @Test(threadPoolSize = 10, invocationCount = 10)
-    public void threadSafeLogger() throws IOException, InterruptedException {
-        TestLoggerException testException = new TestLoggerException();
-        LogMessage failMessage = new LogMessage("test", 0) {
-            @Override
-            public String getMessage() {
-                throw testException;
-            }
-        };
-        try {
-            testAuditLogger.log(failMessage);
-            Thread.sleep(Math.floorMod(new Random().nextInt(), 100));
-            testAuditLogger.commit();
-            Assert.fail("Exception expected");
-        } catch (TestLoggerException e) {
-            Assert.assertSame(e, testException);
-        }
-
-        // should not cause another exception
-        try {
-            testAuditLogger.commit();
-        } catch (TestLoggerException e) {
-            Assert.fail("Exception not cleared from previous logger commit");
-        }
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java b/elide-core/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java
deleted file mode 100644
index 4859ac54e7..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.audit;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestAuditLogger extends AuditLogger {
-    @Override
-    public void commit() throws IOException {
-    }
-
-    public List<LogMessage> getMessages() {
-        return new ArrayList<>(this.messages.get());
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/EntityDictionaryTest.java b/elide-core/src/test/java/com/yahoo/elide/core/EntityDictionaryTest.java
deleted file mode 100644
index bbe171d269..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/EntityDictionaryTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.Child;
-import example.FieldAnnotations;
-import example.FunWithPermissions;
-import example.Left;
-import example.Parent;
-import example.Right;
-import example.StringId;
-import example.User;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class EntityDictionaryTest extends EntityDictionary {
-
-    //Test class to validate inheritance logic
-    private class Friend extends Child { }
-
-    public EntityDictionaryTest() {
-        super(Collections.EMPTY_MAP);
-    }
-
-    @BeforeTest
-    public void init() {
-        this.bindEntity(FunWithPermissions.class);
-        this.bindEntity(Parent.class);
-        this.bindEntity(Child.class);
-        this.bindEntity(User.class);
-        this.bindEntity(Left.class);
-        this.bindEntity(Right.class);
-        this.bindEntity(StringId.class);
-        this.bindEntity(Friend.class);
-        this.bindEntity(FieldAnnotations.class);
-
-        checkNames.forcePut("user has all access", Role.ALL.class);
-    }
-
-    @Test
-    public void testFindCheckByExpression() {
-        Assert.assertEquals(getCheckIdentifier(Role.ALL.class), "user has all access");
-        Assert.assertEquals(getCheckIdentifier(Role.NONE.class), "Prefab.Role.None");
-    }
-
-    @Test
-    public void testGetAttributeOrRelationAnnotation() {
-        String[] fields = {"field1", "field2", "field3", "relation1", "relation2"};
-        Annotation annotation;
-        for (String field : fields) {
-            annotation = this.getAttributeOrRelationAnnotation(FunWithPermissions.class, ReadPermission.class, field);
-            Assert.assertTrue(annotation instanceof ReadPermission, "Every field should return a ReadPermission annotation");
-        }
-    }
-
-    @Test
-    public void testGetParameterizedType() {
-        Class<?> type;
-
-        FunWithPermissions fun = new FunWithPermissions();
-
-        type = getParameterizedType(fun, "relation2");
-        Assert.assertEquals(type, Child.class, "A set of Child objects should return Child.class");
-
-        type = getParameterizedType(fun, "relation3");
-        Assert.assertEquals(type, Child.class, "A Child object should return Child.class");
-    }
-
-    @Test
-    public void testGetInverseRelationshipOwningSide()  {
-        Assert.assertEquals(getRelationInverse(Parent.class, "children"), "parents",
-                "The inverse relationship of children should be parents");
-    }
-
-    @Test
-    public void testGetInverseRelationshipOwnedSide()  {
-        Assert.assertEquals(getRelationInverse(Child.class, "parents"), "children",
-                "The inverse relationship of children should be parents");
-    }
-
-    @Test
-    public void testComputedAttributeIsExposed() {
-        List<String> attributes = getAttributes(User.class);
-        Assert.assertTrue(attributes.contains("password"));
-    }
-
-    @Test
-    public void testExcludedAttributeIsNotExposed() {
-        List<String> attributes = getAttributes(User.class);
-        Assert.assertFalse(attributes.contains("reversedPassword"));
-    }
-
-
-    @Test
-    public void testGetIdAnnotations() throws Exception {
-
-        Collection<Class> expectedAnnotationClasses = Arrays.asList(new Class[]{Id.class, GeneratedValue.class});
-        Collection<Class> actualAnnotationsClasses  = getIdAnnotations(new Parent()).stream()
-            .map(Annotation::annotationType)
-        .collect(Collectors.toList());
-
-        Assert.assertEquals(actualAnnotationsClasses, expectedAnnotationClasses,
-                "getIdAnnotations returns annotations on the ID field of the given class");
-    }
-
-    @Test
-    public void testGetIdAnnotationsNoId() throws Exception {
-
-        Collection<Annotation> expectedAnnotation = Collections.emptyList();
-        Collection<Annotation> actualAnnotations  = getIdAnnotations(new NoId());
-
-        Assert.assertEquals(actualAnnotations, expectedAnnotation,
-                "getIdAnnotations returns an empty collection if there is no ID field for given class");
-    }
-
-    @Entity
-    class NoId {
-
-    }
-
-    @Test
-    public void testGetIdAnnotationsSubClass() throws Exception {
-
-        Collection<Class> expectedAnnotationClasses = Arrays.asList(new Class[]{Id.class, GeneratedValue.class});
-        Collection<Class> actualAnnotationsClasses  = getIdAnnotations(new Friend()).stream()
-                .map(Annotation::annotationType)
-        .collect(Collectors.toList());
-
-        Assert.assertEquals(actualAnnotationsClasses, expectedAnnotationClasses,
-                "getIdAnnotations returns annotations on the ID field when defined in a super class");
-    }
-
-    @Test
-    public void testIsSharableTrue() throws Exception {
-        Assert.assertTrue(isShareable(Right.class));
-    }
-
-    @Test
-    public void testIsSharableFalse() throws Exception {
-        Assert.assertFalse(isShareable(Left.class));
-    }
-
-    @Test
-    public void testGetIdType() throws Exception {
-
-        Assert.assertEquals(getIdType(Parent.class), long.class,
-                "getIdType returns the type of the ID field of the given class");
-
-        Assert.assertEquals(getIdType(StringId.class), String.class,
-                "getIdType returns the type of the ID field of the given class");
-
-        Assert.assertEquals(getIdType(NoId.class), null,
-                "getIdType returns null if ID field is missing");
-
-        Assert.assertEquals(getIdType(Friend.class), long.class,
-                "getIdType returns the type of the ID field when defined in a super class");
-    }
-
-    @Test
-    public void testGetType() throws Exception {
-
-        Assert.assertEquals(getType(FieldAnnotations.class, "id"), Long.class,
-            "getType returns the type of the ID field of the given class");
-
-        Assert.assertEquals(getType(FieldAnnotations.class, "publicField"), long.class,
-            "getType returns the type of attribute when Column annotation is on a field");
-
-        Assert.assertEquals(getType(FieldAnnotations.class, "privateField"), Boolean.class,
-            "getType returns the type of attribute when Column annotation is on a getter");
-
-        Assert.assertEquals(getType(FieldAnnotations.class, "missingField"), null,
-            "getId returns null if attribute is missing");
-
-        Assert.assertEquals(getType(Parent.class, "children"), Set.class,
-            "getType returns the type of relationship fields");
-
-        Assert.assertEquals(getType(Friend.class, "name"), String.class,
-                "getType returns the type of attribute when defined in a super class");
-    }
-
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testGetTypUnknownEntityException() {
-        getType(Object.class, "id");
-    }
-
-    @Test
-    public void testNoExcludedFieldsReturned() {
-        List<String> attrs = getAttributes(Child.class);
-        List<String> rels = getRelationships(Child.class);
-        Assert.assertTrue(!attrs.contains("excludedEntity") && !attrs.contains("excludedRelationship")
-            && !attrs.contains("excludedEntityList"));
-        Assert.assertTrue(!rels.contains("excludedEntity") && !rels.contains("excludedRelationship")
-            && !rels.contains("excludedEntityList"));
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/LifeCycleTest.java b/elide-core/src/test/java/com/yahoo/elide/core/LifeCycleTest.java
deleted file mode 100644
index 43e853398b..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/LifeCycleTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.Check;
-import example.Author;
-import example.Book;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests the invocation & sequencing of DataStoreTransaction method invocations and life cycle events.
- */
-public class LifeCycleTest {
-    public class TestEntityDictionary extends EntityDictionary {
-        public TestEntityDictionary(Map<String, Class<? extends Check>> checks) {
-            super(checks);
-        }
-
-        @Override
-        public Class<?> lookupEntityClass(Class<?> objClass) {
-            // Special handling for mocked Book class which has Entity annotation
-            if (objClass.getName().contains("$MockitoMock$")) {
-                objClass = objClass.getSuperclass();
-            }
-            return super.lookupEntityClass(objClass);
-        }
-    }
-
-    private static final AuditLogger MOCK_AUDIT_LOGGER = mock(AuditLogger.class);
-    private EntityDictionary dictionary;
-
-    LifeCycleTest() {
-        dictionary = new TestEntityDictionary(new HashMap<>());
-        dictionary.bindEntity(Book.class);
-        dictionary.bindEntity(Author.class);
-    }
-
-    @Test
-    public void testElideCreate() throws Exception {
-        DataStore store = mock(DataStore.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        Book book = mock(Book.class);
-
-        Elide.Builder builder = new Elide.Builder(store);
-        builder.withAuditLogger(MOCK_AUDIT_LOGGER);
-        builder.withEntityDictionary(dictionary);
-        Elide elide = builder.build();
-
-        String bookBody = "{\"data\": {\"type\":\"book\",\"attributes\": {\"title\":\"Grapes of Wrath\"}}}";
-
-        when(store.beginTransaction()).thenReturn(tx);
-        when(tx.createObject(Book.class)).thenReturn(book);
-
-        elide.post("/book", bookBody, null);
-        verify(tx).accessUser(null);
-        verify(tx).preCommit();
-
-        verify(tx, times(1)).save(book);
-        verify(tx).flush();
-        verify(tx).commit();
-        verify(tx).close();
-    }
-
-    @Test
-    public void testElideGet() throws Exception {
-        DataStore store = mock(DataStore.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        Book book = mock(Book.class);
-
-        Elide.Builder builder = new Elide.Builder(store);
-        builder.withAuditLogger(MOCK_AUDIT_LOGGER);
-        builder.withEntityDictionary(dictionary);
-        Elide elide = builder.build();
-
-        when(store.beginReadTransaction()).thenReturn(tx);
-        when(tx.loadObject(eq(Book.class), eq(1L), anyObject())).thenReturn(book);
-
-        MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
-        elide.get("/book/1", headers, null);
-        verify(tx).accessUser(null);
-        verify(tx).preCommit();
-        verify(tx).flush();
-        verify(tx).commit();
-        verify(tx).close();
-    }
-
-    @Test
-    public void testElidePatch() throws Exception {
-        DataStore store = mock(DataStore.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        Book book = mock(Book.class);
-
-        Elide.Builder builder = new Elide.Builder(store);
-        builder.withAuditLogger(MOCK_AUDIT_LOGGER);
-        builder.withEntityDictionary(dictionary);
-        Elide elide = builder.build();
-
-        when(book.getId()).thenReturn(new Long(1));
-        when(store.beginTransaction()).thenReturn(tx);
-        when(tx.loadObject(eq(Book.class), eq(1L), anyObject())).thenReturn(book);
-
-        String bookBody = "{\"data\":{\"type\":\"book\",\"id\":1,\"attributes\": {\"title\":\"Grapes of Wrath\"}}}";
-
-        String contentType = "application/vnd.api+json";
-        elide.patch(contentType, contentType, "/book/1", bookBody, null);
-        verify(tx).accessUser(null);
-        verify(tx).preCommit();
-
-        verify(tx).save(book);
-        verify(tx).flush();
-        verify(tx).commit();
-        verify(tx).close();
-    }
-
-    @Test
-    public void testElideDelete() throws Exception {
-        DataStore store = mock(DataStore.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        Book book = mock(Book.class);
-
-        Elide.Builder builder = new Elide.Builder(store);
-        builder.withAuditLogger(MOCK_AUDIT_LOGGER);
-        builder.withEntityDictionary(dictionary);
-        Elide elide = builder.build();
-
-        when(book.getId()).thenReturn(new Long(1));
-        when(store.beginTransaction()).thenReturn(tx);
-        when(tx.loadObject(eq(Book.class), eq(1L), anyObject())).thenReturn(book);
-
-        elide.delete("/book/1", "", null);
-        verify(tx).accessUser(null);
-        verify(tx).preCommit();
-
-        verify(tx).delete(book);
-        verify(tx).flush();
-        verify(tx).commit();
-        verify(tx).close();
-    }
-
-    @Test
-    public void testOnCreate() {
-        Book book = mock(Book.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.createObject(Book.class)).thenReturn(book);
-        RequestScope scope = new RequestScope(null, null, tx, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource resource = PersistentResource.createObject(Book.class, scope, "uuid");
-        Assert.assertNotNull(resource);
-        verify(book, times(1)).onCreateBook();
-        verify(book, times(0)).onDeleteBook();
-        verify(book, times(0)).onCommitBook();
-        verify(book, times(0)).onUpdateTitle();
-        verify(book, times(0)).onCommitTitle();
-    }
-
-    @Test
-    public void createObjectOnCommit() {
-        Book book = mock(Book.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.createObject(Book.class)).thenReturn(book);
-        RequestScope scope = new RequestScope(null, null, tx, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource resource = PersistentResource.createObject(Book.class, scope, "uuid");
-        scope.runCommitTriggers();
-        Assert.assertNotNull(resource);
-        verify(book, times(1)).onCreateBook();
-        verify(book, times(0)).onDeleteBook();
-        verify(book, times(1)).onCommitBook();
-        verify(book, times(0)).onUpdateTitle();
-        verify(book, times(0)).onCommitTitle();
-    }
-
-    @Test
-    public void loadRecordOnCommit() {
-        Book book = mock(Book.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.loadObject(eq(Book.class), eq(1L), anyObject())).thenReturn(book);
-        RequestScope scope = new RequestScope(null, null, tx, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource resource = PersistentResource.loadRecord(Book.class, "1", scope);
-        scope.runCommitTriggers();
-        Assert.assertNotNull(resource);
-        verify(book, times(0)).onCreateBook();
-        verify(book, times(0)).onDeleteBook();
-        verify(book, times(1)).onCommitBook();
-        verify(book, times(0)).onUpdateTitle();
-        verify(book, times(0)).onCommitTitle();
-    }
-
-    @Test
-    public void loadRecordsOnCommit() {
-        Book book = mock(Book.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.loadObjects(eq(Book.class), isA(FilterScope.class))).thenReturn(Arrays.asList(book));
-        RequestScope scope = new RequestScope(null, null, tx, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        Set<PersistentResource<Book>> resources = PersistentResource.loadRecords(Book.class, scope);
-        scope.runCommitTriggers();
-        Assert.assertEquals(resources.size(), 1);
-        verify(book, times(0)).onCreateBook();
-        verify(book, times(0)).onDeleteBook();
-        verify(book, times(1)).onCommitBook();
-        verify(book, times(0)).onUpdateTitle();
-        verify(book, times(0)).onCommitTitle();
-    }
-
-    @Test
-    public void testOnUpdate() {
-        Book book = mock(Book.class);
-        RequestScope scope = new RequestScope(null, null, null, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource resource = new PersistentResource(book, scope);
-        resource.setValue("title", "new title");
-        scope.runCommitTriggers();
-        verify(book, times(0)).onCreateBook();
-        verify(book, times(0)).onDeleteBook();
-        verify(book, times(0)).onCommitBook();
-        verify(book, times(1)).onUpdateTitle();
-        verify(book, times(1)).onCommitTitle();
-    }
-
-    @Test
-    public void testOnDelete() {
-        Book book = mock(Book.class);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        RequestScope scope = new RequestScope(null, null, tx, new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource resource = new PersistentResource(book, scope);
-        resource.deleteResource();
-        verify(book, times(0)).onCreateBook();
-        verify(book, times(1)).onDeleteBook();
-        verify(book, times(0)).onCommitBook();
-        verify(book, times(0)).onCommitTitle();
-        verify(book, times(0)).onUpdateTitle();
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PaginationLogicTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PaginationLogicTest.java
deleted file mode 100644
index 50815787fb..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/PaginationLogicTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-import com.yahoo.elide.core.pagination.Pagination;
-import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MultivaluedMap;
-
-/**
- * Tests parsing the page params for json-api pagination.
- */
-public class PaginationLogicTest {
-
-    @Test
-    public void shouldParseQueryParamsForCurrentPageAndPageSize() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "10");
-        queryParams.add("page[number]", "2");
-
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        // page based strategy uses human readable paging - non-zero index
-        // page 2 becomes (1)*10 so 10 since we shift to zero based index
-        Assert.assertEquals(pageData.getOffset(), 10);
-        Assert.assertEquals(pageData.getLimit(), 10);
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void shouldThrowExceptionForNegativePageNumber() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "10");
-        queryParams.add("page[number]", "-2");
-
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void shouldThrowExceptionForNegativePageSize() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "-10");
-        queryParams.add("page[number]", "2");
-        Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test
-    public void shouldParseQueryParamsForOffsetAndLimit() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[limit]", "10");
-        queryParams.add("page[offset]", "2");
-
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        // offset is direct correlation to start field in query
-        Assert.assertEquals(pageData.getOffset(), 2);
-        Assert.assertEquals(pageData.getLimit(), 10);
-    }
-
-    @Test
-    public void shouldUseDefaultsWhenMissingCurrentPageAndPageSize() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        Assert.assertEquals(pageData.getOffset(), Pagination.DEFAULT_OFFSET);
-        Assert.assertEquals(pageData.getLimit(), Pagination.DEFAULT_PAGE_LIMIT);
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void neverExceedMaxPageSize() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "25000");
-        Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void invalidUsageOfPaginationParameters() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "10");
-        queryParams.add("page[offset]", "100");
-        Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test
-    public void pageBasedPaginationWithDefaultSize() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[number]", "2");
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        Assert.assertEquals(pageData.getLimit(), Pagination.DEFAULT_PAGE_LIMIT);
-        Assert.assertEquals(pageData.getOffset(), Pagination.DEFAULT_PAGE_LIMIT);
-    }
-
-    @Test (expectedExceptions = InvalidValueException.class)
-    public void shouldThrowExceptionForNonIntPageParamValues() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[size]", "2.5");
-        Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test (expectedExceptions = InvalidValueException.class)
-    public void shouldThrowExceptionForInvalidPageParams() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[random]", "1");
-        Pagination.parseQueryParams(queryParams);
-    }
-
-    @Test
-    public void shouldSetGenerateTotals() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        queryParams.add("page[totals]", null);
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        Assert.assertTrue(pageData.isGenerateTotals());
-    }
-
-    @Test
-    public void shouldNotSetGenerateTotals() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        Assert.assertFalse(pageData.isGenerateTotals());
-    }
-
-
-    @Test
-    public void shouldUseDefaultsWhenNoParams() {
-        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
-
-        Pagination pageData = Pagination.parseQueryParams(queryParams);
-        Assert.assertEquals(pageData.getOffset(), 0);
-        Assert.assertEquals(pageData.getLimit(), Pagination.DEFAULT_PAGE_LIMIT);
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PathTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PathTest.java
new file mode 100644
index 0000000000..a85252ac35
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/PathTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import example.Book;
+import example.Editor;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+public class PathTest {
+
+    @Test
+    public void testIsComputed() {
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Editor.class);
+
+        Path computedRelationshipPath = new Path(List.of(
+                new Path.PathElement(Book.class, Editor.class, "editor"),
+                new Path.PathElement(Editor.class, String.class, "firstName")
+        ));
+
+        Path computedAttributePath = new Path(List.of(
+                new Path.PathElement(Editor.class, String.class, "fullName")
+        ));
+
+        Path attributePath = new Path(List.of(
+                new Path.PathElement(Book.class, String.class, "title")
+        ));
+
+        assertTrue(computedRelationshipPath.isComputed(dictionary));
+        assertTrue(computedAttributePath.isComputed(dictionary));
+        assertFalse(attributePath.isComputed(dictionary));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PermissionAnnotationTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PermissionAnnotationTest.java
deleted file mode 100644
index fbdf35b3d9..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/PermissionAnnotationTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.security.PermissionExecutor;
-import com.yahoo.elide.security.User;
-
-import com.yahoo.elide.security.executors.ActivePermissionExecutor;
-import example.FunWithPermissions;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.util.HashMap;
-
-/**
- * Tests audit functions inside RecordDao.
- */
-public class PermissionAnnotationTest {
-    private PersistentResource<FunWithPermissions> funRecord;
-    private final User goodUser;
-    private PersistentResource<FunWithPermissions> badRecord;
-    private final User badUser;
-    private final EntityDictionary dictionary;
-
-    public PermissionAnnotationTest() {
-        goodUser = new User(3);
-        badUser = new User(-1);
-        dictionary = new EntityDictionary(new HashMap<>());
-    }
-
-    @BeforeTest
-    public void setup() {
-        dictionary.bindEntity(FunWithPermissions.class);
-
-        FunWithPermissions fun = new FunWithPermissions();
-        fun.setId(1);
-
-        AuditLogger testLogger = new TestAuditLogger();
-        funRecord = new PersistentResource<>(fun,
-                new RequestScope(null, null, null, goodUser, dictionary, null, testLogger));
-        badRecord = new PersistentResource<>(fun,
-                new RequestScope(null, null, null, badUser, dictionary, null, testLogger));
-    }
-
-    @Test
-    public void testClassAnyOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(funRecord.getRequestScope());
-        permissionExecutor.checkPermission(ReadPermission.class, funRecord);
-        permissionExecutor.checkPermission(UpdatePermission.class, funRecord);
-        permissionExecutor.checkPermission(CreatePermission.class, funRecord);
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testClassAllNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkPermission(DeletePermission.class, funRecord);
-    }
-
-    @Test
-    public void testFieldPermissionOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(funRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "field3");
-        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "relation1");
-        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "relation2");
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testField3PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field3");
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testRelation1PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "relation1");
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testRelation2PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "relation2");
-    }
-
-    /**
-     * Verifies ANY where the first fails but the last succeeds.
-     */
-    @Test()
-    public void testField5PermissionOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field5");
-    }
-
-    /**
-     * Verifies ALL where the first fails.
-     */
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testField6PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field6");
-    }
-
-    /**
-     * Verifies ALL where the last fails.
-     */
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testField7PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field7");
-    }
-
-    /**
-     * Verifies ANY where all fail.
-     */
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testField8PermissionNotOk() {
-        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
-        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field8");
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java
new file mode 100644
index 0000000000..9c08851537
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.google.common.collect.Sets;
+import example.Author;
+import example.Book;
+import example.Child;
+import example.Company;
+import example.ComputedBean;
+import example.FirstClassFields;
+import example.FunWithPermissions;
+import example.Invoice;
+import example.Job;
+import example.Left;
+import example.LineItem;
+import example.MapColorShape;
+import example.NoDeleteEntity;
+import example.NoReadEntity;
+import example.NoShareEntity;
+import example.NoUpdateEntity;
+import example.Parent;
+import example.Publisher;
+import example.Right;
+import example.UpdateAndCreate;
+import example.nontransferable.ContainerWithPackageShare;
+import example.nontransferable.NoTransferBiDirectional;
+import example.nontransferable.ShareableWithPackageShare;
+import example.nontransferable.StrictNoTransfer;
+import example.nontransferable.Untransferable;
+import io.reactivex.Observable;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import nocreate.NoCreateEntity;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Predicate;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.ws.rs.core.MultivaluedMap;
+
+public class PersistenceResourceTestSetup extends PersistentResource {
+    private static final AuditLogger MOCK_AUDIT_LOGGER = mock(AuditLogger.class);
+
+    protected final ElideSettings elideSettings;
+
+    protected static LifeCycleHook bookUpdatePrice = mock(LifeCycleHook.class);
+
+    protected static EntityDictionary initDictionary() {
+        EntityDictionary dictionary = TestDictionary.getTestDictionary();
+
+        dictionary.bindEntity(UpdateAndCreate.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Child.class);
+        dictionary.bindEntity(Parent.class);
+        dictionary.bindEntity(FunWithPermissions.class);
+        dictionary.bindEntity(Job.class);
+        dictionary.bindEntity(Left.class);
+        dictionary.bindEntity(Right.class);
+        dictionary.bindEntity(NoReadEntity.class);
+        dictionary.bindEntity(NoDeleteEntity.class);
+        dictionary.bindEntity(NoUpdateEntity.class);
+        dictionary.bindEntity(NoCreateEntity.class);
+        dictionary.bindEntity(NoShareEntity.class);
+        dictionary.bindEntity(example.User.class);
+        dictionary.bindEntity(FirstClassFields.class);
+        dictionary.bindEntity(MapColorShape.class);
+        dictionary.bindEntity(PersistentResourceTest.ChangeSpecModel.class);
+        dictionary.bindEntity(PersistentResourceTest.ChangeSpecChild.class);
+        dictionary.bindEntity(Invoice.class);
+        dictionary.bindEntity(LineItem.class);
+        dictionary.bindEntity(ComputedBean.class);
+        dictionary.bindEntity(ContainerWithPackageShare.class);
+        dictionary.bindEntity(ShareableWithPackageShare.class);
+        dictionary.bindEntity(NoTransferBiDirectional.class);
+        dictionary.bindEntity(StrictNoTransfer.class);
+        dictionary.bindEntity(Untransferable.class);
+        dictionary.bindEntity(Company.class);
+
+        dictionary.bindTrigger(Book.class, "price",
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.PRESECURITY, bookUpdatePrice);
+
+        return dictionary;
+    }
+
+    protected static ElideSettings initSettings() {
+        return new ElideSettingsBuilder(null)
+                .withEntityDictionary(initDictionary())
+                .withAuditLogger(MOCK_AUDIT_LOGGER)
+                .withDefaultMaxPageSize(10)
+                .withDefaultPageSize(10)
+                .build();
+    }
+
+    public PersistenceResourceTestSetup() {
+        super(
+                new Child(),
+                null, // new request scope + new Child == cannot possibly be a UUID for this object
+                new RequestScope(null, null, NO_VERSION, null, null, null, null, null, UUID.randomUUID(),
+                        initSettings()
+                )
+        );
+
+        elideSettings = initSettings();
+    }
+
+    protected static Child newChild(int id) {
+        Child child = new Child();
+        child.setId(id);
+        child.setParents(new HashSet<>());
+        child.setFriends(new HashSet<>());
+        return child;
+    }
+
+    protected static Child newChild(int id, String name) {
+        Child child = newChild(id);
+        child.setName(name);
+        return child;
+    }
+
+    protected RequestScope buildRequestScope(DataStoreTransaction tx, User user) {
+        return buildRequestScope(null, tx, user, null);
+    }
+
+    protected RequestScope buildRequestScope(String path, DataStoreTransaction tx, User user, MultivaluedMap<String, String> queryParams) {
+        return new RequestScope(null, path, NO_VERSION, null, tx, user, queryParams, null, UUID.randomUUID(), elideSettings);
+    }
+
+    protected <T> PersistentResource<T> bootstrapPersistentResource(T obj) {
+        return bootstrapPersistentResource(obj, mock(DataStoreTransaction.class));
+    }
+
+    protected <T> PersistentResource<T> bootstrapPersistentResource(T obj, DataStoreTransaction tx) {
+        User goodUser = new TestUser("1");
+        RequestScope requestScope = new RequestScope(null, null, NO_VERSION, null, tx, goodUser, null, null, UUID.randomUUID(), elideSettings);
+        return new PersistentResource<>(obj, requestScope.getUUIDFor(obj), requestScope);
+    }
+
+    protected RequestScope getUserScope(User user, AuditLogger auditLogger) {
+        return new RequestScope(null, null, NO_VERSION, new JsonApiDocument(), null, user, null, null, UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                    .withEntityDictionary(dictionary)
+                    .withAuditLogger(auditLogger)
+                    .build());
+    }
+
+    // Testing constructor, setId and non-null empty sets
+    protected static Parent newParent(int id) {
+        Parent parent = new Parent();
+        parent.setId(id);
+        parent.setChildren(new HashSet<>());
+        parent.setSpouses(new HashSet<>());
+        return parent;
+    }
+
+    protected Parent newParent(int id, Child child) {
+        Parent parent = new Parent();
+        parent.setId(id);
+        parent.setChildren(Sets.newHashSet(child));
+        parent.setSpouses(new HashSet<>());
+        return parent;
+    }
+
+    protected Company newCompany(String id) {
+        final Company company = new Company();
+        company.setId(id);
+        company.setDescription("company");
+        return company;
+    }
+
+    /* ChangeSpec-specific test elements */
+    @Entity
+    @Include(rootLevel = false)
+    @CreatePermission(expression = "Prefab.Role.All")
+    @ReadPermission(expression = "Prefab.Role.All")
+    @UpdatePermission(expression = "Prefab.Role.None")
+    @DeletePermission(expression = "Prefab.Role.All")
+    public static final class ChangeSpecModel {
+        @Id
+        public long id;
+
+        @ReadPermission(expression = "Prefab.Role.None")
+        @UpdatePermission(expression = "Prefab.Role.None")
+        public Predicate<ChangeSpec> checkFunction;
+
+        @UpdatePermission(expression = "changeSpecNonCollection")
+        public String testAttr;
+
+        @UpdatePermission(expression = "changeSpecCollection")
+        public List<String> testColl;
+
+        @OneToOne
+        @UpdatePermission(expression = "changeSpecNonCollection")
+        public ChangeSpecChild child;
+
+        @ManyToMany
+        @UpdatePermission(expression = "changeSpecCollection")
+        public List<Child> otherKids;
+
+        public ChangeSpecModel(final Predicate<ChangeSpec> checkFunction) {
+            this.checkFunction = checkFunction;
+        }
+    }
+
+    @Entity
+    @Include(rootLevel = false)
+    @EqualsAndHashCode
+    @AllArgsConstructor
+    @CreatePermission(expression = "Prefab.Role.All")
+    @ReadPermission(expression = "Prefab.Role.All")
+    @UpdatePermission(expression = "Prefab.Role.All")
+    @DeletePermission(expression = "Prefab.Role.All")
+    public static final class ChangeSpecChild {
+        @Id
+        public long id;
+    }
+
+    public static final class ChangeSpecCollection extends OperationCheck<Object> {
+
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            if (changeSpec.isPresent() && (object instanceof ChangeSpecModel)) {
+                ChangeSpec spec = changeSpec.get();
+                if (!(spec.getModified() instanceof Collection)) {
+                    return false;
+                }
+                return ((ChangeSpecModel) object).checkFunction.test(spec);
+            }
+            throw new IllegalStateException("Something is terribly wrong :(");
+        }
+    }
+
+    public static final class ChangeSpecNonCollection extends OperationCheck<Object> {
+
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return changeSpec.filter(c -> object instanceof ChangeSpecModel)
+                    .map(c -> ((ChangeSpecModel) object).checkFunction.test(c))
+                    .orElseThrow(() -> new IllegalStateException("Something is terribly wrong :("));
+        }
+    }
+
+    public Set<PersistentResource> getRelation(PersistentResource resource, String relation) {
+        Observable<PersistentResource> resources =
+                resource.getRelationCheckedFiltered(getRelationship(resource.getResourceType(), relation));
+
+        return resources.toList(LinkedHashSet::new).blockingGet();
+    }
+
+    public com.yahoo.elide.core.request.Relationship getRelationship(Type<?> type, String name) {
+        return com.yahoo.elide.core.request.Relationship.builder()
+                .name(name)
+                .alias(name)
+                .projection(EntityProjection.builder()
+                        .type(type)
+                        .build())
+                .build();
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceNoopUpdateTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceNoopUpdateTest.java
new file mode 100644
index 0000000000..c436b8ff08
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceNoopUpdateTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import example.Child;
+import example.FunWithPermissions;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+public class PersistentResourceNoopUpdateTest extends PersistenceResourceTestSetup {
+    private final RequestScope goodUserScope;
+    private final User goodUser;
+    PersistentResourceNoopUpdateTest() {
+        goodUser = new TestUser("1");
+        goodUserScope = new RequestScope(null, null, NO_VERSION, null,
+                mock(DataStoreTransaction.class), goodUser, null, null, UUID.randomUUID(), elideSettings);
+        initDictionary();
+        reset(goodUserScope.getTransaction());
+    }
+
+    @Test
+    public void testNOOPToOneAddRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+        fun.setRelation3(child);
+
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+        RequestScope goodScope = new RequestScope(null, null, NO_VERSION, null, tx, goodUser, null, null, UUID.randomUUID(), elideSettings);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+
+        when(tx.getToOneRelation(eq(tx), eq(fun), any(), any())).thenReturn(child);
+
+        //We do not want the update to one method to be called when we add the existing entity to the relation
+        funResource.addRelation("relation3", childResource);
+
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testToOneAddRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+        RequestScope goodScope = new RequestScope(null, null, NO_VERSION, null, tx, goodUser, null, null, UUID.randomUUID(), elideSettings);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        funResource.addRelation("relation3", childResource);
+
+        verify(tx, times(1)).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testNOOPToManyAddRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+        Set<Child> children = new HashSet<>();
+        children.add(child);
+        fun.setRelation1(children);
+
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+        RequestScope goodScope = new RequestScope(null, null, NO_VERSION, null, tx, goodUser, null, null, UUID.randomUUID(), elideSettings);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, null, goodScope);
+        //We do not want the update to one method to be called when we add the existing entity to the relation
+        funResource.addRelation("relation1", childResource);
+        verify(tx, never()).updateToManyRelation(eq(tx), eq(child), eq("relation1"), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testToManyAddRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+        RequestScope goodScope = new RequestScope(null, null, NO_VERSION, null, tx, goodUser, null, null, UUID.randomUUID(), elideSettings);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, null, goodScope);
+        funResource.addRelation("relation1", childResource);
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(fun), eq("relation1"), any(), any(), eq(goodScope));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java
index 4b30bf7dcb..109f9b6e15 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java
@@ -1,13 +1,22 @@
 /*
- * Copyright 2016, Yahoo Inc.
+ * Copyright 2017, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.core;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anySet;
-import static org.mockito.Matchers.eq;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -16,187 +25,359 @@
 import static org.mockito.Mockito.when;
 
 import com.yahoo.elide.annotation.Audit;
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.audit.LogMessage;
-import com.yahoo.elide.audit.TestAuditLogger;
+import com.yahoo.elide.core.audit.LogMessage;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
 import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
 import com.yahoo.elide.core.exceptions.InvalidAttributeException;
 import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
 import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.lifecycle.CRUDEvent;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.jsonapi.extensions.PatchRequestScope;
 import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 import com.yahoo.elide.jsonapi.models.Relationship;
 import com.yahoo.elide.jsonapi.models.Resource;
 import com.yahoo.elide.jsonapi.models.ResourceIdentifier;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
 
-import com.google.common.base.Function;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import org.mockito.Answers;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
+import example.Address;
+import example.Author;
+import example.Book;
 import example.Child;
 import example.Color;
+import example.Company;
+import example.ComputedBean;
 import example.FirstClassFields;
 import example.FunWithPermissions;
+import example.GeoLocation;
+import example.Invoice;
+import example.Job;
 import example.Left;
+import example.LineItem;
 import example.MapColorShape;
 import example.NoDeleteEntity;
 import example.NoReadEntity;
 import example.NoShareEntity;
 import example.NoUpdateEntity;
 import example.Parent;
+import example.Price;
 import example.Right;
 import example.Shape;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
+import example.nontransferable.ContainerWithPackageShare;
+import example.nontransferable.NoTransferBiDirectional;
+import example.nontransferable.ShareableWithPackageShare;
+import example.nontransferable.StrictNoTransfer;
+import example.nontransferable.Untransferable;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.IterableUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.mockito.ArgumentCaptor;
+
+import io.reactivex.Observable;
 import nocreate.NoCreateEntity;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Currency;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.BiFunction;
+import java.util.UUID;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 
-
 /**
  * Test PersistentResource.
  */
-public class PersistentResourceTest extends PersistentResource {
-    private final RequestScope goodUserScope;
-    private final RequestScope badUserScope;
-    private static final AuditLogger MOCK_AUDIT_LOGGER = mock(AuditLogger.class);
-
-    public PersistentResourceTest() {
-        super(
-                new Child(),
-                null,
-                new RequestScope(null, null, null, null, new EntityDictionary(new HashMap<>()), null, MOCK_AUDIT_LOGGER)
-        );
-        goodUserScope = new RequestScope(null, null, mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS),
-                new User(1), dictionary, null, MOCK_AUDIT_LOGGER);
-        badUserScope = new RequestScope(null, null, mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS),
-                new User(-1), dictionary, null, MOCK_AUDIT_LOGGER);
-    }
-
-    @BeforeTest
-    public void init() {
-        dictionary.bindEntity(Child.class);
-        dictionary.bindEntity(Parent.class);
-        dictionary.bindEntity(FunWithPermissions.class);
-        dictionary.bindEntity(Left.class);
-        dictionary.bindEntity(Right.class);
-        dictionary.bindEntity(NoReadEntity.class);
-        dictionary.bindEntity(NoDeleteEntity.class);
-        dictionary.bindEntity(NoUpdateEntity.class);
-        dictionary.bindEntity(NoCreateEntity.class);
-        dictionary.bindEntity(NoShareEntity.class);
-        dictionary.bindEntity(example.User.class);
-        dictionary.bindEntity(FirstClassFields.class);
-        dictionary.bindEntity(MapColorShape.class);
-        dictionary.bindEntity(ChangeSpecModel.class);
-        dictionary.bindEntity(ChangeSpecChild.class);
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class PersistentResourceTest extends PersistenceResourceTestSetup {
+
+    private final User goodUser = new TestUser("1");
+    private final User badUser = new TestUser("-1");
+
+    private final DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+    @BeforeEach
+    public void beforeTest() {
+        reset(tx);
+    }
+
+    @Test
+    public void testUpdateToOneRelationHookInAddRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        funResource.addRelation("relation3", childResource);
+
+        verify(tx, times(1)).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(child), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToOneRelationHookInUpdateRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child1 = newChild(1);
+        Child child2 = newChild(2);
+        fun.setRelation1(Sets.newHashSet(child1));
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> child2Resource = new PersistentResource<>(child2, "1", goodScope);
+        funResource.updateRelation("relation3", Sets.newHashSet(child2Resource));
+
+        verify(tx, times(1)).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(child1), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(child2), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToOneRelationHookInRemoveRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child = newChild(1);
+        fun.setRelation3(child);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        funResource.removeRelation("relation3", childResource);
+
+        verify(tx, times(1)).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(child), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToOneRelationHookInClearRelation() {
+        FunWithPermissions fun = new FunWithPermissions();
+        Child child1 = newChild(1);
+        fun.setRelation3(child1);
+
+        when(tx.getToOneRelation(any(), eq(fun), any(), any())).thenReturn(child1);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        funResource.clearRelation("relation3");
+
+        verify(tx, times(1)).updateToOneRelation(eq(tx), eq(fun), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToOneRelation(eq(tx), eq(child1), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToManyRelationHookInAddRelationBidirection() {
+        Parent parent = new Parent();
+        Child child = newChild(1);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        parentResource.addRelation("children", childResource);
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(parent),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child),
+                any(), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToManyRelationHookInRemoveRelationBidirection() {
+        Parent parent = new Parent();
+        Child child = newChild(1);
+        parent.setChildren(Sets.newHashSet(child));
+        child.setParents(Sets.newHashSet(parent));
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        parentResource.removeRelation("children", childResource);
+
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(parent),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child),
+                any(), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToManyRelationHookInClearRelationBidirection() {
+        Parent parent = new Parent();
+        Child child1 = newChild(1);
+        Child child2 = newChild(2);
+        Set<Child> children = Sets.newHashSet(child1, child2);
+        parent.setChildren(children);
+        child1.setParents(Sets.newHashSet(parent));
+        child2.setParents(Sets.newHashSet(parent));
+
+        when(tx.getToManyRelation(any(), eq(parent), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(children).build());
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "3", goodScope);
+        parentResource.clearRelation("children");
+
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(parent),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child1),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child2),
+                any(), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testUpdateToManyRelationHookInUpdateRelationBidirection() {
+        Parent parent = new Parent();
+        Child child1 = newChild(1);
+        Child child2 = newChild(2);
+        Child child3 = newChild(3);
+        Set<Child> children = Sets.newHashSet(child1, child2);
+        parent.setChildren(children);
+        child1.setParents(Sets.newHashSet(parent));
+        child2.setParents(Sets.newHashSet(parent));
+
+        when(tx.getToManyRelation(any(), eq(parent), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(children).build());
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "3", goodScope);
+        PersistentResource<Child> childResource1 = new PersistentResource<>(child1, "1", goodScope);
+        PersistentResource<Child> childResource3 = new PersistentResource<>(child3, "1", goodScope);
+        parentResource.updateRelation("children", Sets.newHashSet(childResource1, childResource3));
+
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(parent),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, never()).updateToManyRelation(eq(tx), eq(child1),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child2),
+                any(), any(), any(), eq(goodScope));
+        verify(tx, times(1)).updateToManyRelation(eq(tx), eq(child3),
+                any(), any(), any(), eq(goodScope));
+    }
+
+    @Test
+    public void testSetAttributeHookInUpdateAttribute() {
+        Parent parent = newParent(1);
+        ArgumentCaptor<Attribute> attributeArgument = ArgumentCaptor.forClass(Attribute.class);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
+        parentResource.updateAttribute("firstName", "foobar");
+
+        verify(tx, times(1)).setAttribute(eq(parent), attributeArgument.capture(), eq(goodScope));
+
+        assertEquals(attributeArgument.getValue().getName(), "firstName");
+        assertEquals(attributeArgument.getValue().getArguments().iterator().next().getValue(), "foobar");
     }
 
     @Test
     public void testGetRelationships() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setRelation1(Sets.newHashSet());
-        fun.relation2 = Sets.newHashSet();
+        fun.setRelation2(Sets.newHashSet());
         fun.setRelation3(null);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
         Map<String, Relationship> relationships = funResource.getRelationships();
 
-        Assert.assertEquals(relationships.size(), 5, "All relationships should be returned.");
-        Assert.assertTrue(relationships.containsKey("relation1"), "relation1 should be present");
-        Assert.assertTrue(relationships.containsKey("relation2"), "relation2 should be present");
-        Assert.assertTrue(relationships.containsKey("relation3"), "relation3 should be present");
-        Assert.assertTrue(relationships.containsKey("relation4"), "relation4 should be present");
-        Assert.assertTrue(relationships.containsKey("relation5"), "relation5 should be present");
+        assertEquals(5, relationships.size(), "All relationships should be returned.");
+        assertTrue(relationships.containsKey("relation1"), "relation1 should be present");
+        assertTrue(relationships.containsKey("relation2"), "relation2 should be present");
+        assertTrue(relationships.containsKey("relation3"), "relation3 should be present");
+        assertTrue(relationships.containsKey("relation4"), "relation4 should be present");
+        assertTrue(relationships.containsKey("relation5"), "relation5 should be present");
+
+        scope = new TestRequestScope(tx, badUser, dictionary);
 
-        PersistentResource<FunWithPermissions> funResourceWithBadScope = new PersistentResource<>(fun, null, "3", badUserScope);
+        PersistentResource<FunWithPermissions> funResourceWithBadScope = new PersistentResource<>(fun, "3", scope);
         relationships = funResourceWithBadScope.getRelationships();
 
-        Assert.assertEquals(relationships.size(), 0, "All relationships should be filtered out");
+        assertEquals(0, relationships.size(), "All relationships should be filtered out");
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testNoCreate() {
-        Assert.assertNotNull(dictionary);
+        assertNotNull(dictionary);
         NoCreateEntity noCreate = new NoCreateEntity();
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
 
-        when(tx.createObject(NoCreateEntity.class)).thenReturn(noCreate);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        when(tx.createNewObject(ClassType.of(NoCreateEntity.class), goodScope)).thenReturn(noCreate);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<NoCreateEntity> created = PersistentResource.createObject(NoCreateEntity.class, goodScope, "uuid");
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> PersistentResource.createObject(
+                        ClassType.of(NoCreateEntity.class), goodScope, Optional.of("1"))); // should throw here
     }
 
     @Test
     public void testGetAttributes() {
         FunWithPermissions fun = new FunWithPermissions();
-        fun.field3 = "Foobar";
+        fun.setField3("Foobar");
         fun.setField1("blah");
         fun.setField2(null);
-        fun.field4 = "bar";
+        fun.setField4("bar");
+
+        when(tx.getAttribute(any(), any(), any())).thenCallRealMethod();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
         Map<String, Object> attributes = funResource.getAttributes();
 
-        Assert.assertEquals(attributes.size(), 6,
+        assertEquals(6, attributes.size(),
                 "A valid user should have access to all attributes that are readable."
         );
 
-        Assert.assertTrue(attributes.containsKey("field2"), "Readable attributes should include field2");
-        Assert.assertTrue(attributes.containsKey("field3"), "Readable attributes should include field3");
-        Assert.assertTrue(attributes.containsKey("field4"), "Readable attributes should include field4");
-        Assert.assertTrue(attributes.containsKey("field5"), "Readable attributes should include field5");
-        Assert.assertTrue(attributes.containsKey("field6"), "Readable attributes should include field6");
-        Assert.assertTrue(attributes.containsKey("field8"), "Readable attributes should include field8");
-        Assert.assertEquals(attributes.get("field2"), null, "field2 should be set to original value.");
-        Assert.assertEquals(attributes.get("field3"), "Foobar", "field3 should be set to original value.");
-        Assert.assertEquals(attributes.get("field4"), "bar", "field4 should be set to original value.");
+        assertTrue(attributes.containsKey("field2"), "Readable attributes should include field2");
+        assertTrue(attributes.containsKey("field3"), "Readable attributes should include field3");
+        assertTrue(attributes.containsKey("field4"), "Readable attributes should include field4");
+        assertTrue(attributes.containsKey("field5"), "Readable attributes should include field5");
+        assertTrue(attributes.containsKey("field6"), "Readable attributes should include field6");
+        assertTrue(attributes.containsKey("field8"), "Readable attributes should include field8");
+        assertNull(attributes.get("field2"), "field2 should be set to original value.");
+        assertEquals(attributes.get("field3"), "Foobar", "field3 should be set to original value.");
+        assertEquals(attributes.get("field4"), "bar", "field4 should be set to original value.");
 
-        PersistentResource<FunWithPermissions> funResourceBad = new PersistentResource<>(fun, null, "3", badUserScope);
+        RequestScope badUserScope = new TestRequestScope(tx, badUser, dictionary);
+        PersistentResource<FunWithPermissions> funResourceBad = new PersistentResource<>(fun, "3", badUserScope);
 
         attributes = funResourceBad.getAttributes();
 
-        Assert.assertEquals(attributes.size(), 3, "An invalid user should have access to a subset of attributes.");
-        Assert.assertTrue(attributes.containsKey("field2"), "Readable attributes should include field2");
-        Assert.assertTrue(attributes.containsKey("field4"), "Readable attributes should include field4");
-        Assert.assertTrue(attributes.containsKey("field5"), "Readable attributes should include field5");
-        Assert.assertEquals(attributes.get("field2"), null, "field2 should be set to original value.");
-        Assert.assertEquals(attributes.get("field4"), "bar", "field4 should be set to original value.");
+        assertEquals(3, attributes.size(), "An invalid user should have access to a subset of attributes.");
+        assertTrue(attributes.containsKey("field2"), "Readable attributes should include field2");
+        assertTrue(attributes.containsKey("field4"), "Readable attributes should include field4");
+        assertTrue(attributes.containsKey("field5"), "Readable attributes should include field5");
+        assertNull(attributes.get("field2"), "field2 should be set to original value.");
+        assertEquals(attributes.get("field4"), "bar", "field4 should be set to original value.");
     }
 
     @Test
@@ -207,63 +388,83 @@ public void testFilter() {
         Child child4 = newChild(-4);
 
         {
-            PersistentResource<Child> child1Resource = new PersistentResource<>(child1, null, "1", goodUserScope);
-            PersistentResource<Child> child2Resource = new PersistentResource<>(child2, null, "-2", goodUserScope);
-            PersistentResource<Child> child3Resource = new PersistentResource<>(child3, null, "3", goodUserScope);
-            PersistentResource<Child> child4Resource = new PersistentResource<>(child4, null, "-4", goodUserScope);
-
-            Set<PersistentResource<Child>> resources =
-                    Sets.newHashSet(child1Resource, child2Resource, child3Resource, child4Resource);
-
-            Set<PersistentResource<Child>> results = PersistentResource.filter(ReadPermission.class, resources);
-            Assert.assertEquals(results.size(), 2, "Only a subset of the children are readable");
-            Assert.assertTrue(results.contains(child1Resource), "Readable children includes children with positive IDs");
-            Assert.assertTrue(results.contains(child3Resource), "Readable children includes children with positive IDs");
+            RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+            PersistentResource<Child> child1Resource = new PersistentResource<>(child1, "1", scope);
+            PersistentResource<Child> child2Resource = new PersistentResource<>(child2, "-2", scope);
+            PersistentResource<Child> child3Resource = new PersistentResource<>(child3, "3", scope);
+            PersistentResource<Child> child4Resource = new PersistentResource<>(child4, "-4", scope);
+
+            Observable<PersistentResource> resources =
+                    Observable.fromArray(child1Resource, child2Resource, child3Resource, child4Resource);
+
+            Set<PersistentResource> results =
+                    PersistentResource.filter(
+                            ReadPermission.class,
+                            Optional.empty(), ALL_FIELDS, resources).toList(LinkedHashSet::new).blockingGet();
+
+            assertEquals(2, results.size(), "Only a subset of the children are readable");
+            assertTrue(results.contains(child1Resource), "Readable children includes children with positive IDs");
+            assertTrue(results.contains(child3Resource), "Readable children includes children with positive IDs");
         }
 
         {
-            PersistentResource<Child> child1Resource = new PersistentResource<>(child1, null, "1", badUserScope);
-            PersistentResource<Child> child2Resource = new PersistentResource<>(child2, null, "-2", badUserScope);
-            PersistentResource<Child> child3Resource = new PersistentResource<>(child3, null, "3", badUserScope);
-            PersistentResource<Child> child4Resource = new PersistentResource<>(child4, null, "-4", badUserScope);
+            RequestScope scope = new TestRequestScope(tx, badUser, dictionary);
+            PersistentResource<Child> child1Resource = new PersistentResource<>(child1, "1", scope);
+            PersistentResource<Child> child2Resource = new PersistentResource<>(child2, "-2", scope);
+            PersistentResource<Child> child3Resource = new PersistentResource<>(child3, "3", scope);
+            PersistentResource<Child> child4Resource = new PersistentResource<>(child4, "-4", scope);
 
-            Set<PersistentResource<Child>> resources =
-                    Sets.newHashSet(child1Resource, child2Resource, child3Resource, child4Resource);
+            Observable<PersistentResource> resources =
+                    Observable.fromArray(child1Resource, child2Resource, child3Resource, child4Resource);
 
-            Set<PersistentResource<Child>> results = PersistentResource.filter(ReadPermission.class, resources);
-            Assert.assertEquals(results.size(), 0, "No children are readable by an invalid user");
+            Set<PersistentResource> results = PersistentResource.filter(ReadPermission.class,
+                    Optional.empty(), ALL_FIELDS, resources).toList(LinkedHashSet::new).blockingGet();
+
+            assertEquals(0, results.size(), "No children are readable by an invalid user");
         }
     }
 
     @Test
     public void testGetValue() throws Exception {
         FunWithPermissions fun = new FunWithPermissions();
-        fun.field3 = "testValue";
+        fun.setField3("testValue");
         String result;
-        result = (String) getValue(fun, "field3",  dictionary);
-        Assert.assertEquals(result, "testValue", "getValue should set the appropriate value in the resource");
+        result = (String) getValue(fun, "field3", getRequestScope());
+        assertEquals("testValue", result, "getValue should set the appropriate value in the resource");
 
         fun.setField1("testValue2");
 
-        result = (String) getValue(fun, "field1", dictionary);
-        Assert.assertEquals(result, "testValue2", "getValue should set the appropriate value in the resource");
+        result = (String) getValue(fun, "field1", getRequestScope());
+        assertEquals(result, "testValue2", "getValue should set the appropriate value in the resource");
 
         Child testChild = newChild(3);
         fun.setRelation1(Sets.newHashSet(testChild));
 
         @SuppressWarnings("unchecked")
-        Set<Child> children = (Set<Child>) getValue(fun, "relation1", dictionary);
+        Set<Child> children = (Set<Child>) getValue(fun, "relation1", getRequestScope());
 
-        Assert.assertTrue(children.contains(testChild), "getValue should set the correct relation.");
-        Assert.assertEquals(children.size(), 1, "getValue should set the relation with the correct number of elements");
+        assertTrue(children.contains(testChild), "getValue should set the correct relation.");
+        assertEquals(1, children.size(), "getValue should set the relation with the correct number of elements");
 
-        try {
-            getValue(fun, "badRelation", dictionary);
-        } catch (InvalidAttributeException e) {
-            return;
-        }
+        ComputedBean computedBean = new ComputedBean();
+
+        String computedTest1 = (String) getValue(computedBean, "test", getRequestScope());
+        String computedTest2 = (String) getValue(computedBean, "testWithScope", getRequestScope());
+        String computedTest3 = (String) getValue(computedBean, "testWithSecurityScope", getRequestScope());
+
+        assertEquals("test1", computedTest1);
+        assertEquals("test2", computedTest2);
+        assertEquals("test3", computedTest3);
+
+        assertThrows(
+                InvalidAttributeException.class,
+                () -> getValue(computedBean, "NonComputedWithScope", getRequestScope()),
+                "Getting a bad relation should throw an InvalidAttributeException.");
 
-        Assert.fail("Getting a bad relation should throw an InvalidAttributeException.");
+        assertThrows(
+                InvalidAttributeException.class,
+                () -> setValue("badRelation", "badValue"),
+                "Getting a bad relation should throw an InvalidAttributeException.");
     }
 
     @Test
@@ -271,23 +472,23 @@ public void testSetValue() throws Exception {
         FunWithPermissions fun = new FunWithPermissions();
         this.obj = fun;
         setValue("field3", "testValue");
-        Assert.assertEquals(fun.field3, "testValue", "setValue should set the appropriate value in the resource");
+        assertEquals("testValue", fun.getField3(), "setValue should set the appropriate value in the resource");
 
         setValue("field1", "testValue2");
-        Assert.assertEquals(fun.getField1(), "testValue2", "setValue should set the appropriate value in the resource");
+        assertEquals("testValue2", fun.getField1(), "setValue should set the appropriate value in the resource");
 
         Child testChild = newChild(3);
         setValue("relation1", Sets.newHashSet(testChild));
 
-        Assert.assertTrue(fun.getRelation1().contains(testChild), "setValue should set the correct relation.");
-        Assert.assertEquals(fun.getRelation1().size(), 1, "setValue should set the relation with the correct number of elements");
-
-        try {
-            setValue("badRelation", "badValue");
-        } catch (InvalidAttributeException e) {
-            return;
-        }
-        Assert.fail("Setting a bad relation should throw an InvalidAttributeException.");
+        assertTrue(fun.getRelation1().contains(testChild), "setValue should set the correct relation.");
+        assertEquals(
+                fun.getRelation1().size(),
+                1,
+                "setValue should set the relation with the correct number of elements");
+        assertThrows(
+                InvalidAttributeException.class,
+                () -> setValue("badRelation", "badValue"),
+                "Getting a bad relation should throw an InvalidAttributeException.");
     }
 
     @Test
@@ -301,30 +502,28 @@ public void testSetMapValue() {
         coerceable.put("Violet", "Triangle");
         setValue("colorShapeMap", coerceable);
 
-        Assert.assertEquals(mapColorShape.getColorShapeMap().get(Color.Red), Shape.Circle);
-        Assert.assertEquals(mapColorShape.getColorShapeMap().get(Color.Green), Shape.Square);
-        Assert.assertEquals(mapColorShape.getColorShapeMap().get(Color.Violet), Shape.Triangle);
-        Assert.assertEquals(mapColorShape.getColorShapeMap().size(), 3);
+        assertEquals(Shape.Circle, mapColorShape.getColorShapeMap().get(Color.Red));
+        assertEquals(Shape.Square, mapColorShape.getColorShapeMap().get(Color.Green));
+        assertEquals(Shape.Triangle, mapColorShape.getColorShapeMap().get(Color.Violet));
+        assertEquals(3, mapColorShape.getColorShapeMap().size());
     }
 
-    @Test(expectedExceptions = {InvalidValueException.class})
+    @Test
     public void testSetMapInvalidColorEnum() {
-        MapColorShape mapColorShape = new MapColorShape();
-        this.obj = mapColorShape;
+        this.obj = new MapColorShape();
 
         HashMap<Object, Object> coerceable = new HashMap<>();
         coerceable.put("InvalidColor", "Circle");
-        setValue("colorShapeMap", coerceable);
+        assertThrows(InvalidValueException.class, () -> setValue("colorShapeMap", coerceable));
     }
 
-    @Test(expectedExceptions = {InvalidValueException.class})
+    @Test
     public void testSetMapInvalidShapeEnum() {
-        MapColorShape mapColorShape = new MapColorShape();
-        this.obj = mapColorShape;
+        this.obj = new MapColorShape();
 
         HashMap<Object, Object> coerceable = new HashMap<>();
         coerceable.put("Red", "InvalidShape");
-        setValue("colorShapeMap", coerceable);
+        assertThrows(InvalidValueException.class, () -> setValue("colorShapeMap", coerceable));
     }
 
     @Test
@@ -334,12 +533,13 @@ public void testDeleteBidirectionalRelation() {
         left.setOne2one(right);
         right.setOne2one(left);
 
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "3", scope);
 
         leftResource.deleteInverseRelation("one2one", right);
 
-        Assert.assertEquals(right.getOne2one(), null, "The one-2-one inverse relationship should have been unset");
-        Assert.assertEquals(left.getOne2one(), right, "The owning relationship should NOT have been unset");
+        assertNull(right.getOne2one(), "The one-2-one inverse relationship should have been unset");
+        assertEquals(right, left.getOne2one(), "The owning relationship should NOT have been unset");
 
         Child child = new Child();
         Parent parent = new Parent();
@@ -347,12 +547,13 @@ public void testDeleteBidirectionalRelation() {
         parent.setChildren(Sets.newHashSet(child));
         parent.setSpouses(Sets.newHashSet());
 
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "4", goodUserScope);
+        scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "4", scope);
 
         childResource.deleteInverseRelation("parents", parent);
 
-        Assert.assertEquals(parent.getChildren().size(), 0, "The many-2-many inverse collection should have been cleared.");
-        Assert.assertTrue(child.getParents().contains(parent), "The owning relationship should NOT have been touched");
+        assertEquals(parent.getChildren().size(), 0, "The many-2-many inverse collection should have been cleared.");
+        assertTrue(child.getParents().contains(parent), "The owning relationship should NOT have been touched");
     }
 
     @Test
@@ -360,11 +561,12 @@ public void testAddBidirectionalRelation() {
         Left left = new Left();
         Right right = new Right();
 
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "3", scope);
 
         leftResource.addInverseRelation("one2one", right);
 
-        Assert.assertEquals(right.getOne2one(), left, "The one-2-one inverse relationship should have been updated.");
+        assertEquals(left, right.getOne2one(), "The one-2-one inverse relationship should have been updated.");
 
         Child child = new Child();
         Parent parent = new Parent();
@@ -372,41 +574,79 @@ public void testAddBidirectionalRelation() {
         parent.setChildren(Sets.newHashSet());
         parent.setSpouses(Sets.newHashSet());
 
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "4", goodUserScope);
+        scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "4", scope);
 
         childResource.addInverseRelation("parents", parent);
 
-        Assert.assertEquals(parent.getChildren().size(), 1, "The many-2-many inverse relationship should have been updated");
-        Assert.assertTrue(parent.getChildren().contains(child), "The many-2-many inverse relationship should have been updated");
+        assertEquals(
+                1,
+                parent.getChildren().size(),
+                "The many-2-many inverse relationship should have been updated");
+        assertTrue(
+                parent.getChildren().contains(child),
+                "The many-2-many inverse relationship should have been updated");
     }
 
     @Test
     public void testSuccessfulOneToOneRelationshipAdd() throws Exception {
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
         Left left = new Left();
         Right right = new Right();
         left.setId(2);
         right.setId(3);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "2", goodScope);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "2", goodScope);
 
         Relationship ids = new Relationship(null, new Data<>(new ResourceIdentifier("right", "3").castToResource()));
 
-        when(tx.loadObject(Right.class, 3L)).thenReturn(right);
+        when(tx.loadObject(any(), eq(3L), any())).thenReturn(right);
         boolean updated = leftResource.updateRelation("one2one", ids.toPersistentResources(goodScope));
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(left);
-        verify(tx, times(1)).save(right);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(left, goodScope);
+        verify(tx, times(1)).save(right, goodScope);
+        verify(tx, times(1)).getToOneRelation(tx, left, getRelationship(ClassType.of(Right.class), "one2one"), goodScope);
 
-        Assert.assertEquals(updated, true, "The one-2-one relationship should be added.");
-        Assert.assertEquals(left.getOne2one().getId(), 3, "The correct object was set in the one-2-one relationship");
+        assertTrue(updated, "The one-2-one relationship should be added.");
+        assertEquals(3, left.getOne2one().getId(), "The correct object was set in the one-2-one relationship");
     }
 
-    @Test
     /**
+     * Avoid NPE when PATCH or POST defines relationship with null id
+     * <pre>
+     * <code>
+     * "relationships": {
+     *   "left": {
+     *     "data": {
+     *       "type": "right",
+     *       "id": null
+     *     }
+     *   }
+     * }
+     * </code>
+     * </pre>
+     */
+    @Test
+    public void testSuccessfulOneToOneRelationshipAddNull() throws Exception {
+        Left left = new Left();
+        left.setId(2);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "2", goodScope);
+
+        Relationship ids = new Relationship(null, new Data<>(new Resource("right", null, null, null, null, null)));
+
+        InvalidObjectIdentifierException thrown = assertThrows(
+                InvalidObjectIdentifierException.class,
+                () -> leftResource.updateRelation("one2one", ids.toPersistentResources(goodScope)));
+
+        assertEquals("Unknown identifier null for right", thrown.getMessage());
+    }
+
+    @Test
+    /*
      * The following are ids for a hypothetical relationship.
      * GIVEN:
      * all (all the ids in the DB) = 1,2,3,4,5
@@ -422,10 +662,8 @@ public void testSuccessfulOneToOneRelationshipAdd() throws Exception {
      * final = (notMine) UNION requested
      */
     public void testSuccessfulManyToManyRelationshipUpdate() throws Exception {
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
         Parent parent = new Parent();
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
         Child child1 = newChild(1);
         Child child2 = newChild(2);
@@ -445,7 +683,9 @@ public void testSuccessfulManyToManyRelationshipUpdate() throws Exception {
         parent.setChildren(allChildren);
         parent.setSpouses(Sets.newHashSet());
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        when(tx.getToManyRelation(any(), eq(parent), any(), any())).thenReturn(new DataStoreIterableBuilder(allChildren).build());
+
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
 
         //Requested = (3,6)
         List<Resource> idList = new ArrayList<>();
@@ -453,12 +693,11 @@ public void testSuccessfulManyToManyRelationshipUpdate() throws Exception {
         idList.add(new ResourceIdentifier("child", "6").castToResource());
         Relationship ids = new Relationship(null, new Data<>(idList));
 
-
-        when(tx.loadObject(Child.class, 2L)).thenReturn(child2);
-        when(tx.loadObject(Child.class, 3L)).thenReturn(child3);
-        when(tx.loadObject(Child.class, -4L)).thenReturn(child4);
-        when(tx.loadObject(Child.class, -5L)).thenReturn(child5);
-        when(tx.loadObject(Child.class, 6L)).thenReturn(child6);
+        when(tx.loadObject(any(), eq(2L), any())).thenReturn(child2);
+        when(tx.loadObject(any(), eq(3L), any())).thenReturn(child3);
+        when(tx.loadObject(any(), eq(-4L), any())).thenReturn(child4);
+        when(tx.loadObject(any(), eq(-5L), any())).thenReturn(child5);
+        when(tx.loadObject(any(), eq(6L), any())).thenReturn(child6);
 
         //Final set after operation = (3,4,5,6)
         Set<Child> expected = new HashSet<>();
@@ -469,18 +708,100 @@ public void testSuccessfulManyToManyRelationshipUpdate() throws Exception {
 
         boolean updated = parentResource.updateRelation("children", ids.toPersistentResources(goodScope));
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(parent);
-        verify(tx, times(1)).save(child1);
-        verify(tx, times(1)).save(child2);
-        verify(tx, times(1)).save(child6);
-        verify(tx, never()).save(child4);
-        verify(tx, never()).save(child5);
-        verify(tx, never()).save(child3);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, times(1)).save(child1, goodScope);
+        verify(tx, times(1)).save(child2, goodScope);
+        verify(tx, times(1)).save(child6, goodScope);
+        verify(tx, never()).save(child4, goodScope);
+        verify(tx, never()).save(child5, goodScope);
+        verify(tx, never()).save(child3, goodScope);
+
+        assertTrue(updated, "Many-2-many relationship should be updated.");
+        assertTrue(parent.getChildren().containsAll(expected), "All expected members were updated");
+        assertTrue(expected.containsAll(parent.getChildren()), "All expected members were updated");
+
+        /*
+         * No tests for reference integrity since the parent is the owner and
+         * this is a many to many relationship.
+         */
+    }
+
+    @Test
+    /*
+     * The following are ids for a hypothetical relationship.
+     * GIVEN:
+     * all (all the ids in the DB) = 1,2,3,4,5
+     * mine (everything the current user has access to) = 1,2,3
+     * requested (what the user wants to change to) = 1,2,3
+     * THEN:
+     * deleted (what gets removed from the DB) = nothing
+     * final (what get stored in the relationship) = 1,2,3,4,5
+     * BECAUSE:
+     * notMine = all - mine
+     * updated = (requested UNION mine) - (requested INTERSECT mine)
+     * deleted = (mine - requested)
+     * final = (notMine) UNION requested
+     */
+    public void testSuccessfulManyToManyRelationshipNoopUpdate() throws Exception {
+        Parent parent = new Parent();
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        Child child1 = newChild(1);
+        Child child2 = newChild(2);
+        Child child3 = newChild(3);
+        Child child4 = newChild(-4); //Not accessible to goodUser
+        Child child5 = newChild(-5); //Not accessible to goodUser
+
+        //All = (1,2,3,4,5)
+        //Mine = (1,2,3)
+        Set<Child> allChildren = new HashSet<>();
+        allChildren.add(child1);
+        allChildren.add(child2);
+        allChildren.add(child3);
+        allChildren.add(child4);
+        allChildren.add(child5);
+        parent.setChildren(allChildren);
+        parent.setSpouses(Sets.newHashSet());
+
+        when(tx.getToManyRelation(any(), eq(parent), any(), any())).thenReturn(new DataStoreIterableBuilder(allChildren).build());
+
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
+
+        //Requested = (1,2,3)
+        List<Resource> idList = new ArrayList<>();
+        idList.add(new ResourceIdentifier("child", "3").castToResource());
+        idList.add(new ResourceIdentifier("child", "2").castToResource());
+        idList.add(new ResourceIdentifier("child", "1").castToResource());
+        Relationship ids = new Relationship(null, new Data<>(idList));
+
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(child1);
+        when(tx.loadObject(any(), eq(2L), any())).thenReturn(child2);
+        when(tx.loadObject(any(), eq(3L), any())).thenReturn(child3);
+        when(tx.loadObject(any(), eq(-4L), any())).thenReturn(child4);
+        when(tx.loadObject(any(), eq(-5L), any())).thenReturn(child5);
+
+        //Final set after operation = (1,2,3,4,5)
+        Set<Child> expected = new HashSet<>();
+        expected.add(child1);
+        expected.add(child2);
+        expected.add(child3);
+        expected.add(child4);
+        expected.add(child5);
+
+        boolean updated = parentResource.updateRelation("children", ids.toPersistentResources(goodScope));
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, never()).save(parent, goodScope);
+        verify(tx, never()).save(child1, goodScope);
+        verify(tx, never()).save(child2, goodScope);
+        verify(tx, never()).save(child4, goodScope);
+        verify(tx, never()).save(child5, goodScope);
+        verify(tx, never()).save(child3, goodScope);
 
-        Assert.assertEquals(updated, true, "Many-2-many relationship should be updated.");
-        Assert.assertTrue(parent.getChildren().containsAll(expected), "All expected members were updated");
-        Assert.assertTrue(expected.containsAll(parent.getChildren()), "All expected members were updated");
+        assertFalse(updated, "Many-2-many relationship should not be updated.");
+        assertTrue(parent.getChildren().containsAll(expected), "All expected members were updated");
+        assertTrue(expected.containsAll(parent.getChildren()), "All expected members were updated");
 
         /*
          * No tests for reference integrity since the parent is the owner and
@@ -488,46 +809,172 @@ public void testSuccessfulManyToManyRelationshipUpdate() throws Exception {
          */
     }
 
+    @Test
+    /*
+     * The following are ids for a hypothetical relationship.
+     * GIVEN:
+     * all (all the ids in the DB) = null
+     * mine (everything the current user has access to) = null
+     * requested (what the user wants to change to) = 1,2,3
+     * THEN:
+     * deleted (what gets removed from the DB) = nothing
+     * final (what get stored in the relationship) = 1,2,3
+     * BECAUSE:
+     * notMine = all - mine
+     * updated = (requested UNION mine) - (requested INTERSECT mine)
+     * deleted = (mine - requested)
+     * final = (notMine) UNION requested
+     */
+    public void testSuccessfulManyToManyRelationshipNullUpdate() throws Exception {
+        Parent parent = new Parent();
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        Child child1 = newChild(1);
+        Child child2 = newChild(2);
+        Child child3 = newChild(3);
+
+        //All = null
+        //Mine = null
+        Set<Child> allChildren = new HashSet<>();
+        allChildren.add(child1);
+        allChildren.add(child2);
+        allChildren.add(child3);
+        parent.setChildren(null);
+        parent.setSpouses(Sets.newHashSet());
+
+        when(tx.getToManyRelation(any(), eq(parent), any(), any())).thenReturn(null);
+
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
+
+        //Requested = (1,2,3)
+        List<Resource> idList = new ArrayList<>();
+        idList.add(new ResourceIdentifier("child", "3").castToResource());
+        idList.add(new ResourceIdentifier("child", "2").castToResource());
+        idList.add(new ResourceIdentifier("child", "1").castToResource());
+        Relationship ids = new Relationship(null, new Data<>(idList));
+
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(child1);
+        when(tx.loadObject(any(), eq(2L), any())).thenReturn(child2);
+        when(tx.loadObject(any(), eq(3L), any())).thenReturn(child3);
+
+        //Final set after operation = (1,2,3)
+        Set<Child> expected = new HashSet<>();
+        expected.add(child1);
+        expected.add(child2);
+        expected.add(child3);
+
+        boolean updated = parentResource.updateRelation("children", ids.toPersistentResources(goodScope));
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, times(1)).save(child1, goodScope);
+        verify(tx, times(1)).save(child2, goodScope);
+        verify(tx, times(1)).save(child3, goodScope);
+
+        assertTrue(updated, "Many-2-many relationship should be updated.");
+        assertTrue(parent.getChildren().containsAll(expected), "All expected members were updated");
+        assertTrue(expected.containsAll(parent.getChildren()), "All expected members were updated");
+
+        /*
+         * No tests for reference integrity since the parent is the owner and
+         * this is a many to many relationship.
+         */
+    }
+
+    /**
+     * Verify that Relationship toMany cannot contain null resources, but toOne can.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testRelationshipMissingData() throws Exception {
+        User goodUser = new TestUser("1");
+
+        @SuppressWarnings("resource")
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+        RequestScope goodScope = new RequestScope(
+                null,
+                null,
+                NO_VERSION,
+                null,
+                tx,
+                goodUser,
+                null,
+                null,
+                UUID.randomUUID(),
+                elideSettings);
+
+        // null resource in toMany relationship is not valid
+        List<Resource> idList = new ArrayList<>();
+        idList.add(new ResourceIdentifier("child", "3").castToResource());
+        idList.add(new ResourceIdentifier("child", "6").castToResource());
+        idList.add(null);
+        assertThrows(
+                NullPointerException.class,
+                () -> new Relationship(Collections.emptyMap(), new Data<>(idList)));
+
+        // However null toOne relationship is valid
+        Relationship toOneRelationship = new Relationship(Collections.emptyMap(), new Data<>((Resource) null));
+        assertTrue(toOneRelationship.getData().get().isEmpty());
+        assertNull(toOneRelationship.toPersistentResources(goodScope));
+
+        // no Data
+        Relationship nullRelationship = new Relationship(Collections.emptyMap(), null);
+        assertNull(nullRelationship.getData());
+        assertNull(nullRelationship.toPersistentResources(goodScope));
+    }
+
     @Test
     public void testGetAttributeSuccess() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setField2("blah");
-        fun.field3 = null;
+        fun.setField3(null);
+
+        when(tx.getAttribute(any(), any(), any())).thenCallRealMethod();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", scope);
 
         String result = (String) funResource.getAttribute("field2");
-        Assert.assertEquals(result, "blah", "The correct attribute should be returned.");
+        assertEquals("blah", result, "The correct attribute should be returned.");
         result = (String) funResource.getAttribute("field3");
-        Assert.assertEquals(result, null, "The correct attribute should be returned.");
+        assertNull(result, "The correct attribute should be returned.");
     }
 
-    @Test(expectedExceptions = InvalidAttributeException.class)
+    @Test
     public void testGetAttributeInvalidField() {
         FunWithPermissions fun = new FunWithPermissions();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        funResource.getAttribute("invalid");
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", scope);
+
+        assertThrows(InvalidAttributeException.class, () -> funResource.getAttribute("invalid"));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testGetAttributeInvalidFieldPermissions() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setField1("foo");
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        funResource.getAttribute("field1");
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", scope);
+
+        assertThrows(ForbiddenAccessException.class, () -> funResource.getAttribute("field1"));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testGetAttributeInvalidEntityPermissions() {
         NoReadEntity noread = new NoReadEntity();
 
-        PersistentResource<NoReadEntity> noreadResource = new PersistentResource<>(noread, null, "1", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        noreadResource.getAttribute("field");
+        PersistentResource<NoReadEntity> noreadResource = new PersistentResource<>(noread, "1", scope);
+
+        assertThrows(ForbiddenAccessException.class, () -> noreadResource.getAttribute("field"));
     }
 
     @Test
@@ -536,13 +983,18 @@ public void testGetRelationSuccess() {
         Child child1 = newChild(1);
         Child child2 = newChild(2);
         Child child3 = newChild(3);
-        fun.relation2 = Sets.newHashSet(child1, child2, child3);
+        Set<Child> children = Sets.newHashSet(child1, child2, child3);
+        fun.setRelation2(children);
+
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        when(scope.getTransaction().getToManyRelation(any(), eq(fun), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(children).build());
 
-        Set<PersistentResource> results = funResource.getRelationCheckedFiltered("relation2");
+        Set<PersistentResource> results = getRelation(funResource, "relation2");
 
-        Assert.assertEquals(results.size(), 3, "All of relation elements should be returned.");
+        assertEquals(3, results.size(), "All of relation elements should be returned.");
     }
 
     @Test
@@ -551,13 +1003,19 @@ public void testGetRelationFilteredSuccess() {
         Child child1 = newChild(1);
         Child child2 = newChild(-2);
         Child child3 = newChild(3);
-        fun.relation2 = Sets.newHashSet(child1, child2, child3);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        Set<Child> children = Sets.newHashSet(child1, child2, child3);
+        fun.setRelation2(Sets.newHashSet(child1, child2, child3));
 
-        Set<PersistentResource> results = funResource.getRelationCheckedFiltered("relation2");
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
-        Assert.assertEquals(results.size(), 2, "Only filtered relation elements should be returned.");
+        when(scope.getTransaction().getToManyRelation(any(), eq(fun), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(children).build());
+
+        Set<PersistentResource> results = getRelation(funResource, "relation2");
+
+        assertEquals(2, results.size(), "Only filtered relation elements should be returned.");
     }
 
     @Test
@@ -568,84 +1026,119 @@ public void testGetRelationWithPredicateSuccess() {
         Child child3 = newChild(3, "chris smith");
         parent.setChildren(Sets.newHashSet(child1, child2, child3));
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.getRelation(any(), any(), any(), any(), any(), anySet())).thenReturn(Sets.newHashSet(child1));
-        User goodUser = new User(1);
+        when(tx.getToManyRelation(eq(tx), any(), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(Sets.newHashSet(child1)).build());
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.add("filter[child.name]", "paul john");
-        RequestScope goodScope = new RequestScope(
-                "/child", null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER, queryParams);
+        RequestScope goodScope = buildRequestScope("/child", tx, goodUser, queryParams);
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
 
-        Set<PersistentResource> results = parentResource.getRelationCheckedFiltered("children");
+        Set<PersistentResource> results = getRelation(parentResource, "children");
 
-        Assert.assertEquals(results.size(), 1);
-        Assert.assertEquals(((Child) results.iterator().next().getObject()).getName(), "paul john");
+        assertEquals(1, results.size());
+        assertEquals("paul john", ((Child) IterableUtils.first(results).getObject()).getName());
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
+    public void testGetSingleRelationInMemory() {
+        // Ensure we don't break when we try to get a specific relationship in memory (i.e. not yet pushed to datastore)
+        Parent parent = newParent(1);
+        Child child1 = newChild(1, "paul john");
+        Child child2 = newChild(2, "john buzzard");
+        Child child3 = newChild(3, "chris smith");
+        Set<Child> children = Sets.newHashSet(child1, child2, child3);
+        parent.setChildren(children);
+
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+        when(scope.getTransaction().getToManyRelation(any(), eq(parent), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(children).build());
+
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", scope);
+
+        PersistentResource childResource =
+                parentResource.getRelation(getRelationship(ClassType.of(Parent.class), "children"), "2");
+
+        assertEquals("2", childResource.getId());
+        assertEquals("john buzzard", ((Child) childResource.getObject()).getName());
+    }
+
+    @Test
     public void testGetRelationForbiddenByEntity() {
         NoReadEntity noread = new NoReadEntity();
 
-        PersistentResource<NoReadEntity> noreadResource = new PersistentResource<>(noread, null, "3", goodUserScope);
-        noreadResource.getRelationCheckedFiltered("child");
+        RequestScope scope = new TestRequestScope(tx, badUser, dictionary);
+
+        PersistentResource<NoReadEntity> noreadResource = new PersistentResource<>(noread, "3", scope);
+        assertThrows(ForbiddenAccessException.class, () -> getRelation(noreadResource, "child"));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testGetRelationForbiddenByField() {
         FunWithPermissions fun = new FunWithPermissions();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", badUserScope);
+        RequestScope scope = new TestRequestScope(tx, badUser, dictionary);
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
-        funResource.getRelationCheckedFiltered("relation1");
+        assertThrows(ForbiddenAccessException.class, () -> getRelation(funResource, "relation1"));
     }
 
     @Test
     public void testGetRelationForbiddenByEntityAllowedByField() {
         FirstClassFields firstClassFields = new FirstClassFields();
 
-        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, null, "3", badUserScope);
+        RequestScope badUserScope = new TestRequestScope(tx, badUser, dictionary);
+
+        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, "3", badUserScope);
 
-        fcResource.getRelationCheckedFiltered("public2");
+        getRelation(fcResource, "public2");
     }
 
     @Test
     public void testGetAttributeForbiddenByEntityAllowedByField() {
         FirstClassFields firstClassFields = new FirstClassFields();
 
-        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, null, "3", badUserScope);
+        RequestScope badUserScope = new TestRequestScope(tx, badUser, dictionary);
+
+        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, "3", badUserScope);
 
         fcResource.getAttribute("public1");
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testGetRelationForbiddenByEntity2() {
         FirstClassFields firstClassFields = new FirstClassFields();
 
-        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, null, "3", badUserScope);
+        RequestScope badUserScope = new TestRequestScope(tx, badUser, dictionary);
 
-        fcResource.getRelationCheckedFiltered("private2");
+        PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields, "3", badUserScope);
+
+        assertThrows(ForbiddenAccessException.class, () -> getRelation(fcResource, "private2"));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testGetAttributeForbiddenByEntity2() {
         FirstClassFields firstClassFields = new FirstClassFields();
 
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+
         PersistentResource<FirstClassFields> fcResource = new PersistentResource<>(firstClassFields,
-                null, "3", goodUserScope);
+                "3", scope);
 
-        fcResource.getAttribute("private1");
+        assertThrows(ForbiddenAccessException.class, () -> fcResource.getAttribute("private1"));
     }
 
-    @Test(expectedExceptions = InvalidAttributeException.class)
+    @Test
     public void testGetRelationInvalidRelation() {
         FunWithPermissions fun = new FunWithPermissions();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        funResource.getRelationCheckedFiltered("invalid");
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
+
+        assertThrows(InvalidAttributeException.class, () -> getRelation(funResource, "invalid"));
     }
 
     @Test
@@ -654,73 +1147,100 @@ public void testGetRelationByIdSuccess() {
         Child child1 = newChild(1);
         Child child2 = newChild(2);
         Child child3 = newChild(3);
-        fun.relation2 = Sets.newHashSet(child1, child2, child3);
-
-        User goodUser = new User(1);
+        fun.setRelation2(Sets.newHashSet(child1, child2, child3));
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.getRelation(any(), any(), any(), any(), any(), anySet())).thenReturn(Sets.newHashSet(child1));
+        when(tx.getToManyRelation(eq(tx), any(), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(Sets.newHashSet(child1)).build());
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
 
-        PersistentResource<?> result = funResource.getRelation("relation2", "1");
+        PersistentResource<?> result = funResource.getRelation(getRelationship(
+                ClassType.of(FunWithPermissions.class),
+                "relation2"),
+                "1");
 
-        Assert.assertEquals(((Child) result.getObject()).getId(), 1, "The correct relationship element should be returned");
+        assertEquals(1,
+                ((Child) result.getObject()).getId(), "The correct relationship element should be returned");
     }
 
-    @Test(expectedExceptions = InvalidObjectIdentifierException.class)
+    @Test
     public void testGetRelationByInvalidId() {
         FunWithPermissions fun = new FunWithPermissions();
         Child child1 = newChild(1);
         Child child2 = newChild(2);
         Child child3 = newChild(3);
-        fun.relation2 = Sets.newHashSet(child1, child2, child3);
+        fun.setRelation2(Sets.newHashSet(child1, child2, child3));
 
-        User goodUser = new User(1);
+        when(tx.getToManyRelation(eq(tx), any(), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(Sets.newHashSet(child1)).build());
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        when(tx.getRelation(any(), any(), any(), any(), any(), anySet())).thenReturn(Sets.newHashSet(child1));
-
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
 
-        funResource.getRelation("relation2", "-1000");
+        assertThrows(InvalidObjectIdentifierException.class,
+                () -> funResource.getRelation(
+                        getRelationship(ClassType.of(FunWithPermissions.class), "relation2"),
+                        "-1000"));
     }
 
     @Test
     public void testGetRelationsNoEntityAccess() {
         FunWithPermissions fun = new FunWithPermissions();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        Set set = funResource.getRelationCheckedFiltered("relation4");
-        Assert.assertEquals(0,  set.size());
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
+
+        Set set = getRelation(funResource, "relation4");
+        assertEquals(0, set.size());
     }
 
     @Test
     public void testGetRelationsNoEntityAccess2() {
         FunWithPermissions fun = new FunWithPermissions();
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodUserScope);
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", scope);
 
-        Set set = funResource.getRelationCheckedFiltered("relation5");
-        Assert.assertEquals(0,  set.size());
+        Set set = getRelation(funResource, "relation5");
+        assertEquals(0, set.size());
     }
 
     @Test
     void testDeleteResourceSuccess() {
         Parent parent = newParent(1);
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
 
         parentResource.deleteResource();
 
-        verify(tx).delete(parent);
+        verify(tx).delete(parent, goodScope);
+    }
+
+    @Test
+    void testDeleteCascades() {
+        Invoice invoice = new Invoice();
+        invoice.setId(1);
+
+        LineItem item = new LineItem();
+        invoice.setItems(Sets.newHashSet(item));
+        item.setInvoice(invoice);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        PersistentResource<Invoice> invoiceResource = new PersistentResource<>(invoice, "1", goodScope);
+
+        invoiceResource.deleteResource();
+
+        verify(tx).delete(invoice, goodScope);
+
+        /* The inverse relation should not be touched for cascading deletes */
+        verify(tx, never()).save(item, goodScope);
+        assertEquals(1, invoice.getItems().size());
     }
 
     @Test
@@ -729,41 +1249,40 @@ void testDeleteResourceUpdateRelationshipSuccess() {
         Child child = newChild(100);
         parent.setChildren(Sets.newHashSet(child));
         parent.setSpouses(Sets.newHashSet());
+
+        Set<Parent> parents = Sets.newHashSet(parent);
         child.setParents(Sets.newHashSet(parent));
 
-        Assert.assertFalse(parent.getChildren().isEmpty());
+        assertFalse(parent.getChildren().isEmpty());
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        when(tx.getToManyRelation(any(), eq(child), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(parents).build());
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, parentResource, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
-        childResource.deleteResource();
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
+        PersistentResource<Child> childResource =
+                new PersistentResource<>(child, parentResource, "children", "1", goodScope);
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).delete(child);
-        verify(tx, times(1)).save(parent);
-        verify(tx, never()).delete(parent);
-        Assert.assertTrue(parent.getChildren().isEmpty());
+        childResource.deleteResource();
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).delete(child, goodScope);
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, never()).delete(parent, goodScope);
+        assertTrue(parent.getChildren().isEmpty());
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     void testDeleteResourceForbidden() {
         NoDeleteEntity nodelete = new NoDeleteEntity();
         nodelete.setId(1);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<NoDeleteEntity> nodeleteResource = new PersistentResource<>(nodelete, "1", goodScope);
 
-        PersistentResource<NoDeleteEntity> nodeleteResource = new PersistentResource<>(nodelete, null, "1", goodScope);
+        assertThrows(ForbiddenAccessException.class, nodeleteResource::deleteResource);
 
-        nodeleteResource.deleteResource();
-
-        verify(tx, never()).delete(nodelete);
+        verify(tx, never()).delete(nodelete, goodScope);
     }
 
     @Test
@@ -773,68 +1292,81 @@ void testAddRelationSuccess() {
 
         Child child = newChild(1);
 
-        User goodUser = new User(1);
-
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
         funResource.addRelation("relation1", childResource);
 
-        goodScope.saveObjects();
-        verify(tx, never()).save(child); // Child wasn't modified
-        verify(tx, times(1)).save(fun);
+        goodScope.saveOrCreateObjects();
+        verify(tx, never()).save(child, goodScope); // Child wasn't modified
+        verify(tx, times(1)).save(fun, goodScope);
 
-        Assert.assertTrue(fun.getRelation1().contains(child), "The correct element should be added to the relation");
+        assertTrue(fun.getRelation1().contains(child), "The correct element should be added to the relation");
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     void testAddRelationForbiddenByField() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setRelation1(Sets.newHashSet());
 
         Child child = newChild(1);
 
-        User badUser = new User(-1);
+        RequestScope badScope = buildRequestScope(tx, badUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", badScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", badScope);
+        assertThrows(ForbiddenAccessException.class, () -> funResource.addRelation("relation1", childResource));
+    }
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope badScope = new RequestScope(null, null, tx, badUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", badScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", badScope);
-        funResource.addRelation("relation1", childResource);
+    @Test
+    void testAddRelationForbiddenByToManyExistingRelationship() {
+        FunWithPermissions fun = new FunWithPermissions();
+
+        Child child = newChild(1);
+        fun.setRelation1(Set.of(child));
+
+        RequestScope badScope = buildRequestScope(tx, badUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", badScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", badScope);
+        assertThrows(ForbiddenAccessException.class, () -> funResource.addRelation("relation1", childResource));
+    }
+
+    @Test
+    void testAddRelationForbiddenByToOneExistingRelationship() {
+        FunWithPermissions fun = new FunWithPermissions();
+
+        Child child = newChild(1);
+        fun.setRelation3(child);
+
+        RequestScope badScope = buildRequestScope(tx, badUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", badScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", badScope);
+        assertThrows(ForbiddenAccessException.class, () -> funResource.addRelation("relation3", childResource));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     void testAddRelationForbiddenByEntity() {
         NoUpdateEntity noUpdate = new NoUpdateEntity();
         noUpdate.setId(1);
         Child child = newChild(2);
-        noUpdate.children = Sets.newHashSet();
-
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        noUpdate.setChildren(Sets.newHashSet());
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<NoUpdateEntity> noUpdateResource = new PersistentResource<>(noUpdate, null, "1", goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "2", goodScope);
-        noUpdateResource.addRelation("children", childResource);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<NoUpdateEntity> noUpdateResource = new PersistentResource<>(noUpdate, "1", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "2", goodScope);
+        assertThrows(ForbiddenAccessException.class, () -> noUpdateResource.addRelation("children", childResource));
     }
 
-    @Test(expectedExceptions = InvalidAttributeException.class)
+    @Test
     public void testAddRelationInvalidRelation() {
         FunWithPermissions fun = new FunWithPermissions();
 
         Child child = newChild(1);
 
-        User goodUser = new User(1);
-
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "3", goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
-        funResource.addRelation("invalid", childResource);
-
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "3", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        assertThrows(InvalidAttributeException.class, () -> funResource.addRelation("invalid", childResource));
     }
 
     @Test()
@@ -845,23 +1377,21 @@ public void testRemoveToManyRelationSuccess() {
         Parent parent3 = newParent(3, child);
         child.setParents(Sets.newHashSet(parent1, parent2, parent3));
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
-        PersistentResource<Object> removeResource = new PersistentResource<>(parent1, null, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        PersistentResource<Object> removeResource = new PersistentResource<>(parent1, "1", goodScope);
         childResource.removeRelation("parents", removeResource);
 
-        Assert.assertEquals(child.getParents().size(), 2, "The many-2-many relationship should be cleared");
-        Assert.assertEquals(parent1.getChildren().size(), 0, "The many-2-many inverse relationship should be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 1, "The many-2-many inverse relationship should not be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 1, "The many-2-many inverse relationship should not be cleared");
+        assertEquals(2, child.getParents().size(), "The many-2-many relationship should be cleared");
+        assertEquals(0, parent1.getChildren().size(), "The many-2-many inverse relationship should be cleared");
+        assertEquals(1, parent3.getChildren().size(), "The many-2-many inverse relationship should not be cleared");
+        assertEquals(1, parent3.getChildren().size(), "The many-2-many inverse relationship should not be cleared");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(child);
-        verify(tx, times(1)).save(parent1);
-        verify(tx, never()).save(parent2);
-        verify(tx, never()).save(parent3);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(child, goodScope);
+        verify(tx, times(1)).save(parent1, goodScope);
+        verify(tx, never()).save(parent2, goodScope);
+        verify(tx, never()).save(parent3, goodScope);
     }
 
     @Test()
@@ -870,20 +1400,18 @@ public void testRemoveToOneRelationSuccess() {
         Child child = newChild(1);
         fun.setRelation3(child);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodScope);
-        PersistentResource<Object> removeResource = new PersistentResource<>(child, null, "1", goodScope);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", goodScope);
+        PersistentResource<Object> removeResource = new PersistentResource<>(child, "1", goodScope);
 
         funResource.removeRelation("relation3", removeResource);
 
-        Assert.assertEquals(fun.getRelation3(), null, "The one-2-one relationship should be cleared");
+        assertNull(fun.getRelation3(), "The one-2-one relationship should be cleared");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(fun);
-        verify(tx, never()).save(child);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(fun, goodScope);
+        verify(tx, never()).save(child, goodScope);
     }
 
     // Test to ensure that save() is not called on unmodified objects
@@ -895,21 +1423,57 @@ public void testNoSaveNonModifications() {
         Parent parent = new Parent();
 
         fun.setRelation3(child);
-        fun.setRelation1(Sets.newHashSet(child));
 
-        parent.setChildren(Sets.newHashSet(child));
+        Set<Child> children1 = Sets.newHashSet(child);
+        fun.setRelation1(children1);
+
+        Set<Child> children2 = Sets.newHashSet(child);
+        parent.setChildren(children2);
         parent.setFirstName("Leeroy");
 
         child.setReadNoAccess(secret);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
-        PersistentResource<Child> secretResource = new PersistentResource<>(secret, null, "1", goodScope);
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        when(tx.getToOneRelation(any(), eq(fun), eq(com.yahoo.elide.core.request.Relationship.builder()
+                .name("relation3")
+                .alias("relation3")
+                .projection(EntityProjection.builder()
+                        .type(Child.class)
+                        .build())
+                .build()), any())).thenReturn(child);
+
+        when(tx.getToManyRelation(any(), eq(fun), eq(com.yahoo.elide.core.request.Relationship.builder()
+                .name("relation1")
+                .alias("relation1")
+                .projection(EntityProjection.builder()
+                        .type(Child.class)
+                        .build())
+                .build()), any())).thenReturn(new DataStoreIterableBuilder(children1).build());
+
+        when(tx.getToManyRelation(any(), eq(parent), eq(com.yahoo.elide.core.request.Relationship.builder()
+                .name("children")
+                .alias("children")
+                .projection(EntityProjection.builder()
+                        .type(Child.class)
+                        .build())
+                .build()), any())).thenReturn(new DataStoreIterableBuilder(children2).build());
+
+        when(tx.getToOneRelation(any(), eq(child), eq(com.yahoo.elide.core.request.Relationship.builder()
+                .name("readNoAccess")
+                .alias("readNoAccess")
+                .projection(EntityProjection.builder()
+                        .type(Child.class)
+                        .build())
+                .build()), any())).thenReturn(secret);
+
+        RequestScope funScope = new TestRequestScope(tx, goodUser, dictionary);
+        RequestScope childScope = new TestRequestScope(tx, goodUser, dictionary);
+        RequestScope parentScope = new TestRequestScope(tx, goodUser, dictionary);
+
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", funScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", childScope);
+        PersistentResource<Child> secretResource = new PersistentResource<>(secret, "1", childScope);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", parentScope);
 
         // Add an existing to-one relationship
         funResource.addRelation("relation3", childResource);
@@ -941,11 +1505,13 @@ public void testNoSaveNonModifications() {
         // Clear empty to-one relation
         secretResource.clearRelation("readNoAccess");
 
-        goodScope.saveObjects();
-        verify(tx, never()).save(fun);
-        verify(tx, never()).save(child);
-        verify(tx, never()).save(parent);
-        verify(tx, never()).save(secret);
+        parentScope.saveOrCreateObjects();
+        childScope.saveOrCreateObjects();
+        funScope.saveOrCreateObjects();
+        verify(tx, never()).save(fun, funScope);
+        verify(tx, never()).save(child, childScope);
+        verify(tx, never()).save(parent, parentScope);
+        verify(tx, never()).save(secret, childScope);
     }
 
     @Test()
@@ -955,19 +1521,17 @@ public void testRemoveNonexistingToOneRelation() {
         Child unownedChild = newChild(2);
         fun.setRelation3(ownedChild);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodScope);
-        PersistentResource<Object> removeResource = new PersistentResource<>(unownedChild, null, "1", goodScope);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", goodScope);
+        PersistentResource<Object> removeResource = new PersistentResource<>(unownedChild, "1", goodScope);
 
         funResource.removeRelation("relation3", removeResource);
 
-        Assert.assertEquals(fun.getRelation3(), ownedChild, "The one-2-one relationship should NOT be cleared");
+        assertEquals(ownedChild, fun.getRelation3(), "The one-2-one relationship should NOT be cleared");
 
-        verify(tx, never()).save(fun);
-        verify(tx, never()).save(ownedChild);
+        verify(tx, never()).save(fun, goodScope);
+        verify(tx, never()).save(ownedChild, goodScope);
     }
 
     @Test()
@@ -980,22 +1544,20 @@ public void testRemoveNonexistingToManyRelation() {
 
         Parent unownedParent = newParent(4, null);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
-        PersistentResource<Object> removeResource = new PersistentResource<>(unownedParent, null, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
+        PersistentResource<Object> removeResource = new PersistentResource<>(unownedParent, "1", goodScope);
         childResource.removeRelation("parents", removeResource);
 
-        Assert.assertEquals(child.getParents().size(), 3, "The many-2-many relationship should not be cleared");
-        Assert.assertEquals(parent1.getChildren().size(), 1, "The many-2-many inverse relationship should not be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 1, "The many-2-many inverse relationship should not be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 1, "The many-2-many inverse relationship should not be cleared");
+        assertEquals(3, child.getParents().size(), "The many-2-many relationship should not be cleared");
+        assertEquals(1, parent1.getChildren().size(), "The many-2-many inverse relationship should not be cleared");
+        assertEquals(1, parent3.getChildren().size(), "The many-2-many inverse relationship should not be cleared");
+        assertEquals(1, parent3.getChildren().size(), "The many-2-many inverse relationship should not be cleared");
 
-        verify(tx, never()).save(child);
-        verify(tx, never()).save(parent1);
-        verify(tx, never()).save(parent2);
-        verify(tx, never()).save(parent3);
+        verify(tx, never()).save(child, goodScope);
+        verify(tx, never()).save(parent1, goodScope);
+        verify(tx, never()).save(parent2, goodScope);
+        verify(tx, never()).save(parent3, goodScope);
     }
 
     @Test()
@@ -1004,26 +1566,35 @@ public void testClearToManyRelationSuccess() {
         Parent parent1 = newParent(1, child);
         Parent parent2 = newParent(2, child);
         Parent parent3 = newParent(3, child);
-        child.setParents(Sets.newHashSet(parent1, parent2, parent3));
+        Set<Parent> parents = Sets.newHashSet(parent1, parent2, parent3);
+        child.setParents(parents);
+
+        when(tx.getToManyRelation(any(), eq(child), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(parents).build());
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(Child.class)
+                .relationship("parents",
+                        EntityProjection.builder()
+                                .type(Parent.class)
+                                .build())
+                .build());
 
-        PersistentResource<Child> childResource = new PersistentResource<>(child, null, "1", goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(child, "1", goodScope);
 
         childResource.clearRelation("parents");
 
-        Assert.assertEquals(child.getParents().size(), 0, "The many-2-many relationship should be cleared");
-        Assert.assertEquals(parent1.getChildren().size(), 0, "The many-2-many inverse relationship should be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 0, "The many-2-many inverse relationship should be cleared");
-        Assert.assertEquals(parent3.getChildren().size(), 0, "The many-2-many inverse relationship should be cleared");
+        assertEquals(0, child.getParents().size(), "The many-2-many relationship should be cleared");
+        assertEquals(0, parent1.getChildren().size(), "The many-2-many inverse relationship should be cleared");
+        assertEquals(0, parent3.getChildren().size(), "The many-2-many inverse relationship should be cleared");
+        assertEquals(0, parent3.getChildren().size(), "The many-2-many inverse relationship should be cleared");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(child);
-        verify(tx, times(1)).save(parent1);
-        verify(tx, times(1)).save(parent2);
-        verify(tx, times(1)).save(parent3);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(child, goodScope);
+        verify(tx, times(1)).save(parent1, goodScope);
+        verify(tx, times(1)).save(parent2, goodScope);
+        verify(tx, times(1)).save(parent3, goodScope);
     }
 
     @Test()
@@ -1032,25 +1603,39 @@ public void testClearToOneRelationSuccess() {
         Child child = newChild(1);
         fun.setRelation3(child);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodScope);
+        when(tx.getToOneRelation(any(), eq(fun), any(), any())).thenReturn(child);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(FunWithPermissions.class)
+                .relationship("relation3",
+                        EntityProjection.builder()
+                                .type(Child.class)
+                                .build())
+                .build());
+
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", goodScope);
         funResource.clearRelation("relation3");
 
-        Assert.assertEquals(fun.getRelation3(), null, "The one-2-one relationship should be cleared");
+        assertNull(fun.getRelation3(), "The one-2-one relationship should be cleared");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(fun);
-        verify(tx, times(1)).save(child);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(fun, goodScope);
+        verify(tx, times(1)).save(child, goodScope);
     }
 
     @Test()
     public void testClearRelationFilteredByReadAccess() {
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
         Parent parent = new Parent();
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(Parent.class)
+                .relationship("children",
+                        EntityProjection.builder()
+                                .type(Child.class)
+                                .build())
+                .build());
 
         Child child1 = newChild(1);
         Child child2 = newChild(2);
@@ -1060,7 +1645,6 @@ public void testClearRelationFilteredByReadAccess() {
         Child child5 = newChild(-5);
         child5.setId(-5); //Not accessible to goodUser
 
-
         //All = (1,2,3,4,5)
         //Mine = (1,2,3)
         Set<Child> allChildren = new HashSet<>();
@@ -1072,7 +1656,10 @@ public void testClearRelationFilteredByReadAccess() {
         parent.setChildren(allChildren);
         parent.setSpouses(Sets.newHashSet());
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        when(tx.getToManyRelation(any(), eq(parent), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(allChildren).build());
+
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
 
         //Final set after operation = (4,5)
         Set<Child> expected = new HashSet<>();
@@ -1081,17 +1668,17 @@ public void testClearRelationFilteredByReadAccess() {
 
         boolean updated = parentResource.clearRelation("children");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(parent);
-        verify(tx, times(1)).save(child1);
-        verify(tx, times(1)).save(child2);
-        verify(tx, times(1)).save(child3);
-        verify(tx, never()).save(child4);
-        verify(tx, never()).save(child5);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, times(1)).save(child1, goodScope);
+        verify(tx, times(1)).save(child2, goodScope);
+        verify(tx, times(1)).save(child3, goodScope);
+        verify(tx, never()).save(child4, goodScope);
+        verify(tx, never()).save(child5, goodScope);
 
-        Assert.assertEquals(updated, true, "The relationship should have been partially cleared.");
-        Assert.assertTrue(parent.getChildren().containsAll(expected), "The unfiltered remaining members are left");
-        Assert.assertTrue(expected.containsAll(parent.getChildren()), "The unfiltered remaining members are left");
+        assertTrue(updated, "The relationship should have been partially cleared.");
+        assertTrue(parent.getChildren().containsAll(expected), "The unfiltered remaining members are left");
+        assertTrue(expected.containsAll(parent.getChildren()), "The unfiltered remaining members are left");
 
         /*
          * No tests for reference integrity since the parent is the owner and
@@ -1099,43 +1686,53 @@ public void testClearRelationFilteredByReadAccess() {
          */
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testClearRelationInvalidToOneUpdatePermission() {
         Left left = new Left();
         left.setId(1);
         Right right = new Right();
         right.setId(1);
-        left.noUpdateOne2One = right;
-        right.noUpdateOne2One = left;
-
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "1", goodScope);
-        leftResource.clearRelation("noUpdateOne2One");
+        left.setNoUpdateOne2One(right);
+        right.setNoUpdateOne2One(left);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(Left.class)
+                .relationship("noUpdateOne2One",
+                        EntityProjection.builder()
+                                .type(Right.class)
+                                .build())
+                .build());
+
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "1", goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> leftResource.clearRelation("noUpdateOne2One"));
         // Modifications have a deferred check component:
         leftResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testNoChangeRelationInvalidToOneUpdatePermission() {
         Left left = new Left();
         left.setId(1);
         Right right = new Right();
         right.setId(1);
-        left.noUpdateOne2One = right;
-        right.noUpdateOne2One = left;
-
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "1", goodScope);
-        leftResource.updateRelation("noUpdateOne2One", leftResource.getRelationCheckedFiltered("noUpdateOne2One"));
+        left.setNoUpdateOne2One(right);
+        right.setNoUpdateOne2One(left);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "1", goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> leftResource.updateRelation("noUpdateOne2One", getRelation(leftResource, "noUpdateOne2One")));
         // Modifications have a deferred check component:
         leftResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testClearRelationInvalidToManyUpdatePermission() {
         Left left = new Left();
         left.setId(1);
@@ -1143,16 +1740,29 @@ public void testClearRelationInvalidToManyUpdatePermission() {
         right1.setId(1);
         Right right2 = new Right();
         right2.setId(2);
-        left.noInverseUpdate = Sets.newHashSet(right1, right2);
-        right1.noUpdate = Sets.newHashSet(left);
-        right2.noUpdate = Sets.newHashSet(left);
 
+        Set<Right> noInverseUpdate = Sets.newHashSet(right1, right2);
+        left.setNoInverseUpdate(noInverseUpdate);
+        right1.setNoUpdate(Sets.newHashSet(left));
+        right2.setNoUpdate(Sets.newHashSet(left));
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "1", goodScope);
-        leftResource.clearRelation("noInverseUpdate");
+        when(tx.getToManyRelation(any(), eq(left), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(noInverseUpdate).build());
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(Left.class)
+                .relationship("noInverseUpdate",
+                        EntityProjection.builder()
+                                .type(Right.class)
+                                .build())
+                .build());
+
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "1", goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> leftResource.clearRelation("noInverseUpdate"));
         // Modifications have a deferred check component:
         leftResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
@@ -1163,87 +1773,338 @@ public void testClearRelationInvalidToOneDeletePermission() {
         left.setId(1);
         NoDeleteEntity noDelete = new NoDeleteEntity();
         noDelete.setId(1);
-        left.noDeleteOne2One = noDelete;
+        left.setNoDeleteOne2One(noDelete);
+
+        when(tx.getToOneRelation(any(), eq(left), any(), any())).thenReturn(noDelete);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, "1", goodScope);
-        Assert.assertTrue(leftResource.clearRelation("noDeleteOne2One"));
-        Assert.assertNull(leftResource.getObject().noDeleteOne2One);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(EntityProjection.builder()
+                .type(Left.class)
+                .relationship("noDeleteOne2One",
+                        EntityProjection.builder()
+                                .type(NoDeleteEntity.class)
+                                .build())
+                .build());
+
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, "1", goodScope);
+        assertTrue(leftResource.clearRelation("noDeleteOne2One"));
+        assertNull(leftResource.getObject().getNoDeleteOne2One());
 
     }
 
-    @Test(expectedExceptions = InvalidAttributeException.class)
+    @Test
     public void testClearRelationInvalidRelation() {
         FunWithPermissions fun = new FunWithPermissions();
         Child child = newChild(1);
         fun.setRelation3(child);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", goodScope);
-        funResource.clearRelation("invalid");
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", goodScope);
+        assertThrows(InvalidAttributeException.class, () -> funResource.clearRelation("invalid"));
     }
 
     @Test
     public void testUpdateAttributeSuccess() {
         Parent parent = newParent(1);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
         parentResource.updateAttribute("firstName", "foobar");
 
-        Assert.assertEquals(parent.getFirstName(), "foobar", "The attribute was updated successfully");
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(parent);
+        assertEquals("foobar", parent.getFirstName(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(parent, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeSuccess() {
+        Company company = newCompany("abc");
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1("street1");
+        address.setStreet2("street2");
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeCloneWithHook() {
+        reset(bookUpdatePrice);
+        Book book = new Book();
+
+        Price originalPrice = new Price();
+        originalPrice.setUnits(new BigDecimal(1.0));
+        originalPrice.setCurrency(Currency.getInstance("USD"));
+        book.setPrice(originalPrice);
+
+        Map<String, Object> newPrice = new HashMap<>();
+        newPrice.put("units", new BigDecimal(2.0));
+        newPrice.put("currency", Currency.getInstance("CNY"));
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Book> bookResource = new PersistentResource<>(book, "1", goodScope);
+        bookResource.updateAttribute("price", newPrice);
+
+        //check that original value was unmodified.
+        assertEquals(Currency.getInstance("USD"), originalPrice.getCurrency());
+        assertEquals(new BigDecimal(1.0), originalPrice.getUnits());
+
+        //check that new value matches expected.
+        assertEquals(Currency.getInstance("CNY"), book.getPrice().getCurrency());
+        assertEquals(new BigDecimal(2.0), book.getPrice().getUnits());
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(book, goodScope);
+
+        ArgumentCaptor<CRUDEvent> eventCapture = ArgumentCaptor.forClass(CRUDEvent.class);
+        verify(bookUpdatePrice, times(1)).execute(eq(UPDATE), eq(PRESECURITY),
+                eventCapture.capture());
+
+        assertEquals(originalPrice, eventCapture.getValue().getChanges().get().getOriginal());
+        assertEquals(book.getPrice(), eventCapture.getValue().getChanges().get().getModified());
+    }
+
+    @Test
+    public void testUpdateNestedComplexAttributeClone() {
+        Company company = newCompany("abc");
+        Address originalAddress = new Address();
+        originalAddress.setStreet1("street1");
+        originalAddress.setStreet2("street2");
+
+        GeoLocation originalGeo = new GeoLocation();
+        originalGeo.setLatitude("1");
+        originalGeo.setLongitude("2");
+        originalAddress.setGeo(originalGeo);
+
+        Map<String, Object> newAddress = new HashMap<>();
+        newAddress.put("street1", "Elm");
+        newAddress.put("street2", "Maple");
+        Map<String, Object> newGeo = new HashMap<>();
+        newGeo.put("latitude", "X");
+        newGeo.put("longitude", "Y");
+        newAddress.put("geo", newGeo);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+
+        parentResource.updateAttribute("address", newAddress);
+
+        //check that original value was unmodified.
+        assertEquals("street1", originalAddress.getStreet1());
+        assertEquals("street2", originalAddress.getStreet2());
+        assertEquals("1", originalAddress.getGeo().getLatitude());
+        assertEquals("2", originalAddress.getGeo().getLongitude());
+
+        //check the new value matches the expected.
+        assertEquals("Elm", company.getAddress().getStreet1());
+        assertEquals("Maple", company.getAddress().getStreet2());
+        assertEquals("X", company.getAddress().getGeo().getLatitude());
+        assertEquals("Y", company.getAddress().getGeo().getLongitude());
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateNullComplexAttributeSuccess() {
+        Company company = newCompany("abc");
+        company.setAddress(new Address());
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = null;
+
+        boolean updated = parentResource.updateAttribute("address", address);
+
+        assertTrue(updated);
+        assertNull(company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeNullField() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1("street1");
+        address.setStreet2(null);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeAllNullFields() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1(null);
+        address.setStreet2(null);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeNested() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1("street1");
+        address.setStreet2("street2");
+        final GeoLocation geo = new GeoLocation();
+        geo.setLatitude("lat");
+        geo.setLongitude("long");
+        address.setGeo(geo);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeNestedNullField() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1("street1");
+        address.setStreet2("street2");
+        final GeoLocation geo = new GeoLocation();
+        geo.setLatitude(null);
+        geo.setLongitude("long");
+        address.setGeo(geo);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeNestedAllNullFields() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1("street1");
+        address.setStreet2("street2");
+        final GeoLocation geo = new GeoLocation();
+        geo.setLatitude(null);
+        geo.setLongitude(null);
+        address.setGeo(geo);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeAllNullFieldsNestedAllNullFields() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1(null);
+        address.setStreet2(null);
+        final GeoLocation geo = new GeoLocation();
+        geo.setLatitude(null);
+        geo.setLongitude(null);
+        address.setGeo(geo);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
+    }
+
+    @Test
+    public void testUpdateComplexAttributeAllNullFieldsNested() {
+        Company company = newCompany("abc");
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Company> parentResource = new PersistentResource<>(company, "1", goodScope);
+        final Address address = new Address();
+        address.setStreet1(null);
+        address.setStreet2(null);
+        final GeoLocation geo = new GeoLocation();
+        geo.setLatitude("lat");
+        geo.setLongitude("long");
+        address.setGeo(geo);
+        parentResource.updateAttribute("address", address);
+
+        assertEquals(address, company.getAddress(), "The attribute was updated successfully");
+
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(company, goodScope);
     }
 
-    @Test(expectedExceptions = InvalidAttributeException.class)
+    @Test
     public void testUpdateAttributeInvalidAttribute() {
         Parent parent = newParent(1);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
-
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, null, "1", goodScope);
-        parentResource.updateAttribute("invalid", "foobar");
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", goodScope);
+        assertThrows(InvalidAttributeException.class, () -> parentResource.updateAttribute("invalid", "foobar"));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testUpdateAttributeInvalidUpdatePermission() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setId(1);
 
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User badUser = new User(-1);
+        RequestScope badScope = buildRequestScope(tx, badUser);
 
-        RequestScope badScope = new RequestScope(null, null, tx, badUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", badScope);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", badScope);
-        funResource.updateAttribute("field4", "foobar");
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> funResource.updateAttribute("field4", "foobar"));
         // Updates will defer and wait for the end!
         funResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testUpdateAttributeInvalidUpdatePermissionNoChange() {
         FunWithPermissions fun = new FunWithPermissions();
         fun.setId(1);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User badUser = new User(-1);
 
-        RequestScope badScope = new RequestScope(null, null, tx, badUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        RequestScope badScope = buildRequestScope(tx, badUser);
+        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, "1", badScope);
 
-        PersistentResource<FunWithPermissions> funResource = new PersistentResource<>(fun, null, "1", badScope);
-        funResource.updateAttribute("field4", funResource.getAttribute("field4"));
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> funResource.updateAttribute("field4", funResource.getAttribute("field4")));
         // Updates will defer and wait for the end!
         funResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
@@ -1256,23 +2117,30 @@ public void testLoadRecords() {
         Child child4 = newChild(4);
         Child child5 = newChild(5);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        EntityProjection collection = EntityProjection.builder()
+                .type(Child.class)
+
+                .build();
 
-        when(tx.loadObjects(eq(Child.class), any(FilterScope.class)))
-                .thenReturn(Lists.newArrayList(child1, child2, child3, child4, child5));
+        when(tx.loadObjects(eq(collection), any(RequestScope.class)))
+                .thenReturn(new DataStoreIterableBuilder(
+                        Lists.newArrayList(child1, child2, child3, child4, child5)).build());
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        Set<PersistentResource<Child>> loaded = PersistentResource.loadRecords(Child.class, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(collection);
+
+        Set<PersistentResource> loaded = PersistentResource.loadRecords(EntityProjection.builder()
+                .type(Child.class)
+                .build(), new ArrayList<>(), goodScope).toList(LinkedHashSet::new).blockingGet();
 
         Set<Child> expected = Sets.newHashSet(child1, child4, child5);
 
         Set<Object> actual = loaded.stream().map(PersistentResource::getObject).collect(Collectors.toSet());
 
-        Assert.assertEquals(actual.size(), 3,
+        assertEquals(3, actual.size(),
                 "The returned list should be filtered to only include elements that have read permission"
         );
-        Assert.assertEquals(expected, actual,
+        assertEquals(expected, actual,
                 "The returned list should only include elements with a positive ID"
         );
     }
@@ -1281,71 +2149,122 @@ public void testLoadRecords() {
     public void testLoadRecordSuccess() {
         Child child1 = newChild(1);
 
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        EntityProjection collection = EntityProjection.builder()
+                .type(Child.class)
+
+                .build();
 
-        when(tx.loadObject(Child.class, 1L)).thenReturn(child1);
+        when(tx.loadObject(eq(collection), eq(1L), any())).thenReturn(child1);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Child> loaded = PersistentResource.loadRecord(Child.class, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(collection);
+        PersistentResource<Child> loaded = PersistentResource.loadRecord(EntityProjection.builder()
+                .type(Child.class)
+                .build(), "1", goodScope);
 
-        Assert.assertEquals(loaded.getObject(), child1, "The load function should return the requested child object");
+        assertEquals(child1, loaded.getObject(), "The load function should return the requested child object");
     }
 
-    @Test(expectedExceptions = InvalidObjectIdentifierException.class)
+    @Test
     public void testLoadRecordInvalidId() {
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        EntityProjection collection = EntityProjection.builder()
+                .type(Child.class)
+
+                .build();
 
-        when(tx.loadObject(Child.class, "1")).thenReturn(null);
+        when(tx.loadObject(eq(collection), eq("1"), any())).thenReturn(null);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource.loadRecord(Child.class, "1", goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(collection);
+        assertThrows(
+                InvalidObjectIdentifierException.class,
+                () -> PersistentResource.loadRecord(EntityProjection.builder()
+
+                        .type(Child.class)
+                        .build(), "1", goodScope));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testLoadRecordForbidden() {
         NoReadEntity noRead = new NoReadEntity();
         noRead.setId(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        EntityProjection collection = EntityProjection.builder()
+                .type(NoReadEntity.class)
+
+                .build();
+
+        when(tx.loadObject(eq(collection), eq(1L), any())).thenReturn(noRead);
 
-        when(tx.loadObject(NoReadEntity.class, 1L)).thenReturn(noRead);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        goodScope.setEntityProjection(collection);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource.loadRecord(NoReadEntity.class, "1", goodScope);
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> PersistentResource.loadRecord(EntityProjection.builder().type(NoReadEntity.class).build(),
+                        "1", goodScope));
     }
 
     @Test()
     public void testCreateObjectSuccess() {
         Parent parent = newParent(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        when(tx.createNewObject(ClassType.of(Parent.class), goodScope)).thenReturn(parent);
 
-        when(tx.createObject(Parent.class)).thenReturn(parent);
+        PersistentResource<Parent> created = PersistentResource.createObject(ClassType.of(Parent.class), goodScope, Optional.of("uuid"));
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Parent> created = PersistentResource.createObject(Parent.class, goodScope, "uuid");
         parent.setChildren(new HashSet<>());
         created.getRequestScope().getPermissionExecutor().executeCommitChecks();
 
-        Assert.assertEquals(created.getObject(), parent,
+        assertEquals(parent, created.getObject(),
                 "The create function should return the requested parent object"
         );
+        assertTrue(goodScope.isNewResource(parent));
+    }
+
+    @Test()
+    public void testCreateMappedIdObjectSuccess() {
+        final Job job = new Job();
+        job.setTitle("day job");
+        job.setParent(newParent(1));
+
+        final RequestScope goodScope = buildRequestScope(tx, new TestUser("1"));
+        when(tx.createNewObject(ClassType.of(Job.class), goodScope)).thenReturn(job);
+
+        PersistentResource<Job> created = PersistentResource.createObject(ClassType.of(Job.class), goodScope, Optional.empty());
+
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+
+        assertEquals("day job", created.getObject().getTitle(),
+                "The create function should return the requested job object"
+        );
+        assertNull(created.getObject().getJobId(), "The create function should not override the ID");
+
+        created = PersistentResource.createObject(ClassType.of(Job.class), goodScope, Optional.of("1234"));
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+
+        assertEquals("day job", created.getObject().getTitle(),
+                "The create function should return the requested job object"
+        );
+        assertNull(created.getObject().getJobId(), "The create function should not override the ID");
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testCreateObjectForbidden() {
         NoCreateEntity noCreate = new NoCreateEntity();
         noCreate.setId(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        User goodUser = new User(1);
 
-        when(tx.createObject(NoCreateEntity.class)).thenReturn(noCreate);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        when(tx.createNewObject(ClassType.of(NoCreateEntity.class), goodScope)).thenReturn(noCreate);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<NoCreateEntity> created = PersistentResource.createObject(NoCreateEntity.class, goodScope, "uuid");
-        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> {
+                    PersistentResource<NoCreateEntity> created = PersistentResource.createObject(
+                            ClassType.of(NoCreateEntity.class),
+                            goodScope, Optional.of("1"));
+                    created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+                }
+        );
     }
 
     @Test
@@ -1355,38 +2274,43 @@ public void testDeletePermissionCheckedOnInverseRelationship() {
         Right right = new Right();
         right.setId(2);
 
-        left.fieldLevelDelete = Sets.newHashSet(right);
-        right.allowDeleteAtFieldLevel = Sets.newHashSet(left);
+        Set<Right> rights = Sets.newHashSet(right);
+        left.setFieldLevelDelete(Sets.newHashSet(right));
+        right.setAllowDeleteAtFieldLevel(Sets.newHashSet(left));
 
         //Bad User triggers the delete permission failure
-        User badUser = new User(-1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope badScope = new RequestScope(null, null, tx, badUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, badScope);
+        when(tx.getToManyRelation(any(), eq(left), any(), any())).thenReturn(new DataStoreIterableBuilder(rights).build());
+
+        RequestScope badScope = buildRequestScope(tx, badUser);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, badScope.getUUIDFor(left), badScope);
 
-        Assert.assertTrue(leftResource.clearRelation("fieldLevelDelete"));
-        Assert.assertEquals(leftResource.getObject().fieldLevelDelete.size(), 0);
+        assertTrue(leftResource.clearRelation("fieldLevelDelete"));
+        assertEquals(0, leftResource.getObject().getFieldLevelDelete().size());
     }
 
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
+    @Test
     public void testUpdatePermissionCheckedOnInverseRelationship() {
         Left left = new Left();
         left.setId(1);
         Right right = new Right();
 
-        left.noInverseUpdate = Sets.newHashSet(right);
-        right.noUpdate = Sets.newHashSet(left);
+        Set<Right> rights = Sets.newHashSet(right);
+        left.setNoInverseUpdate(rights);
+        right.setNoUpdate(Sets.newHashSet(left));
 
         List<Resource> empty = new ArrayList<>();
         Relationship ids = new Relationship(null, new Data<>(empty));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<Left> leftResource = new PersistentResource<>(left, null, goodScope);
+        when(tx.getToManyRelation(any(), eq(left), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(rights).build());
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<Left> leftResource = new PersistentResource<>(left, goodScope.getUUIDFor(left), goodScope);
 
-        leftResource.updateRelation("noInverseUpdate", ids.toPersistentResources(goodScope));
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> leftResource.updateRelation("noInverseUpdate", ids.toPersistentResources(goodScope)));
         // Modifications have a deferred check component:
         leftResource.getRequestScope().getPermissionExecutor().executeCommitChecks();
     }
@@ -1397,49 +2321,51 @@ public void testFieldLevelAudit() throws Exception {
 
         Parent parent = newParent(7);
 
-        User goodUser = new User(1);
         TestAuditLogger logger = new TestAuditLogger();
-        PersistentResource<Parent> parentResource = new PersistentResource<>(
-                parent, getUserScope(goodUser, logger));
+        RequestScope requestScope = getUserScope(goodUser, logger);
+        PersistentResource<Parent> parentResource =
+                new PersistentResource<>(parent, requestScope.getUUIDFor(parent), requestScope);
         PersistentResource<Child> childResource = new PersistentResource<>(
-                parentResource, child, getUserScope(goodUser, logger));
+                child,
+                parentResource,
+                "children",
+                requestScope.getUUIDFor(child),
+                requestScope);
 
         childResource.auditField(new ChangeSpec(childResource, "name", parent, null));
 
-        Assert.assertEquals(logger.getMessages().size(), 1, "One message should be logged");
+        assertEquals(1, logger.getMessages().size(), "One message should be logged");
 
         LogMessage message = logger.getMessages().get(0);
-        Assert.assertEquals(message.getMessage(), "UPDATE Child 5 Parent 7", "Logging template should match");
+        assertEquals("UPDATE Child 5 Parent 7", message.getMessage(), "Logging template should match");
 
-        Assert.assertEquals(message.getOperationCode(), 1, "Operation code should match");
+        assertEquals(1, message.getOperationCode(), "Operation code should match");
+        logger.clear(); // tidy up this thread's messages
     }
 
     @Test
     public void testClassLevelAudit() throws Exception {
         Child child = newChild(5);
-
         Parent parent = newParent(7);
 
-        User goodUser = new User(1);
         TestAuditLogger logger = new TestAuditLogger();
+        RequestScope requestScope = getUserScope(goodUser, logger);
         PersistentResource<Parent> parentResource = new PersistentResource<>(
-                parent,
-                getUserScope(goodUser, logger)
-        );
+                parent, requestScope.getUUIDFor(parent), requestScope);
         PersistentResource<Child> childResource = new PersistentResource<>(
-                parentResource,
-                child,
-                getUserScope(goodUser, logger)
-        );
+                child, parentResource, "children", requestScope.getUUIDFor(child), requestScope);
 
-        childResource.auditClass(Audit.Action.CREATE, new ChangeSpec(childResource, null, null, childResource.getObject()));
+        childResource.auditClass(
+                Audit.Action.CREATE,
+                new ChangeSpec(childResource, null, null, childResource.getObject()));
 
-        Assert.assertEquals(logger.getMessages().size(), 1, "One message should be logged");
+        assertEquals(1, logger.getMessages().size(), "One message should be logged");
 
         LogMessage message = logger.getMessages().get(0);
-        Assert.assertEquals(message.getMessage(), "CREATE Child 5 Parent 7", "Logging template should match");
+        assertEquals("CREATE Child 5 Parent 7", message.getMessage(), "Logging template should match");
 
-        Assert.assertEquals(message.getOperationCode(), 0, "Operation code should match");
+        assertEquals(0, message.getOperationCode(), "Operation code should match");
+        logger.clear(); // tidy up this thread's messages
     }
 
     @Test
@@ -1447,53 +2373,65 @@ public void testOwningRelationshipInverseUpdates() {
         Parent parent = newParent(1);
         Child child = newChild(2);
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
+        when(tx.getToManyRelation(any(), eq(parent), any(), any())).thenReturn(new DataStoreIterableBuilder(parent.getChildren()).build());
 
-        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, goodScope);
-        PersistentResource<Child> childResource = new PersistentResource<>(parentResource, child, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+
+        PersistentResource<Parent> parentResource =
+                new PersistentResource<>(parent, goodScope.getUUIDFor(parent), goodScope);
+        PersistentResource<Child> childResource = new PersistentResource<>(
+                child,
+                parentResource,
+                "children",
+                goodScope.getUUIDFor(child),
+                goodScope);
 
         parentResource.addRelation("children", childResource);
 
-        goodScope.saveObjects();
+        goodScope.saveOrCreateObjects();
         goodScope.getDirtyResources().clear();
-        verify(tx, times(1)).save(parent);
-        verify(tx, times(1)).save(child);
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, times(1)).save(child, goodScope);
 
-        Assert.assertEquals(parent.getChildren().size(), 1, "The owning relationship should be updated");
-        Assert.assertTrue(parent.getChildren().contains(child), "The owning relationship should be updated");
+        assertEquals(1, parent.getChildren().size(), "The owning relationship should be updated");
+        assertTrue(parent.getChildren().contains(child), "The owning relationship should be updated");
 
-        Assert.assertEquals(child.getParents().size(), 1, "The non-owning relationship should also be updated");
-        Assert.assertTrue(child.getParents().contains(parent), "The non-owning relationship should also be updated");
+        assertEquals(1, child.getParents().size(), "The non-owning relationship should also be updated");
+        assertTrue(child.getParents().contains(parent), "The non-owning relationship should also be updated");
 
         reset(tx);
+        when(tx.getToManyRelation(any(), eq(parent), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(parent.getChildren()).build());
+
         parentResource.clearRelation("children");
 
-        goodScope.saveObjects();
-        verify(tx, times(1)).save(parent);
-        verify(tx, times(1)).save(child);
+        goodScope.saveOrCreateObjects();
+        verify(tx, times(1)).save(parent, goodScope);
+        verify(tx, times(1)).save(child, goodScope);
 
-        Assert.assertEquals(parent.getChildren().size(), 0, "The owning relationship should be updated");
-        Assert.assertEquals(child.getParents().size(), 0, "The non-owning relationship should also be updated");
+        assertEquals(0, parent.getChildren().size(), "The owning relationship should be updated");
+        assertEquals(0, child.getParents().size(), "The non-owning relationship should also be updated");
     }
 
     @Test
     public void testIsIdGenerated() {
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        PersistentResource<Child> generated = new PersistentResource<>(new Child(), null, "1", goodUserScope);
+        PersistentResource<Child> generated = new PersistentResource<>(new Child(), "1", scope);
 
-        Assert.assertTrue(generated.isIdGenerated(),
+        assertTrue(generated.isIdGenerated(),
                 "isIdGenerated returns true when ID field has the GeneratedValue annotation");
 
-        PersistentResource<NoCreateEntity> notGenerated = new PersistentResource<>(new NoCreateEntity(), null, "1", goodUserScope);
+        scope = new TestRequestScope(tx, goodUser, dictionary);
+
+        PersistentResource<NoCreateEntity> notGenerated = new PersistentResource<>(new NoCreateEntity(), "1", scope);
 
-        Assert.assertFalse(notGenerated.isIdGenerated(),
+        assertFalse(notGenerated.isIdGenerated(),
                 "isIdGenerated returns false when ID field does not have the GeneratedValue annotation");
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testSharePermissionErrorOnUpdateSingularRelationship() {
+    @Test
+    public void testTransferPermissionErrorOnUpdateSingularRelationship() {
         example.User userModel = new example.User();
         userModel.setId(1);
 
@@ -1504,18 +2442,72 @@ public void testSharePermissionErrorOnUpdateSingularRelationship() {
         idList.add(new ResourceIdentifier("noshare", "1").castToResource());
         Relationship ids = new Relationship(null, new Data<>(idList));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        when(tx.loadObject(NoShareEntity.class, 1L)).thenReturn(noShare);
+        EntityProjection collection = EntityProjection.builder()
+                .type(NoShareEntity.class)
+
+                .build();
+
+        when(tx.loadObject(eq(collection), eq(1L), any())).thenReturn(noShare);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<example.User> userResource =
+                new PersistentResource<>(userModel, goodScope.getUUIDFor(userModel), goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> userResource.updateRelation("noShare", ids.toPersistentResources(goodScope)));
+    }
+
+    @Test
+    public void testTransferPermissionErrorOnUpdateRelationshipPackageLevel() {
+        ContainerWithPackageShare containerWithPackageShare = new ContainerWithPackageShare();
+
+        Untransferable untransferable = new Untransferable();
+        untransferable.setContainerWithPackageShare(containerWithPackageShare);
+
+        List<Resource> unShareableList = new ArrayList<>();
+        unShareableList.add(new ResourceIdentifier("untransferable", "1").castToResource());
+        Relationship unShareales = new Relationship(null, new Data<>(unShareableList));
+
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(untransferable);
+
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<ContainerWithPackageShare> containerResource = new PersistentResource<>(
+                containerWithPackageShare, goodScope.getUUIDFor(containerWithPackageShare), goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> containerResource.updateRelation(
+                        "untransferables", unShareales.toPersistentResources(goodScope)));
+    }
+
+    @Test
+    public void testTransferPermissionSuccessOnUpdateManyRelationshipPackageLevel() {
+        ContainerWithPackageShare containerWithPackageShare = new ContainerWithPackageShare();
+
+        ShareableWithPackageShare shareableWithPackageShare = new ShareableWithPackageShare();
+        shareableWithPackageShare.setContainerWithPackageShare(containerWithPackageShare);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<example.User> userResource = new PersistentResource<>(userModel, null, goodScope);
+        List<Resource> shareableList = new ArrayList<>();
+        shareableList.add(new ResourceIdentifier("shareableWithPackageShare", "1").castToResource());
+        Relationship shareables = new Relationship(null, new Data<>(shareableList));
 
-        userResource.updateRelation("noShare", ids.toPersistentResources(goodScope));
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(shareableWithPackageShare);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<ContainerWithPackageShare> containerResource = new PersistentResource<>(
+                containerWithPackageShare, goodScope.getUUIDFor(containerWithPackageShare), goodScope);
+
+        containerResource.updateRelation(
+                "shareableWithPackageShares", shareables.toPersistentResources(goodScope));
+
+        assertEquals(1, containerWithPackageShare.getShareableWithPackageShares().size());
+        assertTrue(containerWithPackageShare.getShareableWithPackageShares().contains(shareableWithPackageShare));
     }
 
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testSharePermissionErrorOnUpdateManyRelationship() {
+    @Test
+    public void testTransferPermissionErrorOnUpdateManyRelationship() {
         example.User userModel = new example.User();
         userModel.setId(1);
 
@@ -1529,19 +2521,20 @@ public void testSharePermissionErrorOnUpdateManyRelationship() {
         idList.add(new ResourceIdentifier("noshare", "2").castToResource());
         Relationship ids = new Relationship(null, new Data<>(idList));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        when(tx.loadObject(NoShareEntity.class, 1L)).thenReturn(noShare1);
-        when(tx.loadObject(NoShareEntity.class, 2L)).thenReturn(noShare2);
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(noShare1);
+        when(tx.loadObject(any(), eq(2L), any())).thenReturn(noShare2);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<example.User> userResource = new PersistentResource<>(userModel, null, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<example.User> userResource =
+                new PersistentResource<>(userModel, goodScope.getUUIDFor(userModel), goodScope);
 
-        userResource.updateRelation("noShares", ids.toPersistentResources(goodScope));
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> userResource.updateRelation("noShares", ids.toPersistentResources(goodScope)));
     }
 
     @Test
-    public void testSharePermissionSuccessOnUpdateManyRelationship() {
+    public void testTransferPermissionSuccessOnUpdateManyRelationship() {
         example.User userModel = new example.User();
         userModel.setId(1);
 
@@ -1558,22 +2551,23 @@ public void testSharePermissionSuccessOnUpdateManyRelationship() {
         idList.add(new ResourceIdentifier("noshare", "1").castToResource());
         Relationship ids = new Relationship(null, new Data<>(idList));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        when(tx.loadObject(NoShareEntity.class, 1L)).thenReturn(noShare1);
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(noShare1);
+        when(tx.getToManyRelation(any(), eq(userModel), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(noshares).build());
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<example.User> userResource = new PersistentResource<>(userModel, null, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<example.User> userResource =
+                new PersistentResource<>(userModel, goodScope.getUUIDFor(userModel), goodScope);
 
         boolean returnVal = userResource.updateRelation("noShares", ids.toPersistentResources(goodScope));
 
-        Assert.assertTrue(returnVal);
-        Assert.assertEquals(userModel.getNoShares().size(), 1);
-        Assert.assertTrue(userModel.getNoShares().contains(noShare1));
+        assertTrue(returnVal);
+        assertEquals(1, userModel.getNoShares().size());
+        assertTrue(userModel.getNoShares().contains(noShare1));
     }
 
     @Test
-    public void testSharePermissionSuccessOnUpdateSingularRelationship() {
+    public void testTransferPermissionSuccessOnUpdateSingularRelationship() {
         example.User userModel = new example.User();
         userModel.setId(1);
 
@@ -1586,21 +2580,21 @@ public void testSharePermissionSuccessOnUpdateSingularRelationship() {
         idList.add(new ResourceIdentifier("noshare", "1").castToResource());
         Relationship ids = new Relationship(null, new Data<>(idList));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        when(tx.loadObject(NoShareEntity.class, 1L)).thenReturn(noShare);
+        when(tx.getToOneRelation(any(), eq(userModel), any(), any())).thenReturn(noShare);
+        when(tx.loadObject(any(), eq(1L), any())).thenReturn(noShare);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<example.User> userResource = new PersistentResource<>(userModel, null, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<example.User> userResource =
+                new PersistentResource<>(userModel, goodScope.getUUIDFor(userModel), goodScope);
 
         boolean returnVal = userResource.updateRelation("noShare", ids.toPersistentResources(goodScope));
 
-        Assert.assertFalse(returnVal);
-        Assert.assertEquals(userModel.getNoShare(), noShare);
+        assertFalse(returnVal);
+        assertEquals(noShare, userModel.getNoShare());
     }
 
     @Test
-    public void testSharePermissionSuccessOnClearSingularRelationship() {
+    public void testTransferPermissionSuccessOnClearSingularRelationship() {
         example.User userModel = new example.User();
         userModel.setId(1);
 
@@ -1612,247 +2606,349 @@ public void testSharePermissionSuccessOnClearSingularRelationship() {
         List<Resource> empty = new ArrayList<>();
         Relationship ids = new Relationship(null, new Data<>(empty));
 
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
+        when(tx.getToOneRelation(any(), eq(userModel), any(), any())).thenReturn(noShare);
 
-        RequestScope goodScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        PersistentResource<example.User> userResource = new PersistentResource<>(userModel, null, goodScope);
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource<example.User> userResource =
+                new PersistentResource<>(userModel, goodScope.getUUIDFor(userModel), goodScope);
 
         boolean returnVal = userResource.updateRelation("noShare", ids.toPersistentResources(goodScope));
 
-        Assert.assertTrue(returnVal);
-        Assert.assertNull(userModel.getNoShare());
+        assertTrue(returnVal);
+        assertNull(userModel.getNoShare());
+    }
+
+    @Test
+    public void testTransferPermissionErrorOnLineageAncestor() {
+        NoTransferBiDirectional a = new NoTransferBiDirectional();
+        a.setId(1);
+        NoTransferBiDirectional b = new NoTransferBiDirectional();
+        b.setId(2);
+        NoTransferBiDirectional c = new NoTransferBiDirectional();
+        c.setId(3);
+        a.setOther(b);
+        b.setOther(c);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource aResource = new PersistentResource(a, "1", goodScope);
+        PersistentResource bResource = new PersistentResource(b, aResource, "other", "2", goodScope);
+        PersistentResource cResource = new PersistentResource(c, bResource, "other", "3", goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> cResource.addRelation("other", aResource));
+    }
+
+    @Test
+    public void testTransferPermissionSuccessOnLineageParent() {
+        NoTransferBiDirectional a = new NoTransferBiDirectional();
+        a.setId(1);
+        NoTransferBiDirectional b = new NoTransferBiDirectional();
+        b.setId(2);
+        NoTransferBiDirectional c = new NoTransferBiDirectional();
+        c.setId(3);
+        a.setOther(b);
+        b.setOther(c);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource aResource = new PersistentResource(a, "1", goodScope);
+        PersistentResource bResource = new PersistentResource(b, aResource, "other", "2", goodScope);
+        PersistentResource cResource = new PersistentResource(c, bResource, "other", "3", goodScope);
+
+        cResource.addRelation("other", bResource);
+    }
+
+    @Test
+    public void testNoTransferStrictPermissionFailure() {
+        StrictNoTransfer a = new StrictNoTransfer();
+        a.setId(1);
+        StrictNoTransfer b = new StrictNoTransfer();
+        b.setId(2);
+        StrictNoTransfer c = new StrictNoTransfer();
+        c.setId(3);
+        a.setOther(b);
+        b.setOther(c);
+
+        RequestScope goodScope = buildRequestScope(tx, goodUser);
+        PersistentResource aResource = new PersistentResource(a, "1", goodScope);
+        PersistentResource bResource = new PersistentResource(b, aResource, "other", "2", goodScope);
+        PersistentResource cResource = new PersistentResource(c, bResource, "other", "3", goodScope);
+
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> cResource.addRelation("other", bResource));
     }
 
     @Test
     public void testCollectionChangeSpecType() {
-        Function<String, BiFunction<ChangeSpec, BiFunction<Collection, Collection, Boolean>, Boolean>> collectionCheck =
-                (fieldName) ->
-                        (spec, condFn) -> {
-                            if (!fieldName.equals(spec.getFieldName())) {
-                                throw new IllegalStateException("Wrong field name: '" + spec.getFieldName() + "'. Expected: '" + fieldName + "'");
-                            }
-                            return condFn.apply((Collection) spec.getOriginal(), (Collection) spec.getModified());
-                        };
+        Function<String, BiPredicate<ChangeSpec, BiPredicate<Collection, Collection>>> collectionCheck =
+                (fieldName) -> (spec, condFn) -> {
+                    assertEquals(fieldName, spec.getFieldName());
+                    return condFn.test((Collection) spec.getOriginal(), (Collection) spec.getModified());
+                };
+
         // Ensure that change specs coming from collections work properly
-        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(new ChangeSpecModel((spec) -> collectionCheck.apply("testColl").apply(spec, (original, modified) -> original == null && modified.equals(Arrays.asList("a", "b", "c")))));
+
+        ChangeSpecModel csModel = new ChangeSpecModel((spec) -> collectionCheck
+                .apply("testColl")
+                .test(spec, (original, modified) -> original == null && modified.equals(Arrays.asList("a", "b", "c"))));
+
+        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(csModel, tx);
+
+        when(tx.getToManyRelation(any(), eq(model.obj), any(), any()))
+                .thenReturn(new DataStoreIterableBuilder<>().build());
 
         /* Attributes */
         // Set new data from null
-        Assert.assertTrue(model.updateAttribute("testColl", Arrays.asList("a", "b", "c")));
+        assertTrue(model.updateAttribute("testColl", Arrays.asList("a", "b", "c")));
 
         // Set data to empty
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("testColl").apply(spec,
+        model.getObject().checkFunction = (spec) -> collectionCheck.apply("testColl").test(spec,
                 (original, modified) -> original.equals(Arrays.asList("a", "b", "c")) && modified.isEmpty());
-        Assert.assertTrue(model.updateAttribute("testColl", Lists.newArrayList()));
+        assertTrue(model.updateAttribute("testColl", Lists.newArrayList()));
 
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("testColl").apply(spec, (original, modified) -> original.isEmpty() && modified.equals(Arrays.asList("final", "List")));
+        model.getObject().checkFunction = (spec) -> collectionCheck
+                .apply("testColl")
+                .test(
+                        spec,
+                        (original, modified) -> original.isEmpty() && modified.equals(Arrays.asList("final", "List")));
         // / Overwrite attribute data
-        Assert.assertTrue(model.updateAttribute("testColl", Arrays.asList("final", "List")));
+        assertTrue(model.updateAttribute("testColl", Arrays.asList("final", "List")));
 
         /* ToMany relationships */
         // Learn about the other kids
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").apply(spec, (original, modified) -> (original == null || original.isEmpty()) && modified.size() == 1 && modified.contains(new ChangeSpecChild(1)));
-        Assert.assertTrue(model.updateRelation("otherKids", Sets.newHashSet(bootstrapPersistentResource(new ChangeSpecChild(1)))));
+        model.getObject().checkFunction = (spec) -> collectionCheck
+                .apply("otherKids")
+                .test(
+                        spec,
+                        (original, modified) ->
+                                CollectionUtils.isEmpty(original)
+                                        && modified.size() == 1
+                                        && modified.contains(new ChangeSpecChild(1)));
+
+        ChangeSpecChild child1 = new ChangeSpecChild(1);
+        assertTrue(model.updateRelation("otherKids", Sets.newHashSet(bootstrapPersistentResource(child1))));
 
         // Add individual
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").apply(spec, (original, modified) -> original.equals(Arrays.asList(new ChangeSpecChild(1))) && modified.size() == 2 && modified.contains(new ChangeSpecChild(1)) && modified.contains(new ChangeSpecChild(2)));
-        model.addRelation("otherKids", bootstrapPersistentResource(new ChangeSpecChild(2)));
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").apply(spec, (original, modified) -> original.size() == 2 && original.contains(new ChangeSpecChild(1)) && original.contains(new ChangeSpecChild(2)) && modified.size() == 3 && modified.contains(new ChangeSpecChild(1)) && modified.contains(new ChangeSpecChild(2)) && modified.contains(new ChangeSpecChild(3)));
-        model.addRelation("otherKids", bootstrapPersistentResource(new ChangeSpecChild(3)));
+        model.getObject().checkFunction =
+                (spec) -> collectionCheck
+                        .apply("otherKids")
+                        .test(
+                                spec,
+                                (original, modified) ->
+                                        original.equals(Collections.singletonList(new ChangeSpecChild(1)))
+                                                && modified.size() == 2
+                                                && modified.contains(new ChangeSpecChild(1))
+                                                && modified.contains(new ChangeSpecChild(2)));
+
+        ChangeSpecChild child2 = new ChangeSpecChild(2);
+        model.addRelation("otherKids", bootstrapPersistentResource(child2));
+
+        model.getObject().checkFunction = (spec) -> collectionCheck
+                .apply("otherKids")
+                .test(
+                        spec,
+                        (original, modified) ->
+                                original.size() == 2
+                                        && original.contains(new ChangeSpecChild(1))
+                                        && original.contains(new ChangeSpecChild(2))
+                                        && modified.size() == 3
+                                        && modified.contains(new ChangeSpecChild(1))
+                                        && modified.contains(new ChangeSpecChild(2))
+                                        && modified.contains(new ChangeSpecChild(3)));
+
+        ChangeSpecChild child3 = new ChangeSpecChild(3);
+        model.addRelation("otherKids", bootstrapPersistentResource(child3));
 
         // Remove one
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").apply(spec, (original, modified) -> original.size() == 3 && original.contains(new ChangeSpecChild(1)) && original.contains(new ChangeSpecChild(2)) && original.contains(new ChangeSpecChild(3)) && modified.size() == 2 && modified.contains(new ChangeSpecChild(1)) && modified.contains(new ChangeSpecChild(3)));
-        model.removeRelation("otherKids", bootstrapPersistentResource(new ChangeSpecChild(2)));
+        model.getObject().checkFunction = (spec) -> collectionCheck
+                .apply("otherKids")
+                .test(
+                        spec,
+                        (original, modified) ->
+                                original.size() == 3
+                                        && original.contains(new ChangeSpecChild(1))
+                                        && original.contains(new ChangeSpecChild(2))
+                                        && original.contains(new ChangeSpecChild(3))
+                                        && modified.size() == 2
+                                        && modified.contains(new ChangeSpecChild(1))
+                                        && modified.contains(new ChangeSpecChild(3)));
+        model.removeRelation("otherKids", bootstrapPersistentResource(child2));
+
+        when(tx.getToManyRelation(any(), eq(model.obj), any(), any())).thenReturn(
+                new DataStoreIterableBuilder(Sets.newHashSet(child1, child3)).build());
 
         // Clear the rest
-        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").apply(spec, (original, modified) -> original.size() <= 2 && modified.size() < original.size());
+        model.getObject().checkFunction = (spec) -> collectionCheck.apply("otherKids").test(spec, (original, modified)
+                -> original.size() <= 2 && modified.size() < original.size());
         model.clearRelation("otherKids");
     }
 
     @Test
     public void testAttrChangeSpecType() {
-        BiFunction<ChangeSpec, BiFunction<String, String, Boolean>, Boolean> attrCheck = (spec, checkFn) -> {
-            if (!(spec.getModified() instanceof String) && spec.getModified() != null) {
-                return false;
-            }
-            if (!"testAttr".equals(spec.getFieldName())) {
-                return false;
-            }
-            return checkFn.apply((String) spec.getOriginal(), (String) spec.getModified());
+        BiPredicate<ChangeSpec, BiPredicate<String, String>> attrCheck = (spec, checkFn) -> {
+            assertTrue(spec.getModified() instanceof String || spec.getModified() == null);
+            assertEquals("testAttr", spec.getFieldName());
+            return checkFn.test((String) spec.getOriginal(), (String) spec.getModified());
         };
 
-        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(new ChangeSpecModel((spec) -> attrCheck.apply(spec, (original, modified) -> (original == null) && "abc".equals(modified))));
-        Assert.assertTrue(model.updateAttribute("testAttr", "abc"));
+        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(new ChangeSpecModel(
+                (spec) -> attrCheck.test(spec, (original, modified) -> (original == null) && "abc".equals(modified))));
+        assertTrue(model.updateAttribute("testAttr", "abc"));
 
-        model.getObject().checkFunction = (spec) -> attrCheck.apply(spec, (original, modified) -> "abc".equals(original) && "replace".equals(modified));
-        Assert.assertTrue(model.updateAttribute("testAttr", "replace"));
+        model.getObject().checkFunction = (spec) -> attrCheck.test(
+                spec, (original, modified) -> "abc".equals(original) && "replace".equals(modified));
+        assertTrue(model.updateAttribute("testAttr", "replace"));
 
-        model.getObject().checkFunction = (spec) -> attrCheck.apply(spec, (original, modified) -> "replace".equals(original) && modified == null);
-        Assert.assertTrue(model.updateAttribute("testAttr", null));
+        model.getObject().checkFunction = (spec) -> attrCheck.test(
+                spec, (original, modified) -> "replace".equals(original) && modified == null);
+        assertTrue(model.updateAttribute("testAttr", null));
     }
 
     @Test
     public void testRelationChangeSpecType() {
-        BiFunction<ChangeSpec, BiFunction<ChangeSpecChild, ChangeSpecChild, Boolean>, Boolean> relCheck = (spec, checkFn) -> {
-            if (!(spec.getModified() instanceof ChangeSpecChild) && spec.getModified() != null) {
-                return false;
-            }
-            if (!"child".equals(spec.getFieldName())) {
-                return false;
-            }
-            return checkFn.apply((ChangeSpecChild) spec.getOriginal(), (ChangeSpecChild) spec.getModified());
+        BiPredicate<ChangeSpec, BiPredicate<ChangeSpecChild, ChangeSpecChild>> relCheck = (spec, checkFn) -> {
+            assertTrue(spec.getModified() instanceof ChangeSpecChild || spec.getModified() == null);
+            assertEquals("child", spec.getFieldName());
+            return checkFn.test((ChangeSpecChild) spec.getOriginal(), (ChangeSpecChild) spec.getModified());
         };
-        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(new ChangeSpecModel((spec) -> relCheck.apply(spec, (original, modified) -> (original == null) && new ChangeSpecChild(1).equals(modified))));
-        Assert.assertTrue(model.updateRelation("child", Sets.newHashSet(bootstrapPersistentResource(new ChangeSpecChild(1)))));
 
-        model.getObject().checkFunction = (spec) -> relCheck.apply(spec, (original, modified) -> new ChangeSpecChild(1).equals(original) && new ChangeSpecChild(2).equals(modified));
-        Assert.assertTrue(model.updateRelation("child", Sets.newHashSet(bootstrapPersistentResource(new ChangeSpecChild(2)))));
+        PersistentResource<ChangeSpecModel> model = bootstrapPersistentResource(new ChangeSpecModel((spec)
+                -> relCheck.test(spec, (original, modified)
+                -> (original == null) && new ChangeSpecChild(1).equals(modified))), tx);
+
+        when(tx.getToOneRelation(any(), eq(model.obj), any(), any())).thenReturn(null);
+
+        ChangeSpecChild child1 = new ChangeSpecChild(1);
+        assertTrue(model.updateRelation("child", Sets.newHashSet(bootstrapPersistentResource(child1, tx))));
+        when(tx.getToOneRelation(any(), eq(model.obj), any(), any())).thenReturn(child1);
+
+        model.getObject().checkFunction = (spec) -> relCheck.test(
+                spec,
+                (original, modified) ->
+                        new ChangeSpecChild(1).equals(original) && new ChangeSpecChild(2).equals(modified));
+
+        ChangeSpecChild child2 = new ChangeSpecChild(2);
+        assertTrue(model.updateRelation("child", Sets.newHashSet(bootstrapPersistentResource(child2, tx))));
+
+        when(tx.getToOneRelation(any(), eq(model.obj), any(), any())).thenReturn(child2);
 
-        model.getObject().checkFunction = (spec) -> relCheck.apply(spec, (original, modified) -> new ChangeSpecChild(2).equals(original) && modified == null);
-        Assert.assertTrue(model.updateRelation("child", null));
+        model.getObject().checkFunction = (spec) -> relCheck
+                .test(spec, (original, modified) -> new ChangeSpecChild(2).equals(original) && modified == null);
+        assertTrue(model.updateRelation("child", null));
     }
 
     @Test
-    public void testEqualsAndHashcode() {
-        Child childWithId = newChild(1);
-        Child childWithoutId = newChild(0);
+    public void testPatchRequestScope() {
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        PatchRequestScope parentScope = new PatchRequestScope(
+                null,
+                "/book",
+                NO_VERSION,
+                tx,
+                new TestUser("1"),
+                UUID.randomUUID(),
+                null,
+                Collections.emptyMap(),
+                elideSettings);
+        PatchRequestScope scope = new PatchRequestScope(
+                parentScope.getPath(), parentScope.getJsonApiDocument(), parentScope);
+        // verify wrap works
+        assertEquals(parentScope.getUpdateStatusCode(), scope.getUpdateStatusCode());
+        assertEquals(parentScope.getObjectEntityCache(), scope.getObjectEntityCache());
 
-        PersistentResource resourceWithId = new PersistentResource<>(childWithId, goodUserScope);
-        PersistentResource resourceWithDifferentId = new PersistentResource<>(childWithoutId, goodUserScope);
-        PersistentResource resourceWithUUID = new PersistentResource<>(childWithoutId, null, "abc", goodUserScope);
-        PersistentResource resourceWithIdAndUUID = new PersistentResource<>(childWithId, null, "abc", goodUserScope);
+        Parent parent = newParent(7);
 
-        Assert.assertNotEquals(resourceWithId, resourceWithUUID);
-        Assert.assertNotEquals(resourceWithUUID, resourceWithId);
-        Assert.assertNotEquals(resourceWithId.hashCode(), resourceWithUUID.hashCode(), "Hashcodes were equal...");
+        PersistentResource<Parent> parentResource = new PersistentResource<>(parent, "1", scope);
+        parentResource.updateAttribute("firstName", "foobar");
 
-        Assert.assertEquals(resourceWithId, resourceWithIdAndUUID);
-        Assert.assertEquals(resourceWithIdAndUUID, resourceWithId);
-        Assert.assertEquals(resourceWithId.hashCode(), resourceWithIdAndUUID.hashCode());
+        ArgumentCaptor<Attribute> attributeArgument = ArgumentCaptor.forClass(Attribute.class);
+        verify(tx, times(1)).setAttribute(eq(parent), attributeArgument.capture(), eq(scope));
+        assertEquals(attributeArgument.getValue().getName(), "firstName");
+        assertEquals(attributeArgument.getValue().getArguments().iterator().next().getValue(), "foobar");
+    }
 
-        // Hashcode's should only ever look at UUID's if no real ID is present (i.e. object id is null or 0)
-        Assert.assertNotEquals(resourceWithUUID.hashCode(), resourceWithIdAndUUID.hashCode());
+    @Test
+    public void testFilterExpressionByType() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
-        Assert.assertNotEquals(resourceWithId.hashCode(), resourceWithDifferentId.hashCode());
-        Assert.assertNotEquals(resourceWithId, resourceWithDifferentId);
-        Assert.assertNotEquals(resourceWithDifferentId, resourceWithId);
-    }
+        queryParams.add(
+                "filter[author.name][infix]",
+                "Hemingway"
+        );
 
-    private <T> PersistentResource<T> bootstrapPersistentResource(T obj) {
-        User goodUser = new User(1);
-        DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
-        RequestScope requestScope = new RequestScope(null, null, tx, goodUser, dictionary, null, MOCK_AUDIT_LOGGER);
-        return new PersistentResource<>(obj, requestScope);
-    }
+        RequestScope scope = buildRequestScope("/", mock(DataStoreTransaction.class),
+                new TestUser("1"), queryParams);
 
-    private RequestScope getUserScope(User user, AuditLogger auditLogger) {
-        return new RequestScope(null, new JsonApiDocument(), null, user, dictionary, null, auditLogger);
+        Optional<FilterExpression> filter = scope.getLoadFilterExpression(ClassType.of(Author.class));
+        FilterPredicate predicate = (FilterPredicate) filter.get();
+        assertEquals("name", predicate.getField());
+        assertEquals("name", predicate.getFieldPath());
+        assertEquals(Operator.INFIX, predicate.getOperator());
+        assertEquals(Arrays.asList("Hemingway"), predicate.getValues());
+        assertEquals("[Author].name", predicate.getPath().toString());
     }
 
-    // Testing constructor, setId and non-null empty sets
-    private static Parent newParent(int id) {
-        Parent parent = new Parent();
-        parent.setId(id);
-        parent.setChildren(new HashSet<>());
-        parent.setSpouses(new HashSet<>());
-        return parent;
-    }
+    @Test
+    public void testFilterExpressionCollection() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
-    private Parent newParent(int id, Child child) {
-        Parent parent = new Parent();
-        parent.setId(id);
-        parent.setChildren(Sets.newHashSet(child));
-        parent.setSpouses(new HashSet<>());
-        return parent;
-    }
+        queryParams.add(
+                "filter[book.authors.name][infix]",
+                "Hemingway"
+        );
 
+        RequestScope scope = buildRequestScope("/", mock(DataStoreTransaction.class), new TestUser("1"),
+                queryParams);
 
-    private static Child newChild(int id) {
-        Child child = new Child();
-        child.setId(id);
-        child.setParents(new HashSet<>());
-        child.setFriends(new HashSet<>());
-        return child;
+        Optional<FilterExpression> filter = scope.getLoadFilterExpression(ClassType.of(Book.class));
+        FilterPredicate predicate = (FilterPredicate) filter.get();
+        assertEquals("name", predicate.getField());
+        assertEquals("authors.name", predicate.getFieldPath());
+        assertEquals(Operator.INFIX, predicate.getOperator());
+        assertEquals(Arrays.asList("Hemingway"), predicate.getValues());
+        assertEquals("[Book].authors/[Author].name", predicate.getPath().toString());
     }
 
-    private static Child newChild(int id, String name) {
-        Child child = newChild(id);
-        child.setName(name);
-        return child;
-    }
 
-    /* ChangeSpec-specific test elements */
-    @Entity
-    @Include
-    @CreatePermission(any = {Role.ALL.class})
-    @ReadPermission(any = {Role.ALL.class})
-    @UpdatePermission(any = {Role.NONE.class})
-    @DeletePermission(any = {Role.ALL.class})
-    public static final class ChangeSpecModel {
-        @Id
-        public long id;
+    @Test
+    public void testSparseFields() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
-        @ReadPermission(all = {Role.NONE.class})
-        @UpdatePermission(all = {Role.NONE.class})
-        public Function<ChangeSpec, Boolean> checkFunction;
+        queryParams.add("fields[author]", "name");
 
-        @UpdatePermission(all = {ChangeSpecNonCollection.class})
-        public String testAttr;
+        RequestScope scope = buildRequestScope("/", mock(DataStoreTransaction.class),
+                new TestUser("1"), queryParams);
+        Map<String, Set<String>> expected = ImmutableMap.of("author", ImmutableSet.of("name"));
+        assertEquals(expected, scope.getSparseFields());
+    }
 
-        @UpdatePermission(all = {ChangeSpecCollection.class})
-        public List<String> testColl;
+    @Test
+    public void testEqualsAndHashcode() {
+        Child childWithId = newChild(1);
+        Child childWithoutId = newChild(0);
 
-        @OneToOne
-        @UpdatePermission(all = {ChangeSpecNonCollection.class})
-        public ChangeSpecChild child;
+        RequestScope scope = new TestRequestScope(tx, goodUser, dictionary);
 
-        @ManyToMany
-        @UpdatePermission(all = {ChangeSpecCollection.class})
-        public List<Child> otherKids;
+        PersistentResource resourceWithId = new PersistentResource<>(childWithId, scope.getUUIDFor(childWithId), scope);
+        PersistentResource resourceWithDifferentId =
+                new PersistentResource<>(childWithoutId, scope.getUUIDFor(childWithoutId), scope);
+        PersistentResource resourceWithUUID = new PersistentResource<>(childWithoutId, "abc", scope);
+        PersistentResource resourceWithIdAndUUID = new PersistentResource<>(childWithId, "abc", scope);
 
-        public ChangeSpecModel(final Function<ChangeSpec, Boolean> checkFunction) {
-            this.checkFunction = checkFunction;
-        }
-    }
+        assertNotEquals(resourceWithUUID, resourceWithId);
+        assertNotEquals(resourceWithId, resourceWithUUID);
+        assertNotEquals(resourceWithId.hashCode(), resourceWithUUID.hashCode(), "Hashcodes were equal...");
 
-    @Entity
-    @Include
-    @EqualsAndHashCode
-    @AllArgsConstructor
-    @CreatePermission(any = {Role.ALL.class})
-    @ReadPermission(any = {Role.ALL.class})
-    @UpdatePermission(any = {Role.ALL.class})
-    @DeletePermission(any = {Role.ALL.class})
-    @SharePermission(any = {Role.ALL.class})
-    public static final class ChangeSpecChild {
-        @Id
-        public long id;
-    }
-
-    public static final class ChangeSpecCollection extends OperationCheck<Object> {
-
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (changeSpec.isPresent() && (object instanceof ChangeSpecModel)) {
-                ChangeSpec spec = changeSpec.get();
-                if (!(spec.getModified() instanceof Collection)) {
-                    return false;
-                }
-                return ((ChangeSpecModel) object).checkFunction.apply(spec);
-            }
-            throw new IllegalStateException("Something is terribly wrong :(");
-        }
-    }
+        assertEquals(resourceWithIdAndUUID, resourceWithId);
+        assertEquals(resourceWithId, resourceWithIdAndUUID);
+        assertEquals(resourceWithIdAndUUID.hashCode(), resourceWithId.hashCode());
 
-    public static final class ChangeSpecNonCollection extends OperationCheck<Object> {
+        // Hashcode's should only ever look at UUID's if no real ID is present (i.e. object id is null or 0)
+        assertNotEquals(resourceWithIdAndUUID.hashCode(), resourceWithUUID.hashCode());
 
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (changeSpec.isPresent() && (object instanceof ChangeSpecModel)) {
-                return ((ChangeSpecModel) object).checkFunction.apply(changeSpec.get());
-            }
-            throw new IllegalStateException("Something is terribly wrong :(");
-        }
+        assertNotEquals(resourceWithDifferentId.hashCode(), resourceWithId.hashCode());
+        assertNotEquals(resourceWithDifferentId, resourceWithId);
+        assertNotEquals(resourceWithId, resourceWithDifferentId);
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/RequestScopeTest.java b/elide-core/src/test/java/com/yahoo/elide/core/RequestScopeTest.java
index 1814a034bf..658f9c2cc1 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/RequestScopeTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/RequestScopeTest.java
@@ -5,13 +5,23 @@
  */
 package com.yahoo.elide.core;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
 import java.lang.reflect.Method;
 import java.util.Collections;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 
 public class RequestScopeTest {
     @Test
@@ -26,8 +36,44 @@ public void testFilterQueryParams() throws Exception {
         queryParams.put("bar", Collections.singletonList("foo"));
 
         MultivaluedMap<String, String> filtered = (MultivaluedMap<String, String>) method.invoke(null, queryParams);
-        Assert.assertEquals(filtered.size(), 2);
-        Assert.assertTrue(filtered.containsKey("filter"));
-        Assert.assertTrue(filtered.containsKey("filter[xyz]"));
+        assertEquals(2, filtered.size());
+        assertTrue(filtered.containsKey("filter"));
+        assertTrue(filtered.containsKey("filter[xyz]"));
+    }
+
+    @Test
+    public void testNewObjectsForInheritedTypes() throws Exception {
+        // NOTE: This tests that inherited types are properly accounted for during a patch extension request.
+        //       otherwise it is possible to create an inherited type and when performing introspection on a
+        //       superclass we will miss that the object is newly created and then we'll attempt to query
+        //       the datastore.
+
+        @Entity
+        @Include(rootLevel = false)
+        class MyBaseClass {
+            @Id
+            public long id;
+        }
+
+        @Entity
+        @Include(rootLevel = false)
+        class MyInheritedClass extends MyBaseClass {
+            public String myField;
+        }
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(MyBaseClass.class);
+        dictionary.bindEntity(MyInheritedClass.class);
+
+        RequestScope requestScope = new RequestScope(null, "/", NO_VERSION, null, null, null, null, null, UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                        .withEntityDictionary(dictionary)
+                        .build());
+
+        String myId = "myId";
+        // Test that a new inherited class is counted for base type
+        requestScope.setUUIDForObject(ClassType.of(MyInheritedClass.class), myId, new MyInheritedClass());
+        assertNotNull(requestScope.getObjectById(ClassType.of(MyBaseClass.class), myId));
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/ResourceLineageTest.java b/elide-core/src/test/java/com/yahoo/elide/core/ResourceLineageTest.java
new file mode 100644
index 0000000000..7444b9ee3a
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/ResourceLineageTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import org.junit.jupiter.api.Test;
+
+public class ResourceLineageTest {
+
+    @Test
+    public void testGetParent() {
+        ResourceLineage lineage = new ResourceLineage();
+        assertNull(lineage.getParent());
+
+        PersistentResource authorResource = mock(PersistentResource.class);
+        PersistentResource bookResource = mock(PersistentResource.class);
+
+        ResourceLineage longerLineage = new ResourceLineage(lineage, authorResource, "authors");
+        assertEquals(authorResource, longerLineage.getParent());
+
+        ResourceLineage longerLongerLineage = new ResourceLineage(longerLineage, bookResource, "books");
+        assertEquals(bookResource, longerLongerLineage.getParent());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/TestRequestScope.java b/elide-core/src/test/java/com/yahoo/elide/core/TestRequestScope.java
new file mode 100644
index 0000000000..6557cf69d6
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/TestRequestScope.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.links.DefaultJSONApiLinks;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Utility subclass that helps construct RequestScope objects for testing.
+ */
+public class TestRequestScope extends RequestScope {
+
+    private MultivaluedMap queryParamOverrides = null;
+
+    public TestRequestScope(String baseURL,
+                            DataStoreTransaction transaction,
+                            User user,
+                            EntityDictionary dictionary) {
+        super(baseURL, null, NO_VERSION, new JsonApiDocument(), transaction, user, null, null, UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                        .withEntityDictionary(dictionary)
+                        .withJSONApiLinks(new DefaultJSONApiLinks())
+                        .withJsonApiPath("/json")
+                        .build());
+    }
+
+    public TestRequestScope(DataStoreTransaction transaction,
+                        User user,
+                        EntityDictionary dictionary) {
+        super(null, null, NO_VERSION, new JsonApiDocument(), transaction, user, null, null, UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                .withEntityDictionary(dictionary)
+                .build());
+    }
+
+    public TestRequestScope(EntityDictionary dictionary,
+                            String path,
+                            MultivaluedMap<String, String> queryParams) {
+        super(null, path, NO_VERSION, new JsonApiDocument(), null, null, queryParams, null, UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                        .withEntityDictionary(dictionary)
+                        .build());
+    }
+
+    public void setQueryParams(MultivaluedMap<String, String> queryParams) {
+        this.queryParamOverrides = queryParams;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParams() {
+        if (queryParamOverrides != null) {
+            return queryParamOverrides;
+        }
+        return super.getQueryParams();
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/audit/LogMessageImplTest.java b/elide-core/src/test/java/com/yahoo/elide/core/audit/LogMessageImplTest.java
new file mode 100644
index 0000000000..32db1ee8e9
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/audit/LogMessageImplTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.audit;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.TestUser;
+import com.google.common.collect.Sets;
+import example.Child;
+import example.Parent;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class LogMessageImplTest {
+    private static transient PersistentResource<Child> childRecord;
+    private static transient PersistentResource<Child> friendRecord;
+
+    @BeforeAll
+    public static void init() {
+        final EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Child.class);
+        dictionary.bindEntity(Parent.class);
+
+        final Child child = new Child();
+        child.setId(5);
+
+        final Parent parent = new Parent();
+        parent.setId(7);
+
+        final Child friend = new Child();
+        friend.setId(9);
+        child.setFriends(Sets.newHashSet(friend));
+
+        final RequestScope requestScope = new RequestScope(null, null, NO_VERSION, null, null,
+                new TestUser("aaron"), null, null,
+                UUID.randomUUID(),
+                new ElideSettingsBuilder(null)
+                        .withAuditLogger(new TestAuditLogger())
+                        .withEntityDictionary(dictionary)
+                        .build());
+
+        final PersistentResource<Parent> parentRecord = new PersistentResource<>(parent, requestScope.getUUIDFor(parent), requestScope);
+        childRecord = new PersistentResource<>(child, parentRecord, "children", requestScope.getUUIDFor(child), requestScope);
+        friendRecord = new PersistentResource<>(friend, childRecord, "friends", requestScope.getUUIDFor(friend), requestScope);
+    }
+
+    @Test
+    public void verifyOpaqueUserExpressions() {
+        final String[] expressions = { "${opaqueUser.name}", "${opaqueUser.name}" };
+        final LogMessageImpl message = new LogMessageImpl("{0} {1}", childRecord, expressions, 1, Optional.empty());
+        assertEquals("aaron aaron", message.getMessage(), "JEXL substitution evaluates correctly.");
+        assertEquals(Optional.empty(), message.getChangeSpec());
+    }
+
+    @Test
+    public void verifyObjectExpressions() {
+        final String[] expressions = { "${child.id}", "${parent.getId()}" };
+        final LogMessageImpl message = new LogMessageImpl("{0} {1}", childRecord, expressions, 1, Optional.empty());
+        assertEquals("5 7", message.getMessage(), "JEXL substitution evaluates correctly.");
+        assertEquals(Optional.empty(), message.getChangeSpec());
+    }
+
+    @Test
+    public void verifyListExpressions() {
+        final String[] expressions = { "${child[0].id}", "${child[1].id}", "${parent.getId()}" };
+        final String[] expressionForDefault = { "${child.id}" };
+        final LogMessageImpl message = new LogMessageImpl("{0} {1} {2}", friendRecord, expressions, 1, Optional.empty());
+        final LogMessageImpl defaultMessage = new LogMessageImpl("{0}", friendRecord, expressionForDefault, 1, Optional.empty());
+        assertEquals("5 9 7", message.getMessage(), "JEXL substitution evaluates correctly.");
+        assertEquals("9", defaultMessage.getMessage(), "JEXL substitution evaluates correctly.");
+        assertEquals(Optional.empty(), message.getChangeSpec());
+    }
+
+
+    @Test
+    public void invalidExpression() {
+        final String[] expressions = { "${child.id}, ${%%%}" };
+        assertThrows(
+                InvalidSyntaxException.class,
+                () -> new LogMessageImpl("{0} {1}", childRecord, expressions, 1, Optional.empty()).getMessage());
+    }
+
+    @Test
+    public void invalidTemplate() {
+        final String[] expressions = { "${child.id}" };
+        assertThrows(
+                InvalidSyntaxException.class,
+                () -> new LogMessageImpl("{}", childRecord, expressions, 1, Optional.empty()).getMessage());
+    }
+
+    public static class TestLoggerException extends RuntimeException {
+    }
+
+    private AuditLogger testAuditLogger = new Slf4jLogger();
+
+    @Test
+    public void threadSafetyTest() {
+        final List<Throwable> exceptions = new ArrayList<>();
+        final int parallelTests = 10;
+
+        ExecutorService testThreadPool = Executors.newFixedThreadPool(parallelTests);
+
+        for (int i = 0; i < parallelTests; i++) {
+            testThreadPool.submit(() -> {
+                try {
+                    threadSafeLogger();
+                } catch (Exception e) {
+                    exceptions.add(e);
+                }
+            });
+        }
+
+        assertTrue(exceptions.isEmpty(), exceptions.stream().map(Throwable::getMessage).findFirst().orElse(""));
+    }
+
+    public void threadSafeLogger() throws InterruptedException {
+        TestLoggerException testException = new TestLoggerException();
+        LogMessageImpl failMessage = new LogMessageImpl("test", 0) {
+            @Override
+            public String getMessage() {
+                throw testException;
+            }
+        };
+
+        assertSame(assertThrows(TestLoggerException.class, () -> testAuditLogger.log(failMessage)), testException);
+        Thread.sleep(Math.floorMod(ThreadLocalRandom.current().nextInt(), 100));
+
+        // should not cause another exception
+        assertDoesNotThrow(() -> testAuditLogger.commit(), "Exception not cleared from previous logger commit");
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java b/elide-core/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java
new file mode 100644
index 0000000000..6890177bfc
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.audit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestAuditLogger extends AuditLogger {
+    public TestAuditLogger() {
+        // clean any prior test data for this thread
+        super.clear();
+    }
+
+    @Override
+    public void commit() throws IOException {
+        //NOOP
+    }
+
+    public List<LogMessage> getMessages() {
+        return new ArrayList<>(this.MESSAGES.get());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/datastore/DataStoreTransactionTest.java b/elide-core/src/test/java/com/yahoo/elide/core/datastore/DataStoreTransactionTest.java
new file mode 100644
index 0000000000..004ee4881f
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/datastore/DataStoreTransactionTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore;
+
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+public class DataStoreTransactionTest implements DataStoreTransaction {
+    private static final String NAME = "name";
+    private static final String NAME2 = "name2";
+    private static final Attribute NAME_ATTRIBUTE = Attribute.builder().name(NAME).type(String.class).build();
+    private static final String ENTITY = "entity";
+    private RequestScope scope;
+
+    @BeforeEach
+    public void setupMocks() {
+        // this will test with the default interface implementation
+        scope = mock(RequestScope.class);
+        EntityDictionary dictionary = mock(EntityDictionary.class);
+
+        when(scope.getDictionary()).thenReturn(dictionary);
+        when(dictionary.getIdType(STRING_TYPE)).thenReturn(new ClassType(Long.class));
+        when(dictionary.getValue(ENTITY, NAME, scope)).thenReturn(3L);
+        when(dictionary.getValue(ENTITY, NAME2, scope))
+                .thenReturn(new DataStoreIterableBuilder(List.of(1L, 2L, 3L)).build());
+    }
+
+    @Test
+    public void testPreCommit() {
+        preCommit(scope);
+        verify(scope, never()).getDictionary();
+    }
+
+    @Test
+    public void testGetAttribute() {
+        Object actual = getAttribute(ENTITY, NAME_ATTRIBUTE, scope);
+        assertEquals(3L, actual);
+        verify(scope, times(1)).getDictionary();
+    }
+
+    @Test
+    public void testSetAttribute() {
+        setAttribute(ENTITY, NAME_ATTRIBUTE, scope);
+        verify(scope, never()).getDictionary();
+    }
+
+    @Test
+    public void testUpdateToOneRelation() {
+        updateToOneRelation(this, ENTITY, NAME, null, scope);
+        verify(scope, never()).getDictionary();
+    }
+
+    @Test
+    public void testUpdateToManyRelation() {
+        updateToManyRelation(this, ENTITY, NAME, null, null, scope);
+        verify(scope, never()).getDictionary();
+    }
+
+    @Test
+    public void testGetToOneRelation() {
+        Long actual = getToOneRelation(this, ENTITY, Relationship.builder()
+                .name(NAME)
+                .projection(EntityProjection.builder()
+                        .type(String.class)
+                        .build())
+                .build(), scope);
+        assertEquals(3L, actual);
+    }
+
+    @Test
+    public void testGetToManyRelation() {
+        DataStoreIterable actual = getToOneRelation(this, ENTITY, Relationship.builder()
+                .name(NAME2)
+                .projection(EntityProjection.builder()
+                        .type(String.class)
+                        .build())
+                .build(), scope);
+        assertEquals(
+                Lists.newArrayList(new DataStoreIterableBuilder(List.of(1L, 2L, 3L)).build()),
+                Lists.newArrayList(actual));
+    }
+
+    @Test
+    public void testLoadObject() {
+        String string = (String) loadObject(EntityProjection.builder().type(String.class).build(), 2L, scope);
+        assertEquals(ENTITY, string);
+    }
+
+    /** Implemented to support the interface only. No need to test these. **/
+    @Override
+    public Object loadObject(EntityProjection entityProjection, Serializable id, RequestScope scope) {
+        return ENTITY;
+    }
+
+    @Override
+    public DataStoreIterable<Object> loadObjects(EntityProjection entityProjection, RequestScope scope) {
+        return new DataStoreIterableBuilder(Arrays.asList(ENTITY)).build();
+    }
+
+    @Override
+    public void close() throws IOException {
+        // nothing
+    }
+
+    @Override
+    public void save(Object entity, RequestScope scope) {
+        // nothing
+    }
+
+    @Override
+    public void delete(Object entity, RequestScope scope) {
+        // nothing
+    }
+
+    @Override
+    public void flush(RequestScope scope) {
+        // nothing
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        // nothing
+    }
+
+    @Override
+    public void createObject(Object entity, RequestScope scope) {
+        // nothing
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+       //nothing
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/FilteredIteratorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/FilteredIteratorTest.java
new file mode 100644
index 0000000000..7c2891185f
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/FilteredIteratorTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.inmemory;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TestRequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.type.ClassType;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class FilteredIteratorTest {
+
+    @Test
+    public void testFilteredResult() throws Exception {
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+
+        Book book1 = new Book();
+        book1.setTitle("foo");
+        Book book2 = new Book();
+        book2.setTitle("bar");
+        Book book3 = new Book();
+        book3.setTitle("foobar");
+        List<Book> books = List.of(book1, book2, book3);
+
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        FilterExpression expression =
+                filterDialect.parse(ClassType.of(Book.class), new HashSet<>(), "title==*bar", NO_VERSION);
+
+        RequestScope scope = new TestRequestScope(null, null, dictionary);
+
+        Iterator<Book> bookIterator = new FilteredIterator<>(expression, scope, books.iterator());
+
+        assertTrue(bookIterator.hasNext());
+        assertEquals("bar", bookIterator.next().getTitle());
+        assertTrue(bookIterator.hasNext());
+        assertEquals("foobar", bookIterator.next().getTitle());
+        assertFalse(bookIterator.hasNext());
+    }
+
+    @Test
+    public void testEmptyResult() throws Exception {
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+
+        List<Book> books = List.of();
+
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        FilterExpression expression =
+                filterDialect.parse(ClassType.of(Book.class), new HashSet<>(), "title==*bar", NO_VERSION);
+
+        RequestScope scope = new TestRequestScope(null, null, dictionary);
+
+        Iterator<Book> bookIterator = new FilteredIterator<>(expression, scope, books.iterator());
+
+
+        assertFalse(bookIterator.hasNext());
+        assertThrows(NoSuchElementException.class, () -> bookIterator.next());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransactionTest.java b/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransactionTest.java
new file mode 100644
index 0000000000..0dc3d7bec8
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/datastore/inmemory/InMemoryStoreTransactionTest.java
@@ -0,0 +1,625 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.datastore.inmemory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.Editor;
+import example.Price;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class InMemoryStoreTransactionTest {
+
+    private DataStoreTransaction wrappedTransaction = mock(DataStoreTransaction.class);
+    private RequestScope scope = mock(RequestScope.class);
+    private InMemoryStoreTransaction inMemoryStoreTransaction = new InMemoryStoreTransaction(wrappedTransaction);
+    private EntityDictionary dictionary;
+    private LinkedHashSet books = new LinkedHashSet();
+    private Book book1;
+    private Book book2;
+    private Book book3;
+    private Publisher publisher1;
+    private Publisher publisher2;
+    private Author author1;
+    private Author author2;
+    private ElideSettings elideSettings;
+
+    public InMemoryStoreTransactionTest() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Editor.class);
+        dictionary.bindEntity(Publisher.class);
+
+        elideSettings = new ElideSettingsBuilder(null)
+                .withEntityDictionary(EntityDictionary.builder().build())
+                .build();
+
+        author1 = new Author();
+        Address address1 = new Address();
+        address1.setStreet1("Foo");
+        author1.setHomeAddress(address1);
+
+        author2 = new Author();
+        Address address2 = new Address();
+        address2.setStreet1("Bar");
+        author2.setHomeAddress(address2);
+
+        Editor editor1 = new Editor();
+        editor1.setFirstName("Jon");
+        editor1.setLastName("Doe");
+
+        Editor editor2 = new Editor();
+        editor2.setFirstName("Jane");
+        editor2.setLastName("Doe");
+
+        publisher1 = new Publisher();
+        publisher1.setEditor(editor1);
+
+        publisher2 = new Publisher();
+        publisher2.setEditor(editor2);
+
+        book1 = new Book(1,
+                "Book 1",
+                "Literary Fiction",
+                "English",
+                System.currentTimeMillis(),
+                Sets.newHashSet(author1),
+                publisher1,
+                Arrays.asList("Prize1"),
+                new Price());
+
+        book2 = new Book(2,
+                "Book 2",
+                "Science Fiction",
+                "English",
+                System.currentTimeMillis(),
+                Sets.newHashSet(author1),
+                publisher1,
+                Arrays.asList("Prize1", "Prize2"),
+                new Price());
+
+        book3 = new Book(3,
+                "Book 3",
+                "Literary Fiction",
+                "English",
+                System.currentTimeMillis(),
+                Sets.newHashSet(author1),
+                publisher2,
+                Arrays.asList(),
+                new Price());
+
+        books.add(book1);
+        books.add(book2);
+        books.add(book3);
+
+        author1.setBooks(new ArrayList<>(books));
+
+        when(scope.getDictionary()).thenReturn(dictionary);
+    }
+
+    @BeforeEach
+    public void resetMocks() {
+        reset(wrappedTransaction);
+    }
+
+    @Test
+    public void testFullFilterPredicatePushDown() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(expression)
+                .build();
+
+        DataStoreIterable expected = new DataStoreIterableBuilder<>(books).build();
+
+        when(wrappedTransaction.loadObjects(eq(projection), eq(scope)))
+                .thenReturn(expected);
+
+        DataStoreIterable actual = inMemoryStoreTransaction.loadObjects(projection, scope);
+        assertEquals(expected, actual);
+
+        verify(wrappedTransaction, times(1)).loadObjects(eq(projection), eq(scope));
+    }
+
+    @Test
+    public void testFilterPredicateInMemoryOnComplexAttribute() {
+        FilterExpression expression =
+                new InPredicate(new Path(Author.class, dictionary, "homeAddress.street1"), "Foo");
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Author.class)
+                .filterExpression(expression)
+                .build();
+
+        DataStoreIterable filterInMemory =
+                new DataStoreIterableBuilder(Arrays.asList(author1, author2)).filterInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(filterInMemory);
+
+        Collection<Object> loaded = ImmutableList.copyOf(inMemoryStoreTransaction.loadObjects(projection, scope));
+
+        assertEquals(1, loaded.size());
+        assertTrue(loaded.contains(author1));
+    }
+
+    @Test
+    public void testSortOnComputedAttribute() {
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("fullName", Sorting.SortOrder.desc);
+
+        Editor editor1 = new Editor();
+        editor1.setFirstName("A");
+        editor1.setLastName("X");
+        Editor editor2 = new Editor();
+        editor2.setFirstName("B");
+        editor2.setLastName("Y");
+
+        Sorting sorting = new SortingImpl(sortOrder, Editor.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Editor.class)
+                .sorting(sorting)
+                .build();
+
+        DataStoreIterable iterable =
+                new DataStoreIterableBuilder(Arrays.asList(editor1, editor2)).sortInMemory(false).build();
+
+        ArgumentCaptor<EntityProjection> projectionArgument = ArgumentCaptor.forClass(EntityProjection.class);
+        when(wrappedTransaction.loadObjects(projectionArgument.capture(), eq(scope))).thenReturn(iterable);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(projection, scope));
+
+        assertNull(projectionArgument.getValue().getSorting());
+        assertEquals(2, loaded.size());
+
+        Object[] sorted = loaded.toArray();
+        assertEquals(editor2, sorted[0]);
+        assertEquals(editor1, sorted[1]);
+    }
+
+    @Test
+    public void testSortOnComplexAttribute() {
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("homeAddress.street1", Sorting.SortOrder.asc);
+
+        Sorting sorting = new SortingImpl(sortOrder, Author.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Author.class)
+                .sorting(sorting)
+                .build();
+
+        DataStoreIterable sortInMemory =
+                new DataStoreIterableBuilder(Arrays.asList(author1, author2)).sortInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(sortInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(projection, scope));
+
+        assertEquals(2, loaded.size());
+
+        Object[] sorted = loaded.toArray();
+        assertEquals(author2, sorted[0]);
+        assertEquals(author1, sorted[1]);
+    }
+
+    @Test
+    public void testTransactionRequiresInMemoryFilterDuringGetRelation() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        Relationship relationship = Relationship.builder()
+                .projection(EntityProjection.builder()
+                    .type(Book.class)
+                    .filterExpression(expression)
+                    .build())
+                .name("books")
+                .alias("books")
+                .build();
+
+        ArgumentCaptor<Relationship> relationshipArgument = ArgumentCaptor.forClass(Relationship.class);
+
+        when(scope.getNewPersistentResources()).thenReturn(Sets.newHashSet(mock(PersistentResource.class)));
+
+        when(wrappedTransaction.getToManyRelation(eq(inMemoryStoreTransaction), eq(author1), any(), eq(scope)))
+                .thenReturn(new DataStoreIterableBuilder<>(books).build());
+
+        Collection<Object> loaded = ImmutableList.copyOf((Iterable) inMemoryStoreTransaction.getToManyRelation(
+                inMemoryStoreTransaction, author1, relationship, scope));
+
+        verify(wrappedTransaction, times(1)).getToManyRelation(
+                eq(inMemoryStoreTransaction),
+                eq(author1),
+                relationshipArgument.capture(),
+                eq(scope));
+
+        assertNull(relationshipArgument.getValue().getProjection().getFilterExpression());
+        assertNull(relationshipArgument.getValue().getProjection().getSorting());
+        assertNull(relationshipArgument.getValue().getProjection().getPagination());
+
+        assertEquals(2, loaded.size());
+        assertTrue(loaded.contains(book1));
+        assertTrue(loaded.contains(book3));
+    }
+
+    @Test
+    public void testGetToOneRelationship() {
+
+        Relationship relationship = Relationship.builder()
+                .projection(EntityProjection.builder()
+                        .type(Book.class)
+                        .build())
+                .name("publisher")
+                .alias("publisher")
+                .build();
+
+        when(wrappedTransaction.getToOneRelation(eq(inMemoryStoreTransaction), eq(book1), any(), eq(scope)))
+                .thenReturn(publisher1);
+
+        Publisher loaded = inMemoryStoreTransaction.getToOneRelation(
+                inMemoryStoreTransaction, book1, relationship, scope);
+
+        verify(wrappedTransaction, times(1)).getToOneRelation(
+                eq(inMemoryStoreTransaction),
+                eq(book1),
+                eq(relationship),
+                eq(scope));
+
+        assertEquals(publisher1, loaded);
+    }
+
+    @Test
+    public void testDataStoreRequiresTotalInMemoryFilter() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(expression)
+                .build();
+
+        DataStoreIterable filterInMemory = new DataStoreIterableBuilder(books).filterInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(filterInMemory);
+
+        Collection<Object> loaded = ImmutableList.copyOf(inMemoryStoreTransaction.loadObjects(projection, scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(2, loaded.size());
+        assertTrue(loaded.contains(book1));
+        assertTrue(loaded.contains(book3));
+    }
+
+
+    @Test
+    public void testSortingPushDown() {
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("title", Sorting.SortOrder.asc);
+
+        Sorting sorting = new SortingImpl(sortOrder, Book.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .sorting(sorting)
+                .build();
+
+        DataStoreIterable expected = new DataStoreIterableBuilder<>(books).build();
+        when(wrappedTransaction.loadObjects(any(), eq(scope)))
+                .thenReturn(expected);
+
+        DataStoreIterable actual = inMemoryStoreTransaction.loadObjects(projection, scope);
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                eq(projection),
+                eq(scope));
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDataStoreRequiresInMemorySorting() {
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("title", Sorting.SortOrder.desc);
+
+        Sorting sorting = new SortingImpl(sortOrder, Book.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .sorting(sorting)
+                .build();
+
+        DataStoreIterable sortInMemory = new DataStoreIterableBuilder(books).sortInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(sortInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(3, loaded.size());
+
+        List<String> bookTitles = loaded.stream().map((o) -> ((Book) o).getTitle()).collect(Collectors.toList());
+        assertEquals(bookTitles, Lists.newArrayList("Book 3", "Book 2", "Book 1"));
+    }
+
+    @Test
+    public void testFilteringRequiresInMemorySorting() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("title", Sorting.SortOrder.desc);
+
+        Sorting sorting = new SortingImpl(sortOrder, Book.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(expression)
+                .sorting(sorting)
+                .build();
+
+        DataStoreIterable filterInMemory = new DataStoreIterableBuilder(books).filterInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(filterInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(2, loaded.size());
+
+        List<String> bookTitles = loaded.stream().map((o) -> ((Book) o).getTitle()).collect(Collectors.toList());
+        assertEquals(Lists.newArrayList("Book 3", "Book 1"), bookTitles);
+    }
+
+    @Test
+    public void testPaginationPushDown() {
+        PaginationImpl pagination = new PaginationImpl(ClassType.of(Book.class), 0, 1, 10, 10, false, false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .pagination(pagination)
+                .build();
+
+        ArgumentCaptor<EntityProjection> projectionArgument = ArgumentCaptor.forClass(EntityProjection.class);
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope)))
+                .thenReturn(new DataStoreIterableBuilder<>(books).build());
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                projectionArgument.capture(),
+                eq(scope));
+
+        assertEquals(pagination, projectionArgument.getValue().getPagination());
+        assertEquals(3, loaded.size());
+    }
+
+    @Test
+    public void testDataStoreRequiresInMemoryPagination() {
+        PaginationImpl pagination = new PaginationImpl(ClassType.of(Book.class), 0, 2, 10, 10, false, false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .pagination(pagination)
+                .build();
+
+        DataStoreIterable paginateInMemory = new DataStoreIterableBuilder(books).paginateInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(paginateInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(2, loaded.size());
+        assertTrue(loaded.contains(book1));
+        assertTrue(loaded.contains(book2));
+    }
+
+    @Test
+    public void testFilteringRequiresInMemoryPagination() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        PaginationImpl pagination = new PaginationImpl(ClassType.of(Book.class), 0, 2, 10, 10, true, false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(expression)
+                .pagination(pagination)
+                .build();
+
+        DataStoreIterable filterInMemory = new DataStoreIterableBuilder(books).filterInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(filterInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(2, loaded.size());
+        assertTrue(loaded.contains(book1));
+        assertTrue(loaded.contains(book3));
+        assertEquals(2, pagination.getPageTotals());
+    }
+
+    @Test
+    public void testSortingRequiresInMemoryPagination() {
+        PaginationImpl pagination = new PaginationImpl(ClassType.of(Book.class), 0, 3, 10, 10, true, false);
+
+        Map<String, Sorting.SortOrder> sortOrder = new HashMap<>();
+        sortOrder.put("title", Sorting.SortOrder.desc);
+
+        Sorting sorting = new SortingImpl(sortOrder, Book.class, dictionary);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .sorting(sorting)
+                .pagination(pagination)
+                .build();
+
+        DataStoreIterable sortInMemory = new DataStoreIterableBuilder(books).sortInMemory(true).build();
+
+        when(wrappedTransaction.loadObjects(any(), eq(scope))).thenReturn(sortInMemory);
+
+        Collection<Object> loaded = Lists.newArrayList(inMemoryStoreTransaction.loadObjects(
+                projection,
+                scope));
+
+        verify(wrappedTransaction, times(1)).loadObjects(
+                any(EntityProjection.class),
+                eq(scope));
+
+        assertEquals(3, loaded.size());
+        List<String> bookTitles = loaded.stream().map((o) -> ((Book) o).getTitle()).collect(Collectors.toList());
+        assertEquals(Lists.newArrayList("Book 3", "Book 2", "Book 1"), bookTitles);
+        assertEquals(3, pagination.getPageTotals());
+    }
+
+    @Test
+    public void testGetProperty() {
+        when(wrappedTransaction.getProperty(any())).thenReturn(1);
+
+        Integer result = inMemoryStoreTransaction.getProperty("foo");
+
+        verify(wrappedTransaction, times(1)).getProperty(eq("foo"));
+
+        assertEquals(1, result);
+    }
+
+    @Test
+    public void testInMemoryDataStore() {
+        HashMapDataStore wrapped = new HashMapDataStore(DefaultClassScanner.getInstance(), Book.class.getPackage());
+        InMemoryDataStore store = new InMemoryDataStore(wrapped);
+        DataStoreTransaction tx = store.beginReadTransaction();
+        assertEquals(InMemoryStoreTransaction.class, tx.getClass());
+
+        assertEquals(wrapped, wrapped.getDataStore());
+
+        // extract class names from DataStore string
+        String tos = store.toString()
+                .replace("Data store contents", "")
+                .replace("Table ClassType{cls=class", "").replace("} contents", "")
+                .replace("Wrapped:[", "").replace("]", "")
+                .replace("\n\n", ",")
+                .replace(" ", "").replace("\n", "");
+
+        // make sure count is correct
+        assertEquals(ImmutableSet.copyOf(new String[] {
+            "example.Author",
+            "example.Book",
+            "example.Child",
+            "example.CoerceBean",
+            "example.ComputedBean",
+            "example.Editor",
+            "example.FieldAnnotations",
+            "example.FirstClassFields",
+            "example.FunWithPermissions",
+            "example.Invoice",
+            "example.Job",
+            "example.Left",
+            "example.LineItem",
+            "example.MapColorShape",
+            "example.NoDeleteEntity",
+            "example.NoReadEntity",
+            "example.NoShareEntity",
+            "example.NoUpdateEntity",
+            "example.Parent",
+            "example.Post",
+            "example.PrimitiveId",
+            "example.Publisher",
+            "example.Right",
+            "example.StringId",
+            "example.UpdateAndCreate",
+            "example.User",
+            "example.Company",
+            "example.models.generics.Employee",
+            "example.models.generics.Manager",
+            "example.models.generics.Overlord",
+            "example.models.generics.Peon",
+            "example.models.packageinfo.IncludedPackageLevel",
+            "example.models.packageinfo.included.IncludedSubPackage",
+            "example.models.triggers.Invoice",
+            "example.models.versioned.BookV2",
+            "example.nontransferable.ContainerWithPackageShare",
+            "example.nontransferable.NoTransferBiDirectional",
+            "example.nontransferable.ShareableWithPackageShare",
+            "example.nontransferable.StrictNoTransfer",
+            "example.nontransferable.Untransferable"
+        }), ImmutableSet.copyOf(tos.split(",")));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapperTest.java b/elide-core/src/test/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapperTest.java
new file mode 100644
index 0000000000..9983adad9c
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/datastore/wrapped/TransactionWrapperTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.datastore.wrapped;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.request.Attribute;
+import org.junit.jupiter.api.Test;
+
+public class TransactionWrapperTest {
+
+    private static class TestTransactionWrapper extends TransactionWrapper {
+        public TestTransactionWrapper(DataStoreTransaction wrapped) {
+            super(wrapped);
+        }
+    }
+
+    @Test
+    public void testPreCommit() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.preCommit(null);
+        verify(wrapped, times(1)).preCommit(any());
+    }
+
+    @Test
+    public void testClose() throws Exception {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.close();
+
+        verify(wrapped, times(1)).close();
+    }
+
+    @Test
+    public void testLoadObjects() throws Exception {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        DataStoreIterable<Object> expected = mock(DataStoreIterable.class);
+        when(wrapped.loadObjects(any(), any())).thenReturn(expected);
+
+        Iterable<Object> actual = wrapper.loadObjects(null, null);
+
+        verify(wrapped, times(1)).loadObjects(any(), any());
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testCreateObject() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.createObject(null, null);
+
+        verify(wrapped, times(1)).createObject(any(), any());
+    }
+
+    @Test
+    public void testCommit() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.commit(null);
+
+        verify(wrapped, times(1)).commit(any());
+    }
+
+    @Test
+    public void testFlush() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.flush(null);
+
+        verify(wrapped, times(1)).flush(any());
+    }
+
+    @Test
+    public void testDelete() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.delete(null, null);
+
+        verify(wrapped, times(1)).delete(any(), any());
+    }
+
+    @Test
+    public void testSave() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.save(null, null);
+
+        verify(wrapped, times(1)).save(any(), any());
+    }
+
+    @Test
+    public void testGetAttribute() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        when(wrapped.getAttribute(any(), isA(Attribute.class), any())).thenReturn(1L);
+
+        Object actual = wrapper.getAttribute(null, Attribute.builder().name("foo").type(String.class).build(), null);
+
+        verify(wrapped, times(1)).getAttribute(any(), isA(Attribute.class), any());
+        assertEquals(1L, actual);
+    }
+
+    @Test
+    public void testSetAttribute() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.setAttribute(null, null, null);
+
+        verify(wrapped, times(1)).setAttribute(any(), any(), any());
+    }
+
+    @Test
+    public void testUpdateToOneRelation() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.updateToOneRelation(null, null, null, null, null);
+
+        verify(wrapped, times(1)).updateToOneRelation(any(), any(), any(), any(), any());
+    }
+
+    @Test
+    public void testUpdateToManyRelation() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        wrapper.updateToManyRelation(null, null, null, null, null, null);
+
+        verify(wrapped, times(1)).updateToManyRelation(any(), any(), any(), any(), any(), any());
+    }
+
+    @Test
+    public void testGetToManyRelation() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        DataStoreIterable expected = mock(DataStoreIterable.class);
+        when(wrapped.getToManyRelation(any(), any(), any(), any())).thenReturn(expected);
+
+        DataStoreIterable actual = wrapper.getToManyRelation(null, null, null, null);
+
+        verify(wrapped, times(1)).getToManyRelation(any(), any(), any(), any());
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testGetToOneRelation() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        when(wrapped.getToOneRelation(any(), any(), any(), any())).thenReturn(1L);
+
+        Long actual = wrapper.getToOneRelation(null, null, null, null);
+
+        verify(wrapped, times(1)).getToOneRelation(any(), any(), any(), any());
+        assertEquals(1L, actual);
+    }
+
+    @Test
+    public void testLoadObject() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        when(wrapped.loadObject(any(), any(), any())).thenReturn(1L);
+
+        Object actual = wrapper.loadObject(null, null, null);
+
+        verify(wrapped, times(1)).loadObject(any(), any(), any());
+        assertEquals(1L, actual);
+    }
+
+    @Test
+    public void testGetProperty() {
+        DataStoreTransaction wrapped = mock(DataStoreTransaction.class);
+        DataStoreTransaction wrapper = new TestTransactionWrapper(wrapped);
+
+        when(wrapped.getProperty(any())).thenReturn(1L);
+
+        Object actual = wrapper.getProperty("foo");
+
+        verify(wrapped, times(1)).getProperty(any());
+        assertEquals(1L, actual);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityBindingTest.java b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityBindingTest.java
new file mode 100644
index 0000000000..1706d0841f
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityBindingTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.ClassType;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+
+public class EntityBindingTest {
+    private static EntityBinding entityBinding;
+
+    @BeforeAll
+    public static void init() {
+        entityBinding = new EntityBinding(
+                null, ClassType.of(ChildClass.class), "childBinding");
+    }
+
+    @Test
+    public void testGetAllFields() throws Exception {
+        List<String> allFields = entityBinding.getAllFields().stream()
+                .map(AccessibleObject::getName)
+                .collect(Collectors.toList());
+
+        assertEquals(2, allFields.size());
+        assertEquals(allFields.get(0), "childField");
+        assertEquals(allFields.get(1), "parentField");
+    }
+
+    @Test
+    public void testIdField() throws Exception {
+        AccessibleObject idField = entityBinding.getIdField();
+        assertEquals(idField, ClassType.of(ParentClass.class).getDeclaredField("parentField"));
+    }
+
+    @Test
+    public void testIdGeneratedFalseWhenNoAnnotations() throws Exception {
+        assertFalse(entityBinding.isIdGenerated());
+    }
+
+    @Test
+    public void testIdGeneratedTrueWhenGenerateValue() throws Exception {
+        final EntityBinding eb = new EntityBinding(null,
+                ClassType.of(GeneratedValueClass.class), "testBinding");
+        assertTrue(eb.isIdGenerated());
+    }
+
+    @Test
+    public void testIdGeneratedTrueWhenMapsId() throws Exception {
+        final EntityBinding eb = new EntityBinding(null,
+                ClassType.of(MapsIdClass.class), "testBinding");
+        assertTrue(eb.isIdGenerated());
+    }
+
+    @Test
+    public void testIdGeneratedFalseWhenBadMapsId() throws Exception {
+        final EntityBinding eb = new EntityBinding(null,
+                ClassType.of(BadMapsIdClass.class), "testBinding");
+        assertFalse(eb.isIdGenerated());
+    }
+
+    private class ParentClass {
+        @Id
+        String parentField;
+
+        public void ignoredMethod() { }
+    }
+
+    private class ChildClass extends ParentClass {
+        String childField;
+    }
+
+    private class GeneratedValueClass {
+        @Id
+        @GeneratedValue
+        String id;
+    }
+
+    private class MapsIdClass extends ParentClass {
+        @OneToOne
+        @MapsId
+        public ParentClass parent;
+    }
+
+    private class BadMapsIdClass extends ParentClass {
+        @MapsId
+        public ParentClass parent;
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityDictionaryTest.java b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityDictionaryTest.java
new file mode 100644
index 0000000000..ea52e637fd
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/EntityDictionaryTest.java
@@ -0,0 +1,1180 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.dictionary;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.checks.prefab.Collections.AppendOnly;
+import com.yahoo.elide.core.security.checks.prefab.Collections.RemoveOnly;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.Child;
+import example.CoerceBean;
+import example.Editor;
+import example.FieldAnnotations;
+import example.FunWithPermissions;
+import example.GeoLocation;
+import example.Job;
+import example.Left;
+import example.Parent;
+import example.Price;
+import example.Publisher;
+import example.Right;
+import example.StringId;
+import example.User;
+import example.models.generics.Employee;
+import example.models.generics.Manager;
+import example.models.packageinfo.ExcludedPackageLevel;
+import example.models.packageinfo.IncludedPackageLevel;
+import example.models.packageinfo.excluded.ExcludedSubPackage;
+import example.models.packageinfo.included.ExcludedBySuperClass;
+import example.models.packageinfo.included.IncludedSubPackage;
+import example.models.versioned.BookV2;
+import example.nontransferable.NoTransferBiDirectional;
+import example.nontransferable.StrictNoTransfer;
+import org.junit.jupiter.api.Test;
+
+import java.lang.annotation.Annotation;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.persistence.AccessType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+
+public class EntityDictionaryTest extends EntityDictionary {
+
+    //Test class to validate inheritance logic
+    @Include(name = "friend")
+    private class Friend extends Child {
+    }
+
+    public EntityDictionaryTest() {
+        super(
+                Collections.emptyMap(), //checks
+                Collections.emptyMap(), //role Checks
+                DEFAULT_INJECTOR,
+                CoerceUtil::lookup,
+                Collections.emptySet(),
+                DefaultClassScanner.getInstance()
+        );
+        init();
+    }
+
+    private void init() {
+        bindEntity(FunWithPermissions.class);
+        bindEntity(Parent.class);
+        bindEntity(Child.class);
+        bindEntity(Publisher.class);
+        bindEntity(User.class);
+        bindEntity(Left.class);
+        bindEntity(Right.class);
+        bindEntity(StringId.class);
+        bindEntity(Friend.class);
+        bindEntity(FieldAnnotations.class);
+        bindEntity(Manager.class);
+        bindEntity(Employee.class);
+        bindEntity(Job.class);
+        bindEntity(NoId.class);
+        bindEntity(BookV2.class);
+        bindEntity(Book.class);
+        bindEntity(Author.class);
+        bindEntity(Editor.class);
+        bindEntity(IncludedPackageLevel.class);
+        bindEntity(IncludedSubPackage.class);
+        bindEntity(ExcludedPackageLevel.class);
+        bindEntity(ExcludedSubPackage.class);
+        bindEntity(ExcludedBySuperClass.class);
+        bindEntity(StrictNoTransfer.class);
+        bindEntity(NoTransferBiDirectional.class);
+
+        checkNames.forcePut("user has all access", Role.ALL.class);
+    }
+
+    @Test
+    public void testGetInjector() {
+        assertNotNull(getInjector());
+    }
+
+    @Test
+    public void testSetId() {
+        Parent parent = new Parent();
+        setId(parent, "123");
+        assertEquals(parent.getId(), 123);
+    }
+
+    @Test
+    public void testFindCheckByExpression() {
+        assertEquals("user has all access", getCheckIdentifier(Role.ALL.class));
+        assertEquals("Prefab.Role.None", getCheckIdentifier(Role.NONE.class));
+        assertEquals("Prefab.Collections.AppendOnly", getCheckIdentifier(AppendOnly.class));
+        assertEquals("Prefab.Collections.RemoveOnly", getCheckIdentifier(RemoveOnly.class));
+    }
+
+    @SecurityCheck("User is Admin")
+    public static class Bar extends UserCheck {
+
+        @Override
+        public boolean ok(com.yahoo.elide.core.security.User user) {
+            return false;
+        }
+    }
+
+    @Test
+    public void testBindingNoExcludeSet() {
+
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+        testDictionary.bindEntity(Employee.class);
+        // Finds the Binding
+        assertNotNull(testDictionary.entityBindings.get(ClassType.of(Employee.class)));
+    }
+
+    @Test
+    public void testCheckScan() {
+
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+        testDictionary.scanForSecurityChecks();
+
+        assertEquals("User is Admin", testDictionary.getCheckIdentifier(Bar.class));
+    }
+
+    @SecurityCheck("Filter Expression Injection Test")
+    public static class Foo extends FilterExpressionCheck {
+
+        @Inject
+        Long testLong;
+
+        @Override
+        public FilterExpression getFilterExpression(Type entityClass,
+                                                    com.yahoo.elide.core.security.RequestScope requestScope) {
+            assertEquals(testLong, 123L);
+            return null;
+        }
+    }
+
+    @Test
+    public void testCheckInjection() {
+        EntityDictionary testDictionary = EntityDictionary.builder()
+                .injector(new Injector() {
+                    @Override
+                    public void inject(Object entity) {
+                        if (entity instanceof Foo) {
+                            ((Foo) entity).testLong = 123L;
+                        }
+                    }
+                })
+                .build();
+        testDictionary.scanForSecurityChecks();
+
+        assertEquals("Filter Expression Injection Test", testDictionary.getCheckIdentifier(Foo.class));
+    }
+
+    @Test
+    public void testSerdeId() {
+
+        @Include(rootLevel = false)
+        class EntityWithDateId {
+            @Id
+            private Date id;
+        }
+
+        EntityDictionary testDictionary = new EntityDictionary(
+                new HashMap<>(),
+                null,
+                DEFAULT_INJECTOR,
+                unused -> new ISO8601DateSerde(),
+                Collections.emptySet(),
+                DefaultClassScanner.getInstance());
+
+        testDictionary.bindEntity(EntityWithDateId.class);
+
+        EntityWithDateId testModel = new EntityWithDateId();
+        testModel.id = new Date(0);
+        assertEquals("1970-01-01T00:00Z", testDictionary.getId(testModel));
+    }
+
+    @Test
+    public void testGetAttributeOrRelationAnnotation() {
+        String[] fields = {"field1", "field2", "field3", "relation1", "relation2"};
+        Annotation annotation;
+        for (String field : fields) {
+            annotation = getAttributeOrRelationAnnotation(ClassType.of(FunWithPermissions.class), ReadPermission.class, field);
+            assertTrue(annotation instanceof ReadPermission, "Every field should return a ReadPermission annotation");
+        }
+    }
+
+    @Test
+    public void testHasAnnotation() {
+        assertTrue(hasAnnotation(ClassType.of(Book.class), Include.class));
+        assertTrue(hasAnnotation(ClassType.of(Book.class), Transient.class));
+        assertFalse(hasAnnotation(ClassType.of(Book.class), Exclude.class));
+    }
+
+    @Test
+    public void testBindingTriggerPriorToBindingEntityClass1() {
+        @Entity
+        @Include(rootLevel = false)
+        class Foo2 {
+            @Id
+            private long id;
+
+            private int bar;
+        }
+
+        LifeCycleHook<Foo2> trigger = mock(LifeCycleHook.class);
+
+        bindTrigger(Foo2.class, "bar", UPDATE, LifeCycleHookBinding.TransactionPhase.PRESECURITY, trigger);
+        assertEquals(1, getAllExposedFields(ClassType.of(Foo2.class)).size());
+    }
+
+    @Test
+    public void testBindingTriggerPriorToBindingEntityClass2() {
+        @Entity
+        @Include(rootLevel = false)
+        class Foo3 {
+            @Id
+            private long id;
+
+            private int bar;
+        }
+
+        LifeCycleHook<Foo3> trigger = mock(LifeCycleHook.class);
+
+        bindTrigger(Foo3.class, UPDATE, LifeCycleHookBinding.TransactionPhase.PRESECURITY, trigger, true);
+        assertEquals(1, getAllExposedFields(ClassType.of(Foo3.class)).size());
+    }
+
+    @Test
+    public void testBindingTriggerPriorToBindingEntityClass3() {
+        @Entity
+        @Include(rootLevel = false)
+        class Foo4 {
+            @Id
+            private long id;
+
+            private int bar;
+        }
+
+        LifeCycleHook<Foo4> trigger = mock(LifeCycleHook.class);
+
+        bindTrigger(Foo4.class, UPDATE, LifeCycleHookBinding.TransactionPhase.PRESECURITY, trigger, false);
+        assertEquals(1, getAllExposedFields(ClassType.of(Foo4.class)).size());
+    }
+
+    @Test
+    public void testJPAFieldLevelAccess() {
+        @Entity
+        @Include(rootLevel = false)
+        class FieldLevelTest {
+            @Id
+            private long id;
+
+            private int bar;
+
+            @Exclude
+            private int excluded;
+
+            @Transient
+            @ComputedAttribute
+            private int computedField;
+
+            @Transient
+            @ComputedAttribute
+            public int getComputedProperty() {
+                return 1;
+            }
+
+            public void setComputedProperty() {
+                // NOOP
+            }
+        }
+        bindEntity(FieldLevelTest.class);
+
+        assertEquals(AccessType.FIELD, getAccessType(ClassType.of(FieldLevelTest.class)));
+
+        List<String> fields = getAllExposedFields(ClassType.of(FieldLevelTest.class));
+        assertEquals(3, fields.size());
+        assertTrue(fields.contains("bar"));
+        assertTrue(fields.contains("computedField"));
+        assertTrue(fields.contains("computedProperty"));
+    }
+
+    @Test
+    public void testJPAPropertyLevelAccess() {
+        @Entity
+        @Include(rootLevel = false)
+        class PropertyLevelTest {
+            private long id;
+
+            private int excluded;
+            public int bar;
+
+
+            @Exclude
+            public int getExcluded() {
+                return excluded;
+            }
+
+            public void setExcluded(int unused) {
+                //noop
+            }
+
+            @Transient
+            @ComputedAttribute
+            private int computedField;
+
+            @Transient
+            @ComputedAttribute
+            public int getComputedProperty() {
+                return 1;
+            }
+
+            public void setComputedProperty() {
+                //NOOP
+            }
+        }
+        bindEntity(PropertyLevelTest.class);
+
+        assertEquals(AccessType.PROPERTY, getAccessType(ClassType.of(PropertyLevelTest.class)));
+
+        List<String> fields = getAllExposedFields(ClassType.of(PropertyLevelTest.class));
+        assertEquals(2, fields.size());
+        assertTrue(fields.contains("bar"));
+        assertTrue(fields.contains("computedProperty"));
+    }
+
+
+    @Test
+    public void testGetParameterizedType() {
+        Type<?> type;
+
+        FunWithPermissions fun = new FunWithPermissions();
+
+        type = getParameterizedType(fun, "relation2");
+        assertEquals(ClassType.of(Child.class), type, "A set of Child objects should return Child.class");
+
+        type = getParameterizedType(fun, "relation3");
+        assertEquals(ClassType.of(Child.class), type, "A Child object should return Child.class");
+
+        assertEquals(
+                ClassType.of(FieldAnnotations.class),
+                getParameterizedType(ClassType.of(FieldAnnotations.class), "children"),
+                "getParameterizedType return the type of a private field relationship");
+
+        assertEquals(
+                ClassType.of(Child.class),
+                getParameterizedType(ClassType.of(Parent.class), "children"),
+                "getParameterizedType returns the type of relationship fields");
+
+        assertEquals(
+                ClassType.of(Employee.class),
+                getParameterizedType(ClassType.of(Manager.class), "minions"),
+                "getParameterizedType returns the correct generic type of a to-many relationship");
+    }
+
+    @Test
+    public void testIsGeneratedId() {
+        @Include(rootLevel = false)
+        class GeneratedIdModel {
+            @Id
+            @GeneratedValue
+            private long id;
+
+        }
+
+        @Include(rootLevel = false)
+        class NonGeneratedIdModel {
+            @Id
+            private long id;
+
+        }
+        bindEntity(GeneratedIdModel.class);
+        bindEntity(NonGeneratedIdModel.class);
+
+        assertTrue(isIdGenerated(ClassType.of(GeneratedIdModel.class)));
+        assertFalse(isIdGenerated(ClassType.of(NonGeneratedIdModel.class)));
+    }
+
+    @Test
+    public void testHiddenFields() {
+        @Include
+        class Model {
+            @Id
+            private long id;
+
+            private String field1;
+            private String field2;
+        }
+
+        bindEntity(Model.class, (field) -> field.getName().equals("field1"));
+
+        Type<?> modelType = ClassType.of(Model.class);
+
+        assertEquals(List.of("field2"), getAllExposedFields(modelType));
+
+        EntityBinding binding = getEntityBinding(modelType);
+        assertEquals(List.of("id", "field1", "field2"), binding.getAllFields().stream()
+                .map(AccessibleObject::getName)
+                .collect(Collectors.toList()));
+    }
+
+    @Test
+    public void testGetInverseRelationshipOwningSide() {
+        assertEquals(
+                "parents",
+                getRelationInverse(ClassType.of(Parent.class), "children"),
+                "The inverse relationship of children should be parents");
+    }
+
+    @Test
+    public void testGetInverseRelationshipOwnedSide() {
+        assertEquals(
+                "children",
+                getRelationInverse(ClassType.of(Child.class), "parents"),
+                "The inverse relationship of children should be parents");
+    }
+
+    @Test
+    public void testComputedAttributeIsExposed() {
+        List<String> attributes = getAttributes(ClassType.of(User.class));
+        assertTrue(attributes.contains("password"));
+    }
+
+    @Test
+    public void testExcludedAttributeIsNotExposed() {
+        List<String> attributes = getAttributes(ClassType.of(User.class));
+        assertFalse(attributes.contains("reversedPassword"));
+    }
+
+    @Test
+    public void testDetectCascadeRelations() {
+        assertFalse(cascadeDeletes(ClassType.of(FunWithPermissions.class), "relation1"));
+        assertFalse(cascadeDeletes(ClassType.of(FunWithPermissions.class), "relation2"));
+        assertTrue(cascadeDeletes(ClassType.of(FunWithPermissions.class), "relation3"));
+        assertFalse(cascadeDeletes(ClassType.of(FunWithPermissions.class), "relation4"));
+        assertFalse(cascadeDeletes(ClassType.of(FunWithPermissions.class), "relation5"));
+    }
+
+    @Test
+    public void testGetIdAnnotations() throws Exception {
+
+        Collection<Class> expectedAnnotationClasses = Arrays.asList(new Class[]{Id.class, GeneratedValue.class});
+        Collection<Class> actualAnnotationsClasses = getIdAnnotations(new Parent()).stream()
+                .map(Annotation::annotationType)
+                .collect(Collectors.toList());
+
+        assertEquals(actualAnnotationsClasses, expectedAnnotationClasses,
+                "getIdAnnotations returns annotations on the ID field of the given class");
+    }
+
+    @Test
+    public void testGetIdAnnotationsNoId() throws Exception {
+
+        Collection<Annotation> expectedAnnotation = Collections.emptyList();
+        Collection<Annotation> actualAnnotations = getIdAnnotations(new NoId());
+
+        assertEquals(actualAnnotations, expectedAnnotation,
+                "getIdAnnotations returns an empty collection if there is no ID field for given class");
+    }
+
+    @Include(rootLevel = false)
+    class NoId {
+
+    }
+
+    @Test
+    public void testGetIdAnnotationsSubClass() throws Exception {
+
+        Collection<Class> expectedAnnotationClasses = Arrays.asList(new Class[]{Id.class, GeneratedValue.class});
+        Collection<Class> actualAnnotationsClasses = getIdAnnotations(new Friend()).stream()
+                .map(Annotation::annotationType)
+                .collect(Collectors.toList());
+
+        assertEquals(actualAnnotationsClasses, expectedAnnotationClasses,
+                "getIdAnnotations returns annotations on the ID field when defined in a super class");
+    }
+
+    @Test
+    public void testIsSharableTrue() throws Exception {
+        assertTrue(isTransferable(ClassType.of(Right.class)));
+        assertFalse(isStrictNonTransferable(ClassType.of(Right.class)));
+    }
+
+    @Test
+    public void testIsSharableFalse() throws Exception {
+        assertFalse(isTransferable(ClassType.of(Left.class)));
+        assertFalse(isStrictNonTransferable(ClassType.of(Left.class)));
+    }
+
+    @Test
+    public void testIsStrictNonTransferable() throws Exception {
+        assertTrue(isStrictNonTransferable(ClassType.of(StrictNoTransfer.class)));
+        assertFalse(isStrictNonTransferable(ClassType.of(NoTransferBiDirectional.class)));
+    }
+
+    @Test
+    public void testGetIdType() throws Exception {
+        assertEquals(getIdType(ClassType.of(Parent.class)), ClassType.of(long.class),
+                "getIdType returns the type of the ID field of the given class");
+
+        assertEquals(getIdType(ClassType.of(StringId.class)), ClassType.of(String.class),
+                "getIdType returns the type of the ID field of the given class");
+
+        assertNull(getIdType(ClassType.of(NoId.class)),
+                "getIdType returns null if ID field is missing");
+
+        assertEquals(getIdType(ClassType.of(Friend.class)), ClassType.of(long.class),
+                "getIdType returns the type of the ID field when defined in a super class");
+    }
+
+    @Test
+    public void testGetType() throws Exception {
+        assertEquals(
+                ClassType.of(Long.class),
+                getType(ClassType.of(FieldAnnotations.class), "id"),
+                "getType returns the type of the ID field of the given class");
+
+        assertEquals(
+                ClassType.of(long.class),
+                getType(ClassType.of(FieldAnnotations.class), "publicField"),
+                "getType returns the type of attribute when Column annotation is on a field");
+
+        assertEquals(
+                ClassType.of(Boolean.class),
+                getType(ClassType.of(FieldAnnotations.class), "privateField"),
+                "getType returns the type of attribute when Column annotation is on a getter");
+
+        assertNull(getType(ClassType.of(FieldAnnotations.class), "missingField"),
+                "getId returns null if attribute is missing"
+        );
+
+        assertEquals(
+                ClassType.of(FieldAnnotations.class),
+                getType(ClassType.of(FieldAnnotations.class), "parent"),
+                "getType return the type of a private field relationship");
+
+        assertEquals(
+                ClassType.of(Set.class),
+                getType(ClassType.of(FieldAnnotations.class), "children"),
+                "getType return the type of a private field relationship");
+
+        assertEquals(
+                ClassType.of(Set.class),
+                getType(ClassType.of(Parent.class), "children"),
+                "getType returns the type of relationship fields");
+
+        assertEquals(ClassType.of(String.class), getType(ClassType.of(Friend.class), "name"),
+                "getType returns the type of attribute when defined in a super class");
+
+        assertEquals(ClassType.of(Manager.class), getType(ClassType.of(Employee.class), "boss"),
+                "getType returns the correct generic type of a to-one relationship");
+
+        assertEquals(ClassType.of(Set.class), getType(ClassType.of(Manager.class), "minions"),
+                "getType returns the correct generic type of a to-many relationship");
+
+        // ID is "id"
+        assertEquals(ClassType.of(long.class), getType(ClassType.of(Parent.class), "id"),
+                "getType returns the type of surrogate key");
+
+        // ID is not "id"
+        assertEquals(ClassType.of(Long.class), getType(ClassType.of(Job.class), "jobId"),
+                "getType returns the type of surrogate key");
+        assertEquals(ClassType.of(Long.class), getType(ClassType.of(Job.class), "id"),
+                "getType returns the type of surrogate key");
+        assertEquals(ClassType.of(String.class), getType(ClassType.of(StringId.class), "surrogateKey"),
+                "getType returns the type of surrogate key");
+        assertEquals(ClassType.of(String.class), getType(ClassType.of(StringId.class), "id"),
+                "getType returns the type of surrogate key");
+    }
+
+    @Test
+    public void testGetTypUnknownEntityException() {
+        assertThrows(IllegalArgumentException.class, () -> getType(ClassType.of(Object.class), "id"));
+    }
+
+    @Test
+    public void testNoExcludedFieldsReturned() {
+        List<String> attrs = getAttributes(ClassType.of(Child.class));
+        List<String> rels = getRelationships(ClassType.of(Child.class));
+        assertTrue(!attrs.contains("excludedEntity") && !attrs.contains("excludedRelationship")
+                && !attrs.contains("excludedEntityList"));
+        assertTrue(!rels.contains("excludedEntity") && !rels.contains("excludedRelationship")
+                && !rels.contains("excludedEntityList"));
+    }
+
+    public interface BadInterface {
+    }
+
+    @Test
+    public void testBadInterface() {
+        assertThrows(IllegalArgumentException.class, () -> getEntityBinding(ClassType.of(BadInterface.class)));
+    }
+
+    @Test
+    public void testEntityInheritanceBinding() {
+        @Entity
+        @Include(rootLevel = false)
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        class SubclassBinding extends SuperclassBinding {
+        }
+
+        class SubsubclassBinding extends SubclassBinding {
+        }
+
+        bindEntity(SuperclassBinding.class);
+        bindEntity(SubclassBinding.class);
+        bindEntity(SubsubclassBinding.class);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SubclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SuperclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SubclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SubsubclassBinding.class)));
+
+        assertNull(getEntityClass("subclassBinding", NO_VERSION));
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityClass("superclassBinding", NO_VERSION));
+
+        assertEquals("superclassBinding", getJsonAliasFor(ClassType.of(SubclassBinding.class)));
+        assertEquals("superclassBinding", getJsonAliasFor(ClassType.of(SuperclassBinding.class)));
+    }
+
+    @Test
+    public void testEntityInheritanceBindingOverride() {
+        @Entity
+        @Include(rootLevel = false)
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        class SubclassBinding extends SuperclassBinding {
+        }
+
+        @Entity
+        @Include(rootLevel = false)
+        class SubsubclassBinding extends SubclassBinding {
+            @Id
+            private long id;
+        }
+
+        bindEntity(SuperclassBinding.class);
+        bindEntity(SubsubclassBinding.class);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SubclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SubsubclassBinding.class), getEntityBinding(ClassType.of(SubsubclassBinding.class)).entityClass);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SuperclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SubclassBinding.class)));
+        assertEquals(ClassType.of(SubsubclassBinding.class), lookupEntityClass(ClassType.of(SubsubclassBinding.class)));
+    }
+
+    @Test
+    public void testMissingEntityBinding() {
+        @Entity
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        bindEntity(SuperclassBinding.class);
+
+        assertNull(getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupEntityClass(ClassType.of(SuperclassBinding.class)));
+    }
+
+    @Test
+    public void testNonEntityInheritanceBinding() {
+        @Include(rootLevel = false)
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        class SubclassBinding extends SuperclassBinding {
+        }
+
+        class SubsubclassBinding extends SubclassBinding {
+        }
+
+        bindEntity(SuperclassBinding.class);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SubclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SuperclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SubclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SubsubclassBinding.class)));
+    }
+
+    @Test
+    public void testNonEntityInheritanceBindingOverride() {
+        @Include(rootLevel = false)
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        class SubclassBinding extends SuperclassBinding {
+        }
+
+        @Include(rootLevel = false)
+        class SubsubclassBinding extends SubclassBinding {
+            @Id
+            private long id;
+        }
+
+        bindEntity(SuperclassBinding.class);
+        bindEntity(SubsubclassBinding.class);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SubclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SubsubclassBinding.class), getEntityBinding(ClassType.of(SubsubclassBinding.class)).entityClass);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SuperclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SubclassBinding.class)));
+        assertEquals(ClassType.of(SubsubclassBinding.class), lookupIncludeClass(ClassType.of(SubsubclassBinding.class)));
+    }
+
+    @Test
+    public void testNonEntityInheritanceBindingExclusion() {
+        @Include(rootLevel = false)
+        class SuperclassBinding {
+            @Id
+            private long id;
+        }
+
+        class SubclassBinding extends SuperclassBinding {
+        }
+
+        @Exclude
+        class SubsubclassBinding extends SubclassBinding {
+        }
+
+        bindEntity(SuperclassBinding.class);
+        bindEntity(SubsubclassBinding.class);
+
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SubclassBinding.class)).entityClass);
+        assertEquals(ClassType.of(SuperclassBinding.class), getEntityBinding(ClassType.of(SuperclassBinding.class)).entityClass);
+        assertThrows(IllegalArgumentException.class, () ->
+            getEntityBinding(ClassType.of(SubsubclassBinding.class))
+        );
+
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SuperclassBinding.class)));
+        assertEquals(ClassType.of(SuperclassBinding.class), lookupIncludeClass(ClassType.of(SubclassBinding.class)));
+        assertNull(lookupIncludeClass(ClassType.of(SubsubclassBinding.class)));
+    }
+
+    @Test
+    public void testGetFirstAnnotation() {
+        @Exclude
+        class Foo {
+        }
+
+        @Include(rootLevel = false)
+        class Bar extends Foo {
+
+        }
+
+        class Baz extends Bar {
+
+        }
+
+        Annotation first = getFirstAnnotation(ClassType.of(Baz.class), Arrays.asList(Exclude.class, Include.class));
+        assertTrue(first instanceof Include);
+    }
+
+    @Test
+    public void testGetFirstAnnotationConflict() {
+        @Exclude
+        @Include(rootLevel = false)
+        class Foo {
+        }
+
+        Annotation first = getFirstAnnotation(ClassType.of(Foo.class), Arrays.asList(Exclude.class, Include.class));
+        assertTrue(first instanceof Exclude);
+    }
+
+    @Test
+    public void testAnnotationNoSuchMethod() {
+        bindEntity(Book.class);
+        IllegalStateException e = assertThrows(IllegalStateException.class,
+                () -> getMethodAnnotation(ClassType.of(Book.class), "NoMethod", FilterExpressionPath.class));
+        assertTrue(e.getCause() instanceof NoSuchMethodException, e.toString());
+    }
+
+    @Test
+    public void testAnnotationFilterExpressionPath() {
+        bindEntity(Book.class);
+        FilterExpressionPath fe =
+                getMethodAnnotation(ClassType.of(Book.class), "getEditor", FilterExpressionPath.class);
+        assertEquals("publisher.editor", fe.value());
+    }
+
+    @Test
+    public void testBadLookupEntityClass() {
+        assertThrows(IllegalArgumentException.class, () -> lookupEntityClass(null));
+        assertThrows(IllegalArgumentException.class, () -> lookupEntityClass(ClassType.of(Object.class)));
+    }
+
+    @Test
+    public void testFieldIsInjected() {
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+
+        @Include(rootLevel = false)
+        class FieldInject {
+            @Inject
+            private String field;
+        }
+
+        testDictionary.bindEntity(FieldInject.class);
+
+        assertTrue(testDictionary.getEntityBinding(ClassType.of(FieldInject.class)).isInjected());
+    }
+
+    @Test
+    public void testInheritedFieldIsInjected() {
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+        class BaseClass {
+            @Inject
+            private String field;
+        }
+
+        @Include(rootLevel = false)
+        class SubClass extends BaseClass {
+            private String anotherField;
+        }
+
+        testDictionary.bindEntity(SubClass.class);
+
+        assertTrue(testDictionary.getEntityBinding(ClassType.of(SubClass.class)).isInjected());
+    }
+
+    @Test
+    public void testMethodIsInjected() {
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+
+        @Include(rootLevel = false)
+        class MethodInject {
+            @Inject
+            private void setField(String field) {
+                //NOOP
+            }
+        }
+
+        testDictionary.bindEntity(MethodInject.class);
+
+        assertTrue(testDictionary.getEntityBinding(ClassType.of(MethodInject.class)).isInjected());
+    }
+
+    @Test
+    public void testInhertedMethodIsInjected() {
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+        class BaseClass {
+            @Inject
+            private void setField(String field) {
+                //NOOP
+            }
+        }
+
+        @Include(rootLevel = false)
+        class SubClass extends BaseClass {
+            private String anotherField;
+        }
+
+        testDictionary.bindEntity(SubClass.class);
+
+        assertTrue(testDictionary.getEntityBinding(ClassType.of(SubClass.class)).isInjected());
+    }
+
+    @Test
+    public void testConstructorIsInjected() {
+        EntityDictionary testDictionary = EntityDictionary.builder().build();
+
+        @Include(rootLevel = false)
+        class ConstructorInject {
+            @Inject
+            public ConstructorInject(String field) {
+                //NOOP
+            }
+        }
+
+        testDictionary.bindEntity(ConstructorInject.class);
+
+        assertTrue(testDictionary.getEntityBinding(ClassType.of(ConstructorInject.class)).isInjected());
+    }
+
+    @Test
+    public void testFieldLookup() throws Exception {
+        Book book = new Book() {
+            @Override
+            public String toString() {
+                return "ProxyBook";
+            }
+        };
+        book.setId(1234L);
+        Author author = new Author();
+
+        initializeEntity(book);
+
+        RequestScope scope = mock(RequestScope.class);
+
+        assertEquals("Book", getSimpleName(ClassType.of(Book.class)));
+        assertEquals("getEditor",
+                findMethod(ClassType.of(Book.class), "getEditor").getName());
+        assertEquals("setGenre",
+                findMethod(ClassType.of(Book.class), "setGenre", ClassType.of(String.class)).getName());
+
+        setValue(book, "genre", "Elide");
+        assertEquals("Elide", getValue(book, "genre", scope));
+        setValue(book, "authors", ImmutableSet.of(author));
+        assertEquals(ImmutableSet.of(author), getValue(book, "authors", scope));
+
+        assertThrows(InvalidAttributeException.class, () -> setValue(book, "badfield", "Elide"));
+        assertEquals("1234", getId(book));
+        assertTrue(isRoot(ClassType.of(Book.class)));
+
+        assertEquals(ClassType.of(Book.class), lookupBoundClass(ClassType.of(Book.class)));
+        assertNull(lookupBoundClass(ClassType.of(String.class)));
+        // check proxy lookup
+        assertNotEquals(ClassType.of(Book.class), book.getClass());
+        assertEquals(ClassType.of(Book.class), lookupBoundClass(ClassType.of(Book.class)));
+
+        assertFalse(isComputed(ClassType.of(Book.class), "genre"));
+        assertTrue(isComputed(ClassType.of(Book.class), "editor"));
+        assertTrue(isComputed(ClassType.of(Editor.class), "fullName"));
+        assertFalse(isComputed(ClassType.of(Editor.class), "badfield"));
+
+        assertEquals(
+                ImmutableSet.of("awards", "genre", "language", "title"),
+                getFieldsOfType(ClassType.of(Book.class), ClassType.of(String.class)));
+
+        assertTrue(isRelation(ClassType.of(Book.class), "editor"));
+        assertTrue(isAttribute(ClassType.of(Book.class), "title"));
+        assertEquals(
+                Arrays.asList(ClassType.of(Book.class), ClassType.of(Author.class),
+                        ClassType.of(Editor.class), ClassType.of(Publisher.class)),
+                walkEntityGraph(ImmutableSet.of(ClassType.of(Book.class)), x -> x));
+
+        assertTrue(hasBinding(ClassType.of(Book.class)));
+        assertFalse(hasBinding(ClassType.of(String.class)));
+    }
+
+    @Test
+    public void testCoerce() throws Exception {
+        bindEntity(CoerceBean.class);
+        CoerceBean bean = new CoerceBean();
+
+        setValue(bean, "string", 1L);
+        setValue(bean, "list", ImmutableSet.of(true, false));
+        setValue(bean, "map", ImmutableMap.of("one", "1", "two", "2"));
+        setValue(bean, "set", ImmutableList.of(3L, 4L));
+
+        assertEquals("1", bean.string);
+        assertEquals(Arrays.asList(true, false), bean.list);
+        assertEquals(
+                ImmutableMap.of("one", 1L, "two", 2L),
+                bean.map);
+        assertEquals(ImmutableSet.of(3.0, 4.0), bean.set);
+    }
+
+    public static class TestCheck extends UserCheck {
+
+        @Override
+        public boolean ok(com.yahoo.elide.core.security.User user) {
+            throw new IllegalStateException();
+        }
+    }
+
+    @Test
+    public void testCheckLookup() throws Exception {
+        assertEquals(Role.ALL.class, this.getCheck("user has all access"));
+
+        assertEquals(TestCheck.class, this.getCheck("com.yahoo.elide.core.dictionary.EntityDictionaryTest$TestCheck"));
+
+        assertThrows(IllegalArgumentException.class, () -> this.getCheck("UnknownClassName"));
+
+        assertThrows(IllegalArgumentException.class, () -> this.getCheck(String.class.getName()));
+    }
+
+    @Test
+    public void testAttributeOrRelationAnnotationExists() {
+        assertTrue(attributeOrRelationAnnotationExists(ClassType.of(Job.class), "jobId", Id.class));
+        assertFalse(attributeOrRelationAnnotationExists(ClassType.of(Job.class), "title", OneToOne.class));
+    }
+
+    @Test
+    public void testIsValidField() {
+        assertTrue(isValidField(ClassType.of(Job.class), "title"));
+        assertFalse(isValidField(ClassType.of(Job.class), "foo"));
+    }
+
+    @Test
+    public void testBindingHiddenAttribute() {
+        @Include
+        class Book {
+            @Id
+            long id;
+
+            String notHidden;
+
+            String hidden;
+        }
+
+        bindEntity(Book.class, (field) -> field.getName().equals("hidden") ? true : false);
+
+        assertFalse(isAttribute(ClassType.of(Book.class), "hidden"));
+        assertTrue(isAttribute(ClassType.of(Book.class), "notHidden"));
+    }
+
+    @Test
+    public void testGetBoundByVersion() {
+        Set<Type<?>> models = getBoundClassesByVersion("1.0");
+        assertEquals(3, models.size());  //Also includes com.yahoo.elide inner classes from this file.
+        assertTrue(models.contains(ClassType.of(BookV2.class)));
+
+        models = getBoundClassesByVersion(NO_VERSION);
+        assertEquals(21, models.size());
+    }
+
+    @Test
+    public void testGetEntityClassByVersion() {
+        Type<?> model = getEntityClass("book", NO_VERSION);
+        assertEquals(ClassType.of(Book.class), model);
+
+        model = getEntityClass("book", "1.0");
+        assertEquals(ClassType.of(BookV2.class), model);
+    }
+
+    @Test
+    public void testGetModelVersion() {
+        assertEquals("1.0", getModelVersion(ClassType.of(BookV2.class)));
+        assertEquals(NO_VERSION, getModelVersion(ClassType.of(Book.class)));
+    }
+
+    @Test
+    public void testIsComplexAttribute() {
+        //Test complex attribute
+        assertTrue(isComplexAttribute(ClassType.of(Author.class), "homeAddress"));
+        //Test nested complex attribute
+        assertTrue(isComplexAttribute(ClassType.of(Address.class), "geo"));
+        //Test another complex attribute.
+        assertTrue(isComplexAttribute(ClassType.of(Book.class), "price"));
+        //Test Java Type with no default constructor.
+        assertFalse(isComplexAttribute(ClassType.of(Price.class), "currency"));
+        //Test embedded Elide model
+        assertFalse(isComplexAttribute(ClassType.of(Price.class), "book"));
+        //Test String
+        assertFalse(isComplexAttribute(ClassType.of(Book.class), "title"));
+        //Test primitive
+        assertFalse(isComplexAttribute(ClassType.of(Book.class), "publishDate"));
+        //Test primitive wrapper
+        assertFalse(isComplexAttribute(ClassType.of(FieldAnnotations.class), "privateField"));
+        //Test collection
+        assertFalse(isComplexAttribute(ClassType.of(Book.class), "awards"));
+        //Test relationship
+        assertFalse(isComplexAttribute(ClassType.of(Book.class), "authors"));
+        //Test enum
+        assertFalse(isComplexAttribute(ClassType.of(Author.class), "authorType"));
+        //Test collection of complex type
+        assertFalse(isComplexAttribute(ClassType.of(Author.class), "vacationHomes"));
+        //Test map of objects
+        assertFalse(isComplexAttribute(ClassType.of(Author.class), "stuff"));
+    }
+
+    @Test
+    public void testHasBinding() {
+        assertTrue(hasBinding(ClassType.of(FunWithPermissions.class)));
+        assertTrue(hasBinding(ClassType.of(Parent.class)));
+        assertTrue(hasBinding(ClassType.of(Child.class)));
+        assertTrue(hasBinding(ClassType.of(User.class)));
+        assertTrue(hasBinding(ClassType.of(Left.class)));
+        assertTrue(hasBinding(ClassType.of(Right.class)));
+        assertTrue(hasBinding(ClassType.of(StringId.class)));
+        assertTrue(hasBinding(ClassType.of(Friend.class)));
+        assertTrue(hasBinding(ClassType.of(FieldAnnotations.class)));
+        assertTrue(hasBinding(ClassType.of(Manager.class)));
+        assertTrue(hasBinding(ClassType.of(Employee.class)));
+        assertTrue(hasBinding(ClassType.of(Job.class)));
+        assertTrue(hasBinding(ClassType.of(NoId.class)));
+        assertTrue(hasBinding(ClassType.of(BookV2.class)));
+        assertTrue(hasBinding(ClassType.of(Book.class)));
+        assertTrue(hasBinding(ClassType.of((IncludedPackageLevel.class))));
+        assertTrue(hasBinding(ClassType.of((IncludedSubPackage.class))));
+        assertFalse(hasBinding(ClassType.of((ExcludedPackageLevel.class))));
+        assertFalse(hasBinding(ClassType.of((ExcludedSubPackage.class))));
+        assertFalse(hasBinding(ClassType.of((ExcludedBySuperClass.class))));
+
+        //Test bindings for complex attribute types
+        assertTrue(hasBinding(ClassType.of(Address.class)));
+        assertTrue(hasBinding(ClassType.of(GeoLocation.class)));
+        assertFalse(hasBinding(ClassType.of(String.class)));
+        assertFalse(hasBinding(ClassType.of(Author.AuthorType.class)));
+        assertFalse(hasBinding(ClassType.of(Boolean.class)));
+        assertFalse(hasBinding(ClassType.of(Date.class)));
+        assertFalse(hasBinding(ClassType.of(Map.class)));
+        assertFalse(hasBinding(ClassType.of(BigDecimal.class)));
+    }
+
+    @Test
+    public void testEntityPrefix() {
+        assertEquals("example_includedPackageLevel",
+                getJsonAliasFor(ClassType.of(IncludedPackageLevel.class)));
+    }
+
+    @Test
+    public void testEntityDescription() {
+        assertEquals("A book publisher", EntityDictionary.getEntityDescription(ClassType.of(Publisher.class)));
+        assertNull(EntityDictionary.getEntityDescription(ClassType.of(Book.class)));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestDictionary.java b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestDictionary.java
new file mode 100644
index 0000000000..5412ef8848
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestDictionary.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.dictionary;
+
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.google.inject.Binder;
+import com.google.inject.Guice;
+import com.google.inject.Module;
+import com.google.inject.TypeLiteral;
+import com.google.inject.name.Names;
+import example.TestCheckMappings;
+
+import java.util.Collections;
+import java.util.Map;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+/**
+ * Test Entity Dictionary.
+ */
+@Singleton
+public class TestDictionary extends EntityDictionary {
+
+    @Inject
+    public TestDictionary(Injector injector,
+                          @Named("checkMappings") Map<String, Class<? extends Check>> checks) {
+        super(
+                checks,
+                Collections.emptyMap(), //role Checks
+                injector,
+                CoerceUtil::lookup,
+                Collections.emptySet(),
+                DefaultClassScanner.getInstance()
+        );
+    }
+
+    @Override
+    public Type<?> lookupBoundClass(Type<?> objClass) {
+        // Special handling for mocked Book class which has Entity annotation
+        if (objClass.getName().contains("$MockitoMock$")) {
+            objClass = objClass.getSuperclass();
+        }
+        return super.lookupBoundClass(objClass);
+    }
+
+    /**
+     * Returns a test dictionary injected with Guice.
+     * @return a test dictionary.
+     */
+    public static EntityDictionary getTestDictionary() {
+        return getTestDictionary(TestCheckMappings.MAPPINGS);
+    }
+
+    /**
+     * Returns a test dictionary injected with Guice.
+     * @param checks The security checks to setup the dictionary with.
+     * @return a test dictionary.
+     */
+    public static EntityDictionary getTestDictionary(Map<String, Class<? extends Check>> checks) {
+        return Guice.createInjector(new Module() {
+            @Override
+            public void configure(Binder binder) {
+                binder.bind(Injector.class).to(TestInjector.class);
+                binder.bind(EntityDictionary.class).to(TestDictionary.class);
+                binder.bind(new TypeLiteral<Map<String, Class<? extends Check>>>() { })
+                      .annotatedWith(Names.named("checkMappings"))
+                      .toInstance(checks);
+            }
+        }).getInstance(EntityDictionary.class);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestInjector.java b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestInjector.java
new file mode 100644
index 0000000000..c52693b20d
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/dictionary/TestInjector.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.dictionary;
+
+import javax.inject.Inject;
+
+/**
+ * Test Dependency Injector.
+ */
+public class TestInjector implements Injector {
+    private final com.google.inject.Injector injector;
+
+    @Inject
+    public TestInjector(com.google.inject.Injector injector) {
+        this.injector = injector;
+    }
+
+    @Override
+    public void inject(Object entity) {
+        injector.injectMembers(entity);
+    }
+
+    @Override
+    public <T> T instantiate(Class<T> cls) {
+        return injector.getInstance(cls);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/exceptions/ErrorMapperTest.java b/elide-core/src/test/java/com/yahoo/elide/core/exceptions/ErrorMapperTest.java
new file mode 100644
index 0000000000..81a8ac96f3
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/exceptions/ErrorMapperTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.lifecycle.FieldTestModel;
+import com.yahoo.elide.core.lifecycle.LegacyTestModel;
+import com.yahoo.elide.core.lifecycle.PropertyTestModel;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.type.ClassType;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+/**
+ * Tests the error mapping logic.
+ */
+public class ErrorMapperTest {
+
+    private final String baseUrl = "http://localhost:8080/api/v1";
+    private static final ErrorMapper MOCK_ERROR_MAPPER = mock(ErrorMapper.class);
+    private static final Exception EXPECTED_EXCEPTION = new IllegalStateException("EXPECTED_EXCEPTION");
+    private static final CustomErrorException MAPPED_EXCEPTION = new CustomErrorException(
+            422,
+            "MAPPED_EXCEPTION",
+            ErrorObjects.builder()
+                    .addError()
+                    .withCode("SOME_ERROR")
+                    .build()
+    );
+    private EntityDictionary dictionary;
+
+    ErrorMapperTest() throws Exception {
+        dictionary = TestDictionary.getTestDictionary();
+        dictionary.bindEntity(FieldTestModel.class);
+        dictionary.bindEntity(PropertyTestModel.class);
+        dictionary.bindEntity(LegacyTestModel.class);
+    }
+
+    @AfterEach
+    private void afterEach() {
+        reset(MOCK_ERROR_MAPPER);
+    }
+
+    @Test
+    public void testElideCreateNoErrorMapper() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, null);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+        doThrow(EXPECTED_EXCEPTION).when(tx).preCommit(any());
+
+        RuntimeException result = assertThrows(RuntimeException.class, () -> elide.post(baseUrl, "/testModel", body, null, NO_VERSION));
+        assertEquals(EXPECTED_EXCEPTION, result.getCause());
+
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideCreateWithErrorMapperUnmapped() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_ERROR_MAPPER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+        doThrow(EXPECTED_EXCEPTION).when(tx).preCommit(any());
+
+        RuntimeException result = assertThrows(RuntimeException.class, () -> elide.post(baseUrl, "/testModel", body, null, NO_VERSION));
+        assertEquals(EXPECTED_EXCEPTION, result.getCause());
+
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideCreateWithErrorMapperMapped() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_ERROR_MAPPER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+        doThrow(EXPECTED_EXCEPTION).when(tx).preCommit(any());
+        when(MOCK_ERROR_MAPPER.map(EXPECTED_EXCEPTION)).thenReturn(MAPPED_EXCEPTION);
+
+        ElideResponse response = elide.post(baseUrl, "/testModel", body, null, NO_VERSION);
+        assertEquals(422, response.getResponseCode());
+        assertEquals(
+                "{\"errors\":[{\"code\":\"SOME_ERROR\"}]}",
+                response.getBody());
+
+        verify(tx).close();
+    }
+
+    private Elide getElide(DataStore dataStore, EntityDictionary dictionary, ErrorMapper errorMapper) {
+        ElideSettings settings = getElideSettings(dataStore, dictionary, errorMapper);
+        return new Elide(settings, new TransactionRegistry(), settings.getDictionary().getScanner(), false);
+    }
+
+    private ElideSettings getElideSettings(DataStore dataStore, EntityDictionary dictionary, ErrorMapper errorMapper) {
+        return new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withErrorMapper(errorMapper)
+                .withVerboseErrors()
+                .build();
+    }
+
+    private RequestScope buildRequestScope(EntityDictionary dict, DataStoreTransaction tx) {
+        User user = new TestUser("1");
+
+        return new RequestScope(null, null, NO_VERSION, null, tx, user, null, null, UUID.randomUUID(),
+                getElideSettings(null, dict, MOCK_ERROR_MAPPER));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/exceptions/HttpStatusExceptionTest.java b/elide-core/src/test/java/com/yahoo/elide/core/exceptions/HttpStatusExceptionTest.java
new file mode 100644
index 0000000000..9d0b8cba51
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/exceptions/HttpStatusExceptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.exceptions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+
+import java.util.function.Supplier;
+
+public class HttpStatusExceptionTest {
+
+    @Test
+    public void testGetEncodedResponse() {
+        String expected = "{\"errors\":[{\"detail\":\"test&lt;script&gt;encoding\"}]}";
+        HttpStatusException exception =  new HttpStatusException(500, "test<script>encoding") { };
+        Pair<Integer, JsonNode> res = exception.getErrorResponse();
+        assertEquals(expected, res.getRight().toString());
+    }
+
+    @Test
+    public void testGetEncodedVerboseResponse() {
+        String expected = "{\"errors\":[{\"detail\":\"test&lt;script&gt;encoding\"}]}";
+        HttpStatusException exception = new HttpStatusException(500, "test<script>encoding") { };
+        Pair<Integer, JsonNode> res = exception.getVerboseErrorResponse();
+        assertEquals(expected, res.getRight().toString());
+    }
+
+    @Test
+    public void testGetEncodedVerboseResponseWithSupplier() {
+        String expected = "{\"errors\":[{\"detail\":\"test&lt;script&gt;encoding\\na more verbose &lt;script&gt; encoding test\"}]}";
+        Supplier<String> supplier = () -> "a more verbose <script> encoding test";
+        HttpStatusException exception = new HttpStatusException(500, "test<script>encoding",
+                new RuntimeException("runtime exception"), supplier) { };
+        Pair<Integer, JsonNode> res = exception.getVerboseErrorResponse();
+        assertEquals(expected, res.getRight().toString());
+    }
+
+    @Test
+    public void testGetVerboseResponseWithSupplier() {
+        String expected = "{\"errors\":[{\"detail\":\"test&lt;script&gt;encoding\\na more verbose &lt;script&gt; encoding test\"}]}";
+        Supplier<String> supplier = () -> "a more verbose <script> encoding test";
+        HttpStatusException exception = new HttpStatusException(500, "test<script>encoding",
+                new RuntimeException("runtime exception"), supplier) { };
+        Pair<Integer, JsonNode> res = exception.getVerboseErrorResponse();
+        assertEquals(expected, res.getRight().toString());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/FilterPredicateTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/FilterPredicateTest.java
new file mode 100644
index 0000000000..e5425c7221
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/FilterPredicateTest.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+
+/**
+ * Predicate test class.
+ */
+public class FilterPredicateTest {
+    private static DefaultFilterDialect strategy;
+
+    @BeforeAll
+    static void setup() {
+        EntityDictionary entityDictionary = EntityDictionary.builder().build();
+
+        entityDictionary.bindEntity(Book.class);
+        entityDictionary.bindEntity(Author.class);
+
+        strategy = new DefaultFilterDialect(entityDictionary);
+    }
+
+    private Map<String, Set<FilterPredicate>> parse(MultivaluedMap<String, String> queryParams) {
+        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
+
+        Map<String, FilterExpression> expressionMap;
+        try {
+            expressionMap = strategy.parseTypedExpression("/book", queryParams, NO_VERSION);
+        } catch (ParseException e) {
+            throw new BadRequestException(e.getMessage());
+        }
+
+        Map<String, Set<FilterPredicate>> returnMap = new HashMap<>();
+        for (Map.Entry<String, FilterExpression> entry : expressionMap.entrySet()) {
+            String typeName = entry.getKey();
+            FilterExpression expression = entry.getValue();
+
+            if (!returnMap.containsKey(typeName)) {
+                returnMap.put(typeName, new HashSet<>());
+            }
+
+            returnMap.get(typeName).addAll(expression.accept(visitor));
+        }
+        return returnMap;
+    }
+
+    @Test
+    void testSingleFieldSingleValue() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title]", "abc");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+        assertEquals(Collections.singletonList("abc"), predicate.getValues());
+    }
+
+    @Test
+    void testSingleFieldMultipleValues() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title]", "abc,def");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+        assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+    }
+
+    @Test
+    void testMultipleFieldMultipleValues() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title]", "abc,def");
+        queryParams.add("filter[book.genre]", "def,jkl");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        for (FilterPredicate predicate : predicates.get("book")) {
+            switch (predicate.getField()) {
+                case "title":
+                    assertEquals(Operator.IN, predicate.getOperator());
+                    assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+                    break;
+                case "genre":
+                    assertEquals(Operator.IN, predicate.getOperator());
+                    assertEquals(Arrays.asList("def", "jkl"), predicate.getValues());
+                    break;
+                default:
+                    fail(predicate + " case not covered");
+            }
+        }
+    }
+
+    @Test
+    void testSingleFieldWithInOperator() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title][in]", "abc,def");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+        assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+    }
+
+    @Test
+    void testSingleFieldWithNotOperator() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title][not]", "abc,def");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.NOT, predicate.getOperator());
+        assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+    }
+
+    @Test
+    void testSingleFieldWithPrefixOperator() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title][prefix]", "abc");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.PREFIX, predicate.getOperator());
+        assertEquals(Collections.singletonList("abc"), predicate.getValues());
+    }
+
+    @Test
+    void testSingleFieldWithPostfixOperator() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title][postfix]", "abc,def");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.POSTFIX, predicate.getOperator());
+        assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+    }
+
+    @Test
+    void testSingleFieldWithInfixOperator() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.title][infix]", "abc,def");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("title", predicate.getField());
+        assertEquals(Operator.INFIX, predicate.getOperator());
+        assertEquals(Arrays.asList("abc", "def"), predicate.getValues());
+    }
+
+    @Test
+    void testMissingType() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[title]", "abc,def");
+
+        assertThrows(BadRequestException.class, () -> parse(queryParams));
+    }
+
+    @Test
+    void testIntegerFieldType() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.id]", "1");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("id", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+        assertEquals(Collections.singletonList(1L), predicate.getValues());
+    }
+
+    @Test
+    void testComplexAttributeFieldType() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[author.homeAddress.street1]", "foo");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("author"));
+
+        FilterPredicate predicate = predicates.get("author").iterator().next();
+        assertEquals("street1", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+
+        Path path = predicate.getPath();
+        assertEquals(path.getPathElements().get(0).getFieldName(), "homeAddress");
+        assertEquals(path.getPathElements().get(1).getFieldName(), "street1");
+        assertEquals(Collections.singletonList("foo"), predicate.getValues());
+    }
+
+    @Test
+    void testMultipleIntegerFieldType() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book.id]", "1,2,3");
+
+        Map<String, Set<FilterPredicate>> predicates = parse(queryParams);
+        assertTrue(predicates.containsKey("book"));
+
+        FilterPredicate predicate = predicates.get("book").iterator().next();
+        assertEquals("id", predicate.getField());
+        assertEquals(Operator.IN, predicate.getOperator());
+        assertEquals(Arrays.asList(1L, 2L, 3L), predicate.getValues());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/OperatorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/OperatorTest.java
index 9549ea1aab..3d1d2adda2 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/OperatorTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/OperatorTest.java
@@ -5,44 +5,84 @@
  */
 package com.yahoo.elide.core.filter;
 
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
 import com.yahoo.elide.core.exceptions.InvalidValueException;
-import com.yahoo.elide.security.checks.Check;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import example.Address;
 import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public class OperatorTest {
-    public class TestEntityDictionary extends EntityDictionary {
+    private EntityDictionary dictionary;
+    private final RequestScope requestScope;
+    private Author author;
+    private Predicate fn;
+
+    public static class TestEntityDictionary extends EntityDictionary {
         public TestEntityDictionary(Map<String, Class<? extends Check>> checks) {
-            super(checks);
+            super(
+                    checks,
+                    Collections.emptyMap(),  //role checks
+                    EntityDictionary.DEFAULT_INJECTOR,
+                    CoerceUtil::lookup,
+                    Collections.emptySet(), //excluded entities
+                    DefaultClassScanner.getInstance()
+            );
         }
 
         @Override
-        public Class<?> lookupEntityClass(Class<?> objClass) {
+        public Type<?> lookupBoundClass(Type<?> objClass) {
             // Special handling for mocked Book class which has Entity annotation
             if (objClass.getName().contains("$MockitoMock$")) {
                 objClass = objClass.getSuperclass();
             }
-            return super.lookupEntityClass(objClass);
+            return super.lookupBoundClass(objClass);
         }
     }
 
-    private final EntityDictionary dictionary;
-    private Author author;
-    private java.util.function.Predicate fn;
 
     OperatorTest() {
         dictionary = new TestEntityDictionary(new HashMap<>());
         dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Book.class);
+        requestScope = Mockito.mock(RequestScope.class);
+        when(requestScope.getDictionary()).thenReturn(dictionary);
+    }
+
+    private Path constructPath(Class<?> rootEntity, String pathString) {
+        List<Path.PathElement> pathElementsList = new ArrayList<>();
+        Type prevEntity = ClassType.of(rootEntity);
+        for (String field : pathString.split("\\.")) {
+            Type<?> fieldType = ("id".equals(field.toLowerCase(Locale.ENGLISH)))
+                    ? dictionary.getIdType(prevEntity)
+                    : dictionary.getParameterizedType(prevEntity, field);
+            Path.PathElement pathElement = new Path.PathElement(prevEntity, fieldType, field);
+            pathElementsList.add(pathElement);
+            prevEntity = fieldType;
+        }
+        return new Path(pathElementsList);
     }
 
     @Test
@@ -52,41 +92,41 @@ public void inAndNotInTest() throws Exception {
         author.setName("AuthorForTest");
 
         // Test exact match
-        fn = Operator.IN.contextualize("id", Collections.singletonList(1), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Collections.singletonList(1), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.singletonList(1), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.singletonList(1), requestScope);
+        assertFalse(fn.test(author));
 
         // Test contains works
-        fn = Operator.IN.contextualize("id", Arrays.asList(1, 2), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Arrays.asList(1, 2), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Arrays.asList(1, 2), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Arrays.asList(1, 2), requestScope);
+        assertFalse(fn.test(author));
 
         // Test type
-        fn = Operator.IN.contextualize("id", Collections.singletonList("1"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Collections.singletonList("1"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.singletonList("1"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("1"), requestScope);
+        assertFalse(fn.test(author));
 
         // Test not in
-        fn = Operator.IN.contextualize("id", Collections.singletonList(3), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Collections.singletonList(3), dictionary);
-        Assert.assertTrue(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.singletonList(3), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.singletonList(3), requestScope);
+        assertTrue(fn.test(author));
 
         // Test empty
-        fn = Operator.IN.contextualize("id", Collections.emptyList(), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Collections.emptyList(), dictionary);
-        Assert.assertTrue(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope);
+        assertTrue(fn.test(author));
 
         // Test null
         author.setId(null);
-        fn = Operator.IN.contextualize("id", Collections.singletonList(1), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.NOT.contextualize("id", Collections.singletonList(1), dictionary);
-        Assert.assertTrue(fn.test(author));
+        fn = Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.singletonList(1), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.singletonList(1), requestScope);
+        assertTrue(fn.test(author));
     }
 
     @Test
@@ -96,17 +136,161 @@ public void isnullAndNotnullTest() throws Exception {
         author.setName("AuthorForTest");
 
         // When name is not null
-        fn = Operator.ISNULL.contextualize("name", null, dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.NOTNULL.contextualize("name", null, dictionary);
-        Assert.assertTrue(fn.test(author));
+        fn = Operator.ISNULL.contextualize(constructPath(Author.class, "name"), null, requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOTNULL.contextualize(constructPath(Author.class, "name"), null, requestScope);
+        assertTrue(fn.test(author));
 
         // When name is null
         author.setName(null);
-        fn = Operator.ISNULL.contextualize("name", null, dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.NOTNULL.contextualize("name", null, dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.ISNULL.contextualize(constructPath(Author.class, "name"), null, requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOTNULL.contextualize(constructPath(Author.class, "name"), null, requestScope);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void complexAttributeTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        Address address1 = new Address();
+        address1.setStreet1("Foo");
+        author.setHomeAddress(address1);
+
+        fn = Operator.IN.contextualize(constructPath(Author.class, "homeAddress.street1"), Arrays.asList("Foo", "Bar"), requestScope);
+        assertTrue(fn.test(author));
+
+        fn = Operator.IN.contextualize(constructPath(Author.class, "homeAddress.street1"), Arrays.asList("Baz"), requestScope);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void isemptyAndNotemptyTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setAwards(Arrays.asList("Booker Prize", "National Book Awards"));
+        author.getBooks().add(new Book());
+
+        fn = Operator.ISEMPTY.contextualize(constructPath(Author.class, "awards"), null, requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.ISEMPTY.contextualize(constructPath(Author.class, "books"), null, requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOTEMPTY.contextualize(constructPath(Author.class, "awards"), null, requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOTEMPTY.contextualize(constructPath(Author.class, "books"), null, requestScope);
+        assertTrue(fn.test(author));
+
+
+        //name is null and books are null
+        author.setBooks(null);
+        author.setAwards(Arrays.asList());
+        fn = Operator.ISEMPTY.contextualize(constructPath(Author.class, "awards"), null, requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.ISEMPTY.contextualize(constructPath(Author.class, "books"), null, requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOTEMPTY.contextualize(constructPath(Author.class, "awards"), null, requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.NOTEMPTY.contextualize(constructPath(Author.class, "books"), null, requestScope);
+        assertTrue(fn.test(author));
+
+    }
+
+    @Test
+    public void inOperatorTraversingToManyRelationshipTest() throws Exception {
+        Book book = new Book();
+        Author author1 = new Author();
+        author1.setName("Jon");
+        Author author2 = new Author();
+        author2.setName("Jane");
+        book.setAuthors(Arrays.asList(author1, author2));
+
+        fn = Operator.IN.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Jon"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.IN.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Nobody", "Jon"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.IN.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Jane", "Jon"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.IN.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Nobody1", "Nobody2"), requestScope);
+        assertFalse(fn.test(book));
+
+        fn = Operator.NOT.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Jon"), requestScope);
+        assertFalse(fn.test(book));
+
+        fn = Operator.NOT.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Nobody", "Jon"), requestScope);
+        assertFalse(fn.test(book));
+
+        fn = Operator.NOT.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Jane", "Jon"), requestScope);
+        assertFalse(fn.test(book));
+
+        fn = Operator.NOT.contextualize(constructPath(Book.class, "authors.name"), Arrays.asList("Nobody1", "Nobody2"), requestScope);
+        assertTrue(fn.test(book));
+    }
+
+    @Test
+    public void lessThanOpTraversingToManyRelationshipTests() throws Exception {
+        Book book = new Book();
+        Author author1 = new Author();
+        author1.setName("Jon");
+        author1.setId(10L);
+        Author author2 = new Author();
+        author2.setName("Jane");
+        author2.setId(20L);
+        book.setAuthors(Arrays.asList(author1, author2));
+
+        // single value
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Collections.singletonList("11"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Collections.singletonList("40"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Collections.singletonList("5"), requestScope);
+        assertFalse(fn.test(book));
+
+        // multiple value
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Arrays.asList("5", "11"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Arrays.asList("5", "4"), requestScope);
+        assertFalse(fn.test(book));
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Arrays.asList("11", "12"), requestScope);
+        assertTrue(fn.test(book));
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Arrays.asList("40", "50"), requestScope);
+        assertTrue(fn.test(book));
+
+        // when val is null
+        author1.setId(null);
+        author2.setId(null);
+
+        fn = Operator.LT.contextualize(constructPath(Book.class, "authors.id"), Collections.singletonList("11"), requestScope);
+        assertFalse(fn.test(book));
+    }
+
+    @Test
+    public void memberOfTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setAwards(Arrays.asList("Booker Prize", "National Book Awards"));
+        author.getBooks().add(new Book());
+
+        fn = Operator.HASMEMBER.contextualize(constructPath(Author.class, "awards"), Arrays.asList("Booker Prize"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.HASMEMBER.contextualize(constructPath(Author.class, "awards"), Arrays.asList(""), requestScope);
+        assertFalse(fn.test(author));
+
+        fn = Operator.HASNOMEMBER.contextualize(constructPath(Author.class, "awards"), Arrays.asList("National Book Awards"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.HASNOMEMBER.contextualize(constructPath(Author.class, "awards"), Arrays.asList("1"), requestScope);
+        assertTrue(fn.test(author));
+
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.HASNOMEMBER.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope).test(author));
     }
 
     @Test
@@ -116,37 +300,37 @@ public void prefixAndPostfixAndInfixTest() throws Exception {
         author.setName("AuthorForTest");
 
         // When prefix, infix, postfix are correctly matched
-        fn = Operator.PREFIX.contextualize("name", Collections.singletonList("Author"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.INFIX.contextualize("name", Collections.singletonList("For"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.POSTFIX.contextualize("name", Collections.singletonList("Test"), dictionary);
-        Assert.assertTrue(fn.test(author));
+        fn = Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("Author"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.INFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("For"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("Test"), requestScope);
+        assertTrue(fn.test(author));
 
         // When prefix, infix, postfix are correctly matched if case-insensitive
-        fn = Operator.PREFIX.contextualize("name", Collections.singletonList("author"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.INFIX.contextualize("name", Collections.singletonList("for"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.POSTFIX.contextualize("name", Collections.singletonList("test"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("author"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.INFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("for"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("test"), requestScope);
+        assertFalse(fn.test(author));
 
         // When prefix, infix, postfix are not matched
-        fn = Operator.PREFIX.contextualize("name", Collections.singletonList("error"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.INFIX.contextualize("name", Collections.singletonList("error"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.POSTFIX.contextualize("name", Collections.singletonList("error"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("error"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.INFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("error"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("error"), requestScope);
+        assertFalse(fn.test(author));
 
         // When values is null
         author.setName(null);
-        fn = Operator.PREFIX.contextualize("name", Collections.singletonList("Author"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.INFIX.contextualize("name", Collections.singletonList("For"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.POSTFIX.contextualize("name", Collections.singletonList("Test"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("Author"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.INFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("For"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Collections.singletonList("Test"), requestScope);
+        assertFalse(fn.test(author));
     }
 
     @Test
@@ -154,33 +338,43 @@ public void compareOpTests() throws Exception {
         author = new Author();
         author.setId(10L);
 
-        fn = Operator.LT.contextualize("id", Collections.singletonList("11"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.LE.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.GT.contextualize("id", Collections.singletonList("9"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.GE.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertTrue(fn.test(author));
-        fn = Operator.LT.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.LE.contextualize("id", Collections.singletonList("9"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.GT.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.GE.contextualize("id", Collections.singletonList("11"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        // single value
+        fn = Operator.LT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("11"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.LE.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.GT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("9"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.GE.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertTrue(fn.test(author));
+
+        // multiple values
+        fn = Operator.LT.contextualize(constructPath(Author.class, "id"), Arrays.asList("10", "9"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.LE.contextualize(constructPath(Author.class, "id"), Arrays.asList("9", "8"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.GT.contextualize(constructPath(Author.class, "id"), Arrays.asList("10", "11"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.GE.contextualize(constructPath(Author.class, "id"), Arrays.asList("11", "12"), requestScope);
+        assertFalse(fn.test(author));
+
+        // between operator
+        fn = Operator.BETWEEN.contextualize(constructPath(Author.class, "id"), Arrays.asList("9", "11"), requestScope);
+        assertTrue(fn.test(author));
+        fn = Operator.NOTBETWEEN.contextualize(constructPath(Author.class, "id"), Arrays.asList("9", "11"), requestScope);
+        assertFalse(fn.test(author));
 
         // when val is null
         author.setId(null);
-        fn = Operator.LT.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.LE.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.GT.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
-        fn = Operator.GE.contextualize("id", Collections.singletonList("10"), dictionary);
-        Assert.assertFalse(fn.test(author));
+        fn = Operator.LT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.LE.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.GT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertFalse(fn.test(author));
+        fn = Operator.GE.contextualize(constructPath(Author.class, "id"), Collections.singletonList("10"), requestScope);
+        assertFalse(fn.test(author));
+
     }
 
     @Test
@@ -189,19 +383,14 @@ public void testInvalidValueExceptionCases() throws Exception {
         author = new Author();
         author.setId(1L);
         author.setName("AuthorForTest");
-        try {
-            Operator.IN.contextualize("id", Collections.singletonList("a"), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidValueException e) {
-            Assert.assertTrue(true);
-        }
 
-        try {
-            Operator.NOT.contextualize("id", Collections.singletonList("a"), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidValueException e) {
-            Assert.assertTrue(true);
-        }
+        assertThrows(
+                InvalidValueException.class,
+                () -> Operator.IN.contextualize(constructPath(Author.class, "id"), Collections.singletonList("a"), requestScope).test(author));
+
+        assertThrows(
+                InvalidValueException.class,
+                () -> Operator.NOT.contextualize(constructPath(Author.class, "id"), Collections.singletonList("a"), requestScope).test(author));
     }
 
     @Test
@@ -211,102 +400,35 @@ public void testInvalidPredicateExceptionCases() throws Exception {
         author.setId(1L);
         author.setName("AuthorForTest");
 
-        try {
-            Operator.PREFIX.contextualize("name", Arrays.asList("Author", "Author"), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.INFIX.contextualize("name", Arrays.asList("For", "For"), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.POSTFIX.contextualize("name", Arrays.asList("Test", "Test"), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.PREFIX.contextualize("name", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.INFIX.contextualize("name", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.POSTFIX.contextualize("name", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.LT.contextualize("id", Arrays.asList(10, 10), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.LE.contextualize("id", Arrays.asList(10, 10), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.GT.contextualize("id", Arrays.asList(10, 10), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.GE.contextualize("id", Arrays.asList(10, 10), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.LT.contextualize("id", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.LE.contextualize("id", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.GT.contextualize("id", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            Operator.GE.contextualize("id", Collections.emptyList(), dictionary).test(author);
-            Assert.assertTrue(false);
-        } catch (InvalidPredicateException e) {
-            Assert.assertTrue(true);
-        }
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Arrays.asList("Author", "Author"), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.INFIX.contextualize(constructPath(Author.class, "name"), Arrays.asList("For", "For"), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Arrays.asList("Test", "Test"), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.PREFIX.contextualize(constructPath(Author.class, "name"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.INFIX.contextualize(constructPath(Author.class, "name"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.POSTFIX.contextualize(constructPath(Author.class, "name"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.LT.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.LE.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.GT.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope).test(author));
+        assertThrows(
+                BadRequestException.class,
+                () -> Operator.GE.contextualize(constructPath(Author.class, "id"), Collections.emptyList(), requestScope).test(author));
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialectTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialectTest.java
index 1c5fa65e2d..9b27796cf8 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialectTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/DefaultFilterDialectTest.java
@@ -5,33 +5,48 @@
  */
 package com.yahoo.elide.core.filter.dialect;
 
-import com.yahoo.elide.core.EntityDictionary;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
 import example.Author;
 import example.Book;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
+import java.util.Map;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
-import java.util.Collections;
-import java.util.Map;
 
 /**
- * Tests filter query parameter parsing for the default Elide implementation (1.0 and 2.0)
+ * Tests filter query parameter parsing for the default Elide implementation (1.0 and 2.0).
  */
 public class DefaultFilterDialectTest {
 
-    DefaultFilterDialect dialect;
-    @BeforeTest
-    public void init() {
-        EntityDictionary dictionary = new EntityDictionary(Collections.EMPTY_MAP);
+    static DefaultFilterDialect dialect;
+
+    @BeforeAll
+    public static void init() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
 
         dictionary.bindEntity(Author.class);
         dictionary.bindEntity(Book.class);
         dialect = new DefaultFilterDialect(dictionary);
+    }
+
+    @Test
+    public void testGlobalExpressionParsingWithComplexAttribute() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[author.homeAddress.street1][infix]", "State"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/author", queryParams, NO_VERSION);
 
+        assertEquals("author.homeAddress.street1 INFIX [State]", expression.toString());
     }
 
     @Test
@@ -48,14 +63,32 @@ public void testGlobalExpressionParsing() throws Exception {
                 "Hemingway"
         );
 
-        FilterExpression filterExpression = dialect.parseGlobalExpression("/author", queryParams);
+        FilterExpression filterExpression = dialect.parseGlobalExpression("/author", queryParams, NO_VERSION);
 
-        Assert.assertEquals(
+        assertEquals(
                 "(author.books.title IN [foo, bar, baz] AND author.name INFIX [Hemingway])",
                 filterExpression.toString()
         );
     }
 
+    @Test
+    public void testTypedExpressionParsingWithComplexAttribute() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[author.homeAddress.street1][infix]",
+                "State"
+        );
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals(
+                "author.homeAddress.street1 INFIX [State]",
+                expressionMap.get("author").toString()
+        );
+    }
+
     @Test
     public void testTypedExpressionParsing() throws Exception {
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -76,17 +109,21 @@ public void testTypedExpressionParsing() throws Exception {
                 "Hemingway"
         );
 
-        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams);
-
-        Assert.assertEquals(expressionMap.size(), 2);
-        Assert.assertEquals(expressionMap.get("book").toString(),
-                "(book.title IN [foo, bar, baz] AND book.genre IN [scifi])"
+        queryParams.add(
+                "filter[author.books.title][in]",
+                "foo,bar,baz"
         );
-        Assert.assertEquals(expressionMap.get("author").toString(), "author.name INFIX [Hemingway]");
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(2, expressionMap.size());
+        assertEquals("(book.title IN [foo, bar, baz] AND book.genre IN [scifi])", expressionMap.get("book").toString());
+        assertEquals("(author.books.title IN [foo, bar, baz] AND author.name INFIX [Hemingway])",
+                expressionMap.get("author").toString());
     }
 
-    @Test(expectedExceptions = ParseException.class)
-    public void testInvalidType() throws ParseException {
+    @Test
+    public void testInvalidType() {
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
         queryParams.add(
@@ -94,11 +131,11 @@ public void testInvalidType() throws ParseException {
                 "foo,bar,baz"
         );
 
-        dialect.parseTypedExpression("/invalid", queryParams);
+        assertThrows(ParseException.class, () -> dialect.parseTypedExpression("/invalid", queryParams, NO_VERSION));
     }
 
-    @Test(expectedExceptions = ParseException.class)
-    public void testInvalidAttribute() throws ParseException {
+    @Test
+    public void testInvalidAttribute() {
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
         queryParams.add(
@@ -106,19 +143,110 @@ public void testInvalidAttribute() throws ParseException {
                 "foo,bar,baz"
         );
 
-        dialect.parseTypedExpression("/book", queryParams);
+        assertThrows(ParseException.class, () -> dialect.parseTypedExpression("/book", queryParams, NO_VERSION));
     }
 
-    @Test(expectedExceptions = ParseException.class)
+    @Test
     public void testInvalidTypeQualifier() throws ParseException {
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
-        /* This is OK for global but not OK for subqueries */
+        /* This is now OK for global and for subqueries */
         queryParams.add(
                 "filter[author.books.title][in]",
                 "foo,bar,baz"
         );
 
-        dialect.parseTypedExpression("/author", queryParams);
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals("author.books.title IN [foo, bar, baz]", expressionMap.get("author").toString());
+    }
+
+    @Test
+    public void testBetweenOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[author.books.id][between]",
+                "10,20"
+        );
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals("author.books.id BETWEEN [10, 20]", expressionMap.get("author").toString());
+    }
+
+    @Test
+    public void testEmptyOperatorException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[book.authors.name][isempty]",
+                ""
+        );
+
+        assertThrows(ParseException.class,
+                () -> dialect.parseTypedExpression("/book", queryParams, NO_VERSION));
+    }
+
+    @Test
+    public void testMemberOfOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add(
+                "filter[book.awards][hasnomember]",
+                "awards1"
+        );
+
+        assertEquals(
+                "{book=book.awards HASNOMEMBER [awards1]}",
+                dialect.parseTypedExpression("/book", queryParams, NO_VERSION).toString()
+        );
+    }
+
+    @Test
+    public void testMemberOfToManyRelationship() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[book.authors.name][hasmember]",
+                "name"
+        );
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/book", queryParams,
+                NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals("book.authors.name HASMEMBER [name]", expressionMap.get("book").toString());
+    }
+
+    @Test
+    public void testMemberOfOperatorOnNonCollectionAttributeException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add(
+                "filter[book.title][hasmember]",
+                "title"
+        );
+
+        ParseException e = assertThrows(ParseException.class,
+                () -> dialect.parseTypedExpression("/book", queryParams, NO_VERSION));
+
+        assertEquals("Invalid Path: Last Path Element has to be a collection type", e.getMessage());
+    }
+
+    @Test
+    public void testMemberOfOperatorOnRelationshipException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.clear();
+        queryParams.add(
+                "filter[book.authors][hasmember]",
+                "1"
+        );
+
+        ParseException e = assertThrows(ParseException.class,
+                () -> dialect.parseTypedExpression("/book", queryParams, NO_VERSION));
+
+        assertEquals("Invalid Path: Last Path Element cannot be a collection type", e.getMessage());
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialectTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialectTest.java
index b3b5814c89..104c717246 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialectTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/MultipleFilterDialectTest.java
@@ -5,20 +5,24 @@
  */
 package com.yahoo.elide.core.filter.dialect;
 
-import com.beust.jcommander.internal.Lists;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Collections;
-import java.util.Map;
-
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.filter.dialect.jsonapi.JoinFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.SubqueryFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * Tests MultipleFilterDialect
@@ -35,8 +39,8 @@ public void testGlobalExpressionParsing() throws Exception {
         FilterExpression filterExpression = mock(FilterExpression.class);
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Lists.newArrayList(dialect1, dialect2),
-                Collections.EMPTY_LIST
+                Arrays.asList(dialect1, dialect2),
+                Collections.emptyList()
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -51,15 +55,15 @@ public void testGlobalExpressionParsing() throws Exception {
                 "Hemingway"
         );
 
-        when(dialect1.parseGlobalExpression("/author", queryParams)).thenThrow(new ParseException(""));
-        when(dialect2.parseGlobalExpression("/author", queryParams)).thenReturn(filterExpression);
+        when(dialect1.parseGlobalExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException(""));
+        when(dialect2.parseGlobalExpression("/author", queryParams, NO_VERSION)).thenReturn(filterExpression);
 
-        FilterExpression returnExpression = dialect.parseGlobalExpression("/author", queryParams);
+        FilterExpression returnExpression = dialect.parseGlobalExpression("/author", queryParams, NO_VERSION);
 
-        verify(dialect1, times(1)).parseGlobalExpression("/author", queryParams);
-        verify(dialect2, times(1)).parseGlobalExpression("/author", queryParams);
+        verify(dialect1, times(1)).parseGlobalExpression("/author", queryParams, NO_VERSION);
+        verify(dialect2, times(1)).parseGlobalExpression("/author", queryParams, NO_VERSION);
 
-        Assert.assertEquals(filterExpression, returnExpression);
+        assertEquals(returnExpression, filterExpression);
     }
 
     /**
@@ -69,11 +73,11 @@ public void testGlobalExpressionParsing() throws Exception {
     public void testTypedExpressionParsing() throws Exception {
         SubqueryFilterDialect dialect1 = mock(SubqueryFilterDialect.class);
         SubqueryFilterDialect dialect2 = mock(SubqueryFilterDialect.class);
-        Map<String, FilterExpression> expressionMap = Collections.EMPTY_MAP;
+        Map<String, FilterExpression> expressionMap = Collections.emptyMap();
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Collections.EMPTY_LIST,
-                Lists.newArrayList(dialect1, dialect2)
+                Collections.emptyList(),
+                Arrays.asList(dialect1, dialect2)
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -88,26 +92,26 @@ public void testTypedExpressionParsing() throws Exception {
                 "Hemingway"
         );
 
-        when(dialect1.parseTypedExpression("/author", queryParams)).thenThrow(new ParseException(""));
-        when(dialect2.parseTypedExpression("/author", queryParams)).thenReturn(expressionMap);
+        when(dialect1.parseTypedExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException(""));
+        when(dialect2.parseTypedExpression("/author", queryParams, NO_VERSION)).thenReturn(expressionMap);
 
-        Map<String, FilterExpression> returnMap = dialect.parseTypedExpression("/author", queryParams);
+        Map<String, FilterExpression> returnMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
 
-        verify(dialect1, times(1)).parseTypedExpression("/author", queryParams);
-        verify(dialect2, times(1)).parseTypedExpression("/author", queryParams);
+        verify(dialect1, times(1)).parseTypedExpression("/author", queryParams, NO_VERSION);
+        verify(dialect2, times(1)).parseTypedExpression("/author", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expressionMap, returnMap);
+        assertEquals(returnMap, expressionMap);
     }
 
     /**
      * Verify that missing dialects throws a ParseException
      */
-    @Test(expectedExceptions = ParseException.class)
+    @Test
     public void testMissingTypedDialect() throws Exception {
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Collections.EMPTY_LIST,
-                Collections.EMPTY_LIST
+                Collections.emptyList(),
+                Collections.emptyList()
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -122,18 +126,18 @@ public void testMissingTypedDialect() throws Exception {
                 "Hemingway"
         );
 
-        dialect.parseTypedExpression("/author", queryParams);
+        assertThrows(ParseException.class, () -> dialect.parseTypedExpression("/author", queryParams, NO_VERSION));
     }
 
     /**
      * Verify that missing dialects throws a ParseException
      */
-    @Test(expectedExceptions = ParseException.class)
+    @Test
     public void testMissingGlobalDialect() throws Exception {
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Collections.EMPTY_LIST,
-                Collections.EMPTY_LIST
+                Collections.emptyList(),
+                Collections.emptyList()
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -148,7 +152,7 @@ public void testMissingGlobalDialect() throws Exception {
                 "Hemingway"
         );
 
-        dialect.parseGlobalExpression("/author", queryParams);
+        assertThrows(ParseException.class, () -> dialect.parseGlobalExpression("/author", queryParams, NO_VERSION));
     }
 
     /**
@@ -160,8 +164,8 @@ public void testGlobalExpressionParseFailure() throws Exception {
         JoinFilterDialect dialect2 = mock(JoinFilterDialect.class);
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Lists.newArrayList(dialect1, dialect2),
-                Collections.EMPTY_LIST
+                Arrays.asList(dialect1, dialect2),
+                Collections.emptyList()
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -176,13 +180,13 @@ public void testGlobalExpressionParseFailure() throws Exception {
                 "Hemingway"
         );
 
-        when(dialect1.parseGlobalExpression("/author", queryParams)).thenThrow(new ParseException("one"));
-        when(dialect2.parseGlobalExpression("/author", queryParams)).thenThrow(new ParseException("two"));
+        when(dialect1.parseGlobalExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException("one"));
+        when(dialect2.parseGlobalExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException("two"));
 
         try {
-            dialect.parseGlobalExpression("/author", queryParams);
+            dialect.parseGlobalExpression("/author", queryParams, NO_VERSION);
         } catch (ParseException e) {
-            Assert.assertEquals(e.getMessage(), "two\none");
+            assertEquals("two\none", e.getMessage());
         }
     }
 
@@ -195,8 +199,8 @@ public void testTypedExpressionParseFailure() throws Exception {
         SubqueryFilterDialect dialect2 = mock(SubqueryFilterDialect.class);
 
         MultipleFilterDialect dialect = new MultipleFilterDialect(
-                Collections.EMPTY_LIST,
-                Lists.newArrayList(dialect1, dialect2)
+                Collections.emptyList(),
+                Arrays.asList(dialect1, dialect2)
         );
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
@@ -211,13 +215,13 @@ public void testTypedExpressionParseFailure() throws Exception {
                 "Hemingway"
         );
 
-        when(dialect1.parseTypedExpression("/author", queryParams)).thenThrow(new ParseException("one"));
-        when(dialect2.parseTypedExpression("/author", queryParams)).thenThrow(new ParseException("two"));
+        when(dialect1.parseTypedExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException("one"));
+        when(dialect2.parseTypedExpression("/author", queryParams, NO_VERSION)).thenThrow(new ParseException("two"));
 
         try {
-            dialect.parseTypedExpression("/author", queryParams);
+            dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
         } catch (ParseException e) {
-            Assert.assertEquals(e.getMessage(), "two\none");
+            assertEquals("two\none", e.getMessage());
         }
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectTest.java
index 40b772d9e1..a3fd81cbb3 100644
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectTest.java
@@ -5,32 +5,74 @@
  */
 package com.yahoo.elide.core.filter.dialect;
 
-import com.yahoo.elide.core.EntityDictionary;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
 import example.Author;
 import example.Book;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
+import example.Job;
+import example.PrimitiveId;
+import example.Publisher;
+import example.StringId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import cz.jirutka.rsql.parser.ast.ComparisonNode;
+import cz.jirutka.rsql.parser.ast.ComparisonOperator;
+
+import java.net.URLEncoder;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 
 /**
  * Tests RSQLFilterDialect
  */
 public class RSQLFilterDialectTest {
+    private static RSQLFilterDialect dialect;
 
-    RSQLFilterDialect dialect;
-    @BeforeTest
-    public void init() {
-        EntityDictionary dictionary = new EntityDictionary(Collections.EMPTY_MAP);
+    @BeforeAll
+    public static void init() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
 
         dictionary.bindEntity(Author.class);
         dictionary.bindEntity(Book.class);
-        dialect = new RSQLFilterDialect(dictionary);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(StringId.class);
+        dictionary.bindEntity(Job.class);
+        dictionary.bindEntity(PrimitiveId.class);
+        dialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+    }
+
+    @Test
+    public void testTypedExpressionParsingWithComplexAttribute() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[author]",
+                "homeAddress.street1==*State*"
+        );
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals(
+                "author.homeAddress.street1 INFIX [State]",
+                expressionMap.get("author").toString()
+        );
     }
 
     @Test
@@ -42,13 +84,52 @@ public void testTypedExpressionParsing() throws Exception {
                 "title==*foo*;title!=bar*;(genre=in=(sci-fi,action),publishDate>123)"
         );
 
-        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams);
+        queryParams.add(
+                "filter[author]",
+                "books.title=in=(foo,bar,baz)"
+        );
+
 
-        Assert.assertEquals(expressionMap.size(), 1);
-        Assert.assertEquals(expressionMap.get("book").toString(),
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(2, expressionMap.size());
+        assertEquals(
                 "((book.title INFIX [foo] AND NOT (book.title PREFIX [bar])) "
-                        + "AND (book.genre IN [sci-fi, action] OR book.publishDate GT [123]))"
+                        + "AND (book.genre IN [sci-fi, action] OR book.publishDate GT [123]))",
+                expressionMap.get("book").toString()
+        );
+
+        assertEquals(
+                "author.books.title IN [foo, bar, baz]",
+                expressionMap.get("author").toString()
+        );
+
+        queryParams.clear();
+        queryParams.add(
+                "filter[author]",
+                "books.title=ini=(foo,bar,baz)"
+        );
+
+        // Case Insensitive
+        expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+        assertEquals(1, expressionMap.size());
+        assertEquals(
+                "author.books.title IN_INSENSITIVE [foo, bar, baz]",
+                expressionMap.get("author").toString()
+        );
+    }
+
+    @Test
+    public void testGlobalExpressionParsingWithComplexAttribute() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter", "homeAddress.street1==*State*"
         );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals("author.homeAddress.street1 INFIX [State]", expression.toString());
     }
 
     @Test
@@ -57,13 +138,14 @@ public void testGlobalExpressionParsing() throws Exception {
 
         queryParams.add(
                 "filter",
-                "title==*foo*;authors.name==Hemingway"
+                "title==*foo*;authors.name=ini=Hemingway"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "(book.title INFIX [foo] AND book.authors.name IN [Hemingway])"
+        assertEquals(
+                "(book.title INFIX [foo] AND book.authors.name IN_INSENSITIVE [Hemingway])",
+                expression.toString()
         );
     }
 
@@ -76,11 +158,9 @@ public void testEqualOperator() throws Exception {
                 "title==Hemingway"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "book.title IN [Hemingway]"
-        );
+        assertEquals("book.title IN [Hemingway]", expression.toString());
     }
 
     @Test
@@ -92,11 +172,9 @@ public void testNotEqualOperator() throws Exception {
                 "title!=Hemingway"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "NOT (book.title IN [Hemingway])"
-        );
+        assertEquals("NOT (book.title IN [Hemingway])", expression.toString());
     }
 
     @Test
@@ -108,11 +186,23 @@ public void testInOperator() throws Exception {
                 "title=in=Hemingway"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "book.title IN [Hemingway]"
+        assertEquals("book.title IN [Hemingway]", expression.toString());
+    }
+
+    @Test
+    public void testInInsensitiveOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=ini=Hemingway"
         );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title IN_INSENSITIVE [Hemingway]", expression.toString());
     }
 
     @Test
@@ -124,11 +214,23 @@ public void testOutOperator() throws Exception {
                 "title=out=Hemingway"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("NOT (book.title IN [Hemingway])", expression.toString());
+    }
 
-        Assert.assertEquals(expression.toString(),
-                "book.title NOT [Hemingway]"
+    @Test
+    public void testOutInsensitiveOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=outi=Hemingway"
         );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("NOT (book.title IN_INSENSITIVE [Hemingway])", expression.toString());
     }
 
     @Test
@@ -142,12 +244,31 @@ public void testNumericComparisonOperator() throws Exception {
 
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals(
+                "((((book.publishDate GT [5] OR book.publishDate GE [5]) "
+                        + "OR book.publishDate LT [10]) OR book.publishDate LE [10]) AND "
+                        + "(((book.publishDate GT [5] OR book.publishDate GE [5]) "
+                        + "OR book.publishDate LT [10]) OR book.publishDate LE [10]))",
+                expression.toString()
+        );
+    }
+
+    @Test
+    public void testBetweenOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "(publishDate=notbetween=(5,10))"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "((((book.publishDate GT [5] OR book.publishDate GE [5]) OR book.publishDate LT [10]) OR book.publishDate LE [10]) "
-                        + "AND "
-                        + "(((book.publishDate GT [5] OR book.publishDate GE [5]) OR book.publishDate LT [10]) OR book.publishDate LE [10]))"
+        assertEquals(
+                "book.publishDate NOTBETWEEN [5, 10]",
+                expression.toString()
         );
     }
 
@@ -160,10 +281,32 @@ public void testSubstringOperator() throws Exception {
                 "title==*Hemingway*,title==*Hemingway,title==Hemingway*"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "((book.title INFIX [Hemingway] OR book.title POSTFIX [Hemingway]) OR book.title PREFIX [Hemingway])"
+        assertEquals(
+                "((book.title INFIX [Hemingway] "
+                        + "OR book.title POSTFIX [Hemingway]) "
+                        + "OR book.title PREFIX [Hemingway])",
+                expression.toString()
+        );
+    }
+
+    @Test
+    public void testSubstringCIOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=ini=*Hemingway*,title=ini=*Hemingway,title=ini=Hemingway*"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals(
+                "((book.title INFIX_CASE_INSENSITIVE [Hemingway] "
+                        + "OR book.title POSTFIX_CASE_INSENSITIVE [Hemingway]) "
+                        + "OR book.title PREFIX_CASE_INSENSITIVE [Hemingway])",
+                expression.toString()
         );
     }
 
@@ -173,13 +316,15 @@ public void testExpressionGrouping() throws Exception {
 
         queryParams.add(
                 "filter",
-                "title==foo;(title==bar;title==baz)"
+                "title=ini=foo;(title==bar;title==baz)"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "(book.title IN [foo] AND (book.title IN [bar] AND book.title IN [baz]))"
+        assertEquals(
+                "(book.title IN_INSENSITIVE [foo] AND (book.title IN [bar] "
+                        + "AND book.title IN [baz]))",
+                expression.toString()
         );
     }
 
@@ -192,11 +337,9 @@ public void testIsnullOperatorBool() throws Exception {
                 "title=isnull=true"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "book.title ISNULL []"
-        );
+        assertEquals("book.title ISNULL []", expression.toString());
     }
 
     @Test
@@ -208,11 +351,9 @@ public void testIsnullOperatorInt() throws Exception {
                 "title=isnull=1"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "book.title ISNULL []"
-        );
+        assertEquals("book.title ISNULL []", expression.toString());
     }
 
     @Test
@@ -224,11 +365,9 @@ public void testNotnullOperatorBool() throws Exception {
                 "title=isnull=false"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
 
-        Assert.assertEquals(expression.toString(),
-                "book.title NOTNULL []"
-        );
+        assertEquals("book.title NOTNULL []", expression.toString());
     }
 
     @Test
@@ -240,10 +379,272 @@ public void testNotnullOperatorInt() throws Exception {
                 "title=isnull=0"
         );
 
-        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams);
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title NOTNULL []", expression.toString());
+    }
+
+    @Test
+    public void testVisit() {
+        ComparisonNode comparisonNode = new ComparisonNode(
+                new ComparisonOperator("==", false),
+                "id",
+                Collections.singletonList("*20*")
+        );
+
+        RSQLFilterDialect.RSQL2FilterExpressionVisitor visitor = dialect.new RSQL2FilterExpressionVisitor(true);
+
+        assertEquals(
+                "author.id INFIX [20]",
+                visitor.visit(comparisonNode, ClassType.of(Author.class)).toString()
+        );
+    }
+
+    @Test
+    public void testFilterOnCustomizedLongIdField() throws ParseException {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
 
-        Assert.assertEquals(expression.toString(),
-                "book.title NOTNULL []"
+        queryParams.add(
+                "filter",
+                "id==1"
         );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/job", queryParams, NO_VERSION);
+
+        assertEquals("job.jobId IN [1]", expression.toString());
+    }
+
+    @Test
+    public void testFilterOnCustomizedStringIdField() throws ParseException {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "id==*identifier*"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/stringForId", queryParams, NO_VERSION);
+
+        assertEquals("stringId.surrogateKey INFIX [identifier]", expression.toString());
+    }
+
+    @Test
+    public void testInfixFilterOnPrimitiveIdField() throws ParseException {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "id==*1*"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/primitiveTypeId", queryParams, NO_VERSION);
+
+        assertEquals(expression.toString(),
+                "primitiveId.primitiveId INFIX [1]"
+        );
+    }
+
+    //TODO: add test for =isempty= case
+
+    @Test
+    public void testIsemptyOperatorBool() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isempty=true"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title ISEMPTY []", expression.toString());
+    }
+
+    @Test
+    public void testIsemptyOperatorInt() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "authors=isempty=1"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.authors ISEMPTY []", expression.toString());
+    }
+
+    @Test
+    public void testNotemptyOperatorBool() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "authors=isempty=false"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.authors NOTEMPTY []", expression.toString());
+    }
+
+    @Test
+    public void testNotemptyOperatorInt() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isempty=0"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title NOTEMPTY []", expression.toString());
+    }
+
+    @Test
+    public void testEmptyOperatorException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "authors.name=isempty=0"
+        );
+
+        assertThrows(ParseException.class,
+                () -> dialect.parseTypedExpression("/book", queryParams, NO_VERSION));
+    }
+
+    @Test
+    public void testMemberOfOperatorInt() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "awards=hasmember=title1"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.awards HASMEMBER [title1]", expression.toString());
+    }
+
+    @Test
+    public void testMemberOfToManyRelationship() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "authors.name=hasmember='0'"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+        assertEquals("book.authors.name HASMEMBER [0]", expression.toString());
+    }
+
+    @Test
+    public void testMemberOfOperatorOnNonCollectionAttributeException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.clear();
+        queryParams.add(
+                "filter",
+                "title=hasmember=title11"
+        );
+
+        ParseException e = assertThrows(ParseException.class,
+                () -> dialect.parseGlobalExpression("/book", queryParams, NO_VERSION));
+
+        assertEquals("Invalid Path: Last Path Element has to be a collection type", e.getMessage());
+    }
+
+    @Test
+    public void testMemberOfOperatorOnRelationshipException() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.clear();
+        queryParams.add(
+                "filter",
+                "authors=hasmember=1"
+        );
+
+        ParseException e = assertThrows(ParseException.class,
+                () -> dialect.parseGlobalExpression("/book", queryParams, NO_VERSION));
+
+        assertEquals("Invalid Path: Last Path Element cannot be a collection type", e.getMessage());
+    }
+
+    @Test
+    public void testFilterArgumentParsingBadInput() throws Exception {
+
+        Exception exception;
+        Type<Book> bookType = ClassType.of(Book.class);
+
+        // Empty argument name
+        exception = assertThrows(ParseException.class, () -> dialect.parse(bookType, Collections.emptySet(),
+                        "genre=in=(sci-fi,action),title[a:][x:y]==Hemingway", NO_VERSION));
+        assertEquals("Filter expression is not in expected format at: title[a:][x:y]", exception.getMessage());
+
+        // Empty argument value
+        exception = assertThrows(ParseException.class, () -> dialect.parse(bookType, Collections.emptySet(),
+                        "genre=in=(sci-fi,action),title[a:b][:y]==Hemingway", NO_VERSION));
+        assertEquals("Filter expression is not in expected format at: title[a:b][:y]", exception.getMessage());
+
+        // : missing within []
+        exception = assertThrows(ParseException.class, () -> dialect.parse(bookType, Collections.emptySet(),
+                        "genre=in=(sci-fi,action),title[ab][x:y]==Hemingway", NO_VERSION));
+        assertEquals("Filter expression is not in expected format at: title[ab][x:y]", exception.getMessage());
+
+        // Something found after first '[' and not within []
+        exception = assertThrows(ParseException.class, () -> dialect.parse(bookType, Collections.emptySet(),
+                        "genre=in=(sci-fi,action),title[a:b]asdf[x:y]==Hemingway", NO_VERSION));
+        assertEquals("Filter expression is not in expected format at: title[a:b]asdf[x:y]", exception.getMessage());
+
+        // Invalid encoded argument value
+        exception = assertThrows(ParseException.class, () -> dialect.parse(bookType, Collections.emptySet(),
+                        "title[a:b][x:Invalid%_Encoding]==Hemingway", NO_VERSION));
+        assertEquals("Filter expression is not in expected format at: title[a:b][x:Invalid%_Encoding]. "
+                        + "URLDecoder: Illegal hex characters in escape (%) pattern - Error at index 0 in: \"_E\"",
+                exception.getMessage());
+    }
+
+    @Test
+    public void testFilterArgumentParsingEncodeValues() throws Exception {
+
+        FilterExpression expr;
+        Type<Book> bookType = ClassType.of(Book.class);
+        String argValue1 = "with space";
+        String argValue2 = ": \" ' ( ) ; , = ! ~ < > ] [";
+        Set<Argument> inputArgs = new HashSet<>();
+        inputArgs.add(Argument.builder().name("arg1").value(argValue1).build());
+        inputArgs.add(Argument.builder().name("arg2").value(argValue2).build());
+        String encodeArgValue1 = URLEncoder.encode(argValue1, "UTF-8");
+        String encodeArgValue2 = URLEncoder.encode(argValue2, "UTF-8");
+
+        expr = assertDoesNotThrow(
+                        () -> dialect.parse(bookType, Collections.emptySet(), "genre=in=(sci-fi,action),title[arg1:"
+                                        + encodeArgValue1 + "][arg2:" + encodeArgValue2 + "]==Hemingway", NO_VERSION));
+        assertEquals("(book.genre IN [sci-fi, action] OR book.title IN [Hemingway])", expr.toString());
+
+        FilterPredicate left = (FilterPredicate) ((OrFilterExpression) expr).getLeft();
+        Set<Argument> leftArgs = left.getPath().getPathElements().get(0).getArguments();
+        assertTrue(leftArgs.isEmpty());
+
+        FilterPredicate right = (FilterPredicate) ((OrFilterExpression) expr).getRight();
+        Set<Argument> rightArgs = right.getPath().getPathElements().get(0).getArguments();
+        assertTrue(rightArgs.equals(inputArgs));
+    }
+
+    @Test
+    public void testGraphQLFilterDialectWithComplexAttribute() throws Exception {
+        Type<Author> authorType = ClassType.of(Author.class);
+        FilterPredicate predicate = (FilterPredicate)
+                dialect.parse(authorType, Collections.emptySet(), "homeAddress.street1=in=(foo)", NO_VERSION);
+
+        assertEquals(Operator.IN, predicate.getOperator());
+        Path path = predicate.getPath();
+        assertEquals(2, path.getPathElements().size());
+        assertEquals("homeAddress", path.getPathElements().get(0).getFieldName());
+        assertEquals("street1", path.getPathElements().get(1).getFieldName());
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectWithFIQLCompliantStrategyTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectWithFIQLCompliantStrategyTest.java
new file mode 100644
index 0000000000..1da7f40595
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/dialect/RSQLFilterDialectWithFIQLCompliantStrategyTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.dialect;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Tests RSQLFilterDialect
+ */
+public class RSQLFilterDialectWithFIQLCompliantStrategyTest {
+    private static RSQLFilterDialect dialect;
+
+    @BeforeAll
+    public static void init() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Book.class);
+        dialect = RSQLFilterDialect.builder()
+                .dictionary(dictionary)
+                .caseSensitivityStrategy(new CaseSensitivityStrategy.FIQLCompliant())
+                .build();
+    }
+
+    @Test
+    public void testTypedExpressionParsing() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter[book]",
+                "title==*foo*;title!=bar*;(genre=in=(sci-fi,action),publishDate>123)"
+        );
+
+        Map<String, FilterExpression> expressionMap = dialect.parseTypedExpression("/author", queryParams, NO_VERSION);
+
+        assertEquals(1, expressionMap.size());
+        assertEquals(
+                "((book.title INFIX_CASE_INSENSITIVE [foo] AND NOT (book.title PREFIX_CASE_INSENSITIVE [bar])) "
+                        + "AND (book.genre IN_INSENSITIVE [sci-fi, action] OR book.publishDate GT [123]))",
+                expressionMap.get("book").toString()
+        );
+    }
+
+    @Test
+    public void testGlobalExpressionParsing() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title==*foo*;authors.name==Hemingway"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("(book.title INFIX_CASE_INSENSITIVE [foo] AND book.authors.name IN_INSENSITIVE [Hemingway])", expression.toString());
+    }
+
+    @Test
+    public void testEqualOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title==Hemingway"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title IN_INSENSITIVE [Hemingway]", expression.toString());
+    }
+
+    @Test
+    public void testNotEqualOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title!=Hemingway"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("NOT (book.title IN_INSENSITIVE [Hemingway])", expression.toString());
+    }
+
+    @Test
+    public void testInOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=in=Hemingway"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title IN_INSENSITIVE [Hemingway]", expression.toString());
+    }
+
+    @Test
+    public void testOutOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=out=Hemingway"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("NOT (book.title IN_INSENSITIVE [Hemingway])", expression.toString());
+    }
+
+    @Test
+    public void testNumericComparisonOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "(publishDate=gt=5,publishDate=ge=5,publishDate=lt=10,publishDate=le=10);"
+                        + "(publishDate>5,publishDate>=5,publishDate<10,publishDate<=10)"
+
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals(
+                "((((book.publishDate GT [5] OR book.publishDate GE [5]) "
+                        + "OR book.publishDate LT [10]) OR book.publishDate LE [10]) AND "
+                        + "(((book.publishDate GT [5] OR book.publishDate GE [5]) OR "
+                        + "book.publishDate LT [10]) OR book.publishDate LE [10]))",
+                expression.toString()
+        );
+    }
+
+    @Test
+    public void testSubstringOperator() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title==*Hemingway*,title==*Hemingway,title==Hemingway*"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals(
+                "((book.title INFIX_CASE_INSENSITIVE [Hemingway] OR book.title POSTFIX_CASE_INSENSITIVE [Hemingway]) OR book.title PREFIX_CASE_INSENSITIVE [Hemingway])",
+                expression.toString()
+        );
+    }
+
+    @Test
+    public void testExpressionGrouping() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title==foo;(title==bar;title==baz)"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("(book.title IN_INSENSITIVE [foo] AND (book.title IN_INSENSITIVE [bar] AND book.title IN_INSENSITIVE [baz]))", expression.toString());
+    }
+
+    @Test
+    public void testIsnullOperatorBool() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isnull=true"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title ISNULL []", expression.toString());
+    }
+
+    @Test
+    public void testIsnullOperatorInt() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isnull=1"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title ISNULL []", expression.toString());
+    }
+
+    @Test
+    public void testNotnullOperatorBool() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isnull=false"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title NOTNULL []", expression.toString());
+    }
+
+    @Test
+    public void testNotnullOperatorInt() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+
+        queryParams.add(
+                "filter",
+                "title=isnull=0"
+        );
+
+        FilterExpression expression = dialect.parseGlobalExpression("/book", queryParams, NO_VERSION);
+
+        assertEquals("book.title NOTNULL []", expression.toString());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitorTest.java
new file mode 100644
index 0000000000..f16372c6ab
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/ExpressionScopingVisitorTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests ExpressionScopingVisitor
+ */
+public class ExpressionScopingVisitorTest {
+
+    private static final String SCIFI = "scifi";
+    private static final String GENRE = "genre";
+    private static final String NAME = "name";
+
+    @Test
+    public void testExpressionCopy() throws Exception {
+        Path p1Path = new Path(Arrays.asList(
+                new PathElement(Book.class, Author.class, "authors"),
+                new PathElement(Author.class, String.class, NAME)
+        ));
+        FilterPredicate p1 = new InPredicate(p1Path, "foo", "bar");
+
+        FilterPredicate p2 = new InPredicate(new PathElement(Book.class, String.class, NAME), "blah%");
+        FilterPredicate p3 = new InPredicate(new PathElement(Book.class, String.class, GENRE), SCIFI);
+        //P4 is a duplicate of P3
+        FilterPredicate p4 = new InPredicate(new PathElement(Book.class, String.class, GENRE), SCIFI);
+
+        OrFilterExpression or = new OrFilterExpression(p2, p3);
+        AndFilterExpression and1 = new AndFilterExpression(or, p1);
+        AndFilterExpression and2 = new AndFilterExpression(and1, p4);
+        NotFilterExpression not = new NotFilterExpression(and2);
+
+        PathElement scope = new PathElement(Author.class, String.class, NAME);
+        ExpressionScopingVisitor scopingVisitor = new ExpressionScopingVisitor(scope);
+        FilterExpression copy = not.accept(scopingVisitor);
+
+        assertNotEquals(not, copy);
+
+        List<FilterPredicate> predicates = (List) copy.accept(new PredicateExtractionVisitor(new ArrayList<>()));
+        List<FilterPredicate> toCompare = Arrays.asList(p2.scopedBy(scope), p3.scopedBy(scope), p1.scopedBy(scope), p4.scopedBy(scope));
+        for (int i = 0; i < predicates.size(); i++) {
+            FilterPredicate predicateOriginal = toCompare.get(i);
+            FilterPredicate predicateCopy = predicates.get(i);
+            assertEquals(predicateOriginal, predicateCopy);
+            assertTrue(predicateCopy != predicateOriginal);
+        }
+
+        assertEquals("example_Author_name", predicates.get(0).getPath().getAlias());
+        assertTrue(predicates.get(0).getParameters().get(0).getPlaceholder().startsWith(":name_name_"));
+        assertEquals("blah\\%", predicates.get(0).getParameters().get(0).escapeMatching());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicateExtractionVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicateExtractionVisitorTest.java
new file mode 100644
index 0000000000..3bed597613
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicateExtractionVisitorTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.google.common.collect.Sets;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * Tests PredicateExtractionVisitor
+ */
+public class FilterPredicateExtractionVisitorTest {
+
+    @Test
+    public void testPredicateExtraction() throws Exception {
+        Path p1Path = new Path(Arrays.asList(
+                new Path.PathElement(Book.class, Author.class, "authors"),
+                new Path.PathElement(Author.class, String.class, "name")
+        ));
+        FilterPredicate p1 = new InPredicate(p1Path, "foo", "bar");
+
+        Path p2Path = new Path(Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "name")
+        ));
+        FilterPredicate p2 = new InPredicate(p2Path, "blah");
+
+        Path p3Path = new Path(Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "genre")
+        ));
+        FilterPredicate p3 = new InPredicate(p3Path, "scifi");
+
+        //P4 is a duplicate of P3
+        Path p4Path = new Path(Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "genre")
+        ));
+        FilterPredicate p4 = new InPredicate(p4Path, "scifi");
+
+        OrFilterExpression or = new OrFilterExpression(p2, p3);
+        AndFilterExpression and1 = new AndFilterExpression(or, p1);
+        AndFilterExpression and2 = new AndFilterExpression(and1, p4);
+        NotFilterExpression not = new NotFilterExpression(and2);
+
+        //First test collecting the predicates in a Set
+        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
+        Collection<FilterPredicate> filterPredicates = not.accept(visitor);
+
+        assertTrue(filterPredicates.containsAll(Sets.newHashSet(p1, p2, p3)));
+        assertEquals(filterPredicates.size(), 3);
+
+        //Second test collecting the predicates in a List
+        visitor = new PredicateExtractionVisitor(new ArrayList<>());
+        filterPredicates = not.accept(visitor);
+
+        assertTrue(filterPredicates.containsAll(Arrays.asList(p1, p2, p3, p4)));
+        assertEquals(filterPredicates.size(), 4);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractorTest.java
new file mode 100644
index 0000000000..8daea3de76
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/FilterPredicatePushdownExtractorTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.google.common.collect.ImmutableList;
+import example.Author;
+import example.Book;
+import example.Editor;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+public class FilterPredicatePushdownExtractorTest {
+
+    private static EntityDictionary dictionary;
+
+    @BeforeAll
+    public static void init() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Editor.class);
+        dictionary.bindEntity(Publisher.class);
+    }
+
+    @Test
+    public void testFullPredicateExtraction() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression extracted = FilterPredicatePushdownExtractor.extractPushDownPredicate(dictionary, expression);
+
+        assertEquals(expression, extracted);
+    }
+
+    @Test
+    public void testNoPredicateExtraction() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Literary Fiction");
+
+        FilterExpression finalExpression = new NotFilterExpression(new AndFilterExpression(dataStoreExpression, inMemoryExpression));
+
+        FilterExpression extracted = FilterPredicatePushdownExtractor.extractPushDownPredicate(dictionary, finalExpression);
+
+        assertNull(extracted);
+    }
+
+    @Test
+    public void testPartialPredicateExtraction() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Literary Fiction");
+
+        FilterExpression finalExpression = new NotFilterExpression(new OrFilterExpression(dataStoreExpression, inMemoryExpression));
+
+        FilterExpression extracted = FilterPredicatePushdownExtractor.extractPushDownPredicate(dictionary, finalExpression);
+
+        assertEquals(((InPredicate) dataStoreExpression).negate(), extracted);
+    }
+
+    @Test
+    public void testAndPartialPredicateExtraction() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression anotherDataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Science Fiction");
+
+        FilterExpression expectedExpression =
+                new AndFilterExpression(dataStoreExpression, anotherDataStoreExpression);
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Jack");
+
+        FilterExpression finalExpression = new AndFilterExpression(new AndFilterExpression(dataStoreExpression, inMemoryExpression), anotherDataStoreExpression);
+
+        FilterExpression extracted = FilterPredicatePushdownExtractor.extractPushDownPredicate(dictionary, finalExpression);
+
+        assertEquals(expectedExpression, extracted);
+    }
+
+    @Test
+    public void testOrPartialPredicateExtraction() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression anotherDataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Science Fiction");
+
+        FilterExpression expectedExpression =
+                new OrFilterExpression(dataStoreExpression, anotherDataStoreExpression);
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Jane");
+
+        FilterExpression finalExpression = new OrFilterExpression(new AndFilterExpression(dataStoreExpression, inMemoryExpression), anotherDataStoreExpression);
+
+        FilterExpression extracted = FilterPredicatePushdownExtractor.extractPushDownPredicate(dictionary, finalExpression);
+
+        assertEquals(expectedExpression, extracted);
+    }
+
+    @Test
+    public void testInvalidField() {
+        InvalidValueException e = assertThrows(
+                InvalidValueException.class,
+                () -> new InPredicate(new Path(Book.class, dictionary, "badfield"), "Literary Fiction"));
+        assertEquals("Invalid value: book does not contain the field badfield", e.getMessage());
+    }
+
+    @Test
+    public void testPath() {
+        Path path = new Path(Book.class, dictionary, "genre");
+
+        ImmutableList<PathElement> pathElements = ImmutableList.of(
+                new PathElement(Book.class, String.class, "genre"));
+
+        assertEquals("example_Book", path.getAlias());
+        assertEquals("genre", path.getFieldPath());
+        assertEquals(pathElements, path.getPathElements());
+        assertEquals(Optional.of(pathElements.get(0)), path.lastElement());
+        assertEquals("[Book].genre", path.toString());
+
+        path = new Path(Book.class, dictionary, "this.editor.firstName");
+
+        pathElements = ImmutableList.of(
+                new PathElement(Book.class, null, "this"),
+                new PathElement(Book.class, Editor.class, "editor"),
+                new PathElement(Editor.class, String.class, "firstName"));
+
+        assertEquals("example_Book_editor", path.getAlias());
+        assertEquals("this.editor.firstName", path.getFieldPath());
+        assertEquals(pathElements, path.getPathElements());
+        assertEquals(Optional.of(pathElements.get(2)), path.lastElement());
+        assertEquals("[Book].this/[Book].editor/[Editor].firstName", path.toString());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifierTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifierTest.java
new file mode 100644
index 0000000000..94eba66468
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifierTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.filter.expression;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import example.Author;
+import example.Book;
+import example.Editor;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class InMemoryExecutionVerifierTest {
+
+    private static EntityDictionary dictionary;
+
+    @BeforeAll
+    public static void init() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Editor.class);
+        dictionary.bindEntity(Publisher.class);
+    }
+
+    @Test
+    public void testNoInMemoryExecution() {
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        assertFalse(InMemoryExecutionVerifier.shouldExecuteInMemory(dictionary, expression));
+    }
+
+    @Test
+    public void testFullInMemoryExecution() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Literary Fiction");
+
+        FilterExpression finalExpression = new NotFilterExpression(new AndFilterExpression(dataStoreExpression, inMemoryExpression));
+
+        assertTrue(InMemoryExecutionVerifier.shouldExecuteInMemory(dictionary, finalExpression));
+    }
+
+    @Test
+    public void testPartialInMemoryExecution() {
+        FilterExpression dataStoreExpression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Literary Fiction");
+
+        FilterExpression inMemoryExpression =
+                new InPredicate(new Path(Book.class, dictionary, "editor.firstName"), "Literary Fiction");
+
+        FilterExpression finalExpression = new NotFilterExpression(new OrFilterExpression(dataStoreExpression, inMemoryExpression));
+
+        assertTrue(InMemoryExecutionVerifier.shouldExecuteInMemory(dictionary, finalExpression));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutorTest.java
new file mode 100644
index 0000000000..b55a6389e2
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterExecutorTest.java
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.expression;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.predicates.FalsePredicate;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.GEPredicate;
+import com.yahoo.elide.core.filter.predicates.GTPredicate;
+import com.yahoo.elide.core.filter.predicates.InInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.predicates.InfixInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.InfixPredicate;
+import com.yahoo.elide.core.filter.predicates.IsEmptyPredicate;
+import com.yahoo.elide.core.filter.predicates.IsNullPredicate;
+import com.yahoo.elide.core.filter.predicates.LEPredicate;
+import com.yahoo.elide.core.filter.predicates.LTPredicate;
+import com.yahoo.elide.core.filter.predicates.NotEmptyPredicate;
+import com.yahoo.elide.core.filter.predicates.NotInInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.NotInPredicate;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.filter.predicates.PostfixInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.PostfixPredicate;
+import com.yahoo.elide.core.filter.predicates.PrefixInsensitivePredicate;
+import com.yahoo.elide.core.filter.predicates.PrefixPredicate;
+import com.yahoo.elide.core.filter.predicates.TruePredicate;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Predicate;
+
+/**
+ * Tests InMemoryFilterExecutor.
+ */
+public class InMemoryFilterExecutorTest {
+    private Author author;
+    private final InMemoryFilterExecutor visitor;
+    private FilterExpression expression;
+    private Predicate fn;
+
+    private PathElement authorIdElement = new PathElement(Author.class, Long.class, "id");
+    private PathElement authorNameElement = new PathElement(Author.class, String.class, "name");
+    private PathElement authorBooksElement = new PathElement(Author.class, Book.class, "books");
+    private PathElement authorAwardsElement = new PathElement(Author.class, String.class, "awards");
+    private List<Object> listNine = Collections.singletonList("9");
+    private List<Object> listTen = Collections.singletonList("10");
+    private List<Object> listEleven = Collections.singletonList("11");
+
+    public static class TestEntityDictionary extends EntityDictionary {
+
+        public TestEntityDictionary(Map checks) {
+            super(
+                    checks,
+                    Collections.emptyMap(),  //role checks
+                    EntityDictionary.DEFAULT_INJECTOR,
+                    CoerceUtil::lookup,
+                    Collections.emptySet(), //excluded entities
+                    DefaultClassScanner.getInstance()
+            );
+        }
+
+        @Override
+        public Type<?> lookupBoundClass(Type<?> objClass) {
+            // Special handling for mocked Book class which has Entity annotation
+            if (objClass.getName().contains("$MockitoMock$")) {
+                objClass = objClass.getSuperclass();
+            }
+            return super.lookupBoundClass(objClass);
+        }
+
+    }
+
+    InMemoryFilterExecutorTest() {
+        EntityDictionary dictionary = new TestEntityDictionary(new HashMap<>());
+        dictionary.bindEntity(Author.class);
+        RequestScope requestScope = Mockito.mock(RequestScope.class);
+        when(requestScope.getDictionary()).thenReturn(dictionary);
+        visitor = new InMemoryFilterExecutor(requestScope);
+    }
+
+    @Test
+    public void inAndNotInPredicateTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setName("AuthorForTest");
+
+        // Test exact match
+        expression = new InPredicate(authorIdElement, 1L);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, 1L);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // Test exact match insensitive
+        expression = new InInsensitivePredicate(authorNameElement, author.getName().toUpperCase(Locale.ENGLISH));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotInInsensitivePredicate(authorNameElement, author.getName().toUpperCase(Locale.ENGLISH));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // Test contains works
+        expression = new InPredicate(authorIdElement, 1, 2);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, 1, 2);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // Test type
+        expression = new InPredicate(authorIdElement, "1");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, "1");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // Test not in
+        expression = new InPredicate(authorIdElement, 3L);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, 3L);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        // Test empty
+        expression = new InPredicate(authorIdElement, Collections.emptyList());
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, Collections.emptyList());
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        // Test TRUE/FALSE
+        expression = new TruePredicate(authorIdElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new FalsePredicate(authorIdElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // Test null
+        author.setId(null);
+        expression = new InPredicate(authorIdElement, 1);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotInPredicate(authorIdElement, 1);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+    }
+
+    @Test
+    public void isnullAndNotnullPredicateTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setName("AuthorForTest");
+
+        // When name is not null
+        expression = new IsNullPredicate(authorNameElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotNullPredicate(authorNameElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        // When name is null
+        author.setName(null);
+        expression = new IsNullPredicate(authorNameElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotNullPredicate(authorNameElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void isemptyAndNotemptyPredicateTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        // When name is empty and books are empty
+        author.setBooks(new HashSet<>());
+        author.setAwards(new HashSet<>());
+
+        expression = new IsEmptyPredicate(authorAwardsElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new IsEmptyPredicate(authorBooksElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        expression = new NotEmptyPredicate(authorAwardsElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotEmptyPredicate(authorBooksElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+
+        // When name and books are not empty
+        author.setAwards(Arrays.asList("Bookery prize"));
+        author.getBooks().add(new Book());
+
+        expression = new IsEmptyPredicate(authorAwardsElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new IsEmptyPredicate(authorBooksElement);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        expression = new NotEmptyPredicate(authorAwardsElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotEmptyPredicate(authorBooksElement);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+    }
+
+    @Test
+    public void hasMemberPredicateTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        // When name is empty and books are empty
+        author.setAwards(new HashSet<>());
+
+        expression = new FilterPredicate(authorAwardsElement, Operator.HASMEMBER, Arrays.asList(""));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new FilterPredicate(authorAwardsElement, Operator.HASNOMEMBER, Arrays.asList(""));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+
+        // When name and books are not empty
+        author.setAwards(Arrays.asList("Bookery prize"));
+
+        expression = new FilterPredicate(authorAwardsElement, Operator.HASMEMBER, Arrays.asList("Bookery prize"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new FilterPredicate(authorAwardsElement, Operator.HASNOMEMBER, Arrays.asList("National Book Awards"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+    }
+
+    @Test
+    public void prefixAndPostfixAndInfixPredicateTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setName("AuthorForTest");
+
+        // When prefix, infix, postfix are correctly matched
+        expression = new PrefixPredicate(authorNameElement, "Author");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new InfixPredicate(authorNameElement, "For");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new PostfixPredicate(authorNameElement, "Test");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        // When prefix, infix, postfix are correctly matched if case-insensitive
+        expression = new PrefixPredicate(authorNameElement, "author");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new InfixPredicate(authorNameElement, "for");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new PostfixPredicate(authorNameElement, "test");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // When prefix, infix, postfix are correctly matched if case-insensitive
+        expression = new PrefixInsensitivePredicate(authorNameElement, "author");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new InfixInsensitivePredicate(authorNameElement, "for");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new PostfixInsensitivePredicate(authorNameElement, "test");
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+
+        // When prefix, infix, postfix are not matched
+        expression = new PrefixPredicate(authorNameElement, "error");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new InfixPredicate(authorNameElement, "error");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new PostfixPredicate(authorNameElement, "error");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // When values is null
+        author.setName(null);
+        expression = new PrefixPredicate(authorNameElement, "Author");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new InfixPredicate(authorNameElement, "For");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new PostfixPredicate(authorNameElement, "Test");
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void compareOpPredicateTests() throws Exception {
+        author = new Author();
+        author.setId(10L);
+
+        expression = new LTPredicate(authorIdElement, listEleven);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new LEPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new GTPredicate(authorIdElement, listNine);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new GEPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new LTPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new LEPredicate(authorIdElement, listNine);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new GTPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new GEPredicate(authorIdElement, listEleven);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        // when val is null
+        author.setId(null);
+        expression = new LTPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new LEPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new GTPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new GEPredicate(authorIdElement, listTen);
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void negativeTests() throws Exception {
+        author = new Author();
+        author.setId(10L);
+        PathElement pathElement = new PathElement(Author.class, Long.class, "id");
+
+        expression = new NotFilterExpression(new LTPredicate(pathElement, listEleven));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotFilterExpression(new LEPredicate(pathElement, listTen));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotFilterExpression(new GTPredicate(pathElement, listNine));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotFilterExpression(new GEPredicate(pathElement, listTen));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+        expression = new NotFilterExpression(new LTPredicate(pathElement, listTen));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotFilterExpression(new LEPredicate(pathElement, listNine));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotFilterExpression(new GTPredicate(pathElement, listTen));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+        expression = new NotFilterExpression(new GEPredicate(pathElement, listEleven));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+    }
+
+    @Test
+    public void andExpressionTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setName("AuthorForTest");
+
+        expression = new AndFilterExpression(
+                new InPredicate(authorIdElement, 1L),
+                new InPredicate(authorNameElement, "AuthorForTest"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        expression = new AndFilterExpression(
+                new InPredicate(authorIdElement, 0L),
+                new InPredicate(authorNameElement, "AuthorForTest"));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        expression = new AndFilterExpression(
+                new InPredicate(authorIdElement, 1L),
+                new InPredicate(authorNameElement, "Fail"));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+
+        expression = new AndFilterExpression(
+                new InPredicate(authorIdElement, 0L),
+                new InPredicate(authorNameElement, "Fail"));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+    }
+
+    @Test
+    public void orExpressionTest() throws Exception {
+        author = new Author();
+        author.setId(1L);
+        author.setName("AuthorForTest");
+
+        expression = new OrFilterExpression(
+                new InPredicate(authorIdElement, 1L),
+                new InPredicate(authorNameElement, "AuthorForTest"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        expression = new OrFilterExpression(
+                new InPredicate(authorIdElement, 0L),
+                new InPredicate(authorNameElement, "AuthorForTest"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        expression = new OrFilterExpression(
+                new InPredicate(authorIdElement, 1L),
+                new InPredicate(authorNameElement, "Fail"));
+        fn = expression.accept(visitor);
+        assertTrue(fn.test(author));
+
+        expression = new OrFilterExpression(
+                new InPredicate(authorIdElement, 0L),
+                new InPredicate(authorNameElement, "Fail"));
+        fn = expression.accept(visitor);
+        assertFalse(fn.test(author));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitorTest.java
deleted file mode 100644
index 7f4ece4888..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/InMemoryFilterVisitorTest.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.expression;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.security.checks.Check;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import example.Author;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Tests InMemoryFilterVisitor
- */
-public class InMemoryFilterVisitorTest {
-
-    public class TestEntityDictionary extends EntityDictionary {
-        public TestEntityDictionary(Map<String, Class<? extends Check>> checks) {
-            super(checks);
-        }
-
-        @Override
-        public Class<?> lookupEntityClass(Class<?> objClass) {
-            // Special handling for mocked Book class which has Entity annotation
-            if (objClass.getName().contains("$MockitoMock$")) {
-                objClass = objClass.getSuperclass();
-            }
-            return super.lookupEntityClass(objClass);
-        }
-    }
-
-    private final EntityDictionary dictionary;
-    private Author author;
-    private final InMemoryFilterVisitor visitor;
-    private FilterExpression expression;
-    private java.util.function.Predicate fn;
-
-    InMemoryFilterVisitorTest() {
-        dictionary = new TestEntityDictionary(new HashMap<>());
-        dictionary.bindEntity(Author.class);
-        visitor = new InMemoryFilterVisitor(dictionary);
-    }
-
-    @Test
-    public void inAndNotInPredicateTest() throws Exception {
-        author = new Author();
-        author.setId(1L);
-        author.setName("AuthorForTest");
-
-        // Test exact match
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(1L));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Collections.singletonList(1L));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // Test contains works
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Arrays.asList(1, 2));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Arrays.asList(1, 2));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // Test type
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList("1"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Collections.singletonList("1"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // Test not in
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(3L));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Collections.singletonList(3L));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        // Test empty
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        // Test null
-        author.setId(null);
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Arrays.asList(1));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.NOT, Arrays.asList(1));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-    }
-
-    @Test
-    public void isnullAndNotnullPredicateTest() throws Exception {
-        author = new Author();
-        author.setId(1L);
-        author.setName("AuthorForTest");
-
-        // When name is not null
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.ISNULL, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.NOTNULL, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        // When name is null
-        author.setName(null);
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.ISNULL, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.NOTNULL, Collections.emptyList());
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-    }
-
-    @Test
-    public void prefixAndPostfixAndInfixPredicateTest() throws Exception {
-        author = new Author();
-        author.setId(1L);
-        author.setName("AuthorForTest");
-
-        // When prefix, infix, postfix are correctly matched
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.PREFIX, Arrays.asList("Author"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.INFIX, Arrays.asList("For"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.POSTFIX, Arrays.asList("Test"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        // When prefix, infix, postfix are correctly matched if case-insensitive
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.PREFIX, Arrays.asList("author"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.INFIX, Arrays.asList("for"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.POSTFIX, Arrays.asList("test"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // When prefix, infix, postfix are not matched
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.PREFIX, Arrays.asList("error"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.INFIX, Arrays.asList("error"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.POSTFIX, Arrays.asList("error"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // When values is null
-        author.setName(null);
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.PREFIX, Arrays.asList("Author"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.INFIX, Arrays.asList("For"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.POSTFIX, Arrays.asList("Test"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-    }
-
-    @Test
-    public void compareOpPredicateTests() throws Exception {
-        author = new Author();
-        author.setId(10L);
-
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LT, Arrays.asList("11"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LE, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GT, Arrays.asList("9"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GE, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LT, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LE, Arrays.asList("9"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GT, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GE, Arrays.asList("11"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        // when val is null
-        author.setId(null);
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LT, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LE, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GT, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GE, Arrays.asList("10"));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-    }
-
-    @Test
-    public void negativeTests() throws Exception {
-        author = new Author();
-        author.setId(10L);
-
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LT, Arrays.asList("11")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LE, Arrays.asList("10")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GT, Arrays.asList("9")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GE, Arrays.asList("10")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LT, Arrays.asList("10")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.LE, Arrays.asList("9")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GT, Arrays.asList("10")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-        expression = new NotFilterExpression(new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.GE, Arrays.asList("11")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-    }
-
-    @Test
-    public void andExpressionTest() throws Exception {
-        author = new Author();
-        author.setId(1L);
-        author.setName("AuthorForTest");
-
-        expression = new AndFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(1L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("AuthorForTest")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        expression = new AndFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(0L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("AuthorForTest")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        expression = new AndFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(1L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("Fail")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-
-        expression = new AndFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(0L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("Fail")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-    }
-
-    @Test
-    public void orExpressionTest() throws Exception {
-        author = new Author();
-        author.setId(1L);
-        author.setName("AuthorForTest");
-
-        expression = new OrFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(1L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("AuthorForTest")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        expression = new OrFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(0L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("AuthorForTest")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        expression = new OrFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(1L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("Fail")));
-        fn = expression.accept(visitor);
-        Assert.assertTrue(fn.test(author));
-
-        expression = new OrFilterExpression(
-                new Predicate(new Predicate.PathElement(Author.class, "author", Long.class, "id"), Operator.IN, Collections.singletonList(0L)),
-                new Predicate(new Predicate.PathElement(Author.class, "author", String.class, "name"), Operator.IN, Collections.singletonList("Fail")));
-        fn = expression.accept(visitor);
-        Assert.assertFalse(fn.test(author));
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitorTest.java
deleted file mode 100644
index cc0b34b094..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/core/filter/expression/PredicateExtractionVisitorTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter.expression;
-
-import com.google.common.collect.Sets;
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import example.Author;
-import example.Book;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Tests PredicateExtractionVisitor
- */
-public class PredicateExtractionVisitorTest {
-
-    @Test
-    public void testPredicateExtraction() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", Author.class, "authors"),
-                new Predicate.PathElement(Author.class, "author", String.class, "name")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("foo", "bar"));
-
-        List<Predicate.PathElement> p2Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "name")
-        );
-        Predicate p2 = new Predicate(p2Path, Operator.IN, Arrays.asList("blah"));
-
-        List<Predicate.PathElement> p3Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "genre")
-        );
-        Predicate p3 = new Predicate(p3Path, Operator.IN, Arrays.asList("scifi"));
-
-        OrFilterExpression or = new OrFilterExpression(p2, p3);
-        AndFilterExpression and = new AndFilterExpression(or, p1);
-        NotFilterExpression not = new NotFilterExpression(and);
-
-        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-
-        Set<Predicate> predicates = not.accept(visitor);
-
-        Assert.assertEquals(predicates, Sets.newHashSet(p1, p2, p3));
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitorTest.java
new file mode 100644
index 0000000000..77e9e9f7ec
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/filter/visitors/VerifyFieldAccessFilterExpressionVisitorTest.java
@@ -0,0 +1,419 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.filter.visitors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.ClassType;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+
+public class VerifyFieldAccessFilterExpressionVisitorTest {
+
+    private static final String AUTHORS = "authors";
+    private static final String GENRE = "genre";
+    private static final String HOME = "homeAddress";
+    private static final String NAME = "name";
+    private static final String SCIFI = "scifi";
+    private RequestScope scope;
+
+    @BeforeEach
+    public void setupMocks() {
+        // this will test with the default interface implementation
+        scope = mock(RequestScope.class);
+        PermissionExecutor permissionExecutor = mock(PermissionExecutor.class);
+        DataStoreTransaction transaction = mock(DataStoreTransaction.class);
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+
+        when(scope.getDictionary()).thenReturn(dictionary);
+        when(scope.getPermissionExecutor()).thenReturn(permissionExecutor);
+        when(scope.getTransaction()).thenReturn(transaction);
+        when(permissionExecutor.evaluateFilterJoinUserChecks(any(), any())).thenCallRealMethod();
+        when(permissionExecutor.handleFilterJoinReject(any(), any(), any())).thenCallRealMethod();
+    }
+
+    @Test
+    public void testAccept() throws Exception {
+        Path p1Path = new Path(Arrays.asList(
+                new PathElement(Book.class, Author.class, AUTHORS),
+                new PathElement(Author.class, String.class, NAME)
+        ));
+        FilterPredicate p1 = new InPredicate(p1Path, "foo", "bar");
+
+        Path p2Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, NAME)
+        ));
+        FilterPredicate p2 = new InPredicate(p2Path, "blah");
+
+        Path p3Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, GENRE)
+        ));
+        FilterPredicate p3 = new InPredicate(p3Path, SCIFI);
+
+        //P4 is a duplicate of P3
+        Path p4Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, GENRE)
+        ));
+        FilterPredicate p4 = new InPredicate(p4Path, SCIFI);
+
+        OrFilterExpression or = new OrFilterExpression(p2, p3);
+        AndFilterExpression and1 = new AndFilterExpression(or, p1);
+        AndFilterExpression and2 = new AndFilterExpression(and1, p4);
+        NotFilterExpression not = new NotFilterExpression(and2);
+
+        Book book = new Book();
+        Author author = new Author();
+        book.setAuthors(Collections.singleton(author));
+        author.setBooks(Collections.singleton(book));
+
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // unrestricted fields
+        assertTrue(not.accept(visitor));
+        assertTrue(and1.accept(visitor));
+        assertTrue(and2.accept(visitor));
+        assertTrue(or.accept(visitor));
+        assertTrue(p1.accept(visitor));
+        assertTrue(p2.accept(visitor));
+        assertTrue(p3.accept(visitor));
+        assertTrue(p4.accept(visitor));
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        verify(permissionExecutor, times(17)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(5)).checkSpecificFieldPermissions(resource, null, ReadPermission.class, NAME);
+        verify(permissionExecutor, times(21)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, never()).handleFilterJoinReject(any(), any(), any());
+    }
+
+    @Test
+    public void testReject() {
+        Path p1Path = new Path(Arrays.asList(
+                new PathElement(Book.class, Author.class, AUTHORS),
+                new PathElement(Author.class, String.class, NAME)
+        ));
+        FilterPredicate p1 = new InPredicate(p1Path, "foo", "bar");
+
+        Path p2Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, HOME)
+        ));
+        FilterPredicate p2 = new InPredicate(p2Path, "blah");
+
+        Path p3Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, GENRE)
+        ));
+        FilterPredicate p3 = new InPredicate(p3Path, SCIFI);
+
+        //P4 is a duplicate of P3
+        Path p4Path = new Path(Arrays.asList(
+                new PathElement(Book.class, String.class, GENRE)
+        ));
+        FilterPredicate p4 = new InPredicate(p4Path, SCIFI);
+
+        OrFilterExpression or = new OrFilterExpression(p2, p3);
+        AndFilterExpression and1 = new AndFilterExpression(or, p1);
+        AndFilterExpression and2 = new AndFilterExpression(and1, p4);
+        NotFilterExpression not = new NotFilterExpression(and2);
+
+        Book book = new Book();
+        Author author = new Author();
+        book.setAuthors(Collections.singleton(author));
+        author.setBooks(Collections.singleton(book));
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        when(permissionExecutor.checkSpecificFieldPermissions(resource, null, ReadPermission.class, HOME))
+            .thenThrow(ForbiddenAccessException.class);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertFalse(not.accept(visitor));
+        assertFalse(and1.accept(visitor));
+        assertFalse(and2.accept(visitor));
+        assertFalse(or.accept(visitor));
+        assertFalse(p2.accept(visitor));
+
+        // unrestricted fields
+        assertTrue(p1.accept(visitor));
+        assertTrue(p3.accept(visitor));
+        assertTrue(p4.accept(visitor));
+
+        verify(permissionExecutor, times(8)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(5)).checkSpecificFieldPermissions(resource, null, ReadPermission.class, HOME);
+        verify(permissionExecutor, times(9)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(5)).handleFilterJoinReject(any(), any(), any());
+    }
+
+    @Test
+    public void testShortCircuitReject() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("genre==foo", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, GENRE))
+                .thenThrow(ForbiddenAccessException.class);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertFalse(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, GENRE);
+        verify(permissionExecutor, never()).checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE);
+        verify(permissionExecutor, times(1)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(1)).handleFilterJoinReject(any(), any(), any());
+    }
+
+    @Test
+    public void testShortCircuitRejectDeferThenFail() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("authors.homeAddress==main", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        Author author = new Author();
+        book.setAuthors(Collections.singleton(author));
+        author.setBooks(Collections.singleton(book));
+
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        DataStoreTransaction tx = scope.getTransaction();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS))
+                .thenReturn(ExpressionResult.DEFERRED);
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, HOME))
+                .thenThrow(ForbiddenAccessException.class);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertFalse(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS);
+        verify(permissionExecutor, never()).getReadPermissionFilter(ClassType.of(Author.class), null);
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, HOME);
+        verify(permissionExecutor, never()).checkSpecificFieldPermissions(any(), any(), any(), any());
+        verify(permissionExecutor, never()).checkSpecificFieldPermissionsDeferred(any(), any(), any(), any());
+        verify(permissionExecutor, times(2)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(1)).handleFilterJoinReject(any(), any(), any());
+        verify(tx, never()).getToManyRelation(any(), any(), any(), any());
+    }
+
+    @Test
+    public void testShortCircuitDeferred() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("genre==foo", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, GENRE))
+                .thenReturn(ExpressionResult.DEFERRED);
+        when(permissionExecutor.checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE))
+                .thenThrow(ForbiddenAccessException.class);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertFalse(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, GENRE);
+        verify(permissionExecutor, times(1)).checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE);
+        verify(permissionExecutor, times(1)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(1)).handleFilterJoinReject(any(), any(), any());
+    }
+
+    @Test
+    public void testShortCircuitPass() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("authors.name==foo", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        DataStoreTransaction tx = scope.getTransaction();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS))
+                .thenReturn(ExpressionResult.PASS);
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, NAME))
+                .thenReturn(ExpressionResult.PASS);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertTrue(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS);
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, NAME);
+        verify(permissionExecutor, never()).checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE);
+        verify(permissionExecutor, times(2)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, never()).handleFilterJoinReject(any(), any(), any());
+        verify(tx, never()).getToManyRelation(any(), any(), any(), any());
+    }
+
+    @Test
+    public void testUserChecksDeferred() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("authors.homeAddress==main", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        Author author = new Author();
+        book.setAuthors(Collections.singleton(author));
+        author.setBooks(Collections.singleton(book));
+
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+        PersistentResource<Author> resourceAuthor = new PersistentResource<>(author, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        DataStoreTransaction tx = scope.getTransaction();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS))
+                .thenReturn(ExpressionResult.PASS);
+        when(permissionExecutor.checkSpecificFieldPermissionsDeferred(resource, null, ReadPermission.class, AUTHORS))
+                .thenReturn(ExpressionResult.PASS);
+        when(permissionExecutor.getReadPermissionFilter(ClassType.of(Author.class), null)).thenReturn(Optional.empty());
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, HOME))
+                .thenReturn(ExpressionResult.DEFERRED);
+        when(permissionExecutor.checkSpecificFieldPermissions(resourceAuthor, null, ReadPermission.class, HOME))
+                .thenThrow(ForbiddenAccessException.class);
+
+        when(tx.getToManyRelation(eq(tx), eq(book), any(), eq(scope)))
+                .thenReturn(new DataStoreIterableBuilder(book.getAuthors()).build());
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertFalse(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, AUTHORS);
+        verify(permissionExecutor, times(1)).getReadPermissionFilter(ClassType.of(Author.class), new HashSet<>());
+        verify(permissionExecutor, times(1)).checkUserPermissions(ClassType.of(Author.class), ReadPermission.class, HOME);
+        verify(permissionExecutor, times(1)).checkSpecificFieldPermissions(resourceAuthor, null, ReadPermission.class, HOME);
+        verify(permissionExecutor, times(2)).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(1)).handleFilterJoinReject(any(), any(), any());
+        verify(tx, times(1)).getToManyRelation(eq(tx), eq(book), any(), eq(scope));
+    }
+
+    @Test
+    public void testBypassReadonlyFilterRestriction() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("authors.name==foo", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        DataStoreTransaction tx = scope.getTransaction();
+
+        when(permissionExecutor.evaluateFilterJoinUserChecks(any(), any())).thenReturn(ExpressionResult.PASS);
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertTrue(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, never()).checkSpecificFieldPermissions(any(), any(), any(), any());
+        verify(permissionExecutor, never()).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, never()).handleFilterJoinReject(any(), any(), any());
+        verify(tx, never()).getToManyRelation(any(), any(), any(), any());
+    }
+
+    @Test
+    public void testCustomFilterJoin() throws Exception {
+        RSQLFilterDialect dialect = RSQLFilterDialect.builder().dictionary(scope.getDictionary()).build();
+        FilterExpression expression =
+                dialect.parseFilterExpression("genre==foo", ClassType.of(Book.class), true);
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "", scope);
+
+        PermissionExecutor permissionExecutor = scope.getPermissionExecutor();
+        DataStoreTransaction tx = scope.getTransaction();
+
+        when(permissionExecutor.checkUserPermissions(ClassType.of(Book.class), ReadPermission.class, GENRE))
+                .thenReturn(ExpressionResult.DEFERRED);
+        when(permissionExecutor.checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE))
+                .thenThrow(new ForbiddenAccessException(ReadPermission.class));
+
+        when(permissionExecutor.evaluateFilterJoinUserChecks(any(), any())).thenReturn(ExpressionResult.DEFERRED);
+        when(permissionExecutor.handleFilterJoinReject(any(), any(), any())).thenAnswer(invocation -> {
+            FilterPredicate filterPredicate = invocation.getArgument(0);
+            PathElement pathElement = invocation.getArgument(1);
+            ForbiddenAccessException reason = invocation.getArgument(2);
+
+            assertEquals("Book", pathElement.getType().getSimpleName());
+            assertEquals(GENRE, filterPredicate.getField());
+            assertEquals("book.genre IN [foo]", filterPredicate.toString());
+
+            // custom processing
+            return "Book".equals(pathElement.getType().getSimpleName())
+                    && filterPredicate.toString().matches("book.genre IN \\[\\w+\\]")
+                    && reason.getLoggedMessage().matches(".*Message=ReadPermission Denied.*\\n.*")
+                            ? ExpressionResult.DEFERRED
+                            : ExpressionResult.FAIL;
+        });
+
+        VerifyFieldAccessFilterExpressionVisitor visitor = new VerifyFieldAccessFilterExpressionVisitor(resource);
+        // restricted HOME field
+        assertTrue(expression.accept(visitor));
+
+        verify(permissionExecutor, times(1)).evaluateFilterJoinUserChecks(any(), any());
+        verify(permissionExecutor, times(1)).checkSpecificFieldPermissions(resource, null, ReadPermission.class, GENRE);
+        verify(permissionExecutor, never()).checkUserPermissions(any(), any(), isA(String.class));
+        verify(permissionExecutor, times(1)).handleFilterJoinReject(any(), any(), any());
+        verify(tx, never()).getToManyRelation(any(), any(), any(), any());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/ErrorTestModel.java b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/ErrorTestModel.java
new file mode 100644
index 0000000000..4da3396f9c
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/ErrorTestModel.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.security.ChangeSpec;
+
+import java.util.Optional;
+import javax.persistence.Id;
+
+/**
+ * Tests life cycle hooks which raise errors.
+ */
+@Include(name = "errorTestModel")
+@LifeCycleHookBinding(hook = ErrorTestModel.ErrorHook.class, operation = CREATE, phase = PRECOMMIT)
+public class ErrorTestModel {
+
+    @Id
+    private String id;
+
+    private String field;
+
+    static class ErrorHook implements LifeCycleHook<ErrorTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            ErrorTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            throw new BadRequestException("Invalid");
+        }
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/FieldTestModel.java b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/FieldTestModel.java
new file mode 100644
index 0000000000..76a26bcdcd
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/FieldTestModel.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.DELETE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.security.ChangeSpec;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * Tests the invocation &amp; sequencing of DataStoreTransaction method invocations and life cycle events.
+ * Model used to mock different lifecycle test scenarios.  This model uses fields instead of properties.
+ */
+@Include(name = "testModel")
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreSecurityHook.class, operation = CREATE, phase = PRESECURITY)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreFlushHook.class, operation = CREATE, phase = PREFLUSH)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreCommitHook.class, operation = CREATE, phase = PRECOMMIT)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPostCommitHook.class, operation = CREATE, phase = POSTCOMMIT)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreSecurityHook.class, operation = DELETE, phase = PRESECURITY)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreFlushHook.class, operation = DELETE, phase = PREFLUSH)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreCommitHookEverything.class, operation = CREATE,
+        phase = PRECOMMIT, oncePerRequest = false)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreCommitHook.class, operation = DELETE, phase = PRECOMMIT)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPostCommitHook.class, operation = DELETE, phase = POSTCOMMIT)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreSecurityHook.class, operation = UPDATE, phase = PRESECURITY)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreFlushHook.class, operation = UPDATE, phase = PREFLUSH)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPreCommitHook.class, operation = UPDATE, phase = PRECOMMIT)
+@LifeCycleHookBinding(hook = FieldTestModel.ClassPostCommitHook.class, operation = UPDATE, phase = POSTCOMMIT)
+
+@EqualsAndHashCode
+public class FieldTestModel {
+
+    @Id
+    private String id;
+
+    @Getter
+    @Setter
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreSecurityHook.class, operation = CREATE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreFlushHook.class, operation = CREATE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreCommitHook.class, operation = CREATE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePostCommitHook.class, operation = CREATE, phase = POSTCOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreSecurityHook.class, operation = DELETE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreFlushHook.class, operation = DELETE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreCommitHook.class, operation = DELETE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePostCommitHook.class, operation = DELETE, phase = POSTCOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreSecurityHook.class, operation = UPDATE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreFlushHook.class, operation = UPDATE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePreCommitHook.class, operation = UPDATE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.AttributePostCommitHook.class, operation = UPDATE, phase = POSTCOMMIT)
+    private String field;
+
+    @Getter
+    @Setter
+    @OneToMany
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreSecurityHook.class, operation = CREATE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreFlushHook.class, operation = CREATE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreCommitHook.class, operation = CREATE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPostCommitHook.class, operation = CREATE, phase = POSTCOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreSecurityHook.class, operation = DELETE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreFlushHook.class, operation = DELETE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreCommitHook.class, operation = DELETE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPostCommitHook.class, operation = DELETE, phase = POSTCOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreSecurityHook.class, operation = UPDATE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreFlushHook.class, operation = UPDATE, phase = PREFLUSH)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPreCommitHook.class, operation = UPDATE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = FieldTestModel.RelationPostCommitHook.class, operation = UPDATE, phase = POSTCOMMIT)
+    private Set<FieldTestModel> models = new HashSet<>();
+
+    static class ClassPreSecurityHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.classCallback(operation, PRESECURITY);
+        }
+    }
+
+    static class ClassPreFlushHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.classCallback(operation, PREFLUSH);
+        }
+    }
+
+    static class ClassPreCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.classCallback(operation, PRECOMMIT);
+        }
+    }
+
+    static class ClassPreCommitHookEverything implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.classAllFieldsCallback(operation, PRECOMMIT);
+        }
+    }
+
+    static class ClassPostCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.classCallback(operation, POSTCOMMIT);
+        }
+    }
+
+    static class AttributePreSecurityHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.attributeCallback(operation, PRESECURITY, changes.orElse(null));
+        }
+    }
+
+    static class AttributePreFlushHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.attributeCallback(operation, PREFLUSH, changes.orElse(null));
+        }
+    }
+
+    static class AttributePreCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.attributeCallback(operation, PRECOMMIT, changes.orElse(null));
+        }
+    }
+
+    static class AttributePostCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.attributeCallback(operation, POSTCOMMIT, changes.orElse(null));
+        }
+    }
+
+    static class RelationPreSecurityHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.relationCallback(operation, PRESECURITY, changes.orElse(null));
+        }
+    }
+
+    static class RelationPreFlushHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.relationCallback(operation, PREFLUSH, changes.orElse(null));
+        }
+    }
+
+    static class RelationPreCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.relationCallback(operation, PRECOMMIT, changes.orElse(null));
+        }
+    }
+
+    static class RelationPostCommitHook implements LifeCycleHook<FieldTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            FieldTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.relationCallback(operation, POSTCOMMIT, changes.orElse(null));
+        }
+    }
+
+    public void classCallback(LifeCycleHookBinding.Operation operation,
+                              LifeCycleHookBinding.TransactionPhase phase) {
+        //NOOP - this will be mocked to verify hook invocation.
+    }
+
+    public void attributeCallback(LifeCycleHookBinding.Operation operation,
+                                  LifeCycleHookBinding.TransactionPhase phase,
+                                  ChangeSpec changes) {
+        //NOOP - this will be mocked to verify hook invocation.
+    }
+
+    public void relationCallback(LifeCycleHookBinding.Operation operation,
+                                 LifeCycleHookBinding.TransactionPhase phase,
+                                 ChangeSpec changes) {
+        //NOOP - this will be mocked to verify hook invocation.
+    }
+
+    public void classAllFieldsCallback(LifeCycleHookBinding.Operation operation,
+                                       LifeCycleHookBinding.TransactionPhase phase) {
+        //NOOP - this will be mocked to verify hook invocation.
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LegacyTestModel.java b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LegacyTestModel.java
new file mode 100644
index 0000000000..4e62738696
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LegacyTestModel.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.OnCreatePostCommit;
+import com.yahoo.elide.annotation.OnCreatePreCommit;
+import com.yahoo.elide.annotation.OnCreatePreSecurity;
+import com.yahoo.elide.annotation.OnDeletePostCommit;
+import com.yahoo.elide.annotation.OnDeletePreCommit;
+import com.yahoo.elide.annotation.OnDeletePreSecurity;
+import com.yahoo.elide.annotation.OnUpdatePostCommit;
+import com.yahoo.elide.annotation.OnUpdatePreCommit;
+import com.yahoo.elide.annotation.OnUpdatePreSecurity;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Id;
+
+/**
+ * Model used to mock different lifecycle test scenarios using legacy annotations.
+ */
+@Include(name = "legacyTestModel")
+public class LegacyTestModel {
+
+    @Id
+    private String id;
+
+    @Getter
+    @Setter
+    private String field;
+
+    @Getter
+    @Setter
+    private String field2;
+
+    @OnCreatePostCommit("field")
+    public void fieldCreatePostCommit() {
+    }
+
+    @OnCreatePreCommit("field")
+    public void fieldCreatePreCommit() {
+    }
+
+    @OnCreatePreSecurity("field")
+    public void fieldCreatePreSecurity() {
+    }
+
+    @OnUpdatePostCommit("field")
+    public void fieldUpdatePostCommit() {
+    }
+
+    @OnUpdatePreCommit("field")
+    public void fieldUpdatePreCommit() {
+    }
+
+    @OnUpdatePreSecurity("field")
+    public void fieldUpdatePreSecurity() {
+    }
+
+    @OnDeletePostCommit
+    public void classDeletePostCommit() {
+    }
+
+    @OnDeletePreCommit
+    public void classDeletePreCommit() {
+    }
+
+    @OnDeletePreSecurity
+    public void classDeletePreSecurity() {
+    }
+
+    @OnCreatePostCommit
+    public void classCreatePostCommit() {
+    }
+
+    @OnCreatePreCommit
+    public void classCreatePreCommit() {
+    }
+
+    @OnCreatePreSecurity
+    public void classCreatePreSecurity() {
+    }
+
+    @OnUpdatePostCommit
+    public void classUpdatePostCommit() {
+    }
+
+    @OnUpdatePreCommit
+    public void classUpdatePreCommit() {
+    }
+
+    @OnUpdatePreSecurity
+    public void classUpdatePreSecurity() {
+    }
+
+    @OnCreatePreSecurity("*")
+    public void classCreatePreCommitAllUpdates() {
+    }
+
+    @OnCreatePostCommit("field")
+    @OnCreatePreCommit
+    @OnCreatePreSecurity("field")
+    @OnUpdatePostCommit("field")
+    @OnUpdatePreCommit
+    @OnUpdatePreSecurity("field")
+    public void fieldMultiple() {
+    }
+
+    @OnCreatePostCommit
+    @OnCreatePreCommit("field")
+    @OnCreatePreSecurity
+    @OnUpdatePostCommit
+    @OnUpdatePreCommit("field")
+    @OnUpdatePreSecurity
+    @OnDeletePostCommit
+    @OnDeletePreCommit
+    @OnDeletePreSecurity
+    public void classMultiple() {
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LifeCycleTest.java b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LifeCycleTest.java
new file mode 100644
index 0000000000..6f2a5c7b27
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/LifeCycleTest.java
@@ -0,0 +1,1371 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.DELETE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.common.collect.ImmutableSet;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Tests the invocation & sequencing of DataStoreTransaction method invocations and life cycle events.
+ */
+public class LifeCycleTest {
+
+    private final String baseUrl = "http://localhost:8080/api/v1";
+    private static final AuditLogger MOCK_AUDIT_LOGGER = mock(AuditLogger.class);
+    private EntityDictionary dictionary;
+
+    LifeCycleTest() throws Exception {
+        dictionary = TestDictionary.getTestDictionary();
+        dictionary.bindEntity(FieldTestModel.class);
+        dictionary.bindEntity(PropertyTestModel.class);
+        dictionary.bindEntity(LegacyTestModel.class);
+        dictionary.bindEntity(ErrorTestModel.class);
+    }
+
+    @Test
+    public void testLifecycleError() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        ErrorTestModel mockModel = mock(ErrorTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"errorTestModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(ErrorTestModel.class)), any())).thenReturn(mockModel);
+
+        ElideResponse response = elide.post(baseUrl, "/errorTestModel", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_BAD_REQUEST, response.getResponseCode());
+        assertEquals("{\"errors\":[{\"detail\":\"Invalid\"}]}", response.getBody());
+    }
+
+    @Test
+    public void testElideCreate() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+
+        ElideResponse response = elide.post(baseUrl, "/testModel", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRESECURITY));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PREFLUSH));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(POSTCOMMIT));
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+        verify(mockModel, times(2)).classAllFieldsCallback(any(), any());
+        verify(mockModel, times(2)).classAllFieldsCallback(eq(CREATE), eq(PRECOMMIT));
+
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(POSTCOMMIT), any());
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(POSTCOMMIT), any());
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx, times(1)).createObject(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testLegacyElideCreate() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        LegacyTestModel mockModel = mock(LegacyTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"legacyTestModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(LegacyTestModel.class)), any())).thenReturn(mockModel);
+
+        ElideResponse response = elide.post(baseUrl, "/legacyTestModel", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+
+        verify(mockModel, times(1)).classCreatePreCommitAllUpdates();
+        verify(mockModel, times(1)).classCreatePreSecurity();
+        verify(mockModel, times(1)).classCreatePreCommit();
+        verify(mockModel, times(1)).classCreatePostCommit();
+        verify(mockModel, times(3)).classMultiple();
+        verify(mockModel, never()).classUpdatePreCommit();
+        verify(mockModel, never()).classUpdatePostCommit();
+        verify(mockModel, never()).classUpdatePreSecurity();
+        verify(mockModel, never()).classDeletePreCommit();
+        verify(mockModel, never()).classDeletePostCommit();
+        verify(mockModel, never()).classDeletePreSecurity();
+
+        verify(mockModel, times(1)).fieldCreatePreSecurity();
+        verify(mockModel, times(1)).fieldCreatePreCommit();
+        verify(mockModel, times(1)).fieldCreatePostCommit();
+        verify(mockModel, times(3)).fieldMultiple();
+        verify(mockModel, never()).fieldUpdatePreCommit();
+        verify(mockModel, never()).fieldUpdatePostCommit();
+        verify(mockModel, never()).fieldUpdatePreSecurity();
+
+        verify(tx).preCommit(any());
+        verify(tx, times(1)).createObject(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideCreateFailure() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        doThrow(RuntimeException.class).when(mockModel).setField(anyString());
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+
+        ElideResponse response = elide.post(baseUrl, "/testModel", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getResponseCode());
+        assertEquals(
+                "{\"errors\":[{\"detail\":\"Unexpected exception caught\"}]}",
+                response.getBody());
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(tx, never()).preCommit(any());
+        verify(tx, never()).createObject(eq(mockModel), isA(RequestScope.class));
+        verify(tx, never()).flush(isA(RequestScope.class));
+        verify(tx, never()).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideGet() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        when(store.beginReadTransaction()).thenCallRealMethod();
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        ElideResponse response = elide.get(baseUrl, "/testModel/1", queryParams, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, never()).classCallback(eq(CREATE), any());
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+        verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+        verify(tx).preCommit(any());
+        verify(tx).flush(any());
+        verify(tx).commit(any());
+        verify(tx).close();
+    }
+
+    @Test
+    public void testLegacyElideGet() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        LegacyTestModel mockModel = mock(LegacyTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        when(store.beginReadTransaction()).thenCallRealMethod();
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        ElideResponse response = elide.get(baseUrl, "/legacyTestModel/1", queryParams, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, never()).classMultiple();
+        verify(mockModel, never()).classUpdatePreSecurity();
+        verify(mockModel, never()).classUpdatePreCommit();
+        verify(mockModel, never()).classUpdatePostCommit();
+        verify(mockModel, never()).classCreatePreCommitAllUpdates();
+        verify(mockModel, never()).classCreatePreSecurity();
+        verify(mockModel, never()).classCreatePreCommit();
+        verify(mockModel, never()).classCreatePostCommit();
+        verify(mockModel, never()).classDeletePreSecurity();
+        verify(mockModel, never()).classDeletePreCommit();
+        verify(mockModel, never()).classDeletePostCommit();
+
+        verify(mockModel, never()).fieldMultiple();
+        verify(mockModel, never()).fieldUpdatePreSecurity();
+        verify(mockModel, never()).fieldUpdatePreCommit();
+        verify(mockModel, never()).fieldUpdatePostCommit();
+        verify(mockModel, never()).fieldCreatePreSecurity();
+        verify(mockModel, never()).fieldCreatePreCommit();
+        verify(mockModel, never()).fieldCreatePostCommit();
+
+        verify(tx).preCommit(any());
+        verify(tx).flush(any());
+        verify(tx).commit(any());
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideGetSparse() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        when(store.beginReadTransaction()).thenCallRealMethod();
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.putSingle("fields[testModel]", "field");
+        ElideResponse response = elide.get(baseUrl, "/testModel/1", queryParams, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, never()).classCallback(eq(CREATE), any());
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+        verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx).flush(any());
+        verify(tx).commit(any());
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideGetInvalidKey() throws Exception {
+        DataStore store = mock(DataStore.class);
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.putSingle("fields[testModel]", "field");
+        queryParams.putSingle("?filter", "field"); // Key starts with '?'
+        queryParams.putSingle("Sort", "field"); // Valid Key is sort
+        queryParams.putSingle("INCLUDE", "field"); // Valid Key is include
+        queryParams.putSingle("fields.testModel", "field"); // fields is not followed by [
+        queryParams.putSingle("page.size", "10"); // page is not followed by [
+        ElideResponse response = elide.get(baseUrl, "/testModel/1", queryParams, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_BAD_REQUEST, response.getResponseCode());
+        assertEquals("{\"errors\":[{\"detail\":\"Found undefined keys in request: fields.testModel, ?filter, Sort, page.size, INCLUDE\"}]}",
+                        response.getBody());
+    }
+
+    @Test
+    public void testElideGetRelationship() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        FieldTestModel child = mock(FieldTestModel.class);
+        when(mockModel.getModels()).thenReturn(ImmutableSet.of(child));
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        when(store.beginReadTransaction()).thenCallRealMethod();
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        ElideResponse response = elide.get(baseUrl, "/testModel/1/relationships/models", queryParams, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, never()).classCallback(eq(CREATE), any());
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+        verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx).flush(any());
+        verify(tx).commit(any());
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElidePatch() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        dictionary.setValue(mockModel, "id", "1");
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        String contentType = JSONAPI_CONTENT_TYPE;
+        ElideResponse response = elide.patch(baseUrl, contentType, contentType, "/testModel/1", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_NO_CONTENT, response.getResponseCode());
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, never()).classCallback(eq(CREATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRESECURITY));
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PREFLUSH));
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(POSTCOMMIT));
+
+        verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(POSTCOMMIT), any());
+
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx).save(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElidePatchRelationshipAddMultiple() {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel parent = mock(FieldTestModel.class);
+        FieldTestModel child1 = mock(FieldTestModel.class);
+        FieldTestModel child2 = mock(FieldTestModel.class);
+        FieldTestModel child3 = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"relationships\": { \"models\": { \"data\": [ { \"type\": \"testModel\", \"id\": \"2\" }, {\"type\": \"testModel\", \"id\": \"3\" } ] } } } }";
+
+        dictionary.setValue(parent, "id", "1");
+        dictionary.setValue(child1, "id", "2");
+        dictionary.setValue(child2, "id", "3");
+        dictionary.setValue(child3, "id", "4");
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), eq("1"), isA(RequestScope.class))).thenReturn(parent);
+        when(tx.loadObject(isA(EntityProjection.class), eq("2"), isA(RequestScope.class))).thenReturn(child1);
+        when(tx.loadObject(isA(EntityProjection.class), eq("3"), isA(RequestScope.class))).thenReturn(child2);
+        when(tx.loadObject(isA(EntityProjection.class), eq("4"), isA(RequestScope.class))).thenReturn(child3);
+
+        DataStoreIterable iterable = new DataStoreIterableBuilder(List.of(child3)).build();
+        when(tx.getToManyRelation(any(), any(), isA(Relationship.class), isA(RequestScope.class))).thenReturn(iterable);
+
+        String contentType = JSONAPI_CONTENT_TYPE;
+        ElideResponse response = elide.patch(baseUrl, contentType, contentType, "/testModel/1", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_NO_CONTENT, response.getResponseCode());
+
+        verify(parent, times(1)).relationCallback(eq(UPDATE), eq(POSTCOMMIT), notNull());
+
+        verify(parent, times(4)).classCallback(eq(UPDATE), any());
+        verify(parent, never()).classAllFieldsCallback(any(), any());
+        verify(parent, never()).attributeCallback(any(), any(), any());
+    }
+
+    @Test
+    public void testLegacyElidePatch() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        LegacyTestModel mockModel = mock(LegacyTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "{\"data\": {\"type\":\"legacyTestModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+        dictionary.setValue(mockModel, "id", "1");
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        String contentType = JSONAPI_CONTENT_TYPE;
+        ElideResponse response = elide.patch(baseUrl, contentType, contentType, "/legacyTestModel/1", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_NO_CONTENT, response.getResponseCode());
+
+        verify(mockModel, never()).classCreatePreCommitAllUpdates();
+        verify(mockModel, never()).classCreatePreSecurity();
+        verify(mockModel, never()).classCreatePreCommit();
+        verify(mockModel, never()).classCreatePostCommit();
+        verify(mockModel, never()).classDeletePreSecurity();
+        verify(mockModel, never()).classDeletePreCommit();
+        verify(mockModel, never()).classDeletePostCommit();
+
+        verify(mockModel, times(1)).classUpdatePreSecurity();
+        verify(mockModel, times(1)).classUpdatePreCommit();
+        verify(mockModel, times(1)).classUpdatePostCommit();
+        verify(mockModel, times(3)).classMultiple();
+
+        verify(mockModel, never()).fieldCreatePreSecurity();
+        verify(mockModel, never()).fieldCreatePreCommit();
+        verify(mockModel, never()).fieldCreatePostCommit();
+
+        verify(mockModel, times(1)).fieldUpdatePreSecurity();
+        verify(mockModel, times(1)).fieldUpdatePreCommit();
+        verify(mockModel, times(1)).fieldUpdatePostCommit();
+        verify(mockModel, times(3)).fieldMultiple();
+
+        verify(tx).preCommit(any());
+        verify(tx).save(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElideDelete() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        dictionary.setValue(mockModel, "id", "1");
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        ElideResponse response = elide.delete(baseUrl, "/testModel/1", "", null, NO_VERSION);
+        assertEquals(HttpStatus.SC_NO_CONTENT, response.getResponseCode());
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(CREATE), any());
+
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRESECURITY));
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PREFLUSH));
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(POSTCOMMIT));
+
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx).delete(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testLegacyElideDelete() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        LegacyTestModel mockModel = mock(LegacyTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        dictionary.setValue(mockModel, "id", "1");
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+        ElideResponse response = elide.delete(baseUrl, "/legacyTestModel/1", "", null, NO_VERSION);
+        assertEquals(HttpStatus.SC_NO_CONTENT, response.getResponseCode());
+
+        verify(mockModel, never()).classUpdatePostCommit();
+        verify(mockModel, never()).classUpdatePreSecurity();
+        verify(mockModel, never()).classUpdatePreCommit();
+        verify(mockModel, never()).classCreatePreCommitAllUpdates();
+        verify(mockModel, never()).classCreatePostCommit();
+        verify(mockModel, never()).classCreatePreSecurity();
+        verify(mockModel, never()).classCreatePreCommit();
+
+        verify(mockModel, times(1)).classDeletePreSecurity();
+        verify(mockModel, times(1)).classDeletePreCommit();
+        verify(mockModel, times(1)).classDeletePostCommit();
+        verify(mockModel, times(3)).classMultiple();
+
+        verify(mockModel, never()).fieldUpdatePostCommit();
+        verify(mockModel, never()).fieldUpdatePreSecurity();
+        verify(mockModel, never()).fieldUpdatePreCommit();
+        verify(mockModel, never()).fieldCreatePostCommit();
+        verify(mockModel, never()).fieldCreatePreSecurity();
+        verify(mockModel, never()).fieldCreatePreCommit();
+        verify(mockModel, never()).fieldMultiple();
+
+        verify(tx).preCommit(any());
+        verify(tx).delete(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testElidePatchExtensionCreate() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "[{\"op\": \"add\",\"path\": \"/testModel\",\"value\":{"
+                + "\"type\":\"testModel\",\"id\": \"1\",\"attributes\": {\"field\":\"Foo\"}}}]";
+
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(FieldTestModel.class)), any())).thenReturn(mockModel);
+
+        String contentType = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+        ElideResponse response =
+                elide.patch(baseUrl, contentType, contentType, "/", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRESECURITY));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PREFLUSH));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(POSTCOMMIT));
+        verify(mockModel, never()).classCallback(eq(UPDATE), any());
+        verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+        verify(mockModel, times(2)).classAllFieldsCallback(any(), any());
+        verify(mockModel, times(2)).classAllFieldsCallback(eq(CREATE), eq(PRECOMMIT));
+
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(POSTCOMMIT), any());
+        verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(POSTCOMMIT), any());
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+        verify(tx).preCommit(any());
+        verify(tx, times(1)).createObject(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+    @Test
+    public void testLegacyElidePatchExtensionCreate() throws Exception {
+        DataStore store = mock(DataStore.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        LegacyTestModel mockModel = mock(LegacyTestModel.class);
+
+        Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+        String body = "[{\"op\": \"add\",\"path\": \"/legacyTestModel\",\"value\":{"
+                + "\"type\":\"legacyTestModel\",\"id\": \"1\",\"attributes\": {\"field\":\"Foo\"}}}]";
+
+        when(store.beginTransaction()).thenReturn(tx);
+        when(tx.createNewObject(eq(ClassType.of(LegacyTestModel.class)), any())).thenReturn(mockModel);
+
+        String contentType = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+        ElideResponse response =
+                elide.patch(baseUrl, contentType, contentType, "/", body, null, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        verify(mockModel, times(1)).classCreatePreSecurity();
+        verify(mockModel, times(1)).classCreatePreCommit();
+        verify(mockModel, times(1)).classCreatePreCommitAllUpdates();
+        verify(mockModel, times(1)).classCreatePostCommit();
+        verify(mockModel, times(3)).classMultiple();
+        verify(mockModel, never()).classUpdatePreCommit();
+        verify(mockModel, never()).classUpdatePostCommit();
+        verify(mockModel, never()).classUpdatePreSecurity();
+        verify(mockModel, never()).classDeletePreCommit();
+        verify(mockModel, never()).classDeletePostCommit();
+        verify(mockModel, never()).classDeletePreSecurity();
+
+        verify(mockModel, times(1)).fieldCreatePostCommit();
+        verify(mockModel, times(1)).fieldCreatePreCommit();
+        verify(mockModel, times(1)).fieldCreatePreSecurity();
+        verify(mockModel, times(3)).fieldMultiple();
+        verify(mockModel, never()).fieldUpdatePreCommit();
+        verify(mockModel, never()).fieldUpdatePostCommit();
+        verify(mockModel, never()).fieldUpdatePreSecurity();
+
+        verify(tx).preCommit(any());
+        verify(tx, times(1)).createObject(eq(mockModel), isA(RequestScope.class));
+        verify(tx).flush(isA(RequestScope.class));
+        verify(tx).commit(isA(RequestScope.class));
+        verify(tx).close();
+    }
+
+  @Test
+  public void failElidePatchExtensionCreate() throws Exception {
+      DataStore store = mock(DataStore.class);
+      DataStoreTransaction tx = mock(DataStoreTransaction.class);
+      FieldTestModel mockModel = mock(FieldTestModel.class);
+
+      Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+      String body = "[{\"op\": \"add\",\"path\": \"/testModel\",\"value\":{"
+              + "\"type\":\"testModel\",\"attributes\": {\"field\":\"Foo\"}}}]";
+
+      RequestScope scope = buildRequestScope(dictionary, tx);
+      when(store.beginTransaction()).thenReturn(tx);
+      when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+
+      String contentType = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+      ElideResponse response =
+              elide.patch(baseUrl, contentType, contentType, "/", body, null, NO_VERSION);
+      assertEquals(HttpStatus.SC_BAD_REQUEST, response.getResponseCode());
+      assertEquals(
+              "[{\"errors\":[{\"detail\":\"Bad Request Body&#39;Patch extension requires all objects to have an assigned ID (temporary or permanent) when assigning relationships.&#39;\",\"status\":\"400\"}]}]",
+              response.getBody());
+
+      verify(mockModel, never()).classCallback(eq(CREATE), eq(PRESECURITY));
+      verify(mockModel, never()).classCallback(eq(CREATE), eq(PREFLUSH));
+      verify(mockModel, never()).classCallback(eq(CREATE), eq(PRECOMMIT));
+      verify(mockModel, never()).classCallback(eq(CREATE), eq(POSTCOMMIT));
+      verify(mockModel, never()).classCallback(eq(UPDATE), any());
+      verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+      verify(mockModel, never()).classAllFieldsCallback(any(), any());
+      verify(mockModel, never()).classAllFieldsCallback(eq(CREATE), eq(PRECOMMIT));
+
+      verify(mockModel, never()).attributeCallback(eq(CREATE), eq(PRESECURITY), any());
+      verify(mockModel, never()).attributeCallback(eq(CREATE), eq(PREFLUSH), any());
+      verify(mockModel, never()).attributeCallback(eq(CREATE), eq(PRECOMMIT), any());
+      verify(mockModel, never()).attributeCallback(eq(CREATE), eq(POSTCOMMIT), any());
+      verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+      verify(mockModel, never()).relationCallback(eq(CREATE), eq(PRESECURITY), any());
+      verify(mockModel, never()).relationCallback(eq(CREATE), eq(PREFLUSH), any());
+      verify(mockModel, never()).relationCallback(eq(CREATE), eq(PRECOMMIT), any());
+      verify(mockModel, never()).relationCallback(eq(CREATE), eq(POSTCOMMIT), any());
+      verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+      verify(tx, never()).preCommit(any());
+      verify(tx, never()).createObject(eq(mockModel), isA(RequestScope.class));
+      verify(tx, never()).flush(isA(RequestScope.class));
+      verify(tx, never()).commit(isA(RequestScope.class));
+      verify(tx).close();
+  }
+
+  @Test
+  public void testElidePatchExtensionUpdate() throws Exception {
+      DataStore store = mock(DataStore.class);
+      DataStoreTransaction tx = mock(DataStoreTransaction.class);
+      FieldTestModel mockModel = mock(FieldTestModel.class);
+
+      Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+      String body = "[{\"op\": \"replace\",\"path\": \"/testModel/1\",\"value\":{"
+              + "\"type\":\"testModel\",\"id\": \"1\",\"attributes\": {\"field\":\"Foo\"}}}]";
+
+      dictionary.setValue(mockModel, "id", "1");
+      when(store.beginTransaction()).thenReturn(tx);
+      when(tx.loadObject(any(), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+      String contentType = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+      ElideResponse response =
+              elide.patch(baseUrl, contentType, contentType, "/", body, null, NO_VERSION);
+      assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+      assertEquals("[{\"data\":null}]", response.getBody());
+
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRESECURITY));
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PREFLUSH));
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRECOMMIT));
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(POSTCOMMIT));
+      verify(mockModel, never()).classCallback(eq(CREATE), any());
+      verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+      verify(mockModel, never()).classAllFieldsCallback(any(), any());
+      verify(mockModel, never()).classAllFieldsCallback(eq(CREATE), eq(PRECOMMIT));
+
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRESECURITY), any());
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PREFLUSH), any());
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRECOMMIT), any());
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(POSTCOMMIT), any());
+      verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+      verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+      verify(tx).preCommit(any());
+
+      //Twice because the patch extension request is broken into attributes & relationships separately.
+      verify(tx, times(2)).loadObject(any(), any(), isA(RequestScope.class));
+      verify(tx).flush(isA(RequestScope.class));
+      verify(tx).commit(isA(RequestScope.class));
+      verify(tx).close();
+}
+
+  @Test
+  public void testElidePatchExtensionDelete() throws Exception {
+      DataStore store = mock(DataStore.class);
+      DataStoreTransaction tx = mock(DataStoreTransaction.class);
+      FieldTestModel mockModel = mock(FieldTestModel.class);
+
+      Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+      String body = "[{\"op\": \"remove\",\"path\": \"/testModel\",\"value\":{"
+              + "\"type\":\"testModel\",\"id\": \"1\"}}]";
+
+      dictionary.setValue(mockModel, "id", "1");
+      when(store.beginTransaction()).thenReturn(tx);
+      when(tx.loadObject(any(), any(), isA(RequestScope.class))).thenReturn(mockModel);
+
+      String contentType = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+      ElideResponse response =
+              elide.patch(baseUrl, contentType, contentType, "/", body, null, NO_VERSION);
+      assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+      verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+      verify(mockModel, never()).classCallback(eq(UPDATE), any());
+      verify(mockModel, never()).classCallback(eq(CREATE), any());
+      verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRESECURITY));
+      verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PREFLUSH));
+      verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRECOMMIT));
+      verify(mockModel, times(1)).classCallback(eq(DELETE), eq(POSTCOMMIT));
+
+      verify(mockModel, never()).attributeCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+
+      // TODO - Read should not be called for a delete.
+      verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+      verify(tx).preCommit(any());
+      verify(tx).delete(eq(mockModel), isA(RequestScope.class));
+      verify(tx).flush(isA(RequestScope.class));
+      verify(tx).commit(isA(RequestScope.class));
+      verify(tx).close();
+  }
+
+  public void testElidePatchFailure() throws Exception {
+      DataStore store = mock(DataStore.class);
+      DataStoreTransaction tx = mock(DataStoreTransaction.class);
+      FieldTestModel mockModel = mock(FieldTestModel.class);
+
+      Elide elide = getElide(store, dictionary, MOCK_AUDIT_LOGGER);
+
+      String body = "{\"data\": {\"type\":\"testModel\",\"id\":\"1\",\"attributes\": {\"field\":\"Foo\"}}}";
+
+      dictionary.setValue(mockModel, "id", "1");
+      when(store.beginTransaction()).thenReturn(tx);
+      when(tx.loadObject(isA(EntityProjection.class), any(), isA(RequestScope.class))).thenReturn(mockModel);
+      doThrow(ConstraintViolationException.class).when(tx).flush(any());
+
+      String contentType = JSONAPI_CONTENT_TYPE;
+      ElideResponse response =
+              elide.patch(baseUrl, contentType, contentType, "/testModel/1", body, null, NO_VERSION);
+      assertEquals(HttpStatus.SC_BAD_REQUEST, response.getResponseCode());
+      assertEquals(
+              "{\"errors\":[{\"detail\":\"Constraint violation\"}]}",
+              response.getBody());
+
+      verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+      verify(mockModel, never()).classCallback(eq(CREATE), any());
+      verify(mockModel, never()).classCallback(eq(DELETE), any());
+
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRESECURITY));
+      verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PREFLUSH));
+      verify(mockModel, never()).classCallback(eq(UPDATE), eq(PRECOMMIT));
+      verify(mockModel, never()).classCallback(eq(UPDATE), eq(POSTCOMMIT));
+
+      verify(mockModel, never()).attributeCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).attributeCallback(eq(DELETE), any(), any());
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRESECURITY), any());
+      verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PREFLUSH), any());
+      verify(mockModel, never()).attributeCallback(eq(UPDATE), eq(PRECOMMIT), any());
+      verify(mockModel, never()).attributeCallback(eq(UPDATE), eq(POSTCOMMIT), any());
+
+      verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+      verify(mockModel, never()).relationCallback(eq(DELETE), any(), any());
+
+      verify(tx).preCommit(any());
+      verify(tx).save(eq(mockModel), isA(RequestScope.class));
+      verify(tx).flush(isA(RequestScope.class));
+      verify(tx, never()).commit(isA(RequestScope.class));
+      verify(tx).close();
+  }
+
+    @Test
+    public void testCreate() {
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+        PersistentResource resource = PersistentResource.createObject(ClassType.of(FieldTestModel.class), scope, Optional.of("1"));
+        resource.updateAttribute("field", "should not affect calls since this is create!");
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        scope.runQueuedPreSecurityTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRESECURITY));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRESECURITY), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreFlushTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PREFLUSH));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PREFLUSH), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreCommitTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(PRECOMMIT), any());
+        verify(mockModel, times(2)).classAllFieldsCallback(any(), any());
+        verify(mockModel, times(2)).classAllFieldsCallback(eq(CREATE), eq(PRECOMMIT));
+
+        clearInvocations(mockModel);
+        scope.getPermissionExecutor().executeCommitChecks();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(CREATE), eq(POSTCOMMIT));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(CREATE), eq(POSTCOMMIT), any());
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(POSTCOMMIT), any());
+    }
+
+    @Test
+    public void testRead() {
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+        PersistentResource resource = new PersistentResource(mockModel, "1", scope);
+
+        resource.getAttribute(Attribute.builder().type(String.class).name("field").build());
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreSecurityTriggers();
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreFlushTriggers();
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreCommitTriggers();
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+    }
+
+    @Test
+    public void testDelete() {
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+        PersistentResource resource = new PersistentResource(mockModel, "1", scope);
+
+        resource.deleteResource();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRESECURITY));
+
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreSecurityTriggers();
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).classCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreFlushTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PREFLUSH));
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreCommitTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(PRECOMMIT));
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.getPermissionExecutor().executeCommitChecks();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(DELETE), eq(POSTCOMMIT));
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+    }
+
+    @Test
+    public void testAttributeUpdate() {
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+
+        PersistentResource resource = new PersistentResource(mockModel, scope.getUUIDFor(mockModel), scope);
+        resource.updateAttribute("field", "new value");
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRESECURITY));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRESECURITY), notNull());
+
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreSecurityTriggers();
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreFlushTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PREFLUSH));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PREFLUSH), notNull());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(PRECOMMIT), notNull());
+
+        clearInvocations(mockModel);
+        scope.getPermissionExecutor().executeCommitChecks();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(POSTCOMMIT));
+        verify(mockModel, times(1)).attributeCallback(any(), any(), any());
+        verify(mockModel, times(1)).attributeCallback(eq(UPDATE), eq(POSTCOMMIT), notNull());
+    }
+
+    @Test
+    public void testRelationshipUpdate() {
+        FieldTestModel mockModel = mock(FieldTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(FieldTestModel.class), scope)).thenReturn(mockModel);
+
+        FieldTestModel modelToAdd = mock(FieldTestModel.class);
+
+        PersistentResource resource = new PersistentResource(mockModel, scope.getUUIDFor(mockModel), scope);
+        PersistentResource resourceToAdd = new PersistentResource(modelToAdd, scope.getUUIDFor(mockModel), scope);
+
+        resource.addRelation("models", resourceToAdd);
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRESECURITY));
+
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(PRESECURITY), notNull());
+
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreSecurityTriggers();
+
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+        verify(mockModel, never()).relationCallback(any(), any(), any());
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreFlushTriggers();
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PREFLUSH));
+
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(PREFLUSH), notNull());
+
+        clearInvocations(mockModel);
+        scope.runQueuedPreCommitTriggers();
+
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(PRECOMMIT));
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(PRECOMMIT), notNull());
+
+        clearInvocations(mockModel);
+        scope.getPermissionExecutor().executeCommitChecks();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).attributeCallback(any(), any(), any());
+        verify(mockModel, never()).classAllFieldsCallback(any(), any());
+
+        verify(mockModel, times(1)).classCallback(any(), any());
+        verify(mockModel, times(1)).classCallback(eq(UPDATE), eq(POSTCOMMIT));
+        verify(mockModel, times(1)).relationCallback(any(), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(POSTCOMMIT), notNull());
+    }
+
+    @Test
+    public void testAddToCollectionTrigger() {
+        PropertyTestModel mockModel = mock(PropertyTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(PropertyTestModel.class), scope)).thenReturn(mockModel);
+
+        PropertyTestModel modelToAdd1 = mock(PropertyTestModel.class);
+        PropertyTestModel modelToAdd2 = mock(PropertyTestModel.class);
+
+        //First we test adding to a newly created object.
+        PersistentResource resource = PersistentResource.createObject(ClassType.of(PropertyTestModel.class), scope, Optional.of("1"));
+        PersistentResource resourceToAdd1 = new PersistentResource(modelToAdd1, scope.getUUIDFor(mockModel), scope);
+        PersistentResource resourceToAdd2 = new PersistentResource(modelToAdd2, scope.getUUIDFor(mockModel), scope);
+
+        resource.updateRelation("models", new HashSet<>(Arrays.asList(resourceToAdd1, resourceToAdd2)));
+
+        scope.runQueuedPreSecurityTriggers();
+        scope.runQueuedPreCommitTriggers();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(CREATE), eq(POSTCOMMIT), notNull());
+
+        //Build another resource, scope & reset the mock to do a pure update (no create):
+        scope = buildRequestScope(dictionary, tx);
+        resource = new PersistentResource(mockModel, scope.getUUIDFor(mockModel), scope);
+        reset(mockModel);
+
+        resource.updateRelation("models", new HashSet<>(Arrays.asList(resourceToAdd1, resourceToAdd2)));
+
+        scope.runQueuedPreSecurityTriggers();
+        scope.runQueuedPreCommitTriggers();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(POSTCOMMIT), notNull());
+    }
+
+    @Test
+    public void testRemoveFromCollectionTrigger() {
+        PropertyTestModel mockModel = mock(PropertyTestModel.class);
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        when(tx.createNewObject(ClassType.of(PropertyTestModel.class), scope)).thenReturn(mockModel);
+
+        PropertyTestModel childModel1 = mock(PropertyTestModel.class);
+        PropertyTestModel childModel2 = mock(PropertyTestModel.class);
+        PropertyTestModel childModel3 = mock(PropertyTestModel.class);
+        when(childModel1.getId()).thenReturn("2");
+        when(childModel2.getId()).thenReturn("3");
+        when(childModel3.getId()).thenReturn("4");
+
+        //First we test removing from a newly created object.
+        PersistentResource resource = PersistentResource.createObject(ClassType.of(PropertyTestModel.class), scope, Optional.of("1"));
+        PersistentResource childResource1 = new PersistentResource(childModel1, "2", scope);
+        PersistentResource childResource2 = new PersistentResource(childModel2, "3", scope);
+        PersistentResource childResource3 = new PersistentResource(childModel3, "3", scope);
+
+        resource.updateRelation("models", new HashSet<>(Arrays.asList(childResource1, childResource2)));
+
+        scope.runQueuedPreSecurityTriggers();
+        scope.runQueuedPreCommitTriggers();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(eq(UPDATE), any(), any());
+
+        ArgumentCaptor<ChangeSpec> changes = ArgumentCaptor.forClass(ChangeSpec.class);
+        verify(mockModel, times(1)).relationCallback(eq(CREATE),
+                eq(POSTCOMMIT), changes.capture());
+
+        changes.getValue().getModified().equals(List.of(childModel1, childModel2));
+        changes.getValue().getOriginal().equals(List.of());
+
+        //Build another resource, scope & reset the mock to do a pure update (no create):
+        scope = buildRequestScope(dictionary, tx);
+        resource = new PersistentResource(mockModel, scope.getUUIDFor(mockModel), scope);
+        reset(mockModel);
+        Relationship relationship = Relationship.builder()
+                .projection(EntityProjection.builder()
+                    .type(PropertyTestModel.class)
+                    .build())
+                .name("models")
+                .build();
+
+        when(tx.getToManyRelation(tx, mockModel, relationship, scope))
+                .thenReturn(new DataStoreIterableBuilder<Object>(Arrays.asList(childModel1, childModel2)).build());
+
+        when(mockModel.getModels()).thenReturn(new HashSet<>(Arrays.asList(childModel1, childModel2)));
+        resource.updateRelation("models", new HashSet<>(Arrays.asList(childResource1, childResource3)));
+
+        scope.runQueuedPreSecurityTriggers();
+        scope.runQueuedPreCommitTriggers();
+        scope.runQueuedPostCommitTriggers();
+
+        verify(mockModel, never()).relationCallback(eq(CREATE), any(), any());
+
+        changes = ArgumentCaptor.forClass(ChangeSpec.class);
+        verify(mockModel, times(1)).relationCallback(eq(UPDATE), eq(POSTCOMMIT), changes.capture());
+        changes.getValue().getModified().equals(List.of(childModel1, childModel3));
+        changes.getValue().getOriginal().equals(List.of(childModel1, childModel2));
+    }
+
+    @Test
+    public void testPreCommitLifecycleHookException() {
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel testModel = mock(FieldTestModel.class);
+
+        doThrow(IllegalStateException.class)
+                .when(testModel)
+                .attributeCallback(eq(UPDATE), eq(PRECOMMIT), any(ChangeSpec.class));
+
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        PersistentResource resource = new PersistentResource(testModel, "1", scope);
+        resource.updateAttribute("field", "New value");
+        scope.runQueuedPreSecurityTriggers();
+        assertThrows(IllegalStateException.class, () -> scope.runQueuedPreCommitTriggers());
+    }
+
+    @Test
+    public void testPostCommitLifecycleHookException() {
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel testModel = mock(FieldTestModel.class);
+
+        doThrow(IllegalStateException.class)
+                .when(testModel)
+                .attributeCallback(eq(UPDATE), eq(POSTCOMMIT), any(ChangeSpec.class));
+
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        PersistentResource resource = new PersistentResource(testModel, "1", scope);
+        resource.updateAttribute("field", "New value");
+        scope.runQueuedPreSecurityTriggers();
+        scope.runQueuedPreCommitTriggers();
+        assertThrows(IllegalStateException.class, () -> scope.runQueuedPostCommitTriggers());
+    }
+
+    @Test
+    public void testPreSecurityLifecycleHookException() {
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel testModel = mock(FieldTestModel.class);
+
+        doThrow(IllegalStateException.class)
+                .when(testModel)
+                .attributeCallback(eq(UPDATE), eq(PRESECURITY), any(ChangeSpec.class));
+
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        PersistentResource resource = new PersistentResource(testModel, "1", scope);
+
+        assertThrows(IllegalStateException.class, () -> resource.updateAttribute("field", "New value"));
+    }
+
+    @Test
+    public void testPreFlushLifecycleHookException() {
+        DataStoreTransaction tx = mock(DataStoreTransaction.class);
+        FieldTestModel testModel = mock(FieldTestModel.class);
+
+        doThrow(IllegalStateException.class)
+                .when(testModel)
+                .attributeCallback(eq(UPDATE), eq(PREFLUSH), any(ChangeSpec.class));
+
+        RequestScope scope = buildRequestScope(dictionary, tx);
+        PersistentResource resource = new PersistentResource(testModel, "1", scope);
+
+        resource.updateAttribute("field", "New value");
+        scope.runQueuedPreSecurityTriggers();
+        assertThrows(IllegalStateException.class, () -> scope.runQueuedPreFlushTriggers());
+    }
+
+    private Elide getElide(DataStore dataStore, EntityDictionary dictionary, AuditLogger auditLogger) {
+        ElideSettings settings = getElideSettings(dataStore, dictionary, auditLogger);
+        return new Elide(settings, new TransactionRegistry(), settings.getDictionary().getScanner(), false);
+    }
+
+    private ElideSettings getElideSettings(DataStore dataStore, EntityDictionary dictionary, AuditLogger auditLogger) {
+        return new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withAuditLogger(auditLogger)
+                .withVerboseErrors()
+                .build();
+    }
+
+    private RequestScope buildRequestScope(EntityDictionary dict, DataStoreTransaction tx) {
+        User user = new TestUser("1");
+
+        return new RequestScope(null, null, NO_VERSION, null, tx, user, null, null, UUID.randomUUID(),
+                getElideSettings(null, dict, MOCK_AUDIT_LOGGER));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/PropertyTestModel.java b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/PropertyTestModel.java
new file mode 100644
index 0000000000..22c6f87855
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/lifecycle/PropertyTestModel.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.lifecycle;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.security.ChangeSpec;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+/**
+ * Model used to mock different lifecycle test scenarios.  This model uses properties instead of fields.
+ */
+@Include
+public class PropertyTestModel {
+    private String id;
+
+    private Set<PropertyTestModel> models = new HashSet<>();
+
+    static class RelationPostCommitHook implements LifeCycleHook<PropertyTestModel> {
+        @Override
+        public void execute(LifeCycleHookBinding.Operation operation,
+                            LifeCycleHookBinding.TransactionPhase phase,
+                            PropertyTestModel elideEntity,
+                            com.yahoo.elide.core.security.RequestScope requestScope,
+                            Optional<ChangeSpec> changes) {
+            elideEntity.relationCallback(operation, POSTCOMMIT, changes.orElse(null));
+        }
+    }
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @ManyToMany
+    @LifeCycleHookBinding(hook = PropertyTestModel.RelationPostCommitHook.class,
+            operation = CREATE, phase = POSTCOMMIT)
+    @LifeCycleHookBinding(hook = PropertyTestModel.RelationPostCommitHook.class,
+            operation = UPDATE, phase = POSTCOMMIT)
+    public Set<PropertyTestModel> getModels() {
+        return models;
+    }
+
+    public void setModels(Set<PropertyTestModel> models) {
+        this.models = models;
+    }
+
+    public void relationCallback(LifeCycleHookBinding.Operation operation,
+                                 LifeCycleHookBinding.TransactionPhase phase,
+                                 ChangeSpec changes) {
+        //NOOP - this will be mocked to verify hook invocation.
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/pagination/PaginationImplTest.java b/elide-core/src/test/java/com/yahoo/elide/core/pagination/PaginationImplTest.java
new file mode 100644
index 0000000000..dd71da35d1
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/pagination/PaginationImplTest.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.pagination;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.Paginate;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.type.ClassType;
+import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
+import org.junit.jupiter.api.Test;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Tests parsing the page params for json-api pagination.
+ */
+public class PaginationImplTest {
+    private final ElideSettings elideSettings =
+            new ElideSettingsBuilder(null)
+                    .withEntityDictionary(EntityDictionary.builder().build())
+                    .build();
+
+    @Test
+    public void shouldParseQueryParamsForCurrentPageAndPageSize() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "10");
+        queryParams.add("page[number]", "2");
+
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        // page based strategy uses human readable paging - non-zero index
+        // page 2 becomes (1)*10 so 10 since we shift to zero based index
+        assertEquals(10, pageData.getOffset());
+        assertEquals(10, pageData.getLimit());
+    }
+
+    @Test
+    public void shouldThrowExceptionForNegativePageNumber() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "10");
+        queryParams.add("page[number]", "-2");
+
+        assertThrows(InvalidValueException.class, () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings));
+    }
+
+    @Test
+    public void shouldThrowExceptionForNegativePageSize() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "-10");
+        queryParams.add("page[number]", "2");
+
+        assertThrows(InvalidValueException.class, () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings));
+    }
+
+    @Test
+    public void shouldParseQueryParamsForOffsetAndLimit() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[limit]", "10");
+        queryParams.add("page[offset]", "2");
+
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        // offset is direct correlation to start field in query
+        assertEquals(2, pageData.getOffset());
+        assertEquals(10, pageData.getLimit());
+    }
+
+    @Test
+    public void shouldUseDefaultsWhenMissingCurrentPageAndPageSize() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        assertEquals(PaginationImpl.DEFAULT_OFFSET, pageData.getOffset());
+        assertEquals(PaginationImpl.DEFAULT_PAGE_LIMIT, pageData.getLimit());
+    }
+
+    @Test
+    public void checkValidOffsetAndFirstRequest() {
+        PaginationImpl pageData = new PaginationImpl(PaginationImplTest.class,
+                1,
+                10,
+                elideSettings.getDefaultPageSize(),
+                elideSettings.getDefaultMaxPageSize(),
+                false,
+                false);
+
+        assertEquals(1, pageData.getOffset());
+        assertEquals(10, pageData.getLimit());
+    }
+
+    @Test
+    public void checkErroneousPageLimit() {
+        assertThrows(
+                InvalidValueException.class,
+                () -> new PaginationImpl(PaginationImplTest.class,
+                10,
+                100000,
+                elideSettings.getDefaultPageSize(),
+                elideSettings.getDefaultMaxPageSize(),
+                false,
+                false));
+    }
+
+    @Test
+    public void checkBadOffset() {
+        assertThrows(
+                InvalidValueException.class,
+                () -> new PaginationImpl(PaginationImplTest.class,
+                        -1,
+                        1000,
+                        elideSettings.getDefaultPageSize(),
+                        elideSettings.getDefaultMaxPageSize(),
+                        false,
+                        false));
+    }
+
+    @Test
+    public void checkBadLimit() {
+        assertThrows(
+                InvalidValueException.class,
+                () -> new PaginationImpl(PaginationImplTest.class,
+                        0,
+                        -1,
+                        elideSettings.getDefaultPageSize(),
+                        elideSettings.getDefaultMaxPageSize(),
+                        false,
+                        false));
+    }
+
+    @Test
+    public void neverExceedMaxPageSize() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "25000");
+        assertThrows(InvalidValueException.class,
+                () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                        queryParams, elideSettings));
+    }
+
+    @Test
+    public void invalidUsageOfPaginationParameters() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "10");
+        queryParams.add("page[offset]", "100");
+        assertThrows(InvalidValueException.class,
+                () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                        queryParams, elideSettings));
+    }
+
+    @Test
+    public void pageBasedPaginationWithDefaultSize() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[number]", "2");
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImpl.class),
+                queryParams, elideSettings);
+        assertEquals(PaginationImpl.DEFAULT_PAGE_LIMIT, pageData.getLimit());
+        assertEquals(PaginationImpl.DEFAULT_PAGE_LIMIT, pageData.getOffset());
+    }
+
+    @Test
+    public void shouldThrowExceptionForNonIntPageParamValues() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[size]", "2.5");
+        assertThrows(InvalidValueException.class,
+                () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                        queryParams, elideSettings));
+    }
+
+    @Test
+    public void shouldThrowExceptionForInvalidPageParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[random]", "1");
+        assertThrows(InvalidValueException.class,
+        () -> PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings));
+    }
+
+    @Test
+    public void shouldSetGenerateTotals() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        queryParams.add("page[totals]", null);
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        assertTrue(pageData.returnPageTotals());
+    }
+
+    @Test
+    public void shouldNotSetGenerateTotals() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        assertFalse(pageData.returnPageTotals());
+    }
+
+
+    @Test
+    public void shouldUseDefaultsWhenNoParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, elideSettings);
+        assertEquals(0, pageData.getOffset());
+        assertEquals(PaginationImpl.DEFAULT_PAGE_LIMIT, pageData.getLimit());
+
+        pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationImplTest.class),
+                queryParams, new ElideSettingsBuilder(null)
+                    .withEntityDictionary(EntityDictionary.builder().build())
+                    .withDefaultPageSize(10)
+                    .withDefaultMaxPageSize(10)
+                    .build());
+        assertEquals(0, pageData.getOffset());
+        assertEquals(10, pageData.getLimit());
+    }
+
+    @Test
+    public void testClassLevelOverride() {
+        @Paginate(maxLimit = 100000, defaultLimit = 10)
+        class PaginationOverrideTest { }
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedStringMap();
+        PaginationImpl pageData = PaginationImpl.parseQueryParams(ClassType.of(PaginationOverrideTest.class),
+                queryParams,
+                new ElideSettingsBuilder(null)
+                    .withEntityDictionary(EntityDictionary.builder().build())
+                    .withDefaultPageSize(1)
+                    .withDefaultMaxPageSize(1)
+                    .build());
+
+        assertEquals(0, pageData.getOffset());
+        assertEquals(10, pageData.getLimit());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/AggregationStorePermissionExecutorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/security/AggregationStorePermissionExecutorTest.java
new file mode 100644
index 0000000000..5610ea0cd1
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/AggregationStorePermissionExecutorTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.executors.AggregationStorePermissionExecutor;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import lombok.Value;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import javax.persistence.Entity;
+
+/**
+ * test Aggregation Store Permission Executor
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AggregationStorePermissionExecutorTest {
+    private EntityDictionary dictionary;
+    private ElideSettings elideSettings;
+
+
+    public static class FilterCheck extends FilterExpressionCheck<Object> {
+
+        @Override
+        public FilterExpression getFilterExpression(Type<?> entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+            Path path = super.getFieldPath(entityClass, requestScope, "getFilterDim", "filterDim");
+            return new NotNullPredicate(path);
+        }
+    }
+
+    @BeforeAll
+    public void setup() {
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+        checks.put("user all", Role.ALL.class);
+        checks.put("user none", Role.NONE.class);
+        checks.put("filter check", FilterCheck.class);
+        dictionary = TestDictionary.getTestDictionary(checks);
+        elideSettings = new ElideSettingsBuilder(null)
+                .withEntityDictionary(dictionary)
+                .build();
+    }
+
+    @Test
+    public void testUserPermissions() {
+        @Entity
+        @Include
+        @Value
+        @ReadPermission(expression = "user none or filter check")
+        class Model {
+            String filterDim;
+            long metric;
+            long metric2;
+
+            @ReadPermission(expression = "user all")
+            public String getFilterDim() {
+                return filterDim;
+            }
+
+            @ReadPermission(expression = "user none")
+            public long getMetric() {
+                return metric;
+            }
+        }
+
+        com.yahoo.elide.core.RequestScope scope = bindAndgetRequestScope(Model.class);
+        PermissionExecutor executor = scope.getPermissionExecutor();
+
+        // evaluated expression = user all
+        Assertions.assertEquals(
+                ExpressionResult.PASS,
+                executor.checkUserPermissions(ClassType.of(Model.class), ReadPermission.class, "filterDim"));
+
+
+        // evaluated expression = user none -> ForbiddenAccess
+        Assertions.assertThrows(
+                ForbiddenAccessException.class,
+                () -> executor.checkUserPermissions(ClassType.of(Model.class), ReadPermission.class, "metric"));
+
+
+        // evaluated expression = null -> false
+        Assertions.assertEquals(
+                ExpressionResult.PASS,
+                executor.checkSpecificFieldPermissions(
+                        new PersistentResource(new Model("dim1", 0, 1), "1", scope),
+                        null, ReadPermission.class, "metric2"));
+
+
+        // evaluated expression = (user none or filter check) AND (user all OR user none)
+        Assertions.assertEquals(
+                ExpressionResult.DEFERRED,
+                executor.checkUserPermissions(ClassType.of(Model.class), ReadPermission.class, new HashSet<>(Arrays.asList("filterDim", "metric"))));
+
+        // evaluated expression = (user all OR user none)
+        Assertions.assertEquals(
+                ExpressionResult.PASS,
+                executor.checkPermission(ReadPermission.class,
+                        new PersistentResource(new Model("dim1", 0, 1), "1", scope),
+                        new HashSet<>(Arrays.asList("filterDim", "metric"))));
+
+        // evaluated expression = (user none OR null)
+        Assertions.assertEquals(
+                ExpressionResult.PASS,
+                executor.checkPermission(ReadPermission.class,
+                        new PersistentResource(new Model("dim1", 0, 1), "1", scope),
+                        new HashSet<>(Arrays.asList("metric", "metric2"))));
+
+
+    }
+
+    @Test
+    public void filterTest() {
+        @Entity
+        @Include
+        @Value
+        @ReadPermission(expression = "user none or filter check")
+        class Model1 {
+            String filterDim;
+            long metric;
+        }
+
+        com.yahoo.elide.core.RequestScope scope = bindAndgetRequestScope(Model1.class);
+        PermissionExecutor executor = scope.getPermissionExecutor();
+
+        FilterExpression expression = executor.getReadPermissionFilter(ClassType.of(Model1.class),
+                new HashSet<>(Arrays.asList("filterDim", "metric")))
+                .orElse(null);
+        Assertions.assertNotNull(expression);
+        Assertions.assertEquals("model1.filterDim NOTNULL []", expression.toString());
+
+
+        @Entity
+        @Include
+        @Value
+        @ReadPermission(expression = "user none and filter check")
+        class Model2 {
+            String filterDim;
+            long metric;
+        }
+
+        scope = bindAndgetRequestScope(Model2.class);
+        executor = scope.getPermissionExecutor();
+
+        expression = executor.getReadPermissionFilter(ClassType.of(Model2.class), new HashSet<>(Arrays.asList("filterDim", "metric"))).orElse(null);
+        Assertions.assertNull(expression);
+
+        @Entity
+        @Include
+        @Value
+        @ReadPermission(expression = "user all or filter check")
+        class Model3 {
+            String filterDim;
+            long metric;
+        }
+
+        scope = bindAndgetRequestScope(Model3.class);
+        executor = scope.getPermissionExecutor();
+
+        expression = executor.getReadPermissionFilter(ClassType.of(Model3.class), new HashSet<>(Arrays.asList("filterDim", "metric"))).orElse(null);
+        Assertions.assertNull(expression);
+    }
+
+    private com.yahoo.elide.core.RequestScope bindAndgetRequestScope(Class clz) {
+        dictionary.bindEntity(clz);
+        dictionary.bindPermissionExecutor(clz, AggregationStorePermissionExecutor::new);
+        return new com.yahoo.elide.core.RequestScope(null, null, NO_VERSION, null, null, null, null, null, UUID.randomUUID(), elideSettings);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionAnnotationTest.java b/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionAnnotationTest.java
new file mode 100644
index 0000000000..79b62076b1
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionAnnotationTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.security.executors.ActivePermissionExecutor;
+import example.FunWithPermissions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+/**
+ * Tests audit functions inside RecordDao.
+ */
+public class PermissionAnnotationTest {
+    private static final User GOOD_USER = new TestUser("3");
+    private static final User BAD_USER = new TestUser("-1");
+
+    private static com.yahoo.elide.core.PersistentResource<FunWithPermissions> funRecord;
+    private static com.yahoo.elide.core.PersistentResource<FunWithPermissions> badRecord;
+
+    private static EntityDictionary dictionary = TestDictionary.getTestDictionary();
+
+    public PermissionAnnotationTest() { }
+
+    @BeforeAll
+    public static void setup() {
+        dictionary.bindEntity(FunWithPermissions.class);
+
+        FunWithPermissions fun = new FunWithPermissions();
+        fun.setId(1);
+
+        AuditLogger testLogger = new TestAuditLogger();
+
+        ElideSettings elideSettings = new ElideSettingsBuilder(null)
+                .withDefaultPageSize(10)
+                .withDefaultMaxPageSize(10)
+                .withAuditLogger(testLogger)
+                .withEntityDictionary(dictionary)
+                .build();
+
+        RequestScope goodScope = new RequestScope(null, null, NO_VERSION, null, null, GOOD_USER, null, null, UUID.randomUUID(), elideSettings);
+        funRecord = new PersistentResource<>(fun, goodScope.getUUIDFor(fun), goodScope);
+        RequestScope badScope = new RequestScope(null, null, NO_VERSION, null, null, BAD_USER, null, null, UUID.randomUUID(), elideSettings);
+        badRecord = new PersistentResource<>(fun, badScope.getUUIDFor(fun), badScope);
+    }
+
+    @Test
+    public void testClassAnyOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(funRecord.getRequestScope());
+        permissionExecutor.checkPermission(ReadPermission.class, funRecord);
+        permissionExecutor.checkPermission(UpdatePermission.class, funRecord);
+        permissionExecutor.checkPermission(CreatePermission.class, funRecord);
+    }
+
+    @Test
+    public void testClassAllNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkPermission(DeletePermission.class, funRecord));
+    }
+
+    @Test
+    public void testFieldPermissionOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(funRecord.getRequestScope());
+        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "field3");
+        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "relation1");
+        permissionExecutor.checkSpecificFieldPermissions(funRecord, null, ReadPermission.class, "relation2");
+    }
+
+    @Test
+    public void testField3PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "field3"));
+    }
+
+    @Test
+    public void testRelation1PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "relation1"));
+    }
+
+    @Test
+    public void testRelation2PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "relation2"));
+    }
+
+    /**
+     * Verifies ANY where the first fails but the last succeeds.
+     */
+    @Test()
+    public void testField5PermissionOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        permissionExecutor.checkSpecificFieldPermissions(badRecord, null, ReadPermission.class, "field5");
+    }
+
+    /**
+     * Verifies ALL where the first fails.
+     */
+    @Test
+    public void testField6PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "field6"));
+    }
+
+    /**
+     * Verifies ALL where the last fails.
+     */
+    @Test
+    public void testField7PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "field7"));
+    }
+
+    /**
+     * Verifies ANY where all fail.
+     */
+    @Test
+    public void testField8PermissionNotOk() {
+        final PermissionExecutor permissionExecutor = new ActivePermissionExecutor(badRecord.getRequestScope());
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> permissionExecutor.checkSpecificFieldPermissions(
+                        badRecord, null, ReadPermission.class, "field8"));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionExecutorTest.java b/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionExecutorTest.java
new file mode 100644
index 0000000000..1d46cac559
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/PermissionExecutorTest.java
@@ -0,0 +1,675 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import static com.yahoo.elide.core.PersistentResource.ALL_FIELDS;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.type.ClassType;
+import example.TestCheckMappings;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+public class PermissionExecutorTest {
+
+    interface SampleOperationModel {
+        default boolean test() {
+            return true;
+        }
+    }
+
+    @Test
+    public void testSuccessfulOperationCheck() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleOperation")
+        class Model implements SampleOperationModel {
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testFailOperationCheckAll() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleOperation AND Prefab.Role.None")
+        class Model implements SampleOperationModel { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+    }
+
+    @Test
+    public void testFailOperationCheckDeferred() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleOperation")
+        class Model implements SampleOperationModel {
+
+            @Override
+            public boolean test() {
+                return false;
+            }
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+
+        // Because the object is newly created, the check is DEFERRED.
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testSuccessfulCommitChecks() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleOperation")
+        class Model implements SampleOperationModel { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+
+        // Because the object is newly created, the check is DEFERRED.
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testSuccessfulRunAtCommitCheck() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleCommit")
+        class Model implements SampleOperationModel { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+
+        // Because the check is runAtCommit, the check is DEFERRED.
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testFailRunAtCommitCheck() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "sampleCommit")
+        class Model implements SampleOperationModel {
+            @Override
+            public boolean test() {
+                return false;
+            }
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+
+        // Because the check is runAtCommit, the check is DEFERRED.
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testReadFieldAwareSuccessAllAnyField() {
+        SampleBean sampleBean = new SampleBean();
+        sampleBean.id = 1L;
+        PersistentResource resource = newResource(sampleBean, SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS,
+                requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, ALL_FIELDS));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareSuccessFailureAnyField() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareSuccessAll() {
+        SampleBean sampleBean = new SampleBean();
+        sampleBean.id = 1L;
+        PersistentResource resource = newResource(sampleBean, SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), ReadPermission.class, "allVisible"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareFailureAllSpecificField() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkSpecificFieldPermissions(
+                        resource, null, ReadPermission.class, "allVisible"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareFailureAllNoOverride() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkSpecificFieldPermissions(
+                        resource, null, ReadPermission.class, "defaultHidden"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareFailureAll() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkSpecificFieldPermissions(
+                        resource, null, ReadPermission.class, "cannotSeeMe"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareSuccessAny() {
+        SampleBean sampleBean = new SampleBean();
+        sampleBean.id = 1L;
+        PersistentResource resource = newResource(sampleBean, SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), ReadPermission.class, "mayFailInCommit"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFieldAwareFailureAny() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkSpecificFieldPermissions(
+                        resource, null, ReadPermission.class, "mayFailInCommit"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testUpdateFieldAwareSuccessAll() {
+        SampleBean sampleBean = new SampleBean();
+        sampleBean.id = 1L;
+        PersistentResource resource = newResource(sampleBean, SampleBean.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "allVisible"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testUpdateFieldAwareFailureAll() {
+        PersistentResource resource = newResource(SampleBean.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "allVisible");
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testUpdateFieldAwareSuccessAny() {
+        SampleBean sampleBean = new SampleBean();
+        sampleBean.id = 1L;
+        PersistentResource resource = newResource(sampleBean, SampleBean.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "mayFailInCommit"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testUpdateFieldAwareFailureAny() {
+        PersistentResource resource = newResource(SampleBean.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "mayFailInCommit");
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testReadFieldAwareEntireOpenBean() {
+        OpenBean openBean = new OpenBean();
+        openBean.id = 1L;
+        PersistentResource resource = newResource(openBean, OpenBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource));
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "open"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testReadFailureFieldAwareOpenBean() {
+        PersistentResource resource = newResource(OpenBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkSpecificFieldPermissions(
+                        resource, null, ReadPermission.class, "openAll"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testPassAnyFieldAwareFailOperationSuccessCommit() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "Prefab.Role.None AND passingOp")
+        class Model {
+            @Id
+            public Long id;
+
+            @UpdatePermission(expression = "Prefab.Role.None OR passingOp")
+            public String field = "some data";
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testFailAllFieldAwareSuccessOperationFailCommit() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "Prefab.Role.None")
+        class Model {
+            @Id
+            public Long id;
+
+            @UpdatePermission(expression = "Prefab.Role.All AND FailOp")
+            public String field = "some data";
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testPassAnySpecificFieldAwareFailOperationSuccessCommit() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "Prefab.Role.None AND passingOp")
+        class Model {
+            @Id
+            public Long id;
+
+            @UpdatePermission(expression = "Prefab.Role.None OR passingOp")
+            public String field = "some data";
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "field"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testFailAllSpecificFieldAwareSuccessOperationFailCommit() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "Prefab.Role.All")
+        class Model {
+            @Id
+            public Long id;
+
+            @UpdatePermission(expression = "Prefab.Role.All AND FailOp")
+            public String field = "some data";
+        }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "field"));
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testBadInstance() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "privatePermission")
+        class Model { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testSpecificFieldOveriddenOperationCheckSucceed() {
+        PersistentResource resource = newResource(CheckedEntity.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        // Should succeed in operation check despite the commit check failure
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "hello"));
+        requestScope.getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void testSpecificFieldCommitCheckFailByOveriddenField() {
+        PersistentResource resource = newResource(CheckedEntity.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.DEFERRED,
+                requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "hello"));
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testReadCheckExpressionForNewlyCreatedObject() {
+        @Entity
+        @Include(rootLevel = false)
+        @ReadPermission(expression = "FailOp")
+        class Model { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        requestScope.getDictionary().bindEntity(Model.class);
+        assertEquals(ExpressionResult.DEFERRED, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource));
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testDeleteCheckExpressionForNewlyCreatedObject() {
+        @Entity
+        @Include(rootLevel = false)
+        @DeletePermission(expression = "FailOp")
+        class Model { }
+
+        PersistentResource resource = newResource(new Model(), Model.class, true);
+        RequestScope requestScope = resource.getRequestScope();
+        requestScope.getDictionary().bindEntity(Model.class);
+        assertEquals(ExpressionResult.DEFERRED, requestScope.getPermissionExecutor().checkPermission(DeletePermission.class, resource));
+        assertThrows(ForbiddenAccessException.class, () -> requestScope.getPermissionExecutor().executeCommitChecks());
+    }
+
+    @Test
+    public void testCache() {
+        PersistentResource resource = newResource(AnnotationOnlyRecord.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource));
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource));
+    }
+
+
+    @Test
+    public void testNoCache() {
+        PersistentResource resource = newResource(AnnotationOnlyRecord.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+    }
+
+    @Test
+    public void testUserCheckCache() {
+        PersistentResource resource = newResource(UserCheckCacheRecord.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        // This should cache for updates, reads, etc.
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, ALL_FIELDS));
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, ALL_FIELDS));
+        assertEquals(ExpressionResult.PASS, requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, ALL_FIELDS));
+    }
+
+    @Test
+    public void testUserCheckOnFieldSuccess() {
+        OpenBean openBean = new OpenBean();
+        openBean.id = 1L;
+        PersistentResource resource = newResource(OpenBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        ExpressionResult result = requestScope.getPermissionExecutor().checkUserPermissions(ClassType.of(OpenBean.class),
+                ReadPermission.class,
+                "open");
+
+        assertEquals(ExpressionResult.PASS, result);
+    }
+
+    @Test
+    public void testUserCheckOnFieldFailure() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> requestScope.getPermissionExecutor().checkUserPermissions(ClassType.of(SampleBean.class),
+                ReadPermission.class,
+                "cannotSeeMe"));
+    }
+
+    @Test
+    public void testUserCheckOnFieldDeferred() {
+        PersistentResource resource = newResource(SampleBean.class, false);
+        RequestScope requestScope = resource.getRequestScope();
+
+        ExpressionResult result = requestScope.getPermissionExecutor().checkUserPermissions(ClassType.of(SampleBean.class),
+                ReadPermission.class,
+                "allVisible");
+
+        assertEquals(ExpressionResult.DEFERRED, result);
+    }
+
+    public <T> PersistentResource<T> newResource(T obj, Class<T> cls, boolean markNew) {
+        EntityDictionary dictionary = EntityDictionary.builder().checks(TestCheckMappings.MAPPINGS).build();
+        dictionary.bindEntity(cls);
+        RequestScope requestScope = new RequestScope(null, null, NO_VERSION, null, null, null, null, null, UUID.randomUUID(), getElideSettings(dictionary));
+        PersistentResource resource = new PersistentResource<>(obj, requestScope.getUUIDFor(obj), requestScope);
+        if (markNew) {
+            requestScope.getNewPersistentResources().add(resource);
+        }
+        return resource;
+    }
+
+    public <T> PersistentResource<T> newResource(Class<T> cls, boolean markNew) {
+        try {
+            T obj = cls.newInstance();
+            return newResource(obj, cls, markNew);
+        } catch (InstantiationException | IllegalAccessException e) {
+            return null;
+        }
+    }
+
+    private ElideSettings getElideSettings(EntityDictionary dictionary) {
+        return new ElideSettingsBuilder(null)
+                    .withEntityDictionary(dictionary)
+                    .build();
+    }
+
+    public static final class SampleOperationCheck extends OperationCheck<SampleOperationModel> {
+        @Override
+        public boolean ok(SampleOperationModel model, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return model.test();
+        }
+    }
+
+
+    public static final class SampleOperationCheckInverse extends OperationCheck<Object> {
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return !changeSpec.isPresent();
+        }
+    }
+
+    public static final class SampleCommitCheck extends OperationCheck<SampleOperationModel> {
+        @Override
+        public boolean runAtCommit() {
+            return true;
+        }
+
+        @Override
+        public boolean ok(SampleOperationModel model, com.yahoo.elide.core.security.RequestScope requestScope,
+                Optional<ChangeSpec> changeSpec) {
+            return model.test();
+        }
+    }
+
+    @ReadPermission(expression = "Prefab.Role.None")
+    @UpdatePermission(expression = "Prefab.Role.None")
+    @Include(rootLevel = false)
+    @Entity
+    public static final class SampleBean implements SampleOperationModel {
+        @Id
+        public Long id;
+
+        @Override
+        public boolean test() {
+            return id != null && id == 1L;
+        }
+
+        @ReadPermission(expression = "Prefab.Role.All AND sampleOperation")
+        @UpdatePermission(expression = "Prefab.Role.All AND sampleOperation")
+        public String allVisible = "You should see me!";
+
+        public String defaultHidden = "I'm invisible. muwahaha...";
+
+        @ReadPermission(expression = "Prefab.Role.All AND Prefab.Role.None")
+        @UpdatePermission(expression = "Prefab.Role.All AND Prefab.Role.None")
+        public String cannotSeeMe = "hidden";
+
+        @ReadPermission(expression = "sampleOperation")
+        @UpdatePermission(expression =  "sampleOperation OR Prefab.Role.None")
+        public String mayFailInCommit = "aw :(";
+    }
+
+    @ReadPermission(expression = "Prefab.Role.All")
+    @UpdatePermission(expression = "Prefab.Role.All")
+    @Include(rootLevel = false)
+    @Entity
+    public static final class OpenBean implements SampleOperationModel {
+        @Id
+        public Long id;
+
+        public String open;
+
+        @Override
+        public boolean test() {
+            return id != null && id == 1L;
+        }
+
+        @ReadPermission(expression = "Prefab.Role.All AND sampleOperation")
+        @UpdatePermission(expression = "Prefab.Role.All AND sampleOperation")
+        public String openAll = "all";
+
+        @ReadPermission(expression = "Prefab.Role.None OR sampleOperation")
+        @UpdatePermission(expression = "Prefab.Role.None OR sampleOperation")
+        public String openAny = "all";
+    }
+
+    @Entity
+    @Include(rootLevel = false)
+    @UpdatePermission(expression = "sampleOperation")
+    public static final class CheckedEntity {
+        @Id
+        public Long id;
+
+        @UpdatePermission(expression = "sampleOperationInverse")
+        public String hello;
+    }
+
+    /* Cache testing */
+
+    public static class ShouldCache extends OperationCheck<Object> {
+        private static AtomicBoolean hasRun = new AtomicBoolean(false);
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return !hasRun.getAndSet(true);
+        }
+    }
+
+    public static final class PassingOperationCheck extends OperationCheck<Object> {
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return true;
+        }
+    }
+
+    public static final class FailingOperationCheck extends OperationCheck<Object> {
+        @Override
+        public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return false;
+        }
+    }
+
+    @Entity
+    @Include(rootLevel = false)
+    @ReadPermission(expression = "shouldCache")
+    @UpdatePermission(expression = "shouldCache")
+    public static class AnnotationOnlyRecord {
+    }
+
+    /* UserCheck cache testing */
+
+    public static class UserCheckTest extends UserCheck {
+        public AtomicBoolean hasBeenCalled = new AtomicBoolean(false);
+        @Override
+        public boolean ok(User user) {
+            return !hasBeenCalled.getAndSet(true);
+        }
+    }
+
+    @Entity
+    @Include(rootLevel = false)
+    @ReadPermission(expression = "peUserCheck")
+    @UpdatePermission(expression = "peUserCheck")
+    public static class UserCheckCacheRecord {
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/TestUser.java b/elide-core/src/test/java/com/yahoo/elide/core/security/TestUser.java
new file mode 100644
index 0000000000..a0a3767e85
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/TestUser.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.security;
+
+/**
+ * Elide user for testing.
+ */
+public class TestUser extends User {
+
+    public TestUser(String name) {
+        super(() -> name);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/UpdateOnCreateTest.java b/elide-core/src/test/java/com/yahoo/elide/core/security/UpdateOnCreateTest.java
new file mode 100644
index 0000000000..d805fdbd19
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/UpdateOnCreateTest.java
@@ -0,0 +1,451 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.PersistenceResourceTestSetup;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TestRequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.ClassType;
+import example.Author;
+import example.Book;
+import example.UpdateAndCreate;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+public class UpdateOnCreateTest extends PersistenceResourceTestSetup {
+
+    private User userOne = new TestUser("1");
+    private User userTwo = new TestUser("2");
+    private User userThree = new TestUser("3");
+    private User userFour = new TestUser("4");
+
+    private DataStoreTransaction tx = mock(DataStoreTransaction.class);
+
+    @BeforeEach
+    public void beforeMethod() {
+        reset(tx);
+    }
+
+    public UpdateOnCreateTest() {
+        super();
+        initDictionary();
+    }
+
+    //----------------------------------------- ** Entity Creation ** -------------------------------------------------
+
+    //Create allowed based on class level expression
+    @Test
+    public void createPermissionCheckClassAnnotationForCreatingAnEntitySuccessCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userOneScope)).thenReturn(updateAndCreateNewObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userOneScope, Optional.of("1"));
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    //Create allowed based on field level expression
+    @Test
+    public void createPermissionCheckFieldAnnotationForCreatingAnEntitySuccessCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, userThree, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userThreeScope)).thenReturn(updateAndCreateNewObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userThreeScope, Optional.of("2"));
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    //Create denied based on field level expression
+    @Test
+    public void createPermissionCheckFieldAnnotationForCreatingAnEntityFailureCase() {
+        com.yahoo.elide.core.RequestScope userFourScope = new TestRequestScope(tx, userFour, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userFourScope)).thenReturn(updateAndCreateNewObject);
+        assertThrows(
+                ForbiddenAccessException.class,
+                () -> com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userFourScope, Optional.of("3")));
+    }
+
+    //----------------------------------------- ** Update Attribute ** ------------------------------------------------
+    //Expression for field inherited from class level expression
+    @Test
+    public void updatePermissionInheritedForAttributeSuccessCase() {
+        com.yahoo.elide.core.RequestScope userTwoScope = new TestRequestScope(tx, userTwo, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userTwoScope);
+        loaded.updateAttribute("name", "");
+        loaded.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void updatePermissionInheritedForAttributeFailureCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userOneScope);
+        assertThrows(ForbiddenAccessException.class, () -> loaded.updateAttribute("name", ""));
+    }
+
+    //Class level expression overwritten by field level expression
+    @Test
+    public void updatePermissionOverwrittenForAttributeSuccessCase() {
+        com.yahoo.elide.core.RequestScope userFourScope = new TestRequestScope(tx, userFour, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userFourScope);
+        loaded.updateAttribute("alias", "");
+        loaded.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void updatePermissionOverwrittenForAttributeFailureCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, userThree, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userThreeScope);
+        assertThrows(ForbiddenAccessException.class, () -> loaded.updateAttribute("alias", ""));
+    }
+
+
+    //----------------------------------------- ** Update Relation  ** -----------------------------------------------
+    //Expression for relation inherited from class level expression
+    @Test
+    public void updatePermissionInheritedForRelationSuccessCase() {
+        com.yahoo.elide.core.RequestScope userTwoScope = new TestRequestScope(tx, userTwo, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Book());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userTwoScope);
+        com.yahoo.elide.core.PersistentResource<Book> loadedBook = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Book.class)
+                        .build(),
+                "2",
+                userTwoScope);
+        loaded.addRelation("books", loadedBook);
+        loaded.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void updatePermissionInheritedForRelationFailureCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Book());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userOneScope);
+        com.yahoo.elide.core.PersistentResource<Book> loadedBook = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Book.class)
+                        .build(),
+                "2",
+                userOneScope);
+        assertThrows(ForbiddenAccessException.class, () -> loaded.addRelation("books", loadedBook));
+    }
+
+    //Class level expression overwritten by field level expression
+    @Test
+    public void updatePermissionOverwrittenForRelationSuccessCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, new TestUser("3"), dictionary);
+
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+        updateAndCreateExistingObject.setId(1L);
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Author());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+                        .build(),
+                "1",
+                userThreeScope);
+        com.yahoo.elide.core.PersistentResource<Author> loadedAuthor = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Author.class)
+                        .build(),
+                "2",
+                userThreeScope);
+        loaded.addRelation("author", loadedAuthor);
+        loaded.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void updatePermissionOverwrittenForRelationFailureCase() {
+        com.yahoo.elide.core.RequestScope userTwoScope = new TestRequestScope(tx, userTwo, dictionary);
+
+        UpdateAndCreate updateAndCreateExistingObject = new UpdateAndCreate();
+
+        when(tx.loadObject(any(),
+                eq(1L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(updateAndCreateExistingObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Author());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> loaded = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(UpdateAndCreate.class)
+
+                        .build(),
+                "1",
+                userTwoScope);
+        com.yahoo.elide.core.PersistentResource<Author> loadedAuthor = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Author.class)
+                        .build(),
+                "2",
+                userTwoScope);
+        assertThrows(ForbiddenAccessException.class, () -> loaded.addRelation("author", loadedAuthor));
+    }
+
+    //----------------------------------------- ** Update Attribute On Create ** --------------------------------------
+    //Expression for field inherited from class level expression
+    @Test
+    public void createPermissionInheritedForAttributeSuccessCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userOneScope)).thenReturn(updateAndCreateNewObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userOneScope, Optional.of("4"));
+        created.updateAttribute("name", "");
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void createPermissionInheritedForAttributeFailureCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, userThree, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userThreeScope)).thenReturn(updateAndCreateNewObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userThreeScope, Optional.of("5"));
+        assertThrows(ForbiddenAccessException.class, () -> created.updateAttribute("name", ""));
+    }
+
+    //Class level expression overwritten by field level expression
+    @Test
+    public void createPermissionOverwrittenForAttributeSuccessCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, userThree, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userThreeScope)).thenReturn(updateAndCreateNewObject);
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userThreeScope, Optional.of("6"));
+        created.updateAttribute("alias", "");
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void createPermissionOverwrittenForAttributeFailureCase() {
+        com.yahoo.elide.core.RequestScope userFourScope = new TestRequestScope(tx, userFour, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userFourScope)).thenReturn(updateAndCreateNewObject);
+        assertThrows(
+                ForbiddenAccessException.class, () -> {
+                    com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created =
+                            com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userFourScope, Optional.of("7"));
+                    created.updateAttribute("alias", "");
+                }
+        );
+    }
+
+    //----------------------------------------- ** Update Relation On Create ** --------------------------------------
+    //Expression for relation inherited from class level expression
+    @Test
+    public void createPermissionInheritedForRelationSuccessCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userOneScope)).thenReturn(updateAndCreateNewObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Book());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userOneScope, Optional.of("8"));
+        com.yahoo.elide.core.PersistentResource<Book> loadedBook = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Book.class)
+                        .build(),
+                "2",
+                userOneScope);
+
+        created.addRelation("books", loadedBook);
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void createPermissionInheritedForRelationFailureCase() {
+        com.yahoo.elide.core.RequestScope userThreeScope = new TestRequestScope(tx, userThree, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userThreeScope)).thenReturn(updateAndCreateNewObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Book());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userThreeScope, Optional.of("9"));
+        com.yahoo.elide.core.PersistentResource<Book> loadedBook = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                    .type(Book.class)
+                    .build(),
+                "2",
+                userThreeScope);
+        assertThrows(ForbiddenAccessException.class, () -> created.addRelation("books", loadedBook));
+    }
+
+    //Class level expression overwritten by field level expression
+    @Test
+    public void createPermissionOverwrittenForRelationSuccessCase() {
+        com.yahoo.elide.core.RequestScope userTwoScope = new TestRequestScope(tx, userTwo, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userTwoScope)).thenReturn(updateAndCreateNewObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(com.yahoo.elide.core.RequestScope.class)
+        )).thenReturn(new Author());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userTwoScope, Optional.of("10"));
+        com.yahoo.elide.core.PersistentResource<Author> loadedAuthor = com.yahoo.elide.core.PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Author.class)
+                        .build(),
+                "2",
+                userTwoScope);
+        created.addRelation("author", loadedAuthor);
+        created.getRequestScope().getPermissionExecutor().executeCommitChecks();
+    }
+
+    @Test
+    public void createPermissionOverwrittenForRelationFailureCase() {
+        com.yahoo.elide.core.RequestScope userOneScope = new TestRequestScope(tx, userOne, dictionary);
+
+        UpdateAndCreate updateAndCreateNewObject = new UpdateAndCreate();
+        when(tx.createNewObject(ClassType.of(UpdateAndCreate.class), userOneScope)).thenReturn(updateAndCreateNewObject);
+
+        when(tx.loadObject(any(),
+                eq(2L),
+                any(RequestScope.class)
+        )).thenReturn(new Author());
+
+        com.yahoo.elide.core.PersistentResource<UpdateAndCreate> created = com.yahoo.elide.core.PersistentResource.createObject(ClassType.of(UpdateAndCreate.class), userOneScope, Optional.of("11"));
+        com.yahoo.elide.core.PersistentResource<Author> loadedAuthor = PersistentResource.loadRecord(
+                EntityProjection.builder()
+                        .type(Author.class)
+                        .build(),
+                "2",
+                userOneScope);
+        assertThrows(ForbiddenAccessException.class, () -> created.addRelation("author", loadedAuthor));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilderTest.java b/elide-core/src/test/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilderTest.java
new file mode 100644
index 0000000000..16e0d51929
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/security/permissions/PermissionExpressionBuilderTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.security.permissions;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+public class PermissionExpressionBuilderTest {
+
+    private EntityDictionary dictionary;
+    private PermissionExpressionBuilder builder;
+    private ElideSettings elideSettings;
+
+    @BeforeEach
+    public void setupEntityDictionary() {
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+        checks.put("user has all access", Role.ALL.class);
+        checks.put("user has no access", Role.NONE.class);
+
+        dictionary = TestDictionary.getTestDictionary(checks);
+
+        ExpressionResultCache cache = new ExpressionResultCache();
+        builder = new PermissionExpressionBuilder(cache, dictionary);
+
+        elideSettings = new ElideSettingsBuilder(null)
+                .withEntityDictionary(dictionary)
+                .build();
+    }
+
+    @Test
+    public void testAnyFieldExpressionText() {
+        @Entity
+        @Include(rootLevel = false)
+        @ReadPermission(expression = "user has all access AND user has no access")
+        class Model { }
+        dictionary.bindEntity(Model.class);
+
+        PersistentResource resource = newResource(new Model(), Model.class);
+
+        Expression expression = builder.buildAnyFieldExpressions(
+                resource,
+                ReadPermission.class,
+                null, null);
+
+        assertEquals("READ PERMISSION WAS INVOKED ON PersistentResource{type=model, id=null}  "
+                        + "FOR EXPRESSION [((user has all access \u001B[34mWAS UNEVALUATED\u001B[m)) "
+                        + "AND ((user has no access \u001B[34mWAS UNEVALUATED\u001B[m))]",
+                expression.toString());
+
+        expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+
+        assertEquals(
+                "READ PERMISSION WAS INVOKED ON PersistentResource{type=model, id=null}  "
+                        + "FOR EXPRESSION [((user has all access PASSED)) "
+                        + "AND ((user has no access FAILED))]",
+                expression.toString());
+
+    }
+
+    @Test
+    public void testSpecificFieldExpressionText() {
+        @Entity
+        @Include(rootLevel = false)
+        @UpdatePermission(expression = "user has no access")
+        class Model {
+            @Id
+            private long id;
+            @UpdatePermission(expression = "user has all access OR user has no access")
+            private int foo;
+        }
+
+        dictionary.bindEntity(Model.class);
+
+        PersistentResource resource = newResource(new Model(), Model.class);
+        ChangeSpec changes = new ChangeSpec(resource, "foo", 1, 2);
+
+        Expression expression = builder.buildSpecificFieldExpressions(
+                resource,
+                UpdatePermission.class,
+                "foo",
+                changes);
+
+        assertEquals(
+                "UPDATE PERMISSION WAS INVOKED ON PersistentResource{type=model, id=0} WITH CHANGES ChangeSpec { "
+                        + "resource=PersistentResource{type=model, id=0}, field=foo, original=1, modified=2} "
+                        + "FOR EXPRESSION [FIELD(((user has all access "
+                        + "\u001B[34mWAS UNEVALUATED\u001B[m)) OR ((user has no access "
+                        + "\u001B[34mWAS UNEVALUATED\u001B[m)))]",
+                expression.toString());
+
+        expression.evaluate(Expression.EvaluationMode.ALL_CHECKS);
+
+        assertEquals(
+                "UPDATE PERMISSION WAS INVOKED ON PersistentResource{type=model, id=0} WITH CHANGES ChangeSpec { "
+                        + "resource=PersistentResource{type=model, id=0}, field=foo, original=1, modified=2} "
+                        + "FOR EXPRESSION [FIELD(((user has all access "
+                        + "\u001B[32mPASSED\u001B[m)) OR ((user has no access "
+                        + "\u001B[34mWAS UNEVALUATED\u001B[m)))]",
+                expression.toString());
+
+     }
+
+    public <T> PersistentResource newResource(T obj, Class<T> cls) {
+        RequestScope requestScope = new RequestScope(null, null, NO_VERSION, null, null, null, null, null, UUID.randomUUID(), elideSettings);
+        return new PersistentResource<>(obj, requestScope.getUUIDFor(obj), requestScope);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/type/ParameterizedModelTest.java b/elide-core/src/test/java/com/yahoo/elide/core/type/ParameterizedModelTest.java
new file mode 100644
index 0000000000..b33146ae57
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/type/ParameterizedModelTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.core.type;
+
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.spy;
+import com.yahoo.elide.core.exceptions.InvalidParameterizedAttributeException;
+import com.yahoo.elide.core.request.Attribute;
+import org.junit.jupiter.api.Test;
+
+public class ParameterizedModelTest {
+
+    @Test
+    public void testInvoke() {
+        ParameterizedModel testModel = spy(ParameterizedModel.class);
+        Attribute testAttribute = Attribute.builder().type(STRING_TYPE).name("foo").build();
+        String testValue = "bar";
+
+        testModel.addAttributeValue(testAttribute, testValue);
+
+        assertEquals(testValue, testModel.invoke(testAttribute));
+    }
+
+    @Test
+    public void testInvokeException() {
+        ParameterizedModel testModel = spy(ParameterizedModel.class);
+        Attribute testAttribute = Attribute.builder().type(STRING_TYPE).name("foo").build();
+
+        Exception exception = assertThrows(InvalidParameterizedAttributeException.class,
+                () -> testModel.invoke(testAttribute));
+
+        assertEquals("No attribute found with matching parameters for attribute: Attribute(name=foo)",
+                exception.getMessage());
+    }
+
+    @Test
+    public void testFetch() {
+        ParameterizedModel testModel = spy(ParameterizedModel.class);
+        Attribute testAttribute = Attribute.builder().type(STRING_TYPE).name("foo").build();
+        String testValue = "bar";
+
+        testModel.addAttributeValue(testAttribute, testValue);
+
+        assertEquals(testValue, testModel.fetch(testAttribute.getAlias(), "blah"));
+    }
+
+    @Test
+    public void testFetchDefault() {
+        ParameterizedModel testModel = spy(ParameterizedModel.class);
+        Attribute testAttribute = Attribute.builder().type(STRING_TYPE).name("foo").build();
+        String testValue = "blah";
+
+        assertEquals(testValue, testModel.fetch(testAttribute.getAlias(), testValue));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/ClassScannerTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/ClassScannerTest.java
new file mode 100644
index 0000000000..5b4646a05d
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/ClassScannerTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.annotation.Include;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+import javax.persistence.Entity;
+
+public class ClassScannerTest {
+
+    private final ClassScanner scanner;
+
+    public ClassScannerTest() {
+        scanner = DefaultClassScanner.getInstance();
+    }
+
+    @Test
+    public void testGetAllClasses() {
+        Set<Class<?>> classes = scanner.getAllClasses("com.yahoo.elide.core.utils");
+        assertEquals(32, classes.size());
+        assertTrue(classes.contains(ClassScannerTest.class));
+    }
+
+    @Test
+    public void testGetAnnotatedClasses() {
+        Set<Class<?>> classes = scanner.getAnnotatedClasses("example", Include.class);
+        assertEquals(31, classes.size(), "Actual: " + classes);
+        classes.forEach(cls -> assertTrue(cls.isAnnotationPresent(Include.class)));
+    }
+
+    @Test
+    public void testGetAllAnnotatedClasses() {
+        Set<Class<?>> classes = scanner.getAnnotatedClasses(Include.class);
+        assertEquals(43, classes.size(), "Actual: " + classes);
+        classes.forEach(cls -> assertTrue(cls.isAnnotationPresent(Include.class)));
+    }
+
+    @Test
+    public void testGetAnyAnnotatedClasses() {
+        Set<Class<?>> classes = scanner.getAnnotatedClasses(Include.class, Entity.class);
+        assertEquals(54, classes.size());
+        for (Class<?> cls : classes) {
+            assertTrue(cls.isAnnotationPresent(Include.class)
+                    || cls.isAnnotationPresent(Entity.class));
+        }
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBeanTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBeanTest.java
new file mode 100644
index 0000000000..c270fbeaf6
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/BidirectionalConvertUtilBeanTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.apache.commons.beanutils.Converter;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Currency;
+
+public class BidirectionalConvertUtilBeanTest {
+
+    private static BidirectionalConvertUtilBean convertUtilBean;
+
+    @BeforeAll
+    public static void init() {
+        convertUtilBean = new BidirectionalConvertUtilBean();
+        convertUtilBean.register(String.class, Currency.class, new Converter() {
+            @Override
+            public <T> T convert(Class<T> aClass, Object o) {
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testSourceTargetLookup() {
+        assertNotNull(convertUtilBean.lookup(String.class, Currency.class));
+    }
+
+    @Test
+    public void testInvalidLookup() {
+        assertNull(convertUtilBean.lookup(Long.class, Currency.class));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/CoerceUtilTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/CoerceUtilTest.java
new file mode 100644
index 0000000000..8755b4dbc4
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/CoerceUtilTest.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.utils.coerce.converters.EpochToDateConverter;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
+
+public class CoerceUtilTest {
+
+    public enum Seasons { WINTER, SPRING }
+
+    private static Map<Class, Serde> oldSerdes = new HashMap<>();
+
+    @BeforeAll
+    public static void init() {
+        Class [] dateClasses = {
+                Date.class,
+                java.sql.Date.class,
+                Timestamp.class,
+                Time.class
+        };
+
+        for (Class dateClass : dateClasses) {
+            oldSerdes.put(dateClass, CoerceUtil.lookup(dateClass));
+            CoerceUtil.register(dateClass, new EpochToDateConverter(dateClass));
+        }
+    }
+
+    @AfterAll
+    public static void shutdown() {
+        oldSerdes.forEach(CoerceUtil::register);
+    }
+
+    @EqualsAndHashCode
+    @AllArgsConstructor
+    @NoArgsConstructor
+    private static class TestClass {
+        public int field1;
+        public int field2;
+    }
+
+    @Test
+    public void testNoConversions() throws Exception {
+
+        assertEquals(1, CoerceUtil.coerce(1, (Class<Object>) null),
+                     "coerce returns value if target class null");
+
+        assertNull(CoerceUtil.coerce(null, Object.class),
+                     "coerce returns value if value is null");
+
+        assertEquals(1, (Object) CoerceUtil.coerce(1, int.class),
+                "coerce returns value if value is assignable to target");
+    }
+
+    @Test
+    public void testToEnumConversion() throws Exception {
+
+        assertEquals(Seasons.SPRING, CoerceUtil.coerce(1, Seasons.class),
+                "ToEnumConverter is called when target class is Enum");
+    }
+
+    @Test
+    public void testToUUIDConversion() throws Exception {
+        String uuidString = "11111111-2222-3333-4444-555555555555";
+
+        assertEquals(
+                UUID.fromString(uuidString),
+                CoerceUtil.coerce(uuidString, UUID.class),
+                "ToUUIDConverter is called when target class is UUID");
+    }
+
+    @Test
+    public void testBasicConversion() throws Exception {
+
+        assertEquals("1", CoerceUtil.coerce(1, String.class),
+                "coerce converts int to String");
+
+        assertEquals(Long.valueOf("1"), CoerceUtil.coerce("1", Long.class),
+                "coerce converts String to Long");
+
+        assertEquals(1, (Object) CoerceUtil.coerce(1.0, int.class),
+                "coerce converts float to int");
+    }
+
+    @Test
+    public void testError() throws Exception {
+
+        assertThrows(InvalidValueException.class, () -> CoerceUtil.coerce('A', Seasons.class));
+    }
+
+    @Test
+    public void testMapConversion() {
+
+        //Input Map
+        Map<String, Object> testMap = new LinkedHashMap<>();
+        testMap.put("field1", 1);
+        testMap.put("field2", 2);
+
+        //ExpectedObject
+        TestClass testClass = new TestClass(1, 2);
+
+        assertEquals(testClass, CoerceUtil.coerce(testMap, TestClass.class),
+                "FromMapConverter is called when source class is a Map");
+    }
+
+    @Test
+    public void testMapError() throws Exception {
+
+        //Input Map
+        Map<String, Object> testMap = new LinkedHashMap<>();
+        testMap.put("foo", "bar");
+        testMap.put("baz", "qaz");
+
+        assertThrows(InvalidValueException.class, () -> CoerceUtil.coerce(testMap, TestClass.class));
+    }
+
+    @Test
+    public void testConversionFailure() throws Exception {
+        assertThrows(InvalidValueException.class, () -> CoerceUtil.coerce("a", Long.class));
+    }
+
+    @Test
+    public void testNullConversion() throws Exception {
+        assertNull(CoerceUtil.coerce(null, String.class));
+    }
+
+    @Test
+    public void testStringToDate() throws Exception {
+        Date date = CoerceUtil.coerce("1", Date.class);
+        assertEquals(new Date(1), date);
+
+        java.sql.Date date1 = CoerceUtil.coerce("1", java.sql.Date.class);
+        assertEquals(new java.sql.Date(1), date1);
+
+        Timestamp timestamp = CoerceUtil.coerce("1", Timestamp.class);
+        assertEquals(new Timestamp(1), timestamp);
+
+        Time time = CoerceUtil.coerce("1", Time.class);
+        assertEquals(new Time(1), time);
+    }
+
+    @Test
+    public void testLongToDate() {
+        Date dateLong = CoerceUtil.coerce(0L, Date.class);
+        assertEquals(new Date(0), dateLong);
+
+        java.sql.Date date1Long = CoerceUtil.coerce(0L, java.sql.Date.class);
+        assertEquals(new java.sql.Date(0), date1Long);
+
+        Timestamp timestampLong = CoerceUtil.coerce(0L, Timestamp.class);
+        assertEquals(new Timestamp(0), timestampLong);
+
+        Time timeLong = CoerceUtil.coerce(0L, Time.class);
+        assertEquals(new Time(0), timeLong);
+    }
+
+    @Test
+    public void testIntToDate() throws Exception {
+        Date date = CoerceUtil.coerce(0, Date.class);
+        assertEquals(new Date(0), date);
+
+        java.sql.Date date1 = CoerceUtil.coerce(0, java.sql.Date.class);
+        assertEquals(new java.sql.Date(0), date1);
+
+        Timestamp timestamp = CoerceUtil.coerce(0, Timestamp.class);
+        assertEquals(new Timestamp(0), timestamp);
+
+        Time time = CoerceUtil.coerce(0, Time.class);
+        assertEquals(new Time(0), time);
+    }
+
+    @Test
+    public void testDateToTimestamp() {
+        String dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+        TimeZone tz = TimeZone.getTimeZone("UTC");
+        Serde oldDateSerde = CoerceUtil.lookup(Date.class);
+        Serde oldTimestampSerde = CoerceUtil.lookup(java.sql.Timestamp.class);
+        Serde timestampSerde = new ISO8601DateSerde(dateFormat, tz, java.sql.Timestamp.class);
+        CoerceUtil.register(Date.class, new ISO8601DateSerde(dateFormat, tz));
+        CoerceUtil.register(java.sql.Timestamp.class, timestampSerde);
+        Date date = new Date();
+        Timestamp timestamp = CoerceUtil.coerce(date, Timestamp.class);
+        assertEquals(date.getTime(), timestamp.getTime());
+        CoerceUtil.register(Date.class, oldDateSerde);
+        CoerceUtil.register(java.sql.Timestamp.class, oldTimestampSerde);
+    }
+
+    /**
+     * NOTE: BeanUtilsBean is documented as a <em>pseudo-singleton</em>.
+     * https://commons.apache.org/proper/commons-beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/BeanUtilsBean.html
+     */
+    @Test
+    public void testMultipleClassLoaders() {
+        UUID uuid = UUID.randomUUID();
+        String uuidString = uuid.toString();
+        ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+
+        UUID coercedFromPrimaryClassLoader = CoerceUtil.coerce(uuidString, UUID.class);
+        assertEquals(uuid, coercedFromPrimaryClassLoader);
+
+        try {
+            Thread.currentThread().setContextClassLoader(new SecondaryClassLoader());
+            UUID coercedFromSecondaryClassLoader =  CoerceUtil.coerce(uuidString, UUID.class);
+            assertEquals(uuid, coercedFromSecondaryClassLoader);
+        } finally {
+            Thread.currentThread().setContextClassLoader(originalClassLoader);
+        }
+    }
+
+    // Dummy class loader for test
+    private static class SecondaryClassLoader extends ClassLoader { }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ElideCustomSerdeRegistrationTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ElideCustomSerdeRegistrationTest.java
new file mode 100644
index 0000000000..36d007a77b
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ElideCustomSerdeRegistrationTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.datastore.inmemory.InMemoryDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import org.junit.jupiter.api.Test;
+
+class Dummy {
+}
+
+class DummyTwo extends Dummy {
+}
+
+class DummyThree extends Dummy {
+}
+
+public class ElideCustomSerdeRegistrationTest {
+    @ElideTypeConverter(type = Dummy.class, name = "Dummy", subTypes = { DummyThree.class, DummyTwo.class })
+    public static class DummySerde implements Serde<String, Dummy> {
+
+        @Override
+        public Dummy deserialize(String val) {
+            return null;
+        }
+
+        @Override
+        public String serialize(Dummy val) {
+            return null;
+        }
+    }
+
+    @Test
+    public void testRegisterCustomSerde() {
+
+        //Create a fake Elide.  Don't actually bind any entities.
+        HashMapDataStore wrapped = new HashMapDataStore(DefaultClassScanner.getInstance(), String.class.getPackage());
+        InMemoryDataStore store = new InMemoryDataStore(wrapped);
+        ElideSettings elideSettings = new ElideSettingsBuilder(store)
+                .withEntityDictionary(EntityDictionary.builder().build()).build();
+        Elide elide = new Elide(elideSettings);
+        elide.doScans();
+        assertNotNull(CoerceUtil.lookup(Dummy.class));
+        assertNotNull(CoerceUtil.lookup(DummyTwo.class));
+        assertNotNull(CoerceUtil.lookup(DummyThree.class));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/FromMapConverterTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverterTest.java
similarity index 84%
rename from elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/FromMapConverterTest.java
rename to elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverterTest.java
index 41ef5cb13d..d5c140ed35 100644
--- a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/FromMapConverterTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/FromMapConverterTest.java
@@ -3,20 +3,19 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.utils.coerce.converters;
+package com.yahoo.elide.core.utils.coerce.converters;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.commons.beanutils.Converter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.apache.commons.beanutils.Converter;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
-
 public class FromMapConverterTest {
 
     private Converter converter;
@@ -30,7 +29,7 @@ private static class TestClass {
         public TestClass nestedField;
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() throws Exception {
         this.converter = new FromMapConverter();
     }
@@ -52,7 +51,7 @@ public void testMapToClass() throws Exception {
         TestClass nestedClass = new TestClass("value3", "value4", null);
         TestClass testClass = new TestClass("value1", "value2", nestedClass);
 
-        assertEquals(converter.convert(TestClass.class, testMap), testClass,
+        assertEquals(testClass, converter.convert(TestClass.class, testMap),
                 "Map converter correctly converted Map to TestClass");
     }
 
@@ -68,7 +67,7 @@ public void testMapToMap() throws Exception {
         testMap.put("field2", "value2");
         testMap.put("nestedField", nestedMap);
 
-        assertEquals(converter.convert(Map.class, testMap), testMap,
+        assertEquals(testMap, converter.convert(Map.class, testMap),
                 "Map converter correctly converted Map to Map");
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerdeTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerdeTest.java
new file mode 100644
index 0000000000..7d61c6e206
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ISO8601DateSerdeTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.TimeZone;
+
+public class ISO8601DateSerdeTest {
+    @Test
+    public void testDateSerialization() throws Exception {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertEquals("1970-01-01T00:00Z", serde.serialize(new Date(0)));
+    }
+
+    @Test
+    public void testDateDeserialization() throws Exception {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertEquals(serde.deserialize("1970-01-01T00:00Z"), new Date(0));
+    }
+
+    @Test
+    public void testSQLDateSerialization() throws Exception {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertEquals("1970-01-01T00:00Z", serde.serialize(new java.sql.Date(0)));
+    }
+
+    @Test
+    public void testSQLDateDeserialization() throws Exception {
+        ISO8601DateSerde serde =
+            new ISO8601DateSerde("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"), java.sql.Date.class);
+        assertEquals(serde.deserialize("1970-01-01T00:00Z"), new java.sql.Date(0));
+    }
+
+    @Test
+    public void testSQLTimeSerialization() throws Exception {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertEquals("1970-01-01T00:00Z", serde.serialize(new java.sql.Time(0)));
+    }
+
+    @Test
+    public void testSQLTimeDeserialization() throws Exception {
+        ISO8601DateSerde serde =
+            new ISO8601DateSerde("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"), java.sql.Time.class);
+        assertEquals(serde.deserialize("1970-01-01T00:00Z"), new java.sql.Time(0));
+    }
+
+    @Test
+    public void testSQLTimestampSerialization() throws Exception {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertEquals("1970-01-01T00:00Z", serde.serialize(new java.sql.Timestamp(0)));
+    }
+
+    @Test
+    public void testSQLTimestampDeserialization() throws Exception {
+        ISO8601DateSerde serde =
+                new ISO8601DateSerde("yyyy-MM-dd", TimeZone.getTimeZone("UTC"), java.sql.Timestamp.class);
+        java.sql.Timestamp expected = new java.sql.Timestamp(0);
+        java.sql.Timestamp actual = (java.sql.Timestamp) serde.deserialize("1970-01-01");
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDateToSQLTimestampDeserialization() throws Exception {
+        ISO8601DateSerde serde =
+                new ISO8601DateSerde("yyyy-MM-dd", TimeZone.getTimeZone("UTC"), java.sql.Timestamp.class);
+        Timestamp expected = new Timestamp(0);
+        Timestamp actual = (Timestamp) serde.deserialize(new Date(0));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testInvalidDateDeserialization() {
+        ISO8601DateSerde serde = new ISO8601DateSerde();
+        assertThrows(IllegalArgumentException.class, () -> serde.deserialize("1"));
+    }
+
+    @Test
+    public void testInvalidDateDeserializationMessage() {
+        ISO8601DateSerde serde = new ISO8601DateSerde("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"));
+
+        IllegalArgumentException e = assertThrows(
+                IllegalArgumentException.class,
+                () -> serde.deserialize("2019-01-01T00:00Z"));
+        assertEquals("Date strings must be formatted as yyyy-MM-dd'T'HH:mm:ss'Z'", e.getMessage());
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerdeTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerdeTest.java
new file mode 100644
index 0000000000..b28d73e6e6
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/InstantSerdeTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+
+public class InstantSerdeTest {
+    private final Serde<String, Instant> serde = new InstantSerde();
+
+    @Test
+    public void canDeserializeUtcIsoString() {
+        final Instant instant = serde.deserialize("2019-06-01T09:42:55Z");
+
+        assertEquals(1559382175, instant.getEpochSecond());
+        assertEquals(0, instant.getNano());
+    }
+
+    @Test
+    public void canDeserializeOffsetIsoString() {
+        final Instant instant = serde.deserialize("2019-06-01T10:42:55+01:00");
+
+        assertEquals(1559382175, instant.getEpochSecond());
+        assertEquals(0, instant.getNano());
+    }
+
+    @Test
+    public void canDeserializeSubSecondPrecisionUtcIsoString() {
+        final Instant instant = serde.deserialize("2019-06-01T09:42:55.123Z");
+
+        assertEquals(1559382175, instant.getEpochSecond());
+        assertEquals(123000000, instant.getNano());
+    }
+
+    @Test
+    public void canSerialize() {
+        assertEquals(
+            "2019-06-01T09:42:55Z",
+            serde.serialize(Instant.ofEpochSecond(1559382175))
+        );
+    }
+
+    @Test
+    public void canSerializeSubSecondPrecision() {
+        assertEquals(
+            "2019-06-01T09:42:55.123Z",
+            serde.serialize(Instant.ofEpochMilli(1559382175123L))
+        );
+    }
+
+    @Test
+    public void failsParsingWithIllegalArgumentException() {
+
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> serde.deserialize("2019-06-01T09:42:55.12X3Z")
+        );
+
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeTest.java
new file mode 100644
index 0000000000..ba9984dc52
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/OffsetDateTimeTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+public class OffsetDateTimeTest {
+
+    @Test
+    public void testGraphQLOffsetDateTimeSerialize() {
+        OffsetDateTime offsetDateTime =
+                OffsetDateTime.of(1995, 11, 2,
+                        16, 45, 4, 56,
+                        ZoneOffset.ofHoursMinutes(5, 30));
+        String expected = "1995-11-02T16:45:04.000000056+05:30";
+        OffsetDateTimeSerde offsetDateTimeScalar = new OffsetDateTimeSerde();
+        Object actualDate = offsetDateTimeScalar.serialize(offsetDateTime);
+        assertEquals(expected, actualDate);
+    }
+
+    @Test
+    public void testGraphQLOffsetDateTimeDeserialize() {
+        OffsetDateTime actualDate =
+                OffsetDateTime.of(1995, 11, 2,
+                        16, 45, 4, 56,
+                        ZoneOffset.ofHoursMinutes(5, 30));
+        String actual = "1995-11-02T16:45:04.000000056+05:30";
+        OffsetDateTimeSerde offsetDateTimeScalar = new OffsetDateTimeSerde();
+        Object expected = offsetDateTimeScalar.deserialize(actual);
+        assertEquals(expected, actualDate);
+    }
+
+    @Test
+    public void failsParsingWithIllegalArgumentException() {
+        final OffsetDateTimeSerde offsetDateTimeScalar = new OffsetDateTimeSerde();
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> offsetDateTimeScalar.deserialize("2019-06-01T09:42:55.12X3Z")
+        );
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneTest.java
new file mode 100644
index 0000000000..d8fa4eec3b
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/TimeZoneTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import java.util.TimeZone;
+
+public class TimeZoneTest {
+
+    @Test
+    public void testTimeZoneSerialize() {
+
+        TimeZone timezone = TimeZone.getTimeZone("EST");
+        String expected = "EST";
+        TimeZoneSerde timeZoneSerde = new TimeZoneSerde();
+        Object actual = timeZoneSerde.serialize(timezone);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testTimeZoneDeserialize() {
+        TimeZone expectedTimeZone = TimeZone.getTimeZone("EST");
+        String actual = "EST";
+        TimeZoneSerde timeZoneSerde = new TimeZoneSerde();
+        Object actualTimeZone = timeZoneSerde.deserialize(actual);
+        assertEquals(expectedTimeZone, actualTimeZone);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverterTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverterTest.java
new file mode 100644
index 0000000000..7e2ac205a3
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/ToEnumConverterTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.exceptions.InvalidAttributeException;
+import org.apache.commons.beanutils.Converter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+public class ToEnumConverterTest {
+
+    private Converter converter;
+
+    public enum Seasons { WINTER, SPRING, SUMMER, FALL }
+
+    @BeforeEach
+    public void setUp() throws Exception {
+       this.converter = new ToEnumConverter();
+    }
+
+    @Test
+    public void testIntToEnumConversion() throws Exception {
+
+        assertEquals(
+                Seasons.WINTER,
+                converter.convert(Seasons.class, 0),
+                "Enum converter correctly converted int to enum");
+
+        assertEquals(
+                Seasons.SPRING,
+                converter.convert(Seasons.class, 1),
+                "Enum converter correctly converted int to enum");
+    }
+
+    @Test
+    public void testMissingNumberValueException() throws Exception {
+
+        assertThrows(InvalidAttributeException.class, () -> converter.convert(Seasons.class, 5));
+    }
+
+    @Test
+    public void testStringToEnumConversion() throws Exception {
+
+        assertEquals(
+                Seasons.SUMMER,
+                converter.convert(Seasons.class, "SUMMER"),
+                "Enum converter correctly converted String to enum");
+
+        assertEquals(
+                Seasons.FALL,
+                converter.convert(Seasons.class, "FALL"),
+                "Enum converter correctly converted String to enum");
+    }
+
+    @Test
+    public void testMissingStringValueException() throws Exception {
+
+        assertThrows(InvalidAttributeException.class, () -> converter.convert(Seasons.class, "AUTUMN"));
+    }
+
+    @Test
+    public void testInvalidType() throws Exception {
+
+        assertThrows(InvalidAttributeException.class, () -> converter.convert(Seasons.class, 'A'));
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/URLSerdeTest.java b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/URLSerdeTest.java
new file mode 100644
index 0000000000..3cce1fde87
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/core/utils/coerce/converters/URLSerdeTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.utils.coerce.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class URLSerdeTest {
+
+    @Test
+    public void testURLSerialize() throws MalformedURLException {
+
+        URL url = new URL("https://elide.io");
+        String expected = "https://elide.io";
+        URLSerde urlSerde = new URLSerde();
+        Object actual = urlSerde.serialize(url);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testURLDeserialize() throws MalformedURLException {
+        URL expectedURL = new URL("https://elide.io");
+        String actual = "https://elide.io";
+        URLSerde urlSerde = new URLSerde();
+        Object actualURL = urlSerde.deserialize(actual);
+        assertEquals(expectedURL, actualURL);
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/endpoints/ResourceTest.java b/elide-core/src/test/java/com/yahoo/elide/endpoints/ResourceTest.java
index d4dc81be59..e47e0d991b 100644
--- a/elide-core/src/test/java/com/yahoo/elide/endpoints/ResourceTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/endpoints/ResourceTest.java
@@ -1,16 +1,17 @@
 /*
- * Copyright 2015, Yahoo Inc.
+ * Copyright 2018, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.endpoints;
 
-import com.yahoo.elide.Elide;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import com.yahoo.elide.generated.parsers.CoreBaseVisitor;
-
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * The type Config resource test.
@@ -19,30 +20,114 @@ public class ResourceTest {
 
     @Test
     public void verifyParseRelationship() {
-        new CoreBaseVisitor().visit(parse("parent/123/relationships/children"));
+        assertNull(new CoreBaseVisitor().visit(parse("parent/123/relationships/children")));
     }
 
     @Test
     public void verifyParseRelation() {
-        new CoreBaseVisitor().visit(parse("company/123/cities/2/relationships/states/1"));
+        assertNull(new CoreBaseVisitor().visit(parse("company/123/cities/2/relationships/states/1")));
+    }
+
+    @Test
+    public void verifyBase64ID() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "company/QWRkcmVzcyhudW1iZXI9MCwgc3RyZWV0PUJ1bGxpb24gQmx2ZCwgemlwQ29kZT00MDEyMSk=")));
     }
 
-    @Test(expectedExceptions = ParseCancellationException.class)
+    @Test
+    public void verifyUnderscoreInPath() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "foo_bar/")));
+    }
+
+    @Test
+    public void verifyHyphenInPath() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "foo-bar/")));
+    }
+
+    @Test
+    public void verifyURLEncodedID() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "company/abcdef%201234")));
+    }
+
+    @Test
+    public void verifyAmpersandId() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "company/abcdef&234")));
+    }
+
+    @Test
+    public void verifySpaceId() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "company/abcdef 234")));
+    }
+
+    @Test
+    public void verifyColonId() {
+        assertNull(new CoreBaseVisitor().visit(parse(
+                "company/abcdef:234")));
+    }
+
+    @Test
     public void parseFailRelationship() {
-        new CoreBaseVisitor().visit(parse("company/123/relationships"));
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("company/123/relationships")));
     }
 
-    @Test(expectedExceptions = ParseCancellationException.class)
+    @Test
     public void parseFailRelationshipCollection() {
-        new CoreBaseVisitor().visit(parse("company/relationships"));
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("company/relationships")));
     }
 
-    @Test(expectedExceptions = ParseCancellationException.class)
+    @Test
     public void parseFailure() {
-        new CoreBaseVisitor().visit(parse("company/123|apps/2/links/foo"));
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("company/123|apps/2/links/foo")));
+    }
+
+    @Test
+
+    public void invalidNumberStartingPath() {
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("3company/")));
+    }
+
+    @Test
+    public void invalidSpaceInPath() {
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("comp any/relationships")));
+    }
+
+    @Test
+    public void invalidColonInPath() {
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("comp:any/relationships")));
+    }
+
+    @Test
+    public void invalidAmpersandInPath() {
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("comp&any/relationships")));
+    }
+
+    @Test
+    public void wrongPathSeparator() {
+        assertThrows(
+                ParseCancellationException.class,
+                () -> new CoreBaseVisitor().visit(parse("company\\123")));
     }
 
     private static ParseTree parse(String path) {
-        return Elide.parse(path);
+        return JsonApiParser.parse(path);
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java
new file mode 100644
index 0000000000..df85066794
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java
@@ -0,0 +1,835 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.jsonapi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TestRequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.common.collect.Sets;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.Editor;
+import example.Price;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class EntityProjectionMakerTest {
+    private EntityDictionary dictionary;
+
+    @BeforeAll
+    public void init() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Editor.class);
+    }
+
+    @Test
+    public void testRootCollectionNoQueryParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .build())
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootCollectionSparseFields() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("fields[book]", "title,publishDate,authors");
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootEntityNoQueryParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        String path = "/book/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .build())
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testNestedCollectionNoQueryParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        String path = "/author/1/books/3/publisher";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Publisher.class)))
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testNestedEntityNoQueryParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        String path = "/author/1/books/3/publisher/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRelationshipNoQueryParams() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        String path = "/author/1/relationships/books";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRelationshipWithSingleInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "authors");
+        String path = "/book/1/relationships/publisher";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Publisher.class)))
+                        .build())
+                .relationship("authors", EntityProjection.builder()
+                        .attribute(Attribute.builder().name("name").type(String.class).build())
+                        .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                        .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                        .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                        .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .relationship("books", EntityProjection.builder()
+                                .type(Book.class)
+                                .build())
+                        .type(Author.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootCollectionWithSingleInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "authors");
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .attribute(Attribute.builder().name("name").type(String.class).build())
+                        .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                        .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                        .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                        .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .relationship("books", EntityProjection.builder()
+                                .type(Book.class)
+                                .build())
+                        .build())
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootEntityWithSingleInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "authors");
+        String path = "/book/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .attribute(Attribute.builder().name("name").type(String.class).build())
+                        .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                        .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                        .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                        .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .relationship("books", EntityProjection.builder()
+                                .type(Book.class)
+                                .build())
+                        .build())
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootCollectionWithNestedInclude() throws Exception {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "books");
+        queryParams.add("include", "books.publisher,books.editor");
+        String path = "/author";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                .attribute(Attribute.builder().name("name").type(String.class).build())
+                .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .attribute(Attribute.builder().name("title").type(String.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .attribute(Attribute.builder().name("genre").type(String.class).build())
+                        .attribute(Attribute.builder().name("language").type(String.class).build())
+                        .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                        .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                        .attribute(Attribute.builder().name("price").type(Price.class).build())
+                        .relationship("editor", EntityProjection.builder()
+                                .type(Editor.class)
+                                .attribute(Attribute.builder().name("firstName").type(String.class).build())
+                                .attribute(Attribute.builder().name("lastName").type(String.class).build())
+                                .attribute(Attribute.builder().name("fullName").type(String.class).build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .relationship("authors", EntityProjection.builder()
+                                .type(Author.class)
+                                .build())
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Author.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootEntityWithNestedInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "books");
+        queryParams.add("include", "books.publisher,books.editor");
+        String path = "/author/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .attribute(Attribute.builder().name("name").type(String.class).build())
+                .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .attribute(Attribute.builder().name("title").type(String.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .attribute(Attribute.builder().name("genre").type(String.class).build())
+                        .attribute(Attribute.builder().name("language").type(String.class).build())
+                        .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                        .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                        .attribute(Attribute.builder().name("price").type(Price.class).build())
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .relationship("editor", EntityProjection.builder()
+                                .type(Editor.class)
+                                .attribute(Attribute.builder().name("firstName").type(String.class).build())
+                                .attribute(Attribute.builder().name("lastName").type(String.class).build())
+                                .attribute(Attribute.builder().name("fullName").type(String.class).build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .relationship("authors", EntityProjection.builder()
+                                .type(Author.class)
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testNestedEntityWithSingleInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "books");
+        String path = "/author/1/books/3/publisher/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .attribute(Attribute.builder().name("title").type(String.class).build())
+                                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                                        .attribute(Attribute.builder().name("genre").type(String.class).build())
+                                        .attribute(Attribute.builder().name("language").type(String.class).build())
+                                        .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                                        .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                                        .attribute(Attribute.builder().name("price").type(Price.class).build())
+                                        .relationship("authors", EntityProjection.builder()
+                                                .type(Author.class)
+                                                .build())
+                                        .relationship("publisher", EntityProjection.builder()
+                                                .type(Publisher.class)
+                                                .build())
+                                        .relationship("editor", EntityProjection.builder()
+                                                .type(Editor.class)
+                                                .build())
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testNestedCollectionWithSingleInclude() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "books");
+        String path = "/author/1/books/3/publisher";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .relationship("books", EntityProjection.builder()
+                                        .attribute(Attribute.builder().name("title").type(String.class).build())
+                                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                                        .attribute(Attribute.builder().name("genre").type(String.class).build())
+                                        .attribute(Attribute.builder().name("language").type(String.class).build())
+                                        .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                                        .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                                        .attribute(Attribute.builder().name("price").type(Price.class).build())
+                                        .relationship("authors", EntityProjection.builder()
+                                                .type(Author.class)
+                                                .build())
+                                        .relationship("publisher", EntityProjection.builder()
+                                                .type(Publisher.class)
+                                                .build())
+                                        .relationship("editor", EntityProjection.builder()
+                                                .type(Editor.class)
+                                                .build())
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Publisher.class)))
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootEntityWithNestedIncludeAndSparseFields() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "books");
+        queryParams.add("include", "books.publisher,books.editor");
+        queryParams.add("fields[publisher]", "name");
+        queryParams.add("fields[editor]", "fullName");
+        queryParams.add("fields[book]", "publisher,editor,title");
+        String path = "/author/1";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .attribute(Attribute.builder().name("name").type(String.class).build())
+                .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .attribute(Attribute.builder().name("title").type(String.class).build())
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .build())
+                        .relationship("editor", EntityProjection.builder()
+                                .type(Editor.class)
+                                .attribute(Attribute.builder().name("fullName").type(String.class).build())
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootCollectionWithGlobalFilter() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter", "genre=='Science Fiction'");
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Science Fiction");
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .filterExpression(expression)
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testNestedCollectionWithTypedFilter() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[publisher]", "name=='Foo'");
+        String path = "/author/1/books/3/publisher";
+
+        FilterExpression expression =
+                new InPredicate(new Path(Publisher.class, dictionary, "name"), "Foo");
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Author.class)
+                .relationship("books", EntityProjection.builder()
+                        .type(Book.class)
+                        .relationship("publisher", EntityProjection.builder()
+                                .type(Publisher.class)
+                                .attribute(Attribute.builder().name("name").type(String.class).build())
+                                .attribute(Attribute.builder().name("updateHookInvoked").type(boolean.class).build())
+                                .filterExpression(expression)
+                                .relationship("books", EntityProjection.builder()
+                                        .type(Book.class)
+                                        .build())
+                                .relationship("editor", EntityProjection.builder()
+                                        .type(Editor.class)
+                                        .build())
+                                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Publisher.class)))
+                                .build())
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRelationshipsAndIncludeWithFilterAndSort() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("include", "authors");
+        queryParams.add("filter[author]", "name=='Foo'");
+        queryParams.add("filter[publisher]", "name=='Foo'");
+        queryParams.add("sort", "name");
+        String path = "/book/1/relationships/publisher";
+        Sorting sorting = SortingImpl.parseSortRule("name", ClassType.of(Publisher.class), dictionary);
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .filterExpression(new InPredicate(new Path(Publisher.class, dictionary, "name"), "Foo"))
+                        .sorting(sorting)
+                        .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Publisher.class)))
+                        .build())
+                .relationship("authors", EntityProjection.builder()
+                        .attribute(Attribute.builder().name("name").type(String.class).build())
+                        .attribute(Attribute.builder().name("type").type(Author.AuthorType.class).build())
+                        .attribute(Attribute.builder().name("homeAddress").type(Address.class).build())
+                        .attribute(Attribute.builder().name("vacationHomes").type(Set.class).build())
+                        .attribute(Attribute.builder().name("stuff").type(Map.class).build())
+                        .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                        .filterExpression(new InPredicate(new Path(Author.class, dictionary, "name"), "Foo"))
+                        .relationship("books", EntityProjection.builder()
+                                .type(Book.class)
+                                .build())
+                        .type(Author.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootCollectionWithTypedFilter() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("filter[book]", "genre=='Science Fiction'");
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+
+        FilterExpression expression =
+                new InPredicate(new Path(Book.class, dictionary, "genre"), "Science Fiction");
+
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        EntityProjection expected = EntityProjection.builder()
+                .type(Book.class)
+                .attribute(Attribute.builder().name("title").type(String.class).build())
+                .attribute(Attribute.builder().name("awards").type(Collection.class).build())
+                .attribute(Attribute.builder().name("genre").type(String.class).build())
+                .attribute(Attribute.builder().name("language").type(String.class).build())
+                .attribute(Attribute.builder().name("publishDate").type(long.class).build())
+                .attribute(Attribute.builder().name("authorTypes").type(Collection.class).build())
+                .attribute(Attribute.builder().name("price").type(Price.class).build())
+                .filterExpression(expression)
+                .relationship("authors", EntityProjection.builder()
+                        .type(Author.class)
+                        .build())
+                .relationship("publisher", EntityProjection.builder()
+                        .type(Publisher.class)
+                        .build())
+                .relationship("editor", EntityProjection.builder()
+                        .type(Editor.class)
+                        .build())
+                .pagination(PaginationImpl.getDefaultPagination(ClassType.of(Book.class)))
+                .build();
+
+        EntityProjection actual = maker.parsePath(path);
+
+        projectionEquals(expected, actual);
+    }
+
+    @Test
+    public void testInvalidSparseFields() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("fields[book]", "publisher,bookTitle,bookName"); // Invalid Fields: bookTitle & bookName
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        Exception e = assertThrows(InvalidValueException.class, () -> maker.parsePath(path));
+        assertEquals("Invalid value: book does not contain the fields: [bookTitle, bookName]", e.getMessage());
+    }
+
+    @Test
+    public void testInvalidSparseFieldsNested() {
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.add("fields[book]", "publisher,title");
+        queryParams.add("fields[publisher]", "name,cost"); // Invalid Fields: cost
+        queryParams.add("include", "publisher");
+        String path = "/book";
+
+        RequestScope scope = new TestRequestScope(dictionary, path, queryParams);
+        EntityProjectionMaker maker = new EntityProjectionMaker(dictionary, scope);
+
+        Exception e = assertThrows(InvalidValueException.class, () -> maker.parsePath(path));
+        assertEquals("Invalid value: publisher does not contain the fields: [cost]", e.getMessage());
+    }
+
+    private void projectionEquals(EntityProjection projection1, EntityProjection projection2) {
+        assertEquals(projection1.getType(), projection2.getType());
+        assertEquals(projection1.getSorting(), projection2.getSorting());
+        assertEquals(projection1.getFilterExpression(), projection2.getFilterExpression());
+        assertEquals(projection1.getPagination(), projection2.getPagination());
+
+        //Ignore order
+        assertEquals(Sets.newHashSet(projection1.getAttributes()), Sets.newHashSet(projection2.getAttributes()));
+
+        assertEquals(projection1.getRelationships().size(), projection2.getRelationships().size());
+
+        projection1.getRelationships().stream().forEach((relationship -> {
+            assertNotNull(projection2.getRelationship(relationship.getName()).orElse(null));
+            Relationship relationship2 = projection2.getRelationship(relationship.getName()).get();
+
+            assertEquals(relationship.getAlias(), relationship2.getAlias());
+            projectionEquals(relationship.getProjection(), relationship2.getProjection());
+        }));
+
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java
index 90659b1c8b..be94d75629 100644
--- a/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java
@@ -5,38 +5,39 @@
  */
 package com.yahoo.elide.jsonapi;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
 import com.yahoo.elide.core.PersistentResource;
 import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TestRequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
 import com.yahoo.elide.jsonapi.models.Data;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.models.Meta;
 import com.yahoo.elide.jsonapi.models.Relationship;
 import com.yahoo.elide.jsonapi.models.Resource;
 import com.yahoo.elide.jsonapi.models.ResourceIdentifier;
-import com.yahoo.elide.security.User;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
-import org.mockito.Answers;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import example.Child;
 import example.Parent;
+import org.apache.commons.collections4.IterableUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -45,32 +46,19 @@
  * JSON API testing.
  */
 public class JsonApiTest {
-    private RequestScope userScope;
     private JsonApiMapper mapper;
-    @BeforeTest
+    private User user = new TestUser("0");
+    private static String BASE_URL = "http://localhost:8080";
+
+    private EntityDictionary dictionary;
+    private DataStoreTransaction tx = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
+
+    @BeforeEach
     void init() {
-        EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
+        dictionary = TestDictionary.getTestDictionary();
         dictionary.bindEntity(Parent.class);
         dictionary.bindEntity(Child.class);
-        dictionary.bindInitializer(Parent::doInit, Parent.class);
-        mapper = new JsonApiMapper(dictionary);
-        AuditLogger testLogger = new TestAuditLogger();
-        userScope = new RequestScope(null, new JsonApiDocument(),
-                mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS),
-                new User(0), dictionary, mapper, testLogger);
-    }
-
-    @Test
-    public void checkInit() {
-        // Ensure that our object receives its init before serializing
-        Parent parent = new Parent();
-        parent.setId(123L);
-        parent.setChildren(Sets.newHashSet());
-        parent.setSpouses(Sets.newHashSet());
-
-        new PersistentResource<>(parent, userScope).toResource();
-
-        assertTrue(parent.init);
+        mapper = new JsonApiMapper();
     }
 
     @Test
@@ -78,13 +66,30 @@ public void writeSingleNoAttributesNoRel() throws JsonProcessingException {
         Parent parent = new Parent();
         parent.setId(123L);
 
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(new PersistentResource<>(parent, userScope).toResource()));
-
-        String expected = "{\"data\":{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":null},\"relationships\":{\"children\":{\"data\":[]},\"spouses\":{\"data\":[]}}}}";
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
 
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+        jsonApiDocument.setData(new Data<>(new PersistentResource<>(parent, userScope.getUUIDFor(parent), userScope).toResource()));
+
+        String expected = "{\"data\":{"
+                + "\"type\":\"parent\","
+                + "\"id\":\"123\","
+                + "\"attributes\":{\"firstName\":null},"
+                + "\"relationships\":{"
+                +   "\"children\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/children\",\"related\":\"http://localhost:8080/json/parent/123/children\"},"
+                +       "\"data\":[]},"
+                +   "\"spouses\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/spouses\",\"related\":\"http://localhost:8080/json/parent/123/spouses\"},"
+                +       "\"data\":[]}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/parent/123\"}}}";
+
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -98,13 +103,30 @@ public void writeSingle() throws JsonProcessingException {
         child.setParents(Collections.singleton(parent));
         child.setFriends(new HashSet<>());
 
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(new PersistentResource<>(parent, userScope).toResource()));
-
-        String expected = "{\"data\":{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},\"spouses\":{\"data\":[]}}}}";
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
 
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+        jsonApiDocument.setData(new Data<>(new PersistentResource<>(parent, userScope.getUUIDFor(parent), userScope).toResource()));
+
+        String expected = "{\"data\":{"
+                + "\"type\":\"parent\","
+                + "\"id\":\"123\","
+                + "\"attributes\":{\"firstName\":\"bob\"},"
+                + "\"relationships\":{"
+                +   "\"children\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/children\",\"related\":\"http://localhost:8080/json/parent/123/children\"},"
+                +       "\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},"
+                +   "\"spouses\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/spouses\",\"related\":\"http://localhost:8080/json/parent/123/spouses\"},"
+                +       "\"data\":[]}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/parent/123\"}}}";
+
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -118,16 +140,46 @@ public void writeSingleIncluded() throws JsonProcessingException {
         child.setParents(Collections.singleton(parent));
         child.setFriends(new HashSet<>());
 
-        PersistentResource<Parent> pRec = new PersistentResource<>(parent, userScope);
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
+
+        PersistentResource<Parent> pRec = new PersistentResource<>(parent, userScope.getUUIDFor(parent), userScope);
 
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
         jsonApiDocument.setData(new Data<>(pRec.toResource()));
-        jsonApiDocument.addIncluded(new PersistentResource<>(pRec, child, userScope).toResource());
-
-        String expected = "{\"data\":{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},\"spouses\":{\"data\":[]}}},\"included\":[{\"type\":\"child\",\"id\":\"2\",\"attributes\":{\"name\":null},\"relationships\":{\"friends\":{\"data\":[]},\"parents\":{\"data\":[{\"type\":\"parent\",\"id\":\"123\"}]}}}]}";
-
+        jsonApiDocument.addIncluded(
+                new PersistentResource<>(child, pRec, "children", userScope.getUUIDFor(child), userScope).toResource());
+
+        String expected = "{\"data\":{"
+                + "\"type\":\"parent\","
+                + "\"id\":\"123\","
+                + "\"attributes\":{\"firstName\":\"bob\"},"
+                + "\"relationships\":{"
+                +   "\"children\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/children\",\"related\":\"http://localhost:8080/json/parent/123/children\"},"
+                +       "\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},"
+                +   "\"spouses\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/spouses\",\"related\":\"http://localhost:8080/json/parent/123/spouses\"},"
+                +       "\"data\":[]}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/parent/123\"}},"
+                + "\"included\":[{"
+                +   "\"type\":\"child\","
+                +   "\"id\":\"2\","
+                +   "\"attributes\":{\"name\":null},"
+                +   "\"relationships\":{"
+                +       "\"friends\":{"
+                +           "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2/relationships/friends\",\"related\":\"http://localhost:8080/json/parent/123/children/2/friends\"},"
+                +           "\"data\":[]},"
+                +       "\"parents\":{"
+                +           "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2/relationships/parents\",\"related\":\"http://localhost:8080/json/parent/123/children/2/parents\"},"
+                +           "\"data\":[{\"type\":\"parent\",\"id\":\"123\"}]}},"
+                +   "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2\"}}]}";
+
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -142,14 +194,31 @@ public void writeList() throws JsonProcessingException {
         parent.setFirstName("bob");
         child.setFriends(new HashSet<>());
 
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
+
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
         jsonApiDocument.setData(
-            new Data<>(Collections.singletonList(new PersistentResource<>(parent, userScope).toResource())));
-
-        String expected = "{\"data\":[{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},\"spouses\":{\"data\":[]}}}]}";
-
+            new Data<>(Collections.singletonList(new PersistentResource<>(parent, userScope.getUUIDFor(parent), userScope).toResource())));
+
+        String expected = "{\"data\":[{"
+                + "\"type\":\"parent\","
+                + "\"id\":\"123\","
+                + "\"attributes\":{\"firstName\":\"bob\"},"
+                + "\"relationships\":{"
+                +   "\"children\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/children\",\"related\":\"http://localhost:8080/json/parent/123/children\"},"
+                +       "\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},"
+                +   "\"spouses\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/spouses\",\"related\":\"http://localhost:8080/json/parent/123/spouses\"},"
+                +       "\"data\":[]}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/parent/123\"}}]}";
+
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -163,18 +232,50 @@ public void writeListIncluded() throws JsonProcessingException {
         parent.setFirstName("bob");
         child.setFriends(new HashSet<>());
 
-        PersistentResource<Parent> pRec = new PersistentResource<>(parent, userScope);
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
+
+        PersistentResource<Parent> pRec = new PersistentResource<>(parent, userScope.getUUIDFor(parent), userScope);
 
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
         jsonApiDocument.setData(new Data<>(Collections.singletonList(pRec.toResource())));
-        jsonApiDocument.addIncluded(new PersistentResource<>(pRec, child, userScope).toResource());
+        jsonApiDocument.addIncluded(new PersistentResource<>(child,
+                pRec, "children", userScope.getUUIDFor(child), userScope).toResource());
         // duplicate will be ignored
-        jsonApiDocument.addIncluded(new PersistentResource<>(pRec, child, userScope).toResource());
-
-        String expected = "{\"data\":[{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},\"spouses\":{\"data\":[]}}}],\"included\":[{\"type\":\"child\",\"id\":\"2\",\"attributes\":{\"name\":null},\"relationships\":{\"friends\":{\"data\":[]},\"parents\":{\"data\":[{\"type\":\"parent\",\"id\":\"123\"}]}}}]}";
-
+        jsonApiDocument.addIncluded(
+                new PersistentResource<>(child, pRec, "children", userScope.getUUIDFor(child), userScope).toResource());
+
+        String expected = "{\"data\":[{"
+                + "\"type\":\"parent\","
+                + "\"id\":\"123\","
+                + "\"attributes\":{\"firstName\":\"bob\"},"
+                + "\"relationships\":{"
+                +   "\"children\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/children\",\"related\":\"http://localhost:8080/json/parent/123/children\"},"
+                +       "\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},"
+                +   "\"spouses\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/relationships/spouses\",\"related\":\"http://localhost:8080/json/parent/123/spouses\"},"
+                +       "\"data\":[]}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/parent/123\"}}],"
+                + "\"included\":[{"
+                +   "\"type\":\"child\","
+                +   "\"id\":\"2\","
+                +   "\"attributes\":{\"name\":null},"
+                +   "\"relationships\":{"
+                +       "\"friends\":{"
+                +           "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2/relationships/friends\",\"related\":\"http://localhost:8080/json/parent/123/children/2/friends\"},"
+                +           "\"data\":[]},"
+                +       "\"parents\":{"
+                +           "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2/relationships/parents\",\"related\":\"http://localhost:8080/json/parent/123/children/2/parents\"},"
+                +           "\"data\":[{\"type\":\"parent\",\"id\":\"123\"}]}},"
+                +   "\"links\":{\"self\":\"http://localhost:8080/json/parent/123/children/2\"}}]"
+                + "}";
+
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -186,8 +287,12 @@ public void writeEmptyList() throws JsonProcessingException {
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
         jsonApiDocument.setData(empty);
 
+        Data<Resource> data = jsonApiDocument.getData();
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -199,8 +304,41 @@ public void writeEmptyObject() throws JsonProcessingException {
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
         jsonApiDocument.setData(empty);
 
+        Data<Resource> data = jsonApiDocument.getData();
+        String doc = mapper.writeJsonApiDocument(jsonApiDocument);
+        assertEquals(data, jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
+    }
+
+    @Test
+    public void writeNullObject() throws JsonProcessingException {
+        String expected = "{\"data\":null}";
+
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+        jsonApiDocument.setData(null);
+
+        assertNull(jsonApiDocument.getData());
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
-        assertEquals(doc, expected);
+        assertNull(jsonApiDocument.getData());
+
+        assertEquals(expected, doc);
+        checkEquality(jsonApiDocument);
+    }
+
+    @Test
+    public void testMissingTypeInResource() {
+        String doc = "{ \"data\": { \"id\": \"22\", \"attributes\": { \"title\": \"works fine\" } } }";
+
+        assertThrows(JsonMappingException.class, () -> mapper.readJsonApiDocument(doc));
+    }
+
+    @Test
+    public void testMissingTypeInResourceList() {
+        String doc = "{ \"data\": [{ \"id\": \"22\", \"attributes\": { \"title\": \"works fine\" } } ]}";
+
+        assertThrows(JsonMappingException.class, () -> mapper.readJsonApiDocument(doc));
     }
 
     @Test
@@ -214,11 +352,33 @@ public void readSingle() throws IOException {
         Map<String, Object> attributes = data.getAttributes();
         Map<String, Relationship> relations = data.getRelationships();
 
+        assertEquals("parent", data.getType());
+        assertEquals("123", data.getId());
+        assertEquals("bob", attributes.get("firstName"));
+        assertEquals("child", relations.get("children").getData().getSingleValue().getType());
+        assertEquals("2", relations.get("children").getData().getSingleValue().getId());
+        checkEquality(jsonApiDocument);
+    }
+
+    @Test
+    public void readSingleWithMeta() throws IOException {
+        String doc = "{\"data\":{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"data\":{\"type\":\"child\",\"id\":\"2\"}}}},\"meta\":{\"additional\":\"info\"}}";
+
+        JsonApiDocument jsonApiDocument = mapper.readJsonApiDocument(doc);
+
+        Meta meta = jsonApiDocument.getMeta();
+        Data<Resource> dataObj = jsonApiDocument.getData();
+        Resource data = dataObj.getSingleValue();
+        Map<String, Object> attributes = data.getAttributes();
+        Map<String, Relationship> relations = data.getRelationships();
+
+        assertEquals(meta.getMetaMap().get("additional"), "info");
         assertEquals(data.getType(), "parent");
         assertEquals(data.getId(), "123");
         assertEquals(attributes.get("firstName"), "bob");
         assertEquals(relations.get("children").getData().getSingleValue().getType(), "child");
         assertEquals(relations.get("children").getData().getSingleValue().getId(), "2");
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -231,17 +391,18 @@ public void readSingleIncluded() throws Exception {
         Resource data = dataObj.getSingleValue();
         Map<String, Object> attributes = data.getAttributes();
         List<Resource> included = jsonApiDocument.getIncluded();
-        Resource includedChild = included.iterator().next();
+        Resource includedChild = IterableUtils.first(included);
         ResourceIdentifier parent = includedChild.getRelationships()
-                                                 .get("parents")
-                                                 .getResourceIdentifierData().getSingleValue();
-
-        assertEquals(data.getType(), "parent");
-        assertEquals(data.getId(), "123");
-        assertEquals(attributes.get("firstName"), "bob");
-        assertEquals(includedChild.getType(), "child");
-        assertEquals(includedChild.getId(), "2");
-        assertEquals(parent.getId(), "123");
+                .get("parents")
+                .getResourceIdentifierData().getSingleValue();
+
+        assertEquals("parent", data.getType());
+        assertEquals("123", data.getId());
+        assertEquals("bob", attributes.get("firstName"));
+        assertEquals("child", includedChild.getType());
+        assertEquals("2", includedChild.getId());
+        assertEquals("123", parent.getId());
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -255,11 +416,12 @@ public void readList() throws IOException {
         Map<String, Object> attributes = data.getAttributes();
         List<Resource> included = jsonApiDocument.getIncluded();
 
-        assertEquals(data.getType(), "parent");
-        assertEquals(data.getId(), "123");
-        assertEquals(attributes.get("firstName"), "bob");
-        assertEquals(data.getRelationships().get("children").getData().getSingleValue().getId(), "2");
+        assertEquals("parent", data.getType());
+        assertEquals("123", data.getId());
+        assertEquals("bob", attributes.get("firstName"));
+        assertEquals("2", data.getRelationships().get("children").getData().getSingleValue().getId());
         assertNull(included);
+        checkEquality(jsonApiDocument);
     }
 
     @Test
@@ -272,14 +434,90 @@ public void readListIncluded() throws IOException {
         Resource data = list.get().iterator().next();
         Map<String, Object> attributes = data.getAttributes();
         List<Resource> included = jsonApiDocument.getIncluded();
-        Resource includedChild = included.iterator().next();
+        Resource includedChild = IterableUtils.first(included);
         ResourceIdentifier parent = includedChild.getRelationships().get("parents").getResourceIdentifierData().getSingleValue();
 
+        assertEquals("parent", data.getType());
+        assertEquals("123", data.getId());
+        assertEquals("bob", attributes.get("firstName"));
+        assertEquals("child", includedChild.getType());
+        assertEquals("2", includedChild.getId());
+        assertEquals("123", parent.getId());
+        checkEquality(jsonApiDocument);
+    }
+
+    @Test
+    public void readListWithMeta() throws IOException {
+        String doc = "{\"data\":[{\"type\":\"parent\",\"id\":\"123\",\"attributes\":{\"firstName\":\"bob\"},\"relationships\":{\"children\":{\"links\":{\"self\":\"/parent/123/relationships/child\",\"related\":\"/parent/123/child\"},\"data\":{\"type\":\"child\",\"id\":\"2\"}}}}],\"meta\":{\"additional\":\"info\"}}";
+
+        JsonApiDocument jsonApiDocument = mapper.readJsonApiDocument(doc);
+
+        Meta meta = jsonApiDocument.getMeta();
+        Data<Resource> list = jsonApiDocument.getData();
+        Resource data = list.get().iterator().next();
+        Map<String, Object> attributes = data.getAttributes();
+        List<Resource> included = jsonApiDocument.getIncluded();
+
+        assertEquals(meta.getMetaMap().get("additional"), "info");
         assertEquals(data.getType(), "parent");
         assertEquals(data.getId(), "123");
         assertEquals(attributes.get("firstName"), "bob");
-        assertEquals(includedChild.getType(), "child");
-        assertEquals(includedChild.getId(), "2");
-        assertEquals(parent.getId(), "123");
+        assertEquals(data.getRelationships().get("children").getData().getSingleValue().getId(), "2");
+        assertNull(included);
+        checkEquality(jsonApiDocument);
+    }
+
+    @Test
+    public void compareNullAndEmpty() {
+        Data<Resource> empty = new Data<>((Resource) null);
+
+        JsonApiDocument jsonApiEmpty = new JsonApiDocument();
+        jsonApiEmpty.setData(empty);
+
+        JsonApiDocument jsonApiNull = new JsonApiDocument();
+        jsonApiNull.setData(null);
+
+        assertEquals(jsonApiEmpty, jsonApiNull);
+        assertEquals(jsonApiEmpty.hashCode(), jsonApiNull.hashCode());
+    }
+
+    @Test
+    public void compareOrder() {
+        Parent parent1 = new Parent();
+        parent1.setId(123L);
+        Parent parent2 = new Parent();
+        parent2.setId(456L);
+
+        RequestScope userScope = new TestRequestScope(BASE_URL, tx, user, dictionary);
+
+        PersistentResource<Parent> pRec1 = new PersistentResource<>(parent1, userScope.getUUIDFor(parent1), userScope);
+        PersistentResource<Parent> pRec2 = new PersistentResource<>(parent2, userScope.getUUIDFor(parent2), userScope);
+
+        JsonApiDocument jsonApiDocument1 = new JsonApiDocument();
+        jsonApiDocument1.setData(new Data<>(Lists.newArrayList(pRec1.toResource(), pRec2.toResource())));
+
+        JsonApiDocument jsonApiDocument2 = new JsonApiDocument();
+        jsonApiDocument2.setData(new Data<>(Lists.newArrayList(pRec2.toResource(), pRec1.toResource())));
+
+        assertEquals(jsonApiDocument1, jsonApiDocument2);
+        assertEquals(jsonApiDocument1.hashCode(), jsonApiDocument2.hashCode());
+
+        jsonApiDocument1.getData().sort((a, b) -> Integer.compare(a.hashCode(), b.hashCode()));
+        jsonApiDocument2.getData().sort((a, b) -> Integer.compare(b.hashCode(), a.hashCode()));
+
+        assertEquals(jsonApiDocument1, jsonApiDocument2);
+        assertEquals(jsonApiDocument1.hashCode(), jsonApiDocument2.hashCode());
+    }
+
+    private void checkEquality(JsonApiDocument doc1) {
+        JsonApiDocument doc2;
+        try {
+            String json = mapper.writeJsonApiDocument(doc1);
+            doc2 = mapper.readJsonApiDocument(json);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        assertEquals(doc1, doc2);
+        assertEquals(doc1.hashCode(), doc2.hashCode());
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessorTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessorTest.java
index fe4b25a06c..e9c0d78df8 100644
--- a/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessorTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/IncludedProcessorTest.java
@@ -5,34 +5,33 @@
  */
 package com.yahoo.elide.jsonapi.document.processors;
 
-import com.google.common.collect.Sets;
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
 import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.TestRequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.security.TestUser;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 import com.yahoo.elide.jsonapi.models.Resource;
-import com.yahoo.elide.security.User;
+import com.google.common.collect.Sets;
 import example.Child;
+import example.FunWithPermissions;
 import example.Parent;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
-
-import static org.mockito.Mockito.mock;
-
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 
 public class IncludedProcessorTest {
     private static final String INCLUDE = "include";
@@ -48,17 +47,24 @@ public class IncludedProcessorTest {
     private PersistentResource<Child> childRecord3;
     private PersistentResource<Child> childRecord4;
 
-    @BeforeMethod
+    private PersistentResource<FunWithPermissions> funWithPermissionsRecord;
+
+    private DataStoreTransaction mockTransaction = mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS);
+    private TestRequestScope testScope;
+    private EntityDictionary dictionary;
+
+    @BeforeEach
     public void setUp() throws Exception {
         includedProcessor = new IncludedProcessor();
 
-        EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
+        dictionary = TestDictionary.getTestDictionary();
         dictionary.bindEntity(Child.class);
         dictionary.bindEntity(Parent.class);
+        dictionary.bindEntity(FunWithPermissions.class);
 
-        RequestScope goodUserScope = new RequestScope(null,
-                new JsonApiDocument(), mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS),
-                new User(1), dictionary, null, new TestAuditLogger());
+        reset(mockTransaction);
+
+        testScope = new TestRequestScope(mockTransaction, new TestUser("1"), dictionary);
 
         //Create objects
         Parent parent1 = newParent(1);
@@ -70,6 +76,8 @@ public void setUp() throws Exception {
         Child child3 = newChild(4);
         Child child4 = newChild(5);
 
+        FunWithPermissions funWithPermissions = newFunWithPermissions(1);
+
         //Form relationships
         parent1.setSpouses(new HashSet<>(Collections.singletonList(parent2)));
         parent1.setChildren(new HashSet<>(Collections.singletonList(child1)));
@@ -81,14 +89,17 @@ public void setUp() throws Exception {
         child3.setFriends(new HashSet<>(Collections.singletonList(child1)));
         child4.setFriends(new HashSet<>(Collections.singletonList(child2)));
 
-        //Create Persistent Resources
-        parentRecord1 = new PersistentResource<>(parent1, goodUserScope);
-        parentRecord2 = new PersistentResource<>(parent2, goodUserScope);
-        parentRecord3 = new PersistentResource<>(parent3, goodUserScope);
-        childRecord1  = new PersistentResource<>(child1, goodUserScope);
-        childRecord2  = new PersistentResource<>(child2, goodUserScope);
-        childRecord3  = new PersistentResource<>(child3, goodUserScope);
-        childRecord4  = new PersistentResource<>(child4, goodUserScope);
+        //Create Persistent Resource
+        parentRecord1 = new PersistentResource<>(parent1, String.valueOf(parent1.getId()), testScope);
+        parentRecord2 = new PersistentResource<>(parent2, String.valueOf(parent2.getId()), testScope);
+        parentRecord3 = new PersistentResource<>(parent3, String.valueOf(parent3.getId()), testScope);
+        childRecord1  = new PersistentResource<>(child1, String.valueOf(child1.getId()), testScope);
+        childRecord2  = new PersistentResource<>(child2, String.valueOf(child2.getId()), testScope);
+        childRecord3  = new PersistentResource<>(child3, String.valueOf(child3.getId()), testScope);
+        childRecord4  = new PersistentResource<>(child4, String.valueOf(child4.getId()), testScope);
+
+        funWithPermissionsRecord = new PersistentResource<>(funWithPermissions,
+                String.valueOf(funWithPermissions.getId()), testScope);
     }
 
     @Test
@@ -97,12 +108,13 @@ public void testExecuteSingleRelation() throws Exception {
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put(INCLUDE, Collections.singletonList("children"));
-        includedProcessor.execute(jsonApiDocument, parentRecord1, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parentRecord1, queryParams);
 
         List<Resource> expectedIncluded = Collections.singletonList(childRecord1.toResource());
         List<Resource> actualIncluded = jsonApiDocument.getIncluded();
 
-        Assert.assertEquals(actualIncluded, expectedIncluded,
+        assertEquals(expectedIncluded, actualIncluded,
                 "Included Processor added single requested resource from 'include' query param");
     }
 
@@ -116,28 +128,31 @@ public void testExecuteSingleRelationOnCollection() throws Exception {
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put(INCLUDE, Collections.singletonList("children"));
-        includedProcessor.execute(jsonApiDocument, parents, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parents, queryParams);
 
         List<Resource> expectedIncluded = Arrays.asList(childRecord1.toResource(), childRecord2.toResource());
         List<Resource> actualIncluded = jsonApiDocument.getIncluded();
 
-        Assert.assertEquals(actualIncluded, expectedIncluded,
+        assertEquals(expectedIncluded, actualIncluded,
                 "Included Processor added requested resource from all records");
     }
 
     @Test
     public void testExecuteSingleNestedRelation() throws Exception {
+
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put(INCLUDE, Collections.singletonList("children.friends"));
-        includedProcessor.execute(jsonApiDocument, parentRecord1, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parentRecord1, queryParams);
 
         List<Resource> expectedIncluded =
                 Arrays.asList(childRecord1.toResource(), childRecord2.toResource());
         List<Resource> actualIncluded = jsonApiDocument.getIncluded();
 
-        Assert.assertEquals(actualIncluded, expectedIncluded,
+        assertEquals(expectedIncluded, actualIncluded,
                 "Included Processor added single nested requested resources from 'include' query param");
     }
 
@@ -147,13 +162,14 @@ public void testExecuteMultipleRelations() throws Exception {
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put(INCLUDE, Arrays.asList("children", "spouses"));
-        includedProcessor.execute(jsonApiDocument, parentRecord1, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parentRecord1, queryParams);
 
         List<Resource> expectedIncluded =
                 Arrays.asList(childRecord1.toResource(), parentRecord2.toResource());
         List<Resource> actualIncluded = jsonApiDocument.getIncluded();
 
-        Assert.assertEquals(actualIncluded, expectedIncluded,
+        assertEquals(expectedIncluded, actualIncluded,
                 "Included Processor added single requested resource from 'include' query param");
     }
 
@@ -163,7 +179,8 @@ public void testExecuteMultipleNestedRelations() throws Exception {
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put(INCLUDE, Collections.singletonList("children.friends"));
-        includedProcessor.execute(jsonApiDocument, parentRecord3, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parentRecord3, queryParams);
 
         Set<Resource> expectedIncluded =
                 Sets.newHashSet(
@@ -174,16 +191,29 @@ public void testExecuteMultipleNestedRelations() throws Exception {
                 );
         Set<Resource> actualIncluded = new HashSet<>(jsonApiDocument.getIncluded());
 
-        Assert.assertEquals(actualIncluded, expectedIncluded,
+        assertEquals(expectedIncluded, actualIncluded,
                 "Included Processor added multiple nested requested resource collections from 'include' query param");
     }
 
+    @Test
+    public void testIncludeForbiddenRelationship() {
+        JsonApiDocument jsonApiDocument = new JsonApiDocument();
+
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put(INCLUDE, Collections.singletonList("relation1"));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, funWithPermissionsRecord, queryParams);
+
+        assertNull(jsonApiDocument.getIncluded(),
+                "Included Processor included forbidden relationship");
+    }
+
     @Test
     public void testNoQueryParams() throws Exception {
         JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        includedProcessor.execute(jsonApiDocument, parentRecord1, Optional.empty());
+        includedProcessor.execute(jsonApiDocument, parentRecord1, null);
 
-        Assert.assertNull(jsonApiDocument.getIncluded(),
+        assertNull(jsonApiDocument.getIncluded(),
                 "Included Processor adds no resources when not given query params");
     }
 
@@ -194,9 +224,10 @@ public void testNoQueryIncludeParams() throws Exception {
 
         MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
         queryParams.put("unused", Collections.emptyList());
-        includedProcessor.execute(jsonApiDocument, parentRecord1, Optional.of(queryParams));
+        testScope.setQueryParams(queryParams);
+        includedProcessor.execute(jsonApiDocument, parentRecord1, queryParams);
 
-        Assert.assertNull(jsonApiDocument.getIncluded(),
+        assertNull(jsonApiDocument.getIncluded(),
                 "Included Processor adds no resources when not given query params");
     }
 
@@ -214,4 +245,11 @@ private static Child newChild(int id) {
         child.setParents(new HashSet<>());
         return child;
     }
+
+    private FunWithPermissions newFunWithPermissions(int id) {
+        FunWithPermissions funWithPermissions = new FunWithPermissions();
+        funWithPermissions.setId(id);
+        funWithPermissions.setRelation1(new HashSet<>());
+        return funWithPermissions;
+    }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/SortProcessorTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/SortProcessorTest.java
deleted file mode 100644
index 1c175b5b21..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/jsonapi/document/processors/SortProcessorTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.jsonapi.document.processors;
-
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.jsonapi.models.Data;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Resource;
-import com.yahoo.elide.security.User;
-import example.Child;
-import example.Parent;
-import example.Post;
-import org.mockito.Answers;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import static org.mockito.Mockito.mock;
-
-public class SortProcessorTest {
-    private static final String SORT = "sort";
-
-    private SortProcessor sortProcessor;
-
-    private PersistentResource<Parent> parentRecord1;
-    private PersistentResource<Parent> parentRecord2;
-    private PersistentResource<Parent> parentRecord3;
-
-    private EntityDictionary dictionary;
-    private RequestScope goodUserScope;
-
-    @BeforeMethod
-    public void setUp() throws Exception {
-        dictionary = new EntityDictionary(new HashMap<>());
-        dictionary.bindEntity(Child.class);
-        dictionary.bindEntity(Parent.class);
-
-        sortProcessor = new SortProcessor();
-        goodUserScope = new RequestScope(null, new JsonApiDocument(),
-                mock(DataStoreTransaction.class, Answers.CALLS_REAL_METHODS),
-                new User(1), dictionary, null, new TestAuditLogger());
-
-        //Create objects
-        Parent parent1 = newParent(1);
-        parent1.setFirstName("Alex");
-
-        Parent parent2 = newParent(2);
-        parent2.setFirstName("Zack");
-
-        Parent parent3 = newParent(3);
-        parent3.setFirstName("Mike");
-
-        Parent parent4 = newParent(4);
-        parent4.setFirstName("Alex");
-
-        //Create Persistent Resources
-        parentRecord1 = new PersistentResource<>(parent1, goodUserScope);
-        parentRecord2 = new PersistentResource<>(parent2, goodUserScope);
-        parentRecord3 = new PersistentResource<>(parent3, goodUserScope);
-    }
-
-    @Test
-    public void testExecuteSingleSortField() throws Exception {
-
-        // Mock parents
-        Set<PersistentResource> parents = new HashSet<>();
-        parents.add(parentRecord1);
-        parents.add(parentRecord2);
-        parents.add(parentRecord3);
-
-        // Mock query params
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
-        queryParams.put(SORT, Collections.singletonList("firstName"));
-
-        // Assert sort order
-        List<Resource> givenOrder = Arrays.asList(parentRecord1.toResource(), parentRecord2.toResource(), parentRecord3.toResource());
-        List<Resource> expectedOrder = Arrays.asList(parentRecord1.toResource(), parentRecord3.toResource(), parentRecord2.toResource());
-
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(givenOrder));
-        sortProcessor.execute(jsonApiDocument, parents, Optional.of(queryParams));
-        Collection<Resource> actualOrder = jsonApiDocument.getData().get();
-
-        Assert.assertEquals(actualOrder, expectedOrder,
-                "Sort Processor sorted parents in ascending order by name");
-    }
-
-    @Test
-    public void testExecuteDescendingSortField() throws Exception {
-
-        // Mock parents
-        Set<PersistentResource> parents = new HashSet<>();
-        parents.add(parentRecord1);
-        parents.add(parentRecord2);
-        parents.add(parentRecord3);
-
-        // Mock query params
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
-        queryParams.put(SORT, Collections.singletonList("-firstName"));
-
-        // Assert sort order
-        List<Resource> givenOrder = Arrays.asList(parentRecord1.toResource(), parentRecord2.toResource(), parentRecord3.toResource());
-        List<Resource> expectedOrder = Arrays.asList(parentRecord2.toResource(), parentRecord3.toResource(), parentRecord1.toResource());
-
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(givenOrder));
-        sortProcessor.execute(jsonApiDocument, parents, Optional.of(queryParams));
-        Collection<Resource> actualOrder = jsonApiDocument.getData().get();
-
-        Assert.assertEquals(actualOrder, expectedOrder,
-                "Sort Processor sorted parents in descending order by name when field was preceded by '-'");
-    }
-
-    @Test
-    public void testExecuteMultipleSortField() throws Exception {
-        // Mock posts
-        dictionary.bindEntity(Post.class);
-
-        Post post1 = new Post();
-        post1.setId(1);
-        post1.setTitle("Hello world!");
-        post1.setCreated(10);
-
-        Post post2 = new Post();
-        post2.setId(2);
-        post2.setTitle("Hello world!");
-        post2.setCreated(20);
-
-        Post post3 = new Post();
-        post3.setId(3);
-        post3.setTitle("Goodbye world!");
-        post3.setCreated(10);
-
-        //Create Persistent Resources
-        PersistentResource<Post> postRecord1 = new PersistentResource<>(post1, goodUserScope);
-        PersistentResource<Post> postRecord2 = new PersistentResource<>(post2, goodUserScope);
-        PersistentResource<Post> postRecord3 = new PersistentResource<>(post3, goodUserScope);
-
-        // Mock parents
-        Set<PersistentResource> posts = new HashSet<>();
-        posts.add(postRecord1);
-        posts.add(postRecord2);
-        posts.add(postRecord3);
-
-        // Mock query params
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
-        queryParams.put(SORT, Arrays.asList("title", "-created"));
-
-        // Assert sort order
-        List<Resource> givenOrder = Arrays.asList(postRecord1.toResource(), postRecord2.toResource(), postRecord3.toResource());
-        List<Resource> expectedOrder = Arrays.asList(postRecord3.toResource(), postRecord2.toResource(), postRecord1.toResource());
-
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(givenOrder));
-        sortProcessor.execute(jsonApiDocument, posts, Optional.of(queryParams));
-        Collection<Resource> actualOrder = jsonApiDocument.getData().get();
-
-        Assert.assertEquals(actualOrder, expectedOrder,
-                "Sort Processor sorted posts in ascending order by title and resolved ties in descending order by created");
-    }
-
-    @Test
-    public void testExecuteNonExistentField() throws Exception {
-
-        // Mock parents
-        Set<PersistentResource> parents = new HashSet<>();
-        parents.add(parentRecord1);
-        parents.add(parentRecord2);
-        parents.add(parentRecord3);
-
-        // Mock query params
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
-        queryParams.put(SORT, Collections.singletonList("doesNotExist"));
-
-        // Assert sort order
-        List<Resource> givenOrder = Arrays.asList(parentRecord1.toResource(), parentRecord2.toResource(), parentRecord3.toResource());
-
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(givenOrder));
-        sortProcessor.execute(jsonApiDocument, parents, Optional.of(queryParams));
-        Collection<Resource> actualOrder = jsonApiDocument.getData().get();
-
-        Assert.assertEquals(actualOrder, givenOrder,
-                "Sort Processor ignored sort field that didn't exist");
-    }
-
-    @Test
-    public void testExecuteNoSortParam() throws Exception {
-
-        // Mock parents
-        Set<PersistentResource> parents = new HashSet<>();
-        parents.add(parentRecord1);
-        parents.add(parentRecord2);
-        parents.add(parentRecord3);
-
-        // Mock query params
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<>();
-        queryParams.put("notSort", Collections.singletonList("doesNotExist"));
-
-        // Assert sort order
-        List<Resource> givenOrder = Arrays.asList(parentRecord1.toResource(), parentRecord2.toResource(), parentRecord3.toResource());
-
-        JsonApiDocument jsonApiDocument = new JsonApiDocument();
-        jsonApiDocument.setData(new Data<>(givenOrder));
-        sortProcessor.execute(jsonApiDocument, parents, Optional.of(queryParams));
-        Collection<Resource> actualOrder = jsonApiDocument.getData().get();
-
-        Assert.assertEquals(actualOrder, givenOrder,
-                "Sort Processor did nothing when 'sort' param was not given");
-    }
-
-    private static Parent newParent(int id) {
-        Parent parent = new Parent();
-        parent.setId(id);
-        parent.setChildren(new HashSet<>());
-        parent.setSpouses(new HashSet<>());
-        return parent;
-    }
-
-    private static Child newChild(int id) {
-        Child child = new Child();
-        child.setId(id);
-        child.setParents(new HashSet<>());
-        return child;
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/models/PatchTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/models/PatchTest.java
index 3d00ae6b66..2b49ce49ea 100644
--- a/elide-core/src/test/java/com/yahoo/elide/jsonapi/models/PatchTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/jsonapi/models/PatchTest.java
@@ -5,13 +5,13 @@
  */
 package com.yahoo.elide.jsonapi.models;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
+import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
 import java.util.List;
 
 public class PatchTest {
@@ -24,7 +24,7 @@ public void testSerialization() throws Exception {
         String expected = "{\"op\":\"add\",\"path\":\"/foo/bar\",\"value\":\"stringValue\"}";
         String actual = mapper.writeValueAsString(patch);
 
-        Assert.assertEquals(expected, actual, "A patch object should serialize correctly as a string.");
+        assertEquals(expected, actual, "A patch object should serialize correctly as a string.");
     }
 
     @Test
@@ -33,26 +33,26 @@ public void testDeserialization() throws Exception {
         String input = "{\"op\":\"add\",\"path\":\"/foo/bar\",\"value\":\"stringValue\"}";
         Patch patch = mapper.readValue(input, Patch.class);
 
-        Assert.assertEquals(patch.getOperation(), Patch.Operation.ADD, "Deserialized patch operation should match.");
-        Assert.assertEquals(patch.getPath(), "/foo/bar", "Deserialized patch path should match.");
+        assertEquals(Patch.Operation.ADD, patch.getOperation(), "Deserialized patch operation should match.");
+        assertEquals("/foo/bar", patch.getPath(), "Deserialized patch path should match.");
 
         JsonNode node = patch.getValue();
 
         String value = mapper.treeToValue(node, String.class);
 
-        Assert.assertEquals(value, "stringValue", "Deserialized patch value should match");
+        assertEquals("stringValue", value, "Deserialized patch value should match");
     }
 
     @Test
     public void testListSerialization() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode valueNode = mapper.readTree("\"stringValue\"");
-        List<Patch> patches = Lists.newArrayList(new Patch(Patch.Operation.ADD, "/foo/bar", valueNode));
+        List<Patch> patches = Collections.singletonList(new Patch(Patch.Operation.ADD, "/foo/bar", valueNode));
 
         String expected = "[{\"op\":\"add\",\"path\":\"/foo/bar\",\"value\":\"stringValue\"}]";
         String actual = mapper.writeValueAsString(patches);
 
-        Assert.assertEquals(expected, actual, "A list of patch object should serialized correctly as a string.");
+        assertEquals(expected, actual, "A list of patch object should serialized correctly as a string.");
     }
 
     @Test
@@ -62,13 +62,13 @@ public void testListDeserialization() throws Exception {
         String input = "[{\"op\":\"add\",\"path\":\"/foo/bar\",\"value\":\"stringValue\"}]";
 
         List<Patch> patches = mapper.readValue(input, new TypeReference<List<Patch>>() { });
-        Assert.assertEquals(patches.get(0).getOperation(), Patch.Operation.ADD, "Deserialized patch operation should match.");
-        Assert.assertEquals(patches.get(0).getPath(), "/foo/bar", "Deserialized patch path should match.");
+        assertEquals(Patch.Operation.ADD, patches.get(0).getOperation(), "Deserialized patch operation should match.");
+        assertEquals("/foo/bar", patches.get(0).getPath(), "Deserialized patch path should match.");
 
         JsonNode node = patches.get(0).getValue();
 
         String value = mapper.treeToValue(node, String.class);
 
-        Assert.assertEquals(value, "stringValue", "Deserialized patch value should match");
+        assertEquals("stringValue", value, "Deserialized patch value should match");
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/parsers/JsonApiParserTest.java b/elide-core/src/test/java/com/yahoo/elide/parsers/JsonApiParserTest.java
new file mode 100644
index 0000000000..88a73da2d1
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/parsers/JsonApiParserTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.parsers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.jsonapi.parser.JsonApiParser;
+import org.junit.jupiter.api.Test;
+
+public class JsonApiParserTest {
+
+    @Test
+    public void testNormalizePath() {
+
+        String normalizedPath;
+
+        normalizedPath = JsonApiParser.normalizePath("books/1/author");
+        assertEquals("books/1/author", normalizedPath,  "it does not change normalized paths");
+
+        normalizedPath = JsonApiParser.normalizePath("/books");
+        assertEquals("books", normalizedPath,  "it removes leading path separators");
+
+        normalizedPath = JsonApiParser.normalizePath("books/");
+        assertEquals("books", normalizedPath,  "it removes trailing path separators");
+
+        normalizedPath = JsonApiParser.normalizePath("///books///1///author////");
+        assertEquals("books/1/author", normalizedPath,  "it deduplicates path separators");
+
+        normalizedPath = JsonApiParser.normalizePath("//books//1//author//");
+        assertEquals("books/1/author", normalizedPath,  "it deduplicates path separators");
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/CanPaginateVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/CanPaginateVisitorTest.java
index c2b451e029..715cd232b6 100644
--- a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/CanPaginateVisitorTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/CanPaginateVisitorTest.java
@@ -6,46 +6,57 @@
 
 package com.yahoo.elide.parsers.expression;
 
-import com.google.common.collect.Sets;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.core.EntityDictionary;
 import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.FilterExpressionCheck;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.UserCheck;
-import org.testng.Assert;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.visitors.CanPaginateVisitor;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import javax.persistence.Entity;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
 public class CanPaginateVisitorTest {
 
-    private Map<String, Class<? extends Check>> checkMappings;
+    private static Map<String, Class<? extends Check>> checkMappings;
 
     public static final class TestOperationCheck extends OperationCheck<Object> {
         @Override
         public boolean ok(Object object,
-                          com.yahoo.elide.security.RequestScope requestScope,
+                          com.yahoo.elide.core.security.RequestScope requestScope,
                           Optional<ChangeSpec> changeSpec) {
             return false;
         }
     }
 
-    public static final class TestUserCheck extends UserCheck {
+    public static final class FalseUserCheck extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return false;
+        }
+    }
+
+    public static final class TrueUserCheck extends UserCheck {
         @Override
         public boolean ok(User user) {
             return true;
@@ -54,17 +65,18 @@ public boolean ok(User user) {
 
     public static final class TestFilterExpressionCheck extends FilterExpressionCheck<Object> {
         @Override
-        public FilterExpression getFilterExpression(com.yahoo.elide.security.RequestScope requestScope) {
+        public FilterExpression getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
             return null;
         }
     }
 
 
-    @BeforeSuite
-    void init() {
+    @BeforeAll
+    public static void init() {
         checkMappings = new HashMap<>();
         checkMappings.put("In Memory Check", TestOperationCheck.class);
-        checkMappings.put("User Check", TestUserCheck.class);
+        checkMappings.put("False User Check", FalseUserCheck.class);
+        checkMappings.put("True User Check", TrueUserCheck.class);
         checkMappings.put("Filter Expression Check", TestFilterExpressionCheck.class);
     }
 
@@ -72,201 +84,268 @@ void init() {
     @Test
     public void testNoPermissions() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
-            public String title;
+            @Id
+            private long id;
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
 
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testClassOperationPermissions() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         @ReadPermission(expression = "In Memory Check")
         class Book {
-            public String title;
+            @Id
+            private long id;
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testClassUserPermissions() throws Exception {
         @Entity
-        @Include
-        @ReadPermission(expression = "User Check")
+        @Include(rootLevel = false)
+        @ReadPermission(expression = "False User Check")
         class Book {
-            public String title;
+            @Id
+            private long id;
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testFieldFilterPermissions() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression = "Filter Expression Check")
-            public String title;
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testComplexTrueExpression() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression =
-                    "(Filter Expression Check AND User Check) OR (Filter Expression Check OR NOT User Check)")
-            public String title;
+                    "(Filter Expression Check AND False User Check) OR (Filter Expression Check OR NOT False User Check)")
+            private String title;
+        }
+
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
+        dictionary.bindEntity(Book.class);
+        RequestScope scope = mock(RequestScope.class);
+
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
+    }
+
+    @Test
+    public void testFalseUserOROperationExpression() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        class Book {
+            @Id
+            private long id;
+
+            @ReadPermission(expression = "False User Check OR In Memory Check")
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
-    public void testUserOROperationExpression() throws Exception {
+    public void testTrueUserOROperationExpression() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
-            @ReadPermission(expression = "User Check OR In Memory Check")
-            public String title;
+            @Id
+            private long id;
+
+            @ReadPermission(expression = "True User Check OR In Memory Check")
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
-    public void testUserAndOperationExpression() throws Exception {
+    public void testFalseUserAndOperationExpression() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
-            @ReadPermission(expression = "User Check AND In Memory Check")
-            public String title;
+            @Id
+            private long id;
+
+            @ReadPermission(expression = "False User Check AND In Memory Check")
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
+    }
+
+    @Test
+    public void testTrueUserAndOperationExpression() throws Exception {
+        @Entity
+        @Include(rootLevel = false)
+        class Book {
+            @Id
+            private long id;
+
+            @ReadPermission(expression = "True User Check AND In Memory Check")
+            private String title;
+        }
+
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
+        dictionary.bindEntity(Book.class);
+        RequestScope scope = mock(RequestScope.class);
+
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testNotOperationExpression() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression = "NOT In Memory Check")
-            public String title;
+            private String title;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testMultipleFieldsNoPagination() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression = "Filter Expression Check")
-            public String title;
+            private String title;
 
             @ReadPermission(expression = "In Memory Check")
-            public Date publicationDate;
+            private Date publicationDate;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testMultipleFieldsPagination() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         @ReadPermission(expression = "In Memory Check")
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression = "Filter Expression Check")
-            public String title;
+            private String title;
 
             @ReadPermission(expression = "Filter Expression Check")
-            public Date publicationDate;
+            private Date publicationDate;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, new HashSet<>()));
     }
 
     @Test
     public void testSparseFields() throws Exception {
         @Entity
-        @Include
+        @Include(rootLevel = false)
         @ReadPermission(expression = "In Memory Check")
         class Book {
+            @Id
+            private long id;
+
             @ReadPermission(expression = "Filter Expression Check")
-            public String title;
+            private String title;
 
             @ReadPermission(expression = "Filter Expression Check")
-            public Date publicationDate;
+            private Date publicationDate;
 
-            public boolean outOfPrint;
+            private boolean outOfPrint;
         }
 
-        EntityDictionary dictionary = new EntityDictionary(checkMappings);
+        EntityDictionary dictionary = TestDictionary.getTestDictionary(checkMappings);
         dictionary.bindEntity(Book.class);
         RequestScope scope = mock(RequestScope.class);
 
-        Map<String, Set<String>> sparseFields = new HashMap<>();
-        when(scope.getSparseFields()).thenReturn(sparseFields);
-
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        Set<String> sparseFields = new HashSet<>();
 
-        sparseFields.put("book", Sets.newHashSet("title", "publicationDate"));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, sparseFields));
+        sparseFields.add("title");
+        sparseFields.add("publicationDate");
 
-        Assert.assertTrue(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertTrue(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, sparseFields));
 
-        sparseFields.put("book", Sets.newHashSet("outOfPrint"));
+        sparseFields.add("outOfPrint");
 
-        Assert.assertFalse(CanPaginateVisitor.canPaginate(Book.class, dictionary, scope));
+        assertFalse(CanPaginateVisitor.canPaginate(ClassType.of(Book.class), dictionary, scope, sparseFields));
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionNormalizationVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionNormalizationVisitorTest.java
new file mode 100644
index 0000000000..a12fc60b24
--- /dev/null
+++ b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionNormalizationVisitorTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.parsers.expression;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.EntityPermissions;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.security.permissions.expressions.CheckExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionNormalizationVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionVisitor;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.UUID;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class PermissionExpressionNormalizationVisitorTest {
+
+    private PermissionExpressionVisitor permissionExpressionVisitor;
+    private PermissionExpressionNormalizationVisitor normalizationVisitor;
+
+    @BeforeAll
+    public void setUp() {
+        EntityDictionary dictionary = TestDictionary.getTestDictionary();
+        ElideSettings elideSettings = new ElideSettingsBuilder(null)
+                .withEntityDictionary(dictionary)
+                .build();
+        RequestScope requestScope = new RequestScope(null, null, NO_VERSION, null, null, null, null, null, UUID.randomUUID(), elideSettings);
+
+        permissionExpressionVisitor = new PermissionExpressionVisitor(dictionary,
+                (check -> new CheckExpression(check, null, requestScope, null, null)));
+        normalizationVisitor = new PermissionExpressionNormalizationVisitor();
+    }
+
+    @Test
+    public void orExpressionTest() {
+        ParseTree tree;
+        Expression normalizedExpression;
+
+
+        tree = EntityPermissions.parseExpression("not (sampleCommit or sampleOperation)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(NOT ((sampleCommit \u001B[34mWAS UNEVALUATED\u001B[m))) AND "
+                        + "(NOT ((sampleOperation \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (Prefab.Role.All or sampleCommit or initCheck)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((Prefab.Role.All \u001B[34mWAS UNEVALUATED\u001B[m))) AND "
+                        + "(NOT ((sampleCommit \u001B[34mWAS UNEVALUATED\u001B[m)))) AND "
+                        + "(NOT ((initCheck \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+
+        tree = EntityPermissions.parseExpression("not (parentInitCheck or passingOp) or (FailOp or shouldCache)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) AND (NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))) OR "
+                        + "(((FailOp \u001B[34mWAS UNEVALUATED\u001B[m)) OR ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (parentInitCheck or passingOp) or not (FailOp or shouldCache)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) AND (NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))) OR "
+                        + "((NOT ((FailOp \u001B[34mWAS UNEVALUATED\u001B[m))) AND (NOT ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m))))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (not (parentInitCheck or passingOp) or not (FailOp or shouldCache))");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m)) OR ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m))) AND "
+                        + "(((FailOp \u001B[34mWAS UNEVALUATED\u001B[m)) OR ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+    }
+
+    @Test
+    public void andExpressionTest() {
+        ParseTree tree;
+        Expression normalizedExpression;
+
+
+        tree = EntityPermissions.parseExpression("not (sampleCommit and sampleOperation)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(NOT ((sampleCommit \u001B[34mWAS UNEVALUATED\u001B[m))) OR "
+                        + "(NOT ((sampleOperation \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (Prefab.Role.All and sampleCommit and initCheck)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((Prefab.Role.All \u001B[34mWAS UNEVALUATED\u001B[m))) OR "
+                        + "(NOT ((sampleCommit \u001B[34mWAS UNEVALUATED\u001B[m)))) OR "
+                        + "(NOT ((initCheck \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+
+        tree = EntityPermissions.parseExpression("not (parentInitCheck and passingOp) and (FailOp and shouldCache)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) OR (NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))) AND "
+                        + "(((FailOp \u001B[34mWAS UNEVALUATED\u001B[m)) AND ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (parentInitCheck and passingOp) and not (FailOp and shouldCache)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) OR (NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))) AND "
+                        + "((NOT ((FailOp \u001B[34mWAS UNEVALUATED\u001B[m))) OR (NOT ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m))))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not (not (parentInitCheck and passingOp) and not (FailOp and shouldCache))");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m)) AND ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m))) OR "
+                        + "(((FailOp \u001B[34mWAS UNEVALUATED\u001B[m)) AND ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+    }
+
+    @Test
+    public void normalforms() {
+        ParseTree tree;
+        Expression normalizedExpression;
+
+
+        tree = EntityPermissions.parseExpression("not ((parentInitCheck and passingOp) or shouldCache)");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("((NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) OR "
+                        + "(NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))) AND "
+                        + "(NOT ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+
+        tree = EntityPermissions.parseExpression("not (parentInitCheck and (passingOp or shouldCache))");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) OR "
+                        + "((NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m))) AND "
+                        + "(NOT ((shouldCache \u001B[34mWAS UNEVALUATED\u001B[m))))",
+                normalizedExpression.toString());
+
+        tree = EntityPermissions.parseExpression("not parentInitCheck and not passingOp");
+        normalizedExpression = tree.accept(permissionExpressionVisitor).accept(normalizationVisitor);
+        Assertions.assertEquals("(NOT ((parentInitCheck \u001B[34mWAS UNEVALUATED\u001B[m))) AND "
+                        + "(NOT ((passingOp \u001B[34mWAS UNEVALUATED\u001B[m)))",
+                normalizedExpression.toString());
+
+    }
+}
diff --git a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitorTest.java
index dad03a4391..5d1d421955 100644
--- a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitorTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionExpressionVisitorTest.java
@@ -5,31 +5,36 @@
  */
 package com.yahoo.elide.parsers.expression;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.UserCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.expressions.Expression;
-import lombok.AllArgsConstructor;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.TestDictionary;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.permissions.ExpressionResult;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.permissions.expressions.ExpressionVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionVisitor;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import lombok.AllArgsConstructor;
 
-import javax.persistence.Entity;
 import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import javax.persistence.Entity;
 
 /**
  * Test the expression language.
@@ -37,7 +42,7 @@
 public class PermissionExpressionVisitorTest {
     private EntityDictionary dictionary;
 
-    @BeforeMethod
+    @BeforeEach
     public void setupEntityDictionary() {
         Map<String, Class<? extends Check>> checks = new HashMap<>();
         checks.put("Allow", Permissions.Succeeds.class);
@@ -45,7 +50,7 @@ public void setupEntityDictionary() {
         checks.put("user has all access", Role.ALL.class);
         checks.put("user has no access", Role.NONE.class);
 
-        dictionary = new EntityDictionary(checks);
+        dictionary = TestDictionary.getTestDictionary(checks);
         dictionary.bindEntity(Model.class);
         dictionary.bindEntity(ComplexEntity.class);
     }
@@ -53,46 +58,46 @@ public void setupEntityDictionary() {
     @Test
     public void testAndExpression() {
         Expression expression = getExpressionForPermission(ReadPermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     @Test
     public void testOrExpression() {
         Expression expression = getExpressionForPermission(UpdatePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     @Test
     public void testNotExpression() {
         Expression expression = getExpressionForPermission(DeletePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     @Test
     public void testComplexExpression() {
         Expression expression = getExpressionForPermission(UpdatePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     @Test
     public void testComplexModelCreate() {
-        Expression expression = getExpressionForPermission(CreatePermission.class, ComplexEntity.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        Expression expression = getExpressionForPermission(CreatePermission.class, ClassType.of(ComplexEntity.class));
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     @Test
     public void testNamesWithSpaces() {
-        Expression expression = getExpressionForPermission(DeletePermission.class, ComplexEntity.class);
-        Expression expression2 = getExpressionForPermission(UpdatePermission.class, ComplexEntity.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
-        Assert.assertEquals(expression2.evaluate(), ExpressionResult.PASS);
+        Expression expression = getExpressionForPermission(DeletePermission.class, ClassType.of(ComplexEntity.class));
+        Expression expression2 = getExpressionForPermission(UpdatePermission.class, ClassType.of(ComplexEntity.class));
+        assertEquals(ExpressionResult.PASS, expression.evaluate(Expression.EvaluationMode.ALL_CHECKS));
+        assertEquals(ExpressionResult.PASS, expression2.evaluate(Expression.EvaluationMode.ALL_CHECKS));
     }
 
     private Expression getExpressionForPermission(Class<? extends Annotation> permission) {
-        return getExpressionForPermission(permission, Model.class);
+        return getExpressionForPermission(permission, ClassType.of(Model.class));
     }
 
-    private Expression getExpressionForPermission(Class<? extends Annotation> permission, Class model) {
+    private Expression getExpressionForPermission(Class<? extends Annotation> permission, Type model) {
         PermissionExpressionVisitor v = new PermissionExpressionVisitor(dictionary, DummyExpression::new);
         ParseTree permissions = dictionary.getPermissionsForClass(model, permission);
 
@@ -100,7 +105,7 @@ private Expression getExpressionForPermission(Class<? extends Annotation> permis
     }
 
     @Entity
-    @Include
+    @Include(rootLevel = false)
     @ReadPermission(expression = "user has all access AND Allow")
     @UpdatePermission(expression = "Allow or Deny")
     @DeletePermission(expression = "Not Deny")
@@ -125,7 +130,7 @@ public boolean ok(Model object, RequestScope requestScope, Optional<ChangeSpec>
     }
 
     @Entity
-    @Include
+    @Include(rootLevel = false)
     @CreatePermission(expression = "(Deny or Allow) and (not Deny)")
     @DeletePermission(expression = "user has all access or user has no access")
     @UpdatePermission(expression = "user has all access and (user has no access or user has all access)")
@@ -137,19 +142,23 @@ public static class DummyExpression implements Expression {
         Check check;
 
         @Override
-        public ExpressionResult evaluate() {
+        public ExpressionResult evaluate(EvaluationMode ignored) {
             boolean result;
             if (check instanceof UserCheck) {
                 result = ((UserCheck) check).ok(null);
             } else {
-                result = check.ok(null, null, null);
+                result = ((OperationCheck) check).ok(null, null, null);
             }
 
             if (result) {
                 return ExpressionResult.PASS;
-            } else {
-                return ExpressionResult.FAIL;
             }
+            return ExpressionResult.FAIL;
+        }
+
+        @Override
+        public <T> T accept(ExpressionVisitor<T> visitor) {
+            return visitor.visitExpression(this);
         }
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitorTest.java b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitorTest.java
index a27833ca1f..cac6f27f19 100644
--- a/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitorTest.java
+++ b/elide-core/src/test/java/com/yahoo/elide/parsers/expression/PermissionToFilterExpressionVisitorTest.java
@@ -6,426 +6,463 @@
 
 package com.yahoo.elide.parsers.expression;
 
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.core.EntityDictionary;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION;
+import static com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor.TRUE_USER_CHECK_EXPRESSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.EntityPermissions;
+import com.yahoo.elide.core.dictionary.TestDictionary;
 import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
 import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.FilterExpressionCheck;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.UserCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import com.yahoo.elide.security.permissions.ExpressionResult;
-import com.yahoo.elide.security.permissions.expressions.Expression;
-import lombok.AllArgsConstructor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.TestUser;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.permissions.ExpressionResultCache;
+import com.yahoo.elide.core.security.permissions.expressions.CheckExpression;
+import com.yahoo.elide.core.security.permissions.expressions.Expression;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionNormalizationVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionExpressionVisitor;
+import com.yahoo.elide.core.security.visitors.PermissionToFilterExpressionVisitor;
+import com.yahoo.elide.core.type.Type;
+import example.Author;
+import example.Book;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
-import static com.yahoo.elide.parsers.expression.PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION;
-
+@SuppressWarnings("StringEquality")
 public class PermissionToFilterExpressionVisitorTest {
+    private static final Path.PathElement AUTHOR_PATH = new Path.PathElement(Author.class, Book.class, "books");
+    private static final Path.PathElement BOOK_PATH = new Path.PathElement(Book.class, String.class, "title");
+    private static final PermissionExpressionNormalizationVisitor NORMALIZATION_VISITOR = new PermissionExpressionNormalizationVisitor();
+
+    private static final FilterExpression IN_PREDICATE = createDummyPredicate(Operator.IN);
+    private static final FilterExpression NOT_IN_PREDICATE = createDummyPredicate(Operator.NOT);
+    private static final FilterExpression LT_PREDICATE = createDummyPredicate(Operator.LT);
+    private static final FilterExpression GE_PREDICATE = createDummyPredicate(Operator.GE);
+
+    private static final String AND = "AND";
+    private static final String OR = "OR";
+    private static final String AND_NOT = "AND NOT";
+    private static final String OR_NOT = "OR NOT";
+    private static final List<String> OPS = Arrays.asList(AND, OR, AND_NOT, OR_NOT);
+
+    private static final String USER_ALLOW = "user has all access";
+    private static final String USER_DENY = "user has no access";
+    private static final String AT_OP_ALLOW = "Operation Allow";
+    private static final String AT_OP_DENY = "Operation Deny";
+    private static final String IN_FILTER = "in";
+    private static final String NOT_IN_FILTER = "notin";
+    private static final String LT_FILTER = "lt";
+    private static final String GE_FILTER = "ge";
+    private static final List<String> PERMISSIONS = Arrays.asList(AT_OP_ALLOW, AT_OP_DENY, USER_ALLOW, USER_DENY,
+            IN_FILTER, NOT_IN_FILTER, LT_FILTER, GE_FILTER);
+
     private EntityDictionary dictionary;
     private RequestScope requestScope;
+    private ElideSettings elideSettings;
+    private ExpressionResultCache cache;
 
-    @BeforeMethod
+    @BeforeEach
     public void setupEntityDictionary() {
         Map<String, Class<? extends Check>> checks = new HashMap<>();
-        checks.put("Allow", Permissions.Succeeds.class);
-        checks.put("Deny", Permissions.Fails.class);
-        checks.put("user has all access", Role.ALL.class);
-        checks.put("owner is user", FilterExpressionCheck1.class);
-        checks.put("user has no access", Role.NONE.class);
-
-        dictionary = new EntityDictionary(checks);
-        dictionary.bindEntity(Model.class);
-        dictionary.bindEntity(ComplexEntity.class);
-        dictionary.bindEntity(Good1.class);
-        dictionary.bindEntity(Good2.class);
-        dictionary.bindEntity(Good3.class);
-        dictionary.bindEntity(Good4.class);
-        dictionary.bindEntity(Good5.class);
-        dictionary.bindEntity(Good6.class);
-        dictionary.bindEntity(Good7.class);
-        dictionary.bindEntity(GOOD8.class);
-        dictionary.bindEntity(BAD1.class);
-        dictionary.bindEntity(BAD2.class);
-        dictionary.bindEntity(BAD4.class);
-        dictionary.bindEntity(GOOD9.class);
-        dictionary.bindEntity(GOOD10.class);
-        requestScope = newRequestScope();
-    }
+        checks.put(AT_OP_ALLOW, Permissions.Succeeds.class);
+        checks.put(AT_OP_DENY, Permissions.Fails.class);
 
-    @Test
-    public void testParseCombinationExpression() {
-        ParseTree g1 = dictionary.getPermissionsForClass(Good1.class, ReadPermission.class);
-        ParseTree g2 = dictionary.getPermissionsForClass(Good2.class, ReadPermission.class);
-        ParseTree g3 = dictionary.getPermissionsForClass(Good3.class, ReadPermission.class);
-        ParseTree g4 = dictionary.getPermissionsForClass(Good4.class, ReadPermission.class);
-        ParseTree g5 = dictionary.getPermissionsForClass(Good5.class, ReadPermission.class);
-        ParseTree g6 = dictionary.getPermissionsForClass(Good6.class, ReadPermission.class);
-        ParseTree g7 = dictionary.getPermissionsForClass(Good7.class, ReadPermission.class);
-        ParseTree g8 = dictionary.getPermissionsForClass(GOOD8.class, ReadPermission.class);
-        ParseTree b1 = dictionary.getPermissionsForClass(BAD1.class, ReadPermission.class);
-        ParseTree b2 = dictionary.getPermissionsForClass(BAD2.class, ReadPermission.class);
-        ParseTree b4 = dictionary.getPermissionsForClass(BAD4.class, ReadPermission.class);
-        ParseTree g9 = dictionary.getPermissionsForClass(GOOD9.class, ReadPermission.class);
-        ParseTree g10 = dictionary.getPermissionsForClass(GOOD10.class, ReadPermission.class);
-        PermissionToFilterExpressionVisitor fev = new PermissionToFilterExpressionVisitor(dictionary, requestScope);
-        FilterExpression expected = createDummyPredicate();
-        FilterExpression feg1 = fev.visit(g1);
-        Assert.assertEquals(expected, feg1);
-        FilterExpression feg2 = fev.visit(g2);
-        Assert.assertTrue(feg2 == PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION);
-        //Assert.assertEquals(expected, feg2);
-        FilterExpression feg3 = fev.visit(g3);
-        Assert.assertTrue(feg3  == PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION);
-        FilterExpression feg4 = fev.visit(g4);
-        Assert.assertEquals(new OrFilterExpression(expected, expected), feg4);
-        FilterExpression feg5 = fev.visit(g5);
-        Assert.assertTrue(feg5  == PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION);
-        FilterExpression feg6 = fev.visit(g6);
-        Assert.assertEquals(new OrFilterExpression(expected, expected), feg6);
-        FilterExpression feg7 = fev.visit(g7);
-        Assert.assertTrue(feg7 == NO_EVALUATION_EXPRESSION);
-        FilterExpression feg8 = fev.visit(g8);
-        Assert.assertTrue(feg8  == PermissionToFilterExpressionVisitor.NO_EVALUATION_EXPRESSION);
-        FilterExpression feb2 = fev.visit(b2);
-        Assert.assertTrue(feb2 == NO_EVALUATION_EXPRESSION || feb2  == PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION);
-        FilterExpression feb4 = fev.visit(b4);
-        Assert.assertTrue(feb4 == NO_EVALUATION_EXPRESSION || feb4  == PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION);
-        FilterExpression feg9 = fev.visit(g9);
-        Assert.assertTrue(feg9 == NO_EVALUATION_EXPRESSION || feg9  == PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION);
-        FilterExpression feg10 = fev.visit(g10);
-        Assert.assertTrue(feg10 == NO_EVALUATION_EXPRESSION || feg10  == PermissionToFilterExpressionVisitor.FALSE_USER_CHECK_EXPRESSION);
-    }
+        checks.put(USER_ALLOW, Role.ALL.class);
+        checks.put(USER_DENY, Role.NONE.class);
 
-    @Test
-    public void testAndExpression() {
-        Expression expression = getExpressionForPermission(ReadPermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
-    }
+        checks.put(IN_FILTER, Permissions.InFilterExpression.class);
+        checks.put(NOT_IN_FILTER, Permissions.NotInFilterExpression.class);
+        checks.put(LT_FILTER, Permissions.LessThanFilterExpression.class);
+        checks.put(GE_FILTER, Permissions.GreaterThanOrEqualFilterExpression.class);
 
-    @Test
-    public void testOrExpression() {
-        Expression expression = getExpressionForPermission(UpdatePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+        dictionary = TestDictionary.getTestDictionary(checks);
+        elideSettings = new ElideSettingsBuilder(null)
+                .withEntityDictionary(dictionary)
+                .build();
+
+        requestScope = newRequestScope();
+        cache = new ExpressionResultCache();
     }
 
-    @Test
-    public void testNotExpression() {
-        Expression expression = getExpressionForPermission(DeletePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+    ///
+    /// Test filter extraction
+    ///
+    public static Stream<Arguments> identityProvider() {
+        return PERMISSIONS.stream().map(expression -> Arguments.of(expression, filterFor(expression)));
     }
 
-    @Test
-    public void testComplexExpression() {
-        Expression expression = getExpressionForPermission(UpdatePermission.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+    @ParameterizedTest
+    @MethodSource("identityProvider")
+    public void testSingleFilterExpression(String permission, FilterExpression expected) {
+        FilterExpression computed = filterExpressionForPermissions(permission);
+        assertEquals(expected, computed,  String.format("%s != %s", permission, expected.toString()));
     }
 
-    @Test
-    public void testComplexModelCreate() {
-        Expression expression = getExpressionForPermission(CreatePermission.class, ComplexEntity.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
+    public static Stream<Arguments> notExpressionProvider() {
+        return PERMISSIONS.stream().map(expression -> Arguments.of(expression, negate(filterFor(expression))));
     }
 
-    @Test
-    public void testNamesWithSpaces() {
-        Expression expression = getExpressionForPermission(DeletePermission.class, ComplexEntity.class);
-        Expression expression2 = getExpressionForPermission(UpdatePermission.class, ComplexEntity.class);
-        Assert.assertEquals(expression.evaluate(), ExpressionResult.PASS);
-        Assert.assertEquals(expression2.evaluate(), ExpressionResult.PASS);
+    @ParameterizedTest
+    @MethodSource("notExpressionProvider")
+    public void testNotFilterExpression(String permission, FilterExpression expected) {
+        String expression = String.format("NOT %s", permission);
+        FilterExpression computed = filterExpressionForPermissions(expression);
+        assertEquals(expected, computed);
     }
 
-    private Expression getExpressionForPermission(Class<? extends Annotation> permission) {
-        return getExpressionForPermission(permission, Model.class);
+    public static Stream<Arguments> simpleAndProvider() {
+        return OPS.stream().map(op ->
+                PERMISSIONS.stream().map(left ->
+                        PERMISSIONS.stream().map(right ->
+                                Arguments.of(left, op, right, buildFilter(left, op, right))
+                        )
+                ).reduce(Stream.empty(), Stream::concat)
+        ).reduce(Stream.empty(), Stream::concat);
     }
 
-    private Expression getExpressionForPermission(Class<? extends Annotation> permission, Class model) {
-        PermissionExpressionVisitor v = new PermissionExpressionVisitor(dictionary, DummyExpression::new);
-        ParseTree permissions = dictionary.getPermissionsForClass(model, permission);
+    @ParameterizedTest
+    @MethodSource("simpleAndProvider")
+    public void testSimpleExpression(String left, String op, String right, FilterExpression expected) {
+        String permission = String.format("%s %s %s", left, op, right);
+        FilterExpression computed = filterExpressionForPermissions(permission);
+        assertEquals(expected, computed,  String.format("%s != %s", permission, expected));
 
-        return v.visit(permissions);
+        boolean specialCase = isSpecialCase(computed);
+        boolean isFilterable = containsOnlyFilterableExpressions(computed);
+        assertTrue(specialCase || isFilterable, String.format("compound expression contains unfilterable clause '%s'", computed));
     }
 
-    public RequestScope newRequestScope() {
-        User john = new User("John");
-        return requestScope = new com.yahoo.elide.core.RequestScope(null, null, null, john, dictionary, null, null);
+    public static Stream<Arguments> nestedExpressionProvider() {
+        return OPS.stream().map(outerOp ->
+                OPS.stream().map(innerOp ->
+                        PERMISSIONS.stream().map(left ->
+                                PERMISSIONS.stream().map(innerLeft ->
+                                        PERMISSIONS.stream().map(innerRight -> {
+                                            String innerPerm =
+                                                    String.format("%s %s %s", innerLeft, innerOp, innerRight);
+
+                                            return Arguments.of(
+                                                    left,
+                                                    outerOp,
+                                                    innerPerm,
+                                                    buildFilter(left, outerOp, innerLeft, innerOp, innerRight));
+                                        })
+                                ).reduce(Stream.empty(), Stream::concat)
+                        ).reduce(Stream.empty(), Stream::concat)
+                ).reduce(Stream.empty(), Stream::concat)
+        ).reduce(Stream.empty(), Stream::concat);
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "user has all access AND Allow")
-    @UpdatePermission(expression = "Allow or Deny")
-    @DeletePermission(expression = "Not Deny")
-    @CreatePermission(expression = "not Allow or not (Deny and Allow)")
-    static class Model {
+    @ParameterizedTest
+    @MethodSource("nestedExpressionProvider")
+    public void testNestedExpressions(String left, String join, String compound, FilterExpression expected) {
+        String permission = String.format("%s %s (%s)", left, join, compound);
+        FilterExpression computed = filterExpressionForPermissions(permission);
+        assertEquals(expected, computed,  String.format("%s != %s", permission, computed));
+
+        boolean specialCase = isSpecialCase(computed);
+        boolean isFilterable = containsOnlyFilterableExpressions(computed);
+        assertTrue(specialCase || isFilterable, String.format("compound expression contains unfilterable clause '%s'", computed));
     }
 
-    public static class Permissions {
-        public static class Succeeds extends OperationCheck<Model> {
-            @Override
-            public boolean ok(Model object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-                return true;
-            }
-        }
+    @Test
+    public void testTestMethods() {
+        List<FilterExpression> unfilterable = Arrays.asList(
+                FALSE_USER_CHECK_EXPRESSION, TRUE_USER_CHECK_EXPRESSION, NO_EVALUATION_EXPRESSION);
 
-        public static class Fails extends OperationCheck<Model> {
-            @Override
-            public boolean ok(Model object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-                return false;
-            }
+        for (FilterExpression e : unfilterable) {
+            assertTrue(isSpecialCase(e), String.format("isSpecialCase(%s)", e));
         }
-    }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (user has all access OR Allow)")
-    @CreatePermission(expression = "(Deny or Allow) and (not Deny)")
-    @DeletePermission(expression = "user has all access or user has no access")
-    @UpdatePermission(expression = "user has all access and (user has no access or user has all access)")
-    static class ComplexEntity {
-    }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user AND Allow")
-    static class Good1 {
-    }
+        assertTrue(containsOnlyFilterableExpressions(
+                new AndFilterExpression(IN_PREDICATE, NOT_IN_PREDICATE)
+        ));
+        assertTrue(containsOnlyFilterableExpressions(
+                new OrFilterExpression(IN_PREDICATE, NOT_IN_PREDICATE)
+        ));
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR user has all access")
-    static class Good2 {
-    }
+        assertFalse(containsOnlyFilterableExpressions(
+                new AndFilterExpression(IN_PREDICATE, FALSE_USER_CHECK_EXPRESSION)
+        ));
+        assertFalse(containsOnlyFilterableExpressions(
+                new OrFilterExpression(IN_PREDICATE, FALSE_USER_CHECK_EXPRESSION)
+        ));
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (user has all access AND user has all access)")
-    static class Good3 {
-    }
+        assertFalse(containsOnlyFilterableExpressions(
+                new AndFilterExpression(IN_PREDICATE, new AndFilterExpression(IN_PREDICATE, TRUE_USER_CHECK_EXPRESSION))
+        ));
+        assertFalse(containsOnlyFilterableExpressions(
+                new OrFilterExpression(IN_PREDICATE, new OrFilterExpression(IN_PREDICATE, TRUE_USER_CHECK_EXPRESSION))
+        ));
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (owner is user AND user has all access)")
-    static class Good4 {
-    }
+        FilterExpression negated, expected;
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (owner is user OR user has all access)")
-    static class Good5 {
+        negated = negate(new OrFilterExpression(NOT_IN_PREDICATE, NOT_IN_PREDICATE));
+        expected = new AndFilterExpression(IN_PREDICATE, IN_PREDICATE);
+        assertEquals(expected, negated);
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "Allow AND (owner is user OR owner is user)")
-    static class Good6 {
+    //
+    // Helpers
+    //
+    public RequestScope newRequestScope() {
+        User john = new TestUser("John");
+        return requestScope = new RequestScope(null, null, NO_VERSION, null, null, john, null, null, UUID.randomUUID(), elideSettings);
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "Allow")
-    static class Good7 {
+    private FilterExpression filterExpressionForPermissions(String permission) {
+        Function<Check, Expression> checkFn = (check) ->
+                new CheckExpression(check, null, requestScope, null, cache);
+        ParseTree expression = EntityPermissions.parseExpression(permission);
+        PermissionToFilterExpressionVisitor fev = new PermissionToFilterExpressionVisitor(dictionary, requestScope, null);
+        return expression
+                .accept(new PermissionExpressionVisitor(dictionary, checkFn))
+                .accept(NORMALIZATION_VISITOR)
+                .accept(fev);
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (Allow OR user has all access)")
-    static class BAD1 {
+    private static boolean isSpecialCase(FilterExpression expr) {
+        return expr == FALSE_USER_CHECK_EXPRESSION
+                || expr == TRUE_USER_CHECK_EXPRESSION
+                || expr == NO_EVALUATION_EXPRESSION;
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (Allow AND user has all access)")
-    static class BAD2 {
-    }
+    private static boolean containsOnlyFilterableExpressions(FilterExpression expr) {
+        if (isSpecialCase(expr)) {
+            return false;
+        }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "owner is user OR (Allow OR owner is user)")
-    static class BAD4 {
-    }
+        FilterExpression left, right;
+        if (expr instanceof OrFilterExpression) {
+            OrFilterExpression or = (OrFilterExpression) expr;
+            left = or.getLeft();
+            right = or.getRight();
+            return containsOnlyFilterableExpressions(left) && containsOnlyFilterableExpressions(right);
+        }
+        if (expr instanceof AndFilterExpression) {
+            AndFilterExpression and = (AndFilterExpression) expr;
+            left = and.getLeft();
+            right = and.getRight();
+            return containsOnlyFilterableExpressions(left) && containsOnlyFilterableExpressions(right);
+        }
+
+        return true;
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "user has all access OR (Allow AND user has all access)")
-    static class GOOD9 {
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "user has all access AND (Allow OR user has all access)")
-    static class GOOD10 {
+    private static FilterPredicate createDummyPredicate(Operator operator) {
+        List<Path.PathElement> pathList = Arrays.asList(AUTHOR_PATH, BOOK_PATH);
+        return new FilterPredicate(new Path(pathList), operator, Collections.singletonList("Harry Potter"));
     }
 
-    @Entity
-    @Include
-    @ReadPermission(expression = "user has all access AND (user has all access OR user has all access)")
-    static class GOOD8 {
+    private static boolean isFilterPermission(FilterExpression permission) {
+        return permission != TRUE_USER_CHECK_EXPRESSION
+                && permission != FALSE_USER_CHECK_EXPRESSION
+                && permission != NO_EVALUATION_EXPRESSION;
     }
 
-    @Entity
-    @Include(rootLevel = true)
-    @ReadPermission(expression = "owner is user AND user has all access")
-    @CreatePermission(expression = "(Deny or Allow) and (not Deny)")
-    @DeletePermission(expression = "user has all access or user has no access")
-    @UpdatePermission(expression = "user has all access and (user has no access or user has all access)")
-    public class Author {
-        private long id;
-        private String name;
-        private Collection<Book> books = new ArrayList<>();
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.IDENTITY)
-        public long getId() {
-            return id;
+    private static FilterExpression filterFor(String permission) {
+        switch (permission) {
+            case USER_ALLOW:    return TRUE_USER_CHECK_EXPRESSION;
+            case USER_DENY:     return FALSE_USER_CHECK_EXPRESSION;
+            case AT_OP_ALLOW:   return NO_EVALUATION_EXPRESSION;
+            case AT_OP_DENY:    return NO_EVALUATION_EXPRESSION;
+            case IN_FILTER:     return IN_PREDICATE;
+            case NOT_IN_FILTER: return NOT_IN_PREDICATE;
+            case LT_FILTER:     return LT_PREDICATE;
+            case GE_FILTER:     return GE_PREDICATE;
         }
+        return null;
+    }
 
-        public void setId(long id) {
-            this.id = id;
+    private static FilterExpression negate(FilterExpression expression) {
+        if (expression == TRUE_USER_CHECK_EXPRESSION) {
+            return FALSE_USER_CHECK_EXPRESSION;
         }
-
-        public String getName() {
-            return name;
+        if (expression == FALSE_USER_CHECK_EXPRESSION) {
+            return TRUE_USER_CHECK_EXPRESSION;
         }
-
-        public void setName(String name) {
-            this.name = name;
+        if (expression == NO_EVALUATION_EXPRESSION) {
+            return NO_EVALUATION_EXPRESSION;
         }
-
-        @ManyToMany(mappedBy = "authors")
-        public Collection<Book> getBooks() {
-            return books;
+        if (expression instanceof FilterPredicate) {
+            FilterPredicate filter = (FilterPredicate) expression;
+            return filter.negate();
         }
-
-        public void setBooks(Collection<Book> books) {
-            this.books = books;
+        if (expression instanceof AndFilterExpression) {
+            AndFilterExpression and = (AndFilterExpression) expression;
+            return new OrFilterExpression(negate(and.getLeft()), negate(and.getRight()));
         }
+        if (expression instanceof OrFilterExpression) {
+            OrFilterExpression or = (OrFilterExpression) expression;
+            return new AndFilterExpression(negate(or.getLeft()), negate(or.getRight()));
+        }
+        return expression;
+    }
+
+    private static FilterExpression buildFilter(String left, String op, String right) {
+        FilterExpression leftExpr = filterFor(left);
+        FilterExpression rightExpr = filterFor(right);
+        switch (op) {
+            case AND:
+                return filterForAndOf(leftExpr, rightExpr);
+            case OR:
+                return filterForOrOf(leftExpr, rightExpr);
+            case AND_NOT:
+                return filterForAndOf(leftExpr, negate(filterFor(right)));
+            case OR_NOT:
+                return filterForOrOf(leftExpr, negate(filterFor(right)));
+        }
+        return null;
+    }
+
+    private static FilterExpression buildFilter(String left, String op, String innerLeft, String innerOp, String innerRight) {
+        FilterExpression leftExpr = filterFor(left);
+        switch (op) {
+            case AND:
+                return filterForAndOf(leftExpr, buildFilter(innerLeft, innerOp, innerRight));
+            case OR:
+                return filterForOrOf(leftExpr, buildFilter(innerLeft, innerOp, innerRight));
+            case AND_NOT:
+                return filterForAndOf(leftExpr, buildNotFilter(innerLeft, innerOp, innerRight));
+            case OR_NOT:
+                return filterForOrOf(leftExpr, buildNotFilter(innerLeft, innerOp, innerRight));
+        }
+        return null;
+    }
+
+    private static FilterExpression buildNotFilter(String left, String op, String right) {
+        FilterExpression leftExpr = negate(filterFor(left));
+        switch (op) {
+            case AND:
+                return filterForOrOf(leftExpr, negate(filterFor(right)));
+            case OR:
+                return filterForAndOf(leftExpr, negate(filterFor(right)));
+            case AND_NOT:
+                return filterForOrOf(leftExpr, filterFor(right));
+            case OR_NOT:
+                return filterForAndOf(leftExpr, filterFor(right));
+        }
+        return null;
     }
 
-    @Entity
-    @Include(rootLevel = true)
-    @ReadPermission(expression = "owner is user AND user has all access")
-    @CreatePermission(expression = "(Deny or Allow) and (not Deny)")
-    @DeletePermission(expression = "user has all access or user has no access")
-    @UpdatePermission(expression = "user has all access and (user has no access or user has all access)")
-    public class Book {
-        private long id;
-        private String title;
-        private String genre;
-        private String language;
-        private Collection<Author> authors = new ArrayList<>();
-
-        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        public long getId() {
-            return id;
+    private static FilterExpression filterForAndOf(FilterExpression left, FilterExpression right) {
+        if (left == FALSE_USER_CHECK_EXPRESSION || right == FALSE_USER_CHECK_EXPRESSION) {
+            return FALSE_USER_CHECK_EXPRESSION;
         }
 
-        public void setId(long id) {
-            this.id = id;
+        if (!isFilterPermission(left)) {
+            return right;
         }
 
-        public String getTitle() {
-            return title;
+        if (!isFilterPermission(right)) {
+            return left;
         }
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
+        return new AndFilterExpression(left, right);
+    }
 
-        public String getGenre() {
-            return genre;
+    private static FilterExpression filterForOrOf(FilterExpression left, FilterExpression right) {
+        if (left == TRUE_USER_CHECK_EXPRESSION || left == NO_EVALUATION_EXPRESSION) {
+            // left will not filter, return it
+            return left;
         }
 
-        public void setGenre(String genre) {
-            this.genre = genre;
+        if (right == TRUE_USER_CHECK_EXPRESSION || right == NO_EVALUATION_EXPRESSION) {
+            // right will not filter, return it
+            return right;
         }
 
-        public String getLanguage() {
-            return language;
+        if (left == FALSE_USER_CHECK_EXPRESSION && right == FALSE_USER_CHECK_EXPRESSION) {
+            // both false
+            return FALSE_USER_CHECK_EXPRESSION;
         }
 
-        public void setLanguage(String language) {
-            this.language = language;
+        if (left == FALSE_USER_CHECK_EXPRESSION) {
+            return right;
         }
 
-        @ManyToMany
-        public Collection<Author> getAuthors() {
-            return authors;
+        if (right == FALSE_USER_CHECK_EXPRESSION) {
+            return left;
         }
 
-        public void setAuthors(Collection<Author> authors) {
-            this.authors = authors;
-        }
+        return new OrFilterExpression(left, right);
     }
 
-    @AllArgsConstructor
-    public static class DummyExpression implements Expression {
-        Check check;
-
-        @Override
-        public ExpressionResult evaluate() {
-            boolean result;
-            if (check instanceof UserCheck) {
-                result = ((UserCheck) check).ok(null);
-            } else {
-                result = check.ok(null, null, null);
-            }
 
-            if (result) {
-                return ExpressionResult.PASS;
-            } else {
-                return ExpressionResult.FAIL;
+    public static class Permissions {
+        public static class Succeeds extends OperationCheck<Object> {
+            @Override
+            public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+                return true;
             }
         }
-    }
 
-    public static Predicate createDummyPredicate() {
-        List<Predicate.PathElement> pathList = new ArrayList<>();
-        Predicate.PathElement path1 = new Predicate.PathElement(Author.class, "Author", Book.class, "books");
-        Predicate.PathElement path2 = new Predicate.PathElement(Book.class, "Book", String.class, "title");
-        pathList.add(path1);
-        pathList.add(path2);
-        Operator op = Operator.IN;
-        List<Object> value = new ArrayList<>();
-        value.add("Harry Potter");
-        return new Predicate(pathList, op, value);
-    }
+        public static class Fails extends OperationCheck<Object> {
+            @Override
+            public boolean ok(Object object, com.yahoo.elide.core.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+                return false;
+            }
+        }
 
-    public static class FilterExpressionCheck1 extends FilterExpressionCheck {
+        public static class InFilterExpression extends FilterExpressionCheck {
+            @Override
+            public FilterPredicate getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+                return createDummyPredicate(Operator.IN);
+            }
+        }
 
-        @Override
-        public Predicate getFilterExpression(RequestScope requestScope) {
-            return createDummyPredicate();
+        public static class NotInFilterExpression extends FilterExpressionCheck {
+            @Override
+            public FilterPredicate getFilterExpression(Type entityClass,
+                                                       com.yahoo.elide.core.security.RequestScope requestScope) {
+                return createDummyPredicate(Operator.NOT);
+            }
         }
 
-        public FilterExpressionCheck1() {
+        public static class LessThanFilterExpression extends FilterExpressionCheck {
+            @Override
+            public FilterPredicate getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+                return createDummyPredicate(Operator.LT);
+            }
+        }
 
+        public static class GreaterThanOrEqualFilterExpression extends FilterExpressionCheck {
+            @Override
+            public FilterPredicate getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+                return createDummyPredicate(Operator.GE);
+            }
         }
     }
 }
diff --git a/elide-core/src/test/java/com/yahoo/elide/security/PermissionExecutorTest.java b/elide-core/src/test/java/com/yahoo/elide/security/PermissionExecutorTest.java
deleted file mode 100644
index 20c7829b8c..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/security/PermissionExecutorTest.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security;
-
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.UserCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import org.testng.annotations.Test;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.util.HashMap;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class PermissionExecutorTest {
-
-    @Test
-    public void testSuccessfulOperationCheck() throws Exception {
-        @Entity
-        @Include
-        @UpdatePermission(all = {SampleOperationCheck.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        ChangeSpec cspec = new ChangeSpec(null, null, null, null);
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testFailOperationCheckAll() throws Exception {
-        @Entity
-        @Include
-        @UpdatePermission(all = {SampleOperationCheck.class, Role.NONE.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testFailOperationCheckAny() throws Exception {
-        @Entity
-        @Include
-        @UpdatePermission(any = {SampleOperationCheck.class, SampleCommitCheck.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        // Update permissions are deferred. In the case of "any," commit checks must execute before failure can be detected
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testSuccessfulCommitChecks() throws Exception {
-        @Entity
-        @Include
-        @UpdatePermission(all = {SampleCommitCheck.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        ChangeSpec cspec = new ChangeSpec(null, null, null, null);
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testFailCommitChecks() throws Exception {
-        @Entity
-        @Include
-        @UpdatePermission(all = {SampleCommitCheck.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testReadFieldAwareSuccessAllAnyField() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, new ChangeSpec(null, null, null, null));
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFieldAwareSuccessFailureAnyField() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testReadFieldAwareSuccessAll() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), ReadPermission.class, "allVisible");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFieldAwareFailureAllSpecificField() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "allVisible");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFieldAwareFailureAllNoOverride() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "defaultHidden");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFieldAwareFailureAll() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "cannotSeeMe");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testReadFieldAwareSuccessAny() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), ReadPermission.class, "mayFailInCommit");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFieldAwareFailureAny() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "mayFailInCommit");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testUpdateFieldAwareSuccessAll() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "allVisible");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testUpdateFieldAwareFailureAll() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "allVisible");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testUpdateFieldAwareSuccessAny() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "mayFailInCommit");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testUpdateFieldAwareFailureAny() {
-        PersistentResource resource = newResource(SampleBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "mayFailInCommit");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testReadFieldAwareEntireOpenBean() {
-        PersistentResource resource = newResource(OpenBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource);
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "open");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadFailureFieldAwareOpenBean() {
-        PersistentResource resource = newResource(OpenBean.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, ReadPermission.class, "openAll");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testPassAnyFieldAwareFailOperationSuccessCommit() {
-        @Entity
-        @Include
-        @UpdatePermission(all = {Role.NONE.class, PassingCommitCheck.class})
-        class Model {
-            @Id
-            public Long id;
-
-            @UpdatePermission(any = {Role.NONE.class, PassingCommitCheck.class})
-            public String field = "some data";
-        }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = {ForbiddenAccessException.class})
-    public void testFailAllFieldAwareSuccessOperationFailCommit() {
-        @Entity
-        @Include
-        @UpdatePermission(all = {Role.NONE.class})
-        class Model {
-            @Id
-            public Long id;
-
-            @UpdatePermission(all = {Role.ALL.class, FailingCommitCheck.class})
-            public String field = "some data";
-        }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testPassAnySpecificFieldAwareFailOperationSuccessCommit() {
-        @Entity
-        @Include
-        @UpdatePermission(all = {Role.NONE.class, PassingCommitCheck.class})
-        class Model {
-            @Id
-            public Long id;
-
-            @UpdatePermission(any = {Role.NONE.class, PassingCommitCheck.class})
-            public String field = "some data";
-        }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "field");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = {ForbiddenAccessException.class})
-    public void testFailAllSpecificFieldAwareSuccessOperationFailCommit() {
-        @Entity
-        @Include
-        @UpdatePermission(all = {Role.ALL.class})
-        class Model {
-            @Id
-            public Long id;
-
-            @UpdatePermission(all = {Role.ALL.class, FailingCommitCheck.class})
-            public String field = "some data";
-        }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "field");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = {IllegalArgumentException.class})
-    public void testBadInstance() {
-        @Entity
-        @Include
-        @UpdatePermission(all = {PrivatePermission.class})
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource);
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test
-    public void testSpecificFieldOveriddenOperationCheckSucceed() {
-        PersistentResource resource = newResource(CommitCheckEntity.class);
-        RequestScope requestScope = resource.getRequestScope();
-        // Should succeed in operation check despite the commit check failure
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, null, UpdatePermission.class, "hello");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = {ForbiddenAccessException.class})
-    public void testSpecificFieldCommitCheckFailByOveriddenField() {
-        PersistentResource resource = newResource(CommitCheckEntity.class);
-        RequestScope requestScope = resource.getRequestScope();
-        // Should succeed in commit check despite the operation check failure
-        requestScope.getPermissionExecutor().checkSpecificFieldPermissions(resource, new ChangeSpec(null, null, null, null), UpdatePermission.class, "hello");
-        requestScope.getPermissionExecutor().executeCommitChecks();
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testReadCheckExpressionAlwaysInline() {
-        @Entity
-        @Include
-        @ReadPermission(expression = "FailAtCommit")
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getDictionary().bindEntity(Model.class);
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource);
-        // NOTE: This check should throw a ForbiddenAccess since commit-time checks should be converted
-        //       to inline checks. As a result, DO NOT call executeCommitChecks() in this test.
-    }
-
-    @Test(expectedExceptions = ForbiddenAccessException.class)
-    public void testDeleteCheckExpressionAlwaysInline() {
-        @Entity
-        @Include
-        @DeletePermission(expression = "FailAtCommit")
-        class Model { }
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getDictionary().bindEntity(Model.class);
-        requestScope.getPermissionExecutor().checkPermission(DeletePermission.class, resource);
-        // NOTE: This check should throw a ForbiddenAccess since commit-time checks should be converted
-        //       to inline checks. As a result, DO NOT call executeCommitChecks() in this test.
-    }
-
-    @Test
-    public void testCache() {
-        PersistentResource resource = newResource(AnnotationOnlyRecord.class);
-        RequestScope requestScope = resource.getRequestScope();
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource);
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource);
-    }
-
-    @Test(expectedExceptions = {ForbiddenAccessException.class})
-    public void testNoCache() {
-        PersistentResource resource = newResource(AnnotationOnlyRecord.class);
-        RequestScope requestScope = resource.getRequestScope();
-        ChangeSpec cspec = new ChangeSpec(null, null, null, null);
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-    }
-
-    @Test
-    public void testUserCheckCache() {
-        PersistentResource resource = newResource(UserCheckCacheRecord.class);
-        RequestScope requestScope = resource.getRequestScope();
-        ChangeSpec cspec = new ChangeSpec(null, null, null, null);
-        // This should cache for updates, reads, etc.
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().checkPermission(UpdatePermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, cspec);
-        requestScope.getPermissionExecutor().checkPermission(ReadPermission.class, resource, cspec);
-    }
-
-    public <T> PersistentResource newResource(T obj, Class<T> cls) {
-        EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
-        dictionary.getCheckMappings().put("FailAtCommit", FailingCommitCheck.class);
-        dictionary.bindEntity(cls);
-        RequestScope requestScope = new RequestScope(null, null, null, null, dictionary, null, null);
-        return new PersistentResource<>(obj, requestScope);
-    }
-
-    public PersistentResource newResource(Class cls) {
-        EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
-        dictionary.bindEntity(cls);
-        RequestScope requestScope = new RequestScope(null, null, null, null, dictionary, null, null);
-        try {
-            return new PersistentResource<>(cls.newInstance(), requestScope);
-        } catch (InstantiationException | IllegalAccessException e) {
-            return null;
-        }
-    }
-
-    public static final class SampleOperationCheck extends OperationCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return changeSpec.isPresent();
-        }
-    }
-
-    public static final class SampleCommitCheck extends CommitCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return changeSpec.isPresent();
-        }
-    }
-
-    public static final class SampleOperationCheckCommitInverse extends OperationCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return !changeSpec.isPresent();
-        }
-    }
-
-    public static final class PassingCommitCheck extends CommitCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return true;
-        }
-    }
-
-    public static final class FailingCommitCheck extends CommitCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return false;
-        }
-
-        @Override
-        public String checkIdentifier() {
-            return "FailAtCommit";
-        }
-    }
-
-    private static final class PrivatePermission extends OperationCheck<Object> {
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return false;
-        }
-    }
-
-    @ReadPermission(all = {Role.NONE.class})
-    @UpdatePermission(all = {Role.NONE.class})
-    @Include
-    @Entity
-    public static final class SampleBean {
-        @Id
-        public Long id;
-
-        @ReadPermission(all = {Role.ALL.class, SampleOperationCheck.class})
-        @UpdatePermission(all = {Role.ALL.class, SampleCommitCheck.class})
-        public String allVisible = "You should see me!";
-
-        public String defaultHidden = "I'm invisible. muwahaha...";
-
-        @ReadPermission(all = {Role.ALL.class, Role.NONE.class})
-        @UpdatePermission(all = {Role.ALL.class, Role.NONE.class})
-        public String cannotSeeMe = "hidden";
-
-        @ReadPermission(any = {SampleOperationCheck.class})
-        @UpdatePermission(any = {SampleCommitCheck.class, Role.NONE.class})
-        public String mayFailInCommit = "aw :(";
-    }
-
-    @ReadPermission(all = {Role.ALL.class})
-    @UpdatePermission(all = {Role.ALL.class})
-    @Include
-    @Entity
-    public static final class OpenBean {
-        @Id
-        public Long id;
-
-        public String open;
-
-        @ReadPermission(all = {Role.NONE.class, SampleOperationCheck.class})
-        @UpdatePermission(all = {SampleCommitCheck.class, SampleOperationCheck.class})
-        public String openAll = "all";
-
-        @ReadPermission(any = {SampleOperationCheck.class, SampleOperationCheck.class})
-        @UpdatePermission(any = {SampleCommitCheck.class, SampleOperationCheck.class})
-        public String openAny = "all";
-    }
-
-    @Entity
-    @Include
-    @UpdatePermission(all = {SampleCommitCheck.class})
-    public static final class CommitCheckEntity {
-        @Id
-        public Long id;
-
-        @UpdatePermission(all = {SampleOperationCheckCommitInverse.class})
-        public String hello;
-    }
-
-    /* Cache testing */
-
-    public static class ShouldCache extends OperationCheck<Object> {
-        private static AtomicBoolean hasRun = new AtomicBoolean(false);
-        @Override
-        public boolean ok(Object object, com.yahoo.elide.security.RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return !hasRun.getAndSet(true);
-        }
-    }
-
-    @Entity
-    @Include
-    @ReadPermission(any = { ShouldCache.class })
-    @UpdatePermission(any = { ShouldCache.class })
-    public static class AnnotationOnlyRecord {
-    }
-
-    /* UserCheck cache testing */
-
-    public static class UserCheckTest extends UserCheck {
-        public AtomicBoolean hasBeenCalled = new AtomicBoolean(false);
-        @Override
-        public boolean ok(User user) {
-            return !hasBeenCalled.getAndSet(true);
-        }
-    }
-
-    @Entity
-    @Include
-    @ReadPermission(any = {UserCheckTest.class})
-    @UpdatePermission(any = {UserCheckTest.class})
-    public static class UserCheckCacheRecord {
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilderTest.java b/elide-core/src/test/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilderTest.java
deleted file mode 100644
index 46105b022c..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/security/permissions/PermissionExpressionBuilderTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.security.permissions;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.PersistentResource;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.checks.Check;
-import com.yahoo.elide.security.checks.prefab.Role;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import javax.persistence.Entity;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PermissionExpressionBuilderTest {
-
-    private EntityDictionary dictionary;
-    private PermissionExpressionBuilder builder;
-
-    @BeforeMethod
-    public void setupEntityDictionary() {
-        Map<String, Class<? extends Check>> checks = new HashMap<>();
-        checks.put("user has all access", Role.ALL.class);
-        checks.put("user has no access", Role.NONE.class);
-
-        dictionary = new EntityDictionary(checks);
-
-        ExpressionResultCache cache = new ExpressionResultCache();
-        builder = new PermissionExpressionBuilder(cache, dictionary);
-    }
-
-    @Test
-    public void testAnyFieldExpressionText() {
-        @Entity
-        @Include
-        @ReadPermission(expression = "user has all access AND user has no access")
-        class Model { }
-        dictionary.bindEntity(Model.class);
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-
-        PermissionExpressionBuilder.Expressions expressions = builder.buildAnyFieldExpressions(
-                resource,
-                ReadPermission.class,
-                (ChangeSpec) null);
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "READ PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  "
-                        + "FOR EXPRESSION [FIELDS(\u001B[31mFAILURE\u001B[m) OR ENTITY(((user has all access "
-                        + "\u001B[34mWAS UNEVALUATED\u001B[m)) AND ((user has no access "
-                        + "\u001B[34mWAS UNEVALUATED\u001B[m)))]");
-
-        expressions.getCommitExpression().evaluate();
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "READ PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  "
-                        + "FOR EXPRESSION [FIELDS(\u001B[31mFAILURE\u001B[m) OR ENTITY(((user has all access "
-                        + "\u001B[32mPASSED\u001B[m)) AND ((user has no access "
-                        + "\u001B[31mFAILED\u001B[m)))]");
-
-    }
-
-    @Test
-    public void testSpecificFieldExpressionText() {
-        @Entity
-        @Include
-        @UpdatePermission(expression = "user has no access")
-        class Model {
-            @UpdatePermission(expression = "user has all access OR user has no access")
-            public int foo;
-        }
-
-        dictionary.bindEntity(Model.class);
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-        ChangeSpec changes = new ChangeSpec(resource, "foo", 1, 2);
-
-        PermissionExpressionBuilder.Expressions expressions = builder.buildSpecificFieldExpressions(
-                resource,
-                UpdatePermission.class,
-                "foo",
-                changes);
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "UPDATE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null } WITH CHANGES ChangeSpec { "
-                        + "resource=PersistentResource { type=model, id=null }, field=foo, original=1, modified=2} "
-                        + "FOR EXPRESSION [FIELD(((user has all access "
-                        + "\u001B[34mWAS UNEVALUATED\u001B[m)) OR ((user has no access "
-                        + "\u001B[34mWAS UNEVALUATED\u001B[m)))]");
-
-        expressions.getCommitExpression().evaluate();
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "UPDATE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null } WITH CHANGES ChangeSpec { "
-                        + "resource=PersistentResource { type=model, id=null }, field=foo, original=1, modified=2} "
-                        + "FOR EXPRESSION [FIELD(((user has all access "
-                        + "\u001B[32mPASSED\u001B[m)) OR ((user has no access "
-                        + "\u001B[34mWAS UNEVALUATED\u001B[m)))]");
-
-     }
-
-    @Test
-    public void testSharePermissionExpressionText() {
-        @Entity
-        @Include
-        @SharePermission(expression = "user has no access")
-        class Model {
-        }
-
-        dictionary.bindEntity(Model.class);
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-
-        PermissionExpressionBuilder.Expressions expressions = builder.buildSharePermissionExpressions(resource);
-
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "SHARE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  FOR EXPRESSION [SHARE "
-                        + "ENTITY((user has no access \u001B[34mWAS UNEVALUATED\u001B[m))]");
-
-        expressions.getCommitExpression().evaluate();
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "SHARE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  FOR EXPRESSION [SHARE "
-                        + "ENTITY((user has no access \u001B[31mFAILED\u001B[m))]");
-
-    }
-
-    @Test
-    public void testMissingSharePermissionExpressionText() {
-        @Entity
-        @Include
-        class Model {
-        }
-
-        dictionary.bindEntity(Model.class);
-
-        PersistentResource resource = newResource(new Model(), Model.class);
-
-        PermissionExpressionBuilder.Expressions expressions = builder.buildSharePermissionExpressions(resource);
-
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "SHARE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  FOR EXPRESSION "
-                        + "[SHARE ENTITY(NOT MARKED SHAREABLE)]");
-
-        expressions.getCommitExpression().evaluate();
-
-        Assert.assertEquals(expressions.getCommitExpression().toString(),
-                "SHARE PERMISSION WAS INVOKED ON PersistentResource { type=model, id=null }  FOR EXPRESSION "
-                        + "[SHARE ENTITY(NOT MARKED SHAREABLE)]");
-    }
-
-    public <T> PersistentResource newResource(T obj, Class<T> cls) {
-        RequestScope requestScope = new RequestScope(null, null, null, null, dictionary, null, null);
-        return new PersistentResource<>(obj, requestScope);
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/CoerceUtilTest.java b/elide-core/src/test/java/com/yahoo/elide/utils/coerce/CoerceUtilTest.java
deleted file mode 100644
index 110e302ac0..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/CoerceUtilTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils.coerce;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import com.yahoo.elide.core.exceptions.InvalidValueException;
-
-import org.testng.annotations.Test;
-
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class CoerceUtilTest {
-
-    public enum Seasons { WINTER, SPRING }
-
-    @EqualsAndHashCode
-    @AllArgsConstructor
-    @NoArgsConstructor
-    private static class TestClass {
-        public int field1;
-        public int field2;
-    }
-
-    @Test
-    public void testNoConversions() throws Exception {
-
-        assertEquals(CoerceUtil.coerce(1, (Class<Object>) null), 1,
-                     "coerce returns value if target class null");
-
-        assertEquals(CoerceUtil.coerce(null, Object.class), null,
-                     "coerce returns value if value is null");
-
-        assertEquals((Object) CoerceUtil.coerce(1, int.class), 1,
-                "coerce returns value if value is assignable to target");
-    }
-
-    @Test
-    public void testToEnumConversion() throws Exception {
-
-        assertEquals(CoerceUtil.coerce(1, Seasons.class), Seasons.SPRING,
-                "ToEnumConverter is called when target class is Enum");
-    }
-
-    @Test
-    public void testBasicConversion() throws Exception {
-
-        assertEquals(CoerceUtil.coerce(1, String.class), "1",
-                "coerce converts int to String");
-
-        assertEquals(CoerceUtil.coerce("1", Long.class), Long.valueOf("1"),
-                "coerce converts String to Long");
-
-        assertEquals((Object) CoerceUtil.coerce(1.0, int.class), 1,
-                "coerce converts float to int");
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void testError() throws Exception {
-
-        CoerceUtil.coerce('A', Seasons.class);
-    }
-
-    @Test
-    public void testMapConversion() {
-
-        //Input Map
-        Map<String, Object> testMap = new LinkedHashMap<>();
-        testMap.put("field1", 1);
-        testMap.put("field2", 2);
-
-        //ExpectedObject
-        TestClass testClass = new TestClass(1, 2);
-
-        assertEquals(CoerceUtil.coerce(testMap, TestClass.class), testClass,
-                "FromMapConverter is called when source class is a Map");
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void testMapError() throws Exception {
-
-        //Input Map
-        Map<String, Object> testMap = new LinkedHashMap<>();
-        testMap.put("foo", "bar");
-        testMap.put("baz", "qaz");
-
-        CoerceUtil.coerce(testMap, TestClass.class);
-    }
-
-    @Test(expectedExceptions = InvalidValueException.class)
-    public void testConversionFailure() throws Exception {
-        CoerceUtil.coerce("a", Long.class);
-    }
-
-    @Test
-    public void testNullConversion() throws Exception {
-        assertNull(CoerceUtil.coerce(null, String.class));
-    }
-
-    @Test
-    public void testStringToDate() throws Exception {
-        Date date = CoerceUtil.coerce("1", Date.class);
-        assertEquals(date, new Date(1));
-
-        java.sql.Date date1 = CoerceUtil.coerce("1", java.sql.Date.class);
-        assertEquals(date1, new java.sql.Date(1));
-
-        Timestamp timestamp = CoerceUtil.coerce("1", Timestamp.class);
-        assertEquals(timestamp, new Timestamp(1));
-
-        Time time = CoerceUtil.coerce("1", Time.class);
-        assertEquals(time, new Time(1));
-    }
-}
diff --git a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverterTest.java b/elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverterTest.java
deleted file mode 100644
index fafd9caedf..0000000000
--- a/elide-core/src/test/java/com/yahoo/elide/utils/coerce/converters/ToEnumConverterTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils.coerce.converters;
-
-import com.yahoo.elide.core.exceptions.InvalidAttributeException;
-import org.apache.commons.beanutils.Converter;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-
-
-public class ToEnumConverterTest {
-
-    private Converter converter;
-
-    public enum Seasons { WINTER, SPRING, SUMMER, FALL }
-
-    @BeforeMethod
-    public void setUp() throws Exception {
-       this.converter = new ToEnumConverter();
-    }
-
-    @Test
-    public void testIntToEnumConversion() throws Exception {
-
-        assertEquals(converter.convert(Seasons.class, 0),  Seasons.WINTER,
-                "Enum converter correctly converted int to enum");
-
-        assertEquals(converter.convert(Seasons.class, 1),  Seasons.SPRING,
-                "Enum converter correctly converted int to enum");
-    }
-
-    @Test(expectedExceptions = InvalidAttributeException.class)
-    public void testMissingNumberValueException() throws Exception {
-
-        converter.convert(Seasons.class, 5);
-    }
-
-    @Test
-    public void testStringToEnumConversion() throws Exception {
-
-        assertEquals(converter.convert(Seasons.class, "SUMMER"),  Seasons.SUMMER,
-                "Enum converter correctly converted String to enum");
-
-        assertEquals(converter.convert(Seasons.class, "FALL"),  Seasons.FALL,
-                "Enum converter correctly converted String to enum");
-    }
-
-    @Test(expectedExceptions = InvalidAttributeException.class)
-    public void testMissingStringValueException() throws Exception {
-
-        converter.convert(Seasons.class, "AUTUMN");
-    }
-
-    @Test(expectedExceptions = InvalidAttributeException.class)
-    public void testInvalidType() throws Exception {
-
-        converter.convert(Seasons.class, 'A');
-    }
-}
diff --git a/elide-core/src/test/java/example/Address.java b/elide-core/src/test/java/example/Address.java
new file mode 100644
index 0000000000..2295f33d31
--- /dev/null
+++ b/elide-core/src/test/java/example/Address.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class Address {
+
+    @Getter @Setter
+    private String street1;
+
+    @Getter @Setter
+    private String street2;
+
+    @Getter @Setter
+    private GeoLocation geo;
+}
diff --git a/elide-core/src/test/java/example/Author.java b/elide-core/src/test/java/example/Author.java
index 87979fa39d..9cb0b34e54 100644
--- a/elide-core/src/test/java/example/Author.java
+++ b/elide-core/src/test/java/example/Author.java
@@ -6,13 +6,17 @@
 package example;
 
 import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.Exclude;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -25,40 +29,56 @@
  */
 @Entity
 @Table(name = "author")
-@Include(rootLevel = true)
-@SharePermission(any = {Role.ALL.class})
+@Include
 @Audit(action = Audit.Action.CREATE,
         operation = 10,
         logStatement = "{0}",
         logExpressions = {"${author.name}"})
 public class Author {
+    public enum AuthorType {
+        EXCLUSIVE,
+        CONTRACTED,
+        FREELANCE
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Getter @Setter
     private Long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
 
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
+    @Exclude
+    private String naturalKey = UUID.randomUUID().toString();
 
-    public void setId(Long id) {
-        this.id = id;
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
     }
 
-    public String getName() {
-        return name;
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Author && naturalKey.equals(((Author) obj).naturalKey);
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
+    @Getter @Setter
+    private String name;
 
     @ManyToMany(mappedBy = "authors")
-    public Collection<Book> getBooks() {
-        return books;
-    }
+    @Getter @Setter
+    private Collection<Book> books = new ArrayList<>();
 
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
-    }
+    @Getter @Setter
+    private AuthorType type;
+
+    @Getter @Setter
+    private Address homeAddress;
+
+    @Getter @Setter
+    private Set<Address> vacationHomes;
+
+    @Getter @Setter
+    private Map<Object, Object> stuff;
+
+    @ElementCollection
+    @Getter @Setter
+    private Collection<String> awards;
 }
diff --git a/elide-core/src/test/java/example/BaseId.java b/elide-core/src/test/java/example/BaseId.java
index 20dfee6bc4..bcd4f95d91 100644
--- a/elide-core/src/test/java/example/BaseId.java
+++ b/elide-core/src/test/java/example/BaseId.java
@@ -10,6 +10,9 @@
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 
+/**
+ * Basic class that has an id.
+ */
 @MappedSuperclass
 public abstract class BaseId {
     private long id;
diff --git a/elide-core/src/test/java/example/Book.java b/elide-core/src/test/java/example/Book.java
index 61049fe740..db0c57d1d0 100644
--- a/elide-core/src/test/java/example/Book.java
+++ b/elide-core/src/test/java/example/Book.java
@@ -6,35 +6,49 @@
 package example;
 
 import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.FilterExpressionPath;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.OnCommit;
-import com.yahoo.elide.annotation.OnCreate;
-import com.yahoo.elide.annotation.OnDelete;
-import com.yahoo.elide.annotation.OnUpdate;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import example.Author.AuthorType;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * Model for books.
  */
 @Entity
-@SharePermission(any = {Role.ALL.class})
+@CreatePermission(expression = "Book operation check")
+@UpdatePermission(expression = "Book operation check")
+@DeletePermission(expression = "Book operation check")
 @Table(name = "book")
-@Include(rootLevel = true)
+@Include
 @Audit(action = Audit.Action.CREATE,
         operation = 10,
         logStatement = "{0}",
         logExpressions = {"${book.title}"})
+@AllArgsConstructor
+@NoArgsConstructor
 public class Book {
     private long id;
     private String title;
@@ -42,7 +56,9 @@ public class Book {
     private String language;
     private long publishDate = 0;
     private Collection<Author> authors = new ArrayList<>();
-    private boolean onCreateBookCalled = false;
+    private Publisher publisher = null;
+    private Collection<String> awards = new ArrayList<>();
+    private Price price;
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     public long getId() {
@@ -94,28 +110,58 @@ public void setAuthors(Collection<Author> authors) {
         this.authors = authors;
     }
 
-    @OnUpdate("title")
-    public void onUpdateTitle() {
-       // title attribute updated
+    @ElementCollection(targetClass = AuthorType.class)
+    @FilterExpressionPath("authors.type")
+    public Collection<AuthorType> getAuthorTypes() {
+        return getAuthors().stream().map(Author::getType).distinct().collect(Collectors.toList());
+    }
+
+
+    @ElementCollection(targetClass = String.class)
+    public Collection<String> getAwards() {
+        return awards;
+    }
+
+    public void setAwards(Collection<String> awards) {
+        this.awards = awards;
+    }
+
+    @OneToOne
+    public Publisher getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(Publisher publisher) {
+        this.publisher = publisher;
+    }
+
+    public Price getPrice() {
+        return price;
     }
 
-    @OnCommit("title")
-    public void onCommitTitle() {
-       // title attribute update committed
+    public void setPrice(Price price) {
+        this.price = price;
     }
 
-    @OnCreate
-    public void onCreateBook() {
-        // book entity created
+    @Transient
+    @ComputedRelationship
+    @OneToOne
+    @FilterExpressionPath("publisher.editor")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        return getPublisher().getEditor();
     }
 
-    @OnCommit
-    public void onCommitBook() {
-       // book entity committed
+    public void checkPermission(RequestScope requestScope) {
+        // performs create permission check
     }
 
-    @OnDelete
-    public void onDeleteBook() {
-       // book entity deleted
+    static public class BookOperationCheck extends OperationCheck<Book> {
+        @Override
+        public boolean ok(Book book, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            // trigger method for testing
+            book.checkPermission(requestScope);
+            return true;
+        }
     }
 }
diff --git a/elide-core/src/test/java/example/Child.java b/elide-core/src/test/java/example/Child.java
index 1d23e6723c..3e51b6f3d2 100644
--- a/elide-core/src/test/java/example/Child.java
+++ b/elide-core/src/test/java/example/Child.java
@@ -5,19 +5,17 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.Audit;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.Child.InitCheck;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.Optional;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,14 +24,11 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToOne;
-import java.util.Optional;
-import java.util.Set;
 
-@Entity
-@CreatePermission(any = { InitCheck.class })
-@SharePermission(any = {Role.ALL.class})
-@ReadPermission(all = {NegativeChildIdCheck.class, NegativeIntegerUserCheck.class, Child.InitCheckOp.class})
-@Include
+@Entity(name = "childEntity")
+@CreatePermission(expression = "initCheck")
+@ReadPermission(expression = "negativeChildId AND negativeIntegerUser AND initCheck")
+@Include(name = "child")
 @Audit(action = Audit.Action.DELETE,
        operation = 0,
        logStatement = "DELETE Child {0} Parent {1}",
@@ -105,7 +100,7 @@ public void setName(String name) {
     @OneToOne(
             targetEntity = Child.class
     )
-    @ReadPermission(all = {Role.NONE.class})
+    @ReadPermission(expression = "Prefab.Role.None")
     public Child getReadNoAccess() {
         return noReadAccess;
     }
@@ -114,23 +109,10 @@ public void setReadNoAccess(Child noReadAccess) {
         this.noReadAccess = noReadAccess;
     }
 
-    static public class InitCheck extends CommitCheck<Child> {
-        @Override
-        public boolean ok(Child child, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (child.getParents() != null) {
-                return true;
-            }
-            return false;
-        }
-    }
-
-    static public class InitCheckOp extends OperationCheck<Child> {
+    static public class InitCheck extends OperationCheck<Child> {
         @Override
         public boolean ok(Child child, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (child.getParents() != null) {
-                return true;
-            }
-            return false;
+            return child.getParents() != null;
         }
     }
 }
diff --git a/elide-core/src/test/java/example/CoerceBean.java b/elide-core/src/test/java/example/CoerceBean.java
new file mode 100644
index 0000000000..0be2ac27ff
--- /dev/null
+++ b/elide-core/src/test/java/example/CoerceBean.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Entity;
+
+@Entity
+@Include(rootLevel = false)
+public class CoerceBean {
+    public String string;
+    public List<Boolean> list;
+    public Map<String, Long> map;
+    public Set<Double> set;
+}
diff --git a/elide-core/src/test/java/example/Company.java b/elide-core/src/test/java/example/Company.java
new file mode 100644
index 0000000000..00fb5d1c8b
--- /dev/null
+++ b/elide-core/src/test/java/example/Company.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Include
+@Data
+public class Company {
+
+    @Id
+    private String id;
+    private String description;
+
+    private Address address;
+}
diff --git a/elide-core/src/test/java/example/ComputedBean.java b/elide-core/src/test/java/example/ComputedBean.java
new file mode 100644
index 0000000000..3e9d495449
--- /dev/null
+++ b/elide-core/src/test/java/example/ComputedBean.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.RequestScope;
+
+import javax.persistence.Entity;
+
+/**
+ * Bean with only computed fields
+ */
+@Include(rootLevel = false)
+@Entity
+public class ComputedBean {
+
+    @ComputedAttribute
+    public String getTest() {
+        return "test1";
+    }
+
+    @ComputedAttribute
+    public String getTestWithScope(RequestScope requestScope) {
+        return "test2";
+    }
+
+    @ComputedAttribute
+    public String getTestWithSecurityScope(com.yahoo.elide.core.security.RequestScope requestScope) {
+        return "test3";
+    }
+
+    public String getNonComputedWithScope(RequestScope requestScope) {
+        return "should not run!";
+    }
+}
diff --git a/elide-core/src/test/java/example/Editor.java b/elide-core/src/test/java/example/Editor.java
new file mode 100644
index 0000000000..9f169f414e
--- /dev/null
+++ b/elide-core/src/test/java/example/Editor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * Model for authors.
+ */
+@Entity
+@Table(name = "editor")
+@Include
+@Audit(action = Audit.Action.CREATE,
+        operation = 10,
+        logStatement = "{0}",
+        logExpressions = {"${editor.name}"})
+public class Editor {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Getter @Setter
+    private Long id;
+
+    @Exclude
+    private String naturalKey = UUID.randomUUID().toString();
+
+    @Getter @Setter
+    private String firstName;
+
+    @Getter @Setter
+    private String lastName;
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Editor && naturalKey.equals(((Editor) obj).naturalKey);
+    }
+
+    @ComputedAttribute
+    public String getFullName() {
+        return firstName + " " + lastName;
+    }
+
+    @Transient
+    @ComputedRelationship
+    @OneToOne
+    @FilterExpressionPath("this")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        return this;
+    }
+
+    public static class FieldPathFilterExpression extends FilterExpressionCheck {
+        @Override
+        public FilterPredicate getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+            Path path = super.getFieldPath(entityClass, requestScope, "getEditor", "editor");
+            return new NotNullPredicate(path);
+        }
+    }
+}
diff --git a/elide-core/src/test/java/example/FieldAnnotations.java b/elide-core/src/test/java/example/FieldAnnotations.java
index 286fbd68ad..df6ca90040 100644
--- a/elide-core/src/test/java/example/FieldAnnotations.java
+++ b/elide-core/src/test/java/example/FieldAnnotations.java
@@ -7,14 +7,18 @@
 
 import com.yahoo.elide.annotation.Include;
 
+import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 
-@Include(rootLevel = true, type = "stringId")
+@Include(name = "stringId")
 @Entity
 public class FieldAnnotations {
 
+    @Id
     private Long id;
 
     @Column
@@ -22,7 +26,12 @@ public class FieldAnnotations {
 
     private Boolean privateField;
 
-    @Id
+    @OneToMany(mappedBy = "parent")
+    private Set<FieldAnnotations> children;
+
+    @ManyToOne
+    private FieldAnnotations parent;
+
     public Long getId() {
         return id;
     }
diff --git a/elide-core/src/test/java/example/FirstClassFields.java b/elide-core/src/test/java/example/FirstClassFields.java
index f7a7580d6b..71ae40dab1 100644
--- a/elide-core/src/test/java/example/FirstClassFields.java
+++ b/elide-core/src/test/java/example/FirstClassFields.java
@@ -10,17 +10,16 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
-@CreatePermission(all = {Role.NONE.class})
-@ReadPermission(all = {Role.NONE.class})
-@UpdatePermission(all = {Role.NONE.class})
-@DeletePermission(all = {Role.NONE.class})
-@Include(rootLevel = true)
+@CreatePermission(expression = "Prefab.Role.None")
+@ReadPermission(expression = "Prefab.Role.None")
+@UpdatePermission(expression = "Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.None")
+@Include
 @Entity
 public class FirstClassFields {
     @Id
@@ -33,10 +32,10 @@ public class FirstClassFields {
     public Left private2;
 
     // Public vars
-    @ReadPermission(any = {Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     public String public1;
 
-    @ReadPermission(any = {Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     @OneToOne
     public Left public2;
 }
diff --git a/elide-core/src/test/java/example/FunWithPermissions.java b/elide-core/src/test/java/example/FunWithPermissions.java
index a59a4422de..8d3c212f41 100644
--- a/elide-core/src/test/java/example/FunWithPermissions.java
+++ b/elide-core/src/test/java/example/FunWithPermissions.java
@@ -5,18 +5,16 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.AbstractSet;
 import java.util.Iterator;
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -27,11 +25,11 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-@CreatePermission(any = { Role.ALL.class })
-@ReadPermission(all = { Role.ALL.class })
-@UpdatePermission(any = { Role.NONE.class, Role.ALL.class })
-@DeletePermission(all = { Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "fun") // optional here because class has this name
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.None OR Prefab.Role.All")
+@DeletePermission(expression = "Prefab.Role.None AND Prefab.Role.All")
+@Include(name = "fun") // optional here because class has this name
 @Entity
 @Table(name = "fun")
 public class FunWithPermissions {
@@ -39,27 +37,45 @@ public class FunWithPermissions {
     private long id;
     private String field1;
     private String field2;
+    private String field3;
+    private String field4;
+    private Set<Child> relation1;
+    private Set<Child> relation2;
+    private Child relation3;
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    public String field3;
+    @ReadPermission(expression = "negativeIntegerUser")
+    public String getField3() {
+        return field3;
+    }
 
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
-    public String field4;
+    public void setField3(String field3) {
+        this.field3 = field3;
+    }
 
-    private Set<Child> relation1;
+    @UpdatePermission(expression = "negativeIntegerUser")
+    public String getField4() {
+        return field4;
+    }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
+    public void setField4(String field4) {
+        this.field4 = field4;
+    }
+
+    public void setRelation2(Set<Child> relation2) {
+        this.relation2 = relation2;
+    }
+
+    @ReadPermission(expression = "negativeIntegerUser")
     @OneToMany(
             targetEntity = Child.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE }
     )
-    public Set<Child> relation2;
-
-
-    private Child relation3;
+    public Set<Child> getRelation2() {
+        return relation2;
+    }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
+    @UpdatePermission(expression = "negativeIntegerUser")
     @OneToOne (cascade = CascadeType.ALL)
     @JoinColumn(name = "child_id")
     public Child getRelation3() {
@@ -73,7 +89,7 @@ public void setRelation3(Child relation3) {
 
     private Set<NoReadEntity> relation4;
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
     @OneToMany(
             targetEntity = NoReadEntity.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE })
@@ -99,7 +115,7 @@ public void setRelation4(Set<NoReadEntity> relation4) {
 
     private NoReadEntity relation5;
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
     @OneToOne(
             targetEntity = NoReadEntity.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE })
@@ -122,7 +138,7 @@ public void setId(long id) {
         this.id = id;
     }
 
-    @ReadPermission(any = { Role.NONE.class})
+    @ReadPermission(expression = "Prefab.Role.None")
     public String getField1() {
         return field1;
     }
@@ -131,7 +147,7 @@ public void setField1(String field1) {
         this.field1 = field1;
     }
 
-    @ReadPermission(all = { Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     public String getField2() {
         return field2;
     }
@@ -140,8 +156,8 @@ public void setField2(String field2) {
         this.field2 = field2;
     }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
+    @UpdatePermission(expression = "negativeIntegerUser")
     @OneToMany(
             targetEntity = Child.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE }
@@ -155,18 +171,50 @@ public void setRelation1(Set<Child> relation) {
     }
 
     /* Verifies a chain of checks where all can succeed */
-    @ReadPermission(any = { NegativeIntegerUserCheck.class, Role.ALL.class })
-    public String field5;
 
-    /* Verifies a chain of checks where the first can fail or all succeed */
-    @ReadPermission(all = { NegativeIntegerUserCheck.class, Role.ALL.class })
-    public String field6;
+    private String field5;
+
+    @ReadPermission(expression = "Prefab.Role.All OR negativeIntegerUser")
+    public String getField5() {
+        return field5;
+    }
+
+    public void setField5(String field5) {
+        this.field5 = field5;
+    }
+
+    private String field6;
+
+    @ReadPermission(expression = "negativeIntegerUser AND Prefab.Role.All")
+    public String getField6() {
+        return field6;
+    }
+
+    public void setField6(String field6) {
+        this.field6 = field6;
+    }
+
+    private String field7;
 
     /* Verifies a chain of checks where the last can fail. */
-    @ReadPermission(all = { Role.ALL.class, Role.NONE.class })
-    public String field7;
+    @ReadPermission(expression = "Prefab.Role.All AND Prefab.Role.None")
+    public String getField7() {
+        return field7;
+    }
+
+    public void setField7(String field7) {
+        this.field7 = field7;
+    }
+
+    private String field8;
 
     /* Verifies a chain of checks where all can fail or the last can succeed. */
-    @ReadPermission(any = { Role.NONE.class, NegativeIntegerUserCheck.class })
-    public String field8;
+    @ReadPermission(expression = "Prefab.Role.None OR negativeIntegerUser")
+    public String getField8() {
+        return field8;
+    }
+
+    public void setField8(String field8) {
+        this.field8 = field8;
+    }
 }
diff --git a/elide-core/src/test/java/example/GeoLocation.java b/elide-core/src/test/java/example/GeoLocation.java
new file mode 100644
index 0000000000..92bf07558a
--- /dev/null
+++ b/elide-core/src/test/java/example/GeoLocation.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class GeoLocation {
+
+    @Getter @Setter
+    private String latitude;
+
+    @Getter @Setter
+    private String longitude;
+
+}
diff --git a/elide-core/src/test/java/example/Invoice.java b/elide-core/src/test/java/example/Invoice.java
new file mode 100644
index 0000000000..5486dba123
--- /dev/null
+++ b/elide-core/src/test/java/example/Invoice.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity(name = "invoice")
+@Include
+@Data
+public class Invoice {
+    @Id
+    private long id;
+    @OneToMany(cascade = { CascadeType.ALL} , mappedBy = "invoice", targetEntity = LineItem.class)
+    private Set<LineItem> items;
+    private Map<String, BigDecimal> taxes;
+    private Date creationDate;
+}
diff --git a/elide-core/src/test/java/example/Job.java b/elide-core/src/test/java/example/Job.java
new file mode 100644
index 0000000000..25076c1e04
--- /dev/null
+++ b/elide-core/src/test/java/example/Job.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * Model to represent a Parent's Job.
+ *
+ * Used to test/demonstrate the use of {@literal @MapsId} annotation.
+ */
+@Entity
+@Table(name = "job")
+@Include(name = "job")
+public class Job {
+
+    @Id
+    @Getter
+    private Long jobId;
+
+    @Getter @Setter
+    private String title;
+
+    @OneToOne
+    @MapsId
+    @Getter @Setter
+    private Parent parent;
+}
diff --git a/elide-core/src/test/java/example/Left.java b/elide-core/src/test/java/example/Left.java
index 068cbb3dfa..0edfb5eac6 100644
--- a/elide-core/src/test/java/example/Left.java
+++ b/elide-core/src/test/java/example/Left.java
@@ -5,12 +5,13 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -20,20 +21,21 @@
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.util.Set;
-
 
-@Include(rootLevel = true, type = "left") // optional here because class has this name
+@Include(name = "left") // optional here because class has this name
 @Entity
 @Table(name = "xleft")  // left is SQL keyword
-@DeletePermission(
-        any = {NegativeIntegerUserCheck.class}
-)
+@DeletePermission(expression = "negativeIntegerUser")
+@NonTransferable
 public class Left {
     @JsonIgnore
     private long id;
     private Set<Right> one2many;
     private Right one2one;
+    private NoDeleteEntity noDeleteOne2One;
+    private Set<Right> fieldLevelDelete;
+    private Right noUpdateOne2One;
+    private Set<Right> noInverseUpdate;
 
     @OneToOne(
             optional = false,
@@ -72,33 +74,54 @@ public long getId() {
         return id;
     }
 
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
+    @UpdatePermission(expression = "Prefab.Role.None")
     @OneToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "noUpdateOne2One"
     )
-    public Right noUpdateOne2One;
+    public Right getNoUpdateOne2One() {
+        return noUpdateOne2One;
+    }
+
+    public void setNoUpdateOne2One(Right noUpdateOne2One) {
+        this.noUpdateOne2One = noUpdateOne2One;
+    }
 
     @ManyToMany(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "noUpdate"
     )
-    public Set<Right> noInverseUpdate;
+    public Set<Right> getNoInverseUpdate() {
+        return noInverseUpdate;
+    }
+
+    public void setNoInverseUpdate(Set<Right> noInverseUpdate) {
+        this.noInverseUpdate = noInverseUpdate;
+    }
 
     @OneToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = NoDeleteEntity.class
+
     )
-    public NoDeleteEntity noDeleteOne2One;
+    public NoDeleteEntity getNoDeleteOne2One() {
+        return noDeleteOne2One;
+    }
+
+    public void setNoDeleteOne2One(NoDeleteEntity noDeleteOne2One) {
+        this.noDeleteOne2One = noDeleteOne2One;
+    }
 
     @ManyToMany(
-        cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-        targetEntity = Right.class,
-        mappedBy = "allowDeleteAtFieldLevel"
+        cascade = { CascadeType.PERSIST, CascadeType.MERGE }
     )
-    public Set<Right> fieldLevelDelete;
+    public Set<Right> getFieldLevelDelete() {
+        return fieldLevelDelete;
+    }
+
+    public void setFieldLevelDelete(Set<Right> fieldLevelDelete) {
+        this.fieldLevelDelete = fieldLevelDelete;
+    }
 }
diff --git a/elide-core/src/test/java/example/LineItem.java b/elide-core/src/test/java/example/LineItem.java
new file mode 100644
index 0000000000..58aec86705
--- /dev/null
+++ b/elide-core/src/test/java/example/LineItem.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Include(rootLevel = false)
+public class LineItem {
+    private long id;
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    private Invoice invoice;
+
+    @ManyToOne(targetEntity = Invoice.class)
+    public Invoice getInvoice() {
+        return invoice;
+    }
+
+    public void setInvoice(Invoice invoice) {
+        this.invoice = invoice;
+    }
+}
diff --git a/elide-core/src/test/java/example/MapColorShape.java b/elide-core/src/test/java/example/MapColorShape.java
index f4f18231ea..b0db776b8e 100644
--- a/elide-core/src/test/java/example/MapColorShape.java
+++ b/elide-core/src/test/java/example/MapColorShape.java
@@ -6,24 +6,21 @@
 package example;
 
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * Bean with Map of Enums.
  */
 @Entity
 @Table(name = "color_shape")
-@Include(rootLevel = true)
-@SharePermission(any = {Role.ALL.class})
+@Include
 public class MapColorShape {
     private long id;
     private String name;
diff --git a/elide-core/src/test/java/example/NegativeChildIdCheck.java b/elide-core/src/test/java/example/NegativeChildIdCheck.java
index eb6b044e16..e90a8e1d69 100644
--- a/elide-core/src/test/java/example/NegativeChildIdCheck.java
+++ b/elide-core/src/test/java/example/NegativeChildIdCheck.java
@@ -5,9 +5,9 @@
  */
 package example;
 
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 
 import java.util.Optional;
 
diff --git a/elide-core/src/test/java/example/NegativeIntegerUserCheck.java b/elide-core/src/test/java/example/NegativeIntegerUserCheck.java
index 3508b5c772..a96c99aae3 100644
--- a/elide-core/src/test/java/example/NegativeIntegerUserCheck.java
+++ b/elide-core/src/test/java/example/NegativeIntegerUserCheck.java
@@ -5,8 +5,8 @@
  */
 package example;
 
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.UserCheck;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.UserCheck;
 
 /**
  * Useful for testing permissions based on different users.
@@ -14,7 +14,7 @@
 public class NegativeIntegerUserCheck extends UserCheck {
     @Override
     public boolean ok(User user) {
-        Integer id = (Integer) user.getOpaqueUser();
+        Integer id = Integer.parseInt(user.getPrincipal().getName());
         return id >= 0;
     }
 }
diff --git a/elide-core/src/test/java/example/NoDeleteEntity.java b/elide-core/src/test/java/example/NoDeleteEntity.java
index 138b76c3ba..e1f0a6f394 100644
--- a/elide-core/src/test/java/example/NoDeleteEntity.java
+++ b/elide-core/src/test/java/example/NoDeleteEntity.java
@@ -7,14 +7,13 @@
 
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-@DeletePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "nodelete") // optional here because class has this name
+@DeletePermission(expression = "Prefab.Role.None")
+@Include(name = "nodelete") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "nodelete")
diff --git a/elide-core/src/test/java/example/NoReadEntity.java b/elide-core/src/test/java/example/NoReadEntity.java
index cdb99f3c07..9260010811 100644
--- a/elide-core/src/test/java/example/NoReadEntity.java
+++ b/elide-core/src/test/java/example/NoReadEntity.java
@@ -7,30 +7,25 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-@ReadPermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "noread") // optional here because class has this name
+@ReadPermission(expression = "Prefab.Role.None")
+@Include(name = "noread") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "noread")
+@Data
 public class NoReadEntity {
+    @Id
     private long id;
-    public String field;
 
-    @OneToOne
-    public Child child;
+    private String field;
 
-    @Id
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+    @OneToOne
+    private Child child;
 }
diff --git a/elide-core/src/test/java/example/NoShareEntity.java b/elide-core/src/test/java/example/NoShareEntity.java
index 4bbcf445d8..ce5549eac9 100644
--- a/elide-core/src/test/java/example/NoShareEntity.java
+++ b/elide-core/src/test/java/example/NoShareEntity.java
@@ -6,18 +6,17 @@
 package example;
 
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.annotation.NonTransferable;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-@SharePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "noshare") // optional here because class has this name
+@Include(name = "noshare") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "noshare")
+@NonTransferable
 public class NoShareEntity {
     private long id;
 
diff --git a/elide-core/src/test/java/example/NoUpdateEntity.java b/elide-core/src/test/java/example/NoUpdateEntity.java
index f869e1c678..3126ad2463 100644
--- a/elide-core/src/test/java/example/NoUpdateEntity.java
+++ b/elide-core/src/test/java/example/NoUpdateEntity.java
@@ -7,30 +7,24 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import lombok.Data;
 
+import java.util.Set;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import java.util.Set;
 
-@UpdatePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "noupdate") // optional here because class has this name
+@UpdatePermission(expression = "Prefab.Role.None")
+@Include(name = "noupdate") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "noupdate")
+@Data
 public class NoUpdateEntity {
+    @Id
     private long id;
 
     @OneToMany()
-    public Set<Child> children;
-
-    @Id
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+    private Set<Child> children;
 }
diff --git a/elide-core/src/test/java/example/Parent.java b/elide-core/src/test/java/example/Parent.java
index 55b1ea831b..77c80c3a79 100644
--- a/elide-core/src/test/java/example/Parent.java
+++ b/elide-core/src/test/java/example/Parent.java
@@ -10,13 +10,15 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
 import lombok.ToString;
 
+import java.util.Optional;
+import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,34 +27,33 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.PrePersist;
 import javax.validation.constraints.NotNull;
-import java.util.Optional;
-import java.util.Set;
 
-@CreatePermission(any = { Parent.InitCheck.class, Role.ALL.class })
-@ReadPermission(any = { Parent.InitCheckOp.class, Role.ALL.class })
-@UpdatePermission(any = { Parent.InitCheck.class, Role.ALL.class, Role.NONE.class })
-@DeletePermission(any = { Parent.InitCheckOp.class, Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "parent") // optional here because class has this name
+@CreatePermission(expression = "parentInitCheck OR Prefab.Role.All")
+@ReadPermission(expression = "parentInitCheck OR Prefab.Role.All")
+@UpdatePermission(expression = "parentInitCheck OR Prefab.Role.All OR Prefab.Role.None")
+@DeletePermission(expression = "parentInitCheck OR Prefab.Role.All OR Prefab.Role.None")
+@Include(name = "parent") // optional here because class has this name
 @Entity
 @ToString
 public class Parent extends BaseId {
+    @ReadPermission(expression = "Prefab.Role.None")
+    public transient boolean init = false;
     private Set<Child> children;
     private Set<Parent> spouses;
     private String firstName;
     private String specialAttribute;
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
 
     @PrePersist
     public void doInit() {
         init = true;
     }
 
-    @ReadPermission(any = { Role.ALL.class, Role.NONE.class })
-    @UpdatePermission(any = { Role.ALL.class, Role.NONE.class })
+    @ReadPermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+    @UpdatePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
     // Hibernate
     @ManyToMany(
             targetEntity = Child.class,
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE }
+            cascade = {CascadeType.PERSIST, CascadeType.MERGE}
     )
     @JoinTable(
             name = "Parent_Child",
@@ -89,8 +90,8 @@ public void setFirstName(String name) {
     }
 
     // Special attribute is to catch a corner case for patch extension
-    @ReadPermission(all = {Role.NONE.class})
-    @UpdatePermission(all = {SpecialValue.class})
+    @ReadPermission(expression = "Prefab.Role.None")
+    @UpdatePermission(expression = "specialValue")
     public String getSpecialAttribute() {
         return specialAttribute;
     }
@@ -99,23 +100,10 @@ public void setSpecialAttribute(String specialAttribute) {
         this.specialAttribute = specialAttribute;
     }
 
-    static public class InitCheck extends CommitCheck<Parent> {
+    static public class InitCheck extends OperationCheck<Parent> {
         @Override
         public boolean ok(Parent parent, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (parent.getChildren() != null && parent.getSpouses() != null) {
-                return true;
-            }
-            return false;
-        }
-    }
-
-    static public class InitCheckOp extends OperationCheck<Parent> {
-        @Override
-        public boolean ok(Parent parent, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (parent.getChildren() != null && parent.getSpouses() != null) {
-                return true;
-            }
-            return false;
+            return parent.getChildren() != null && parent.getSpouses() != null;
         }
     }
 
diff --git a/elide-core/src/test/java/example/Post.java b/elide-core/src/test/java/example/Post.java
index d224630c54..84c65349e8 100644
--- a/elide-core/src/test/java/example/Post.java
+++ b/elide-core/src/test/java/example/Post.java
@@ -10,25 +10,23 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.persistence.Entity;
 
-@CreatePermission(any = { Role.ALL.class })
-@ReadPermission(any = { Role.ALL.class })
-@UpdatePermission(any = { Role.ALL.class, Role.NONE.class })
-@DeletePermission(any = { Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "post") // optional here because class has this name
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+@Include(name = "post") // optional here because class has this name
 @Entity
 public class Post extends BaseId {
     private String title;
     private int created;
     private final Set<Parent> spouses = new HashSet<>();
 
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
+    @ReadPermission(expression = "Prefab.Role.None") public transient boolean init = false;
 
     public void doInit() {
         init = true;
diff --git a/elide-core/src/test/java/example/Price.java b/elide-core/src/test/java/example/Price.java
new file mode 100644
index 0000000000..1d42001c6c
--- /dev/null
+++ b/elide-core/src/test/java/example/Price.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Price {
+    private BigDecimal units;
+    private Currency currency;
+
+    //Ignored by Elide....
+    Book book;
+}
diff --git a/elide-core/src/test/java/example/PrimitiveId.java b/elide-core/src/test/java/example/PrimitiveId.java
new file mode 100644
index 0000000000..2c1c902995
--- /dev/null
+++ b/elide-core/src/test/java/example/PrimitiveId.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+
+@Include(name = "primitiveTypeId")
+@Entity
+@Data
+public class PrimitiveId {
+
+    @Id
+    private long primitiveId;
+}
diff --git a/elide-core/src/test/java/example/Publisher.java b/elide-core/src/test/java/example/Publisher.java
new file mode 100644
index 0000000000..0ba333efb6
--- /dev/null
+++ b/elide-core/src/test/java/example/Publisher.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.ReadPermission;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+/**
+ * Model for publisher.
+ */
+@Entity
+@Include(rootLevel = false, description = "A book publisher")
+public class Publisher {
+
+    private long id;
+    private String name;
+    private Set<Book> books = new HashSet<>();
+    private Editor editor;
+
+    @Exclude
+    @Getter @Setter
+    private boolean updateHookInvoked = false;
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String title) {
+        this.name = title;
+    }
+
+    @OneToMany(mappedBy = "publisher")
+    @LifeCycleHookBinding(operation = UPDATE, phase = PRECOMMIT, hook = PublisherUpdateHook.class)
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+
+    @ManyToOne
+    @FilterExpressionPath("editor")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        return editor;
+    }
+
+    public void setEditor(Editor editor) {
+        this.editor = editor;
+    }
+}
diff --git a/elide-core/src/test/java/example/PublisherUpdateHook.java b/elide-core/src/test/java/example/PublisherUpdateHook.java
new file mode 100644
index 0000000000..babbf61284
--- /dev/null
+++ b/elide-core/src/test/java/example/PublisherUpdateHook.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+
+import java.util.Optional;
+
+/**
+ * Used to tests life cycle hook invocations.
+ */
+public class PublisherUpdateHook implements LifeCycleHook<Publisher> {
+
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                        Publisher elideEntity, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        elideEntity.setUpdateHookInvoked(true);
+    }
+}
diff --git a/elide-core/src/test/java/example/Right.java b/elide-core/src/test/java/example/Right.java
index 683442f969..0b3c8e54c7 100644
--- a/elide-core/src/test/java/example/Right.java
+++ b/elide-core/src/test/java/example/Right.java
@@ -5,12 +5,11 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -20,12 +19,10 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.util.Set;
 
 
-@Include(rootLevel = true, type = "right") // optional here because class has this name
-@SharePermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Role.NONE.class})
+@Include(name = "right") // optional here because class has this name
+@UpdatePermission(expression = "Prefab.Role.None")
 @Entity
 @Table(name = "xright")     // right is SQL keyword
 public class Right {
@@ -33,14 +30,15 @@ public class Right {
     private long id;
     private Left many2one;
     private Left one2one;
+    private Set<Left> allowDeleteAtFieldLevel;
+    private Left noUpdateOne2One;
+    private Set<Left> noUpdate;
 
     @OneToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Left.class
     )
-    @UpdatePermission(
-            any = { Role.ALL.class }
-    )
+    @UpdatePermission(expression = "Prefab.Role.All")
     public Left getOne2one() {
         return one2one;
     }
@@ -71,30 +69,41 @@ public long getId() {
         return id;
     }
 
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
+    @UpdatePermission(expression = "Prefab.Role.None")
     @OneToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Left.class
     )
-    public Left noUpdateOne2One;
+    public Left getNoUpdateOne2One() {
+        return noUpdateOne2One;
+    }
 
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
+    public void setNoUpdateOne2One(Left noUpdateOne2One) {
+        this.noUpdateOne2One = noUpdateOne2One;
+    }
+
+    @UpdatePermission(expression = "Prefab.Role.None")
     @ManyToMany(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Left.class
     )
-    public Set<Left> noUpdate;
+    public Set<Left> getNoUpdate() {
+        return noUpdate;
+    }
+
+    public void setNoUpdate(Set<Left> noUpdate) {
+        this.noUpdate = noUpdate;
+    }
 
     @ManyToMany(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-            targetEntity = Left.class
+            cascade = { CascadeType.PERSIST, CascadeType.MERGE }
     )
-    @UpdatePermission(
-            any = {Role.ALL.class}
-    )
-    public Set<Left> allowDeleteAtFieldLevel;
+    @UpdatePermission(expression = "Prefab.Role.All")
+    public Set<Left> getAllowDeleteAtFieldLevel() {
+        return allowDeleteAtFieldLevel;
+    }
+
+    public void setAllowDeleteAtFieldLevel(Set<Left> allowDeleteAtFieldLevel) {
+        this.allowDeleteAtFieldLevel = allowDeleteAtFieldLevel;
+    }
 }
diff --git a/elide-core/src/test/java/example/StringId.java b/elide-core/src/test/java/example/StringId.java
index acc90c599d..e72f0e5526 100644
--- a/elide-core/src/test/java/example/StringId.java
+++ b/elide-core/src/test/java/example/StringId.java
@@ -11,18 +11,18 @@
 import javax.persistence.Id;
 
 
-@Include(rootLevel = true, type = "stringForId")
+@Include(name = "stringForId")
 @Entity
 public class StringId {
 
-    private String id;
+    private String surrogateKey;
 
     @Id
-    public String getId() {
-        return id;
+    public String getSurrogateKey() {
+        return surrogateKey;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setSurrogateKey(String surrogateKey) {
+        this.surrogateKey = surrogateKey;
     }
 }
diff --git a/elide-core/src/test/java/example/TestCheckMappings.java b/elide-core/src/test/java/example/TestCheckMappings.java
new file mode 100644
index 0000000000..92257fb3b1
--- /dev/null
+++ b/elide-core/src/test/java/example/TestCheckMappings.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.core.PersistentResourceTest;
+import com.yahoo.elide.core.security.PermissionExecutorTest;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * Check mappings to be used by tests.
+ */
+public class TestCheckMappings {
+    public static final ImmutableMap<String, Class<? extends Check>> MAPPINGS =
+            ImmutableMap.<String, Class<? extends Check>>builder()
+                    .put("Prefab.Role.All", Role.ALL.class)
+                    .put("changeSpecCollection", PersistentResourceTest.ChangeSpecCollection.class)
+                    .put("changeSpecNonCollection", PersistentResourceTest.ChangeSpecNonCollection.class)
+                    .put("initCheck", Child.InitCheck.class)
+                    .put("parentInitCheck", Parent.InitCheck.class)
+                    .put("negativeIntegerUser", NegativeIntegerUserCheck.class)
+                    .put("negativeChildId", NegativeChildIdCheck.class)
+                    .put("FailOp", PermissionExecutorTest.FailingOperationCheck.class)
+                    .put("sampleOperation", PermissionExecutorTest.SampleOperationCheck.class)
+                    .put("sampleOperationInverse", PermissionExecutorTest.SampleOperationCheckInverse.class)
+                    .put("sampleCommit", PermissionExecutorTest.SampleCommitCheck.class)
+                    .put("shouldCache", PermissionExecutorTest.ShouldCache.class)
+                    .put("peUserCheck", PermissionExecutorTest.UserCheckTest.class)
+                    .put("passingOp", PermissionExecutorTest.PassingOperationCheck.class)
+                    .put("Principal is user one", UserIdChecks.UserOneCheck.class)
+                    .put("Principal is user two", UserIdChecks.UserTwoCheck.class)
+                    .put("Principal is user three", UserIdChecks.UserThreeCheck.class)
+                    .put("Principal is user four", UserIdChecks.UserFourCheck.class)
+                    .put("Book operation check", Book.BookOperationCheck.class)
+                    .put("Field path editor check", Editor.FieldPathFilterExpression.class)
+                    .build();
+}
diff --git a/elide-core/src/test/java/example/UpdateAndCreate.java b/elide-core/src/test/java/example/UpdateAndCreate.java
new file mode 100644
index 0000000000..9a8f06cd02
--- /dev/null
+++ b/elide-core/src/test/java/example/UpdateAndCreate.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.UpdatePermission;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+/**
+ * Model for authors.
+ */
+@Entity
+@Include
+@CreatePermission(expression = "Principal is user one OR Principal is user two")
+@UpdatePermission(expression = "Principal is user two")
+@Audit(action = Audit.Action.CREATE,
+        operation = 10,
+        logStatement = "{0}",
+        logExpressions = {"${author.name}"})
+public class UpdateAndCreate {
+    public enum AuthorType {
+        EXCLUSIVE,
+        CONTRACTED,
+        FREELANCE
+    }
+
+    private Long id;
+    private String name;
+    private String alias;
+    private Collection<Book> books = new ArrayList<>();
+    private Author author;
+    private AuthorType type;
+
+
+    @Getter
+    @Setter
+    private Address homeAddress;
+
+    @Id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @CreatePermission(expression = "Principal is user one OR Principal is user two OR Principal is user three")
+    @UpdatePermission(expression = "Principal is user two OR Principal is user four")
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    @CreatePermission(expression = "Principal is user two")
+    public AuthorType getType() {
+        return type;
+    }
+
+    public void setType(AuthorType type) {
+        this.type = type;
+    }
+
+    @OneToMany
+    public Collection<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Collection<Book> books) {
+        this.books = books;
+    }
+
+    @CreatePermission(expression = "Principal is user two")
+    @UpdatePermission(expression = "Principal is user three")
+    @OneToOne
+    public Author getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/elide-core/src/test/java/example/User.java b/elide-core/src/test/java/example/User.java
index 482b8daba5..96ff2b5914 100644
--- a/elide-core/src/test/java/example/User.java
+++ b/elide-core/src/test/java/example/User.java
@@ -5,11 +5,12 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.ComputedAttribute;
 import com.yahoo.elide.annotation.Exclude;
 import com.yahoo.elide.annotation.Include;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.Set;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -17,13 +18,12 @@
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
-import java.util.Set;
 
 /**
  * Used to test computed attributes.
  */
 @Entity
-@Include(rootLevel = true)
+@Include
 public class User {
     @JsonIgnore
     private long id;
@@ -66,6 +66,7 @@ public String getPassword() {
 
     /**
      * Sets the password but first reverses it.
+     * @param password password to encode
      */
     @ComputedAttribute
     @Transient
diff --git a/elide-core/src/test/java/example/UserIdChecks.java b/elide-core/src/test/java/example/UserIdChecks.java
new file mode 100644
index 0000000000..6de3ef1faa
--- /dev/null
+++ b/elide-core/src/test/java/example/UserIdChecks.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.UserCheck;
+
+/**
+ * Useful for testing permissions based on different users.
+ */
+public class UserIdChecks {
+
+    public static class UserOneCheck extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            Integer id = Integer.parseInt(user.getPrincipal().getName());
+            return id.equals(1);
+        }
+    }
+
+    public static class UserTwoCheck extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            Integer id = Integer.parseInt(user.getPrincipal().getName());
+            return id.equals(2);
+        }
+    }
+
+    public static class UserThreeCheck extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            Integer id = Integer.parseInt(user.getPrincipal().getName());
+            return id.equals(3);
+        }
+    }
+
+    public static class UserFourCheck extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            Integer id = Integer.parseInt(user.getPrincipal().getName());
+            return id.equals(4);
+        }
+    }
+}
diff --git a/elide-core/src/test/java/example/models/BaseId.java b/elide-core/src/test/java/example/models/BaseId.java
new file mode 100644
index 0000000000..01fe9ebcf2
--- /dev/null
+++ b/elide-core/src/test/java/example/models/BaseId.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+import com.yahoo.elide.annotation.Exclude;
+
+import java.util.UUID;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Base class for Entities that provides a hashcode and equals that will be the same
+ * before and after an object is persisted to the DB.
+ */
+@MappedSuperclass
+public abstract class BaseId {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    protected long id;
+
+    @Exclude
+    protected String naturalKey = UUID.randomUUID().toString();
+
+    @Exclude
+    public String getNaturalKey() {
+        return naturalKey;
+    }
+
+    public void setNaturalKey(String naturalKey) {
+        this.naturalKey = naturalKey;
+    }
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof BaseId && naturalKey.equals(((BaseId) obj).naturalKey);
+    }
+}
diff --git a/elide-core/src/test/java/example/models/generics/Employee.java b/elide-core/src/test/java/example/models/generics/Employee.java
new file mode 100644
index 0000000000..4d8971f1eb
--- /dev/null
+++ b/elide-core/src/test/java/example/models/generics/Employee.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test parameterized subclass/superclass hierarchies.
+ */
+@Entity
+public class Employee extends Peon<Manager> {
+}
diff --git a/elide-core/src/test/java/example/models/generics/Manager.java b/elide-core/src/test/java/example/models/generics/Manager.java
new file mode 100644
index 0000000000..cc968a8ed8
--- /dev/null
+++ b/elide-core/src/test/java/example/models/generics/Manager.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import javax.persistence.Entity;
+
+/**
+ * Tests a parameterized superclass.
+ */
+@Entity
+public class Manager extends Overlord<Employee> {
+}
diff --git a/elide-core/src/test/java/example/models/generics/Overlord.java b/elide-core/src/test/java/example/models/generics/Overlord.java
new file mode 100644
index 0000000000..9a4419f887
--- /dev/null
+++ b/elide-core/src/test/java/example/models/generics/Overlord.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import example.models.BaseId;
+
+import java.util.Set;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+
+
+/**
+ * Parameterized base class for testing.
+ * @param <T> Minion type
+ */
+@MappedSuperclass
+public class Overlord<T> extends BaseId {
+
+    @OneToMany
+    private Set<T> minions;
+}
diff --git a/elide-core/src/test/java/example/models/generics/Peon.java b/elide-core/src/test/java/example/models/generics/Peon.java
new file mode 100644
index 0000000000..86032c7eb5
--- /dev/null
+++ b/elide-core/src/test/java/example/models/generics/Peon.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import example.models.BaseId;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+
+
+/**
+ * Parameterized base class for testing.
+ * @param <T> Boss Type
+ */
+@MappedSuperclass
+public class Peon<T> extends BaseId {
+
+    @OneToOne
+    private T boss;
+}
diff --git a/elide-core/src/test/java/example/models/generics/package-info.java b/elide-core/src/test/java/example/models/generics/package-info.java
new file mode 100644
index 0000000000..6213df9d61
--- /dev/null
+++ b/elide-core/src/test/java/example/models/generics/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@Include
+package example.models.generics;
+
+import com.yahoo.elide.annotation.Include;
diff --git a/elide-core/src/test/java/example/models/packageinfo/ExcludedPackageLevel.java b/elide-core/src/test/java/example/models/packageinfo/ExcludedPackageLevel.java
new file mode 100644
index 0000000000..a32dad37df
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/ExcludedPackageLevel.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.packageinfo;
+
+import com.yahoo.elide.annotation.Exclude;
+import example.models.BaseId;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test parameterized subclass/superclass hierarchies.
+ */
+@Entity
+@Exclude
+public class ExcludedPackageLevel extends BaseId {
+}
diff --git a/elide-core/src/test/java/example/models/packageinfo/IncludedPackageLevel.java b/elide-core/src/test/java/example/models/packageinfo/IncludedPackageLevel.java
new file mode 100644
index 0000000000..e8336e5371
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/IncludedPackageLevel.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.packageinfo;
+
+import example.models.BaseId;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test parameterized subclass/superclass hierarchies.
+ */
+@Entity
+public class IncludedPackageLevel extends BaseId {
+}
diff --git a/elide-core/src/test/java/example/models/packageinfo/excluded/ExcludedSubPackage.java b/elide-core/src/test/java/example/models/packageinfo/excluded/ExcludedSubPackage.java
new file mode 100644
index 0000000000..4fd94e7e73
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/excluded/ExcludedSubPackage.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.packageinfo.excluded;
+
+import example.models.BaseId;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test Include on parent package level
+ */
+@Entity
+public class ExcludedSubPackage extends BaseId {
+}
diff --git a/elide-core/src/test/java/example/models/packageinfo/excluded/package-info.java b/elide-core/src/test/java/example/models/packageinfo/excluded/package-info.java
new file mode 100644
index 0000000000..47fda99056
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/excluded/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@Exclude
+package example.models.packageinfo.excluded;
+
+import com.yahoo.elide.annotation.Exclude;
diff --git a/elide-core/src/test/java/example/models/packageinfo/included/ExcludedBySuperClass.java b/elide-core/src/test/java/example/models/packageinfo/included/ExcludedBySuperClass.java
new file mode 100644
index 0000000000..df60288766
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/included/ExcludedBySuperClass.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.packageinfo.included;
+
+import example.ExcludedEntity;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test Exclude on superclass
+ */
+@Entity
+public class ExcludedBySuperClass extends ExcludedEntity {
+
+    public ExcludedBySuperClass() {
+        super(1, "");
+    }
+}
diff --git a/elide-core/src/test/java/example/models/packageinfo/included/IncludedSubPackage.java b/elide-core/src/test/java/example/models/packageinfo/included/IncludedSubPackage.java
new file mode 100644
index 0000000000..7a966ac119
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/included/IncludedSubPackage.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.packageinfo.included;
+
+import example.models.BaseId;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test Include on parent package level
+ */
+@Entity
+public class IncludedSubPackage extends BaseId {
+}
diff --git a/elide-core/src/test/java/example/models/packageinfo/package-info.java b/elide-core/src/test/java/example/models/packageinfo/package-info.java
new file mode 100644
index 0000000000..9d10a9b1db
--- /dev/null
+++ b/elide-core/src/test/java/example/models/packageinfo/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@Include(name = "example", description = "Example Package", friendlyName = "Example")
+package example.models.packageinfo;
+
+import com.yahoo.elide.annotation.Include;
diff --git a/elide-core/src/test/java/example/models/triggers/Invoice.java b/elide-core/src/test/java/example/models/triggers/Invoice.java
new file mode 100644
index 0000000000..143bb4c65c
--- /dev/null
+++ b/elide-core/src/test/java/example/models/triggers/Invoice.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import example.models.BaseId;
+import example.models.triggers.services.BillingService;
+import lombok.Data;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+/**
+ * Invoice for a group of purchased items.
+ */
+@Entity(name = "customerInvoice")
+@Include(name = "customerInvoice")
+@Data
+public class Invoice extends BaseId {
+    @Transient
+    @Exclude
+    @Inject
+    private BillingService billingService;
+
+    private boolean complete = false;
+    private long total = 0;
+}
diff --git a/elide-core/src/test/java/example/models/triggers/InvoiceCompletionHook.java b/elide-core/src/test/java/example/models/triggers/InvoiceCompletionHook.java
new file mode 100644
index 0000000000..d609d530d2
--- /dev/null
+++ b/elide-core/src/test/java/example/models/triggers/InvoiceCompletionHook.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import example.models.triggers.services.BillingService;
+
+import java.util.Optional;
+
+/**
+ * Test hook which runs when an Invoice is marked complete.
+ */
+public class InvoiceCompletionHook implements LifeCycleHook<Invoice> {
+
+    private BillingService billingService;
+
+    public InvoiceCompletionHook (BillingService billingService) {
+        this.billingService = billingService;
+    }
+
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                        Invoice invoice, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        boolean completeNow = (Boolean) changes.get().getModified();
+        boolean completeBefore = (Boolean) changes.get().getOriginal();
+
+        if (completeNow == completeBefore) {
+            return;
+        }
+
+        if (completeNow) {
+            long surcharge = billingService.purchase(invoice);
+            invoice.setTotal(invoice.getTotal() + surcharge);
+        }
+    }
+}
diff --git a/elide-core/src/test/java/example/models/triggers/services/BillingService.java b/elide-core/src/test/java/example/models/triggers/services/BillingService.java
new file mode 100644
index 0000000000..2d5c257d7b
--- /dev/null
+++ b/elide-core/src/test/java/example/models/triggers/services/BillingService.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers.services;
+
+import example.models.triggers.Invoice;
+
+/**
+ * Interface to make a financial transaction based on an Invoice.
+ */
+public interface BillingService {
+
+    /**
+     * Purchases the items in the invoice.
+     * @param invoice Contains a list of what to purchase
+     * @return surcharges to add to the total.
+     */
+    public long purchase(Invoice invoice);
+}
diff --git a/elide-core/src/test/java/example/models/versioned/BookV2.java b/elide-core/src/test/java/example/models/versioned/BookV2.java
new file mode 100644
index 0000000000..599f54a62e
--- /dev/null
+++ b/elide-core/src/test/java/example/models/versioned/BookV2.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.versioned;
+
+import com.yahoo.elide.annotation.Include;
+import example.models.BaseId;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Include(name = "book")
+@Entity
+@Data
+@Table(name = "book")
+public class BookV2 extends BaseId {
+
+    @Column(name = "title")
+    private String name;
+
+    private long publishDate = 0;
+}
diff --git a/elide-core/src/test/java/example/models/versioned/package-info.java b/elide-core/src/test/java/example/models/versioned/package-info.java
new file mode 100644
index 0000000000..19e619c268
--- /dev/null
+++ b/elide-core/src/test/java/example/models/versioned/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@ApiVersion(version = "1.0")
+package example.models.versioned;
+
+import com.yahoo.elide.annotation.ApiVersion;
diff --git a/elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java b/elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java
new file mode 100644
index 0000000000..c0bfe48682
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.nontransferable;
+
+import com.yahoo.elide.annotation.NonTransferable;
+
+import java.util.Collection;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * Container for ShareableWithPackageShare and Untransferable.
+ */
+@Entity
+@NonTransferable(enabled = false)
+public class ContainerWithPackageShare {
+    private long id;
+    private Collection<Untransferable> untransferables;
+    private Collection<ShareableWithPackageShare> shareableWithPackageShares;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @OneToMany(fetch = FetchType.LAZY)
+    public Collection<Untransferable> getUntransferables() {
+        return untransferables;
+    }
+
+    public void setUntransferables(Collection<Untransferable> unshareables) {
+        this.untransferables = unshareables;
+    }
+
+    @OneToMany(fetch = FetchType.LAZY)
+    public Collection<ShareableWithPackageShare> getShareableWithPackageShares() {
+        return shareableWithPackageShares;
+    }
+
+    public void setShareableWithPackageShares(Collection<ShareableWithPackageShare> shareableWithPackageShare) {
+        this.shareableWithPackageShares = shareableWithPackageShare;
+    }
+}
diff --git a/elide-core/src/test/java/example/nontransferable/NoTransferBiDirectional.java b/elide-core/src/test/java/example/nontransferable/NoTransferBiDirectional.java
new file mode 100644
index 0000000000..aa09e6a1c0
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/NoTransferBiDirectional.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.nontransferable;
+
+import com.yahoo.elide.annotation.Include;
+import example.BaseId;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+@Entity
+@Include(name = "noShareBid")
+public class NoTransferBiDirectional extends BaseId {
+    private NoTransferBiDirectional other;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    public NoTransferBiDirectional getOther() {
+        return other;
+    }
+
+    public void setOther(NoTransferBiDirectional other) {
+        this.other = other;
+    }
+}
diff --git a/elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java b/elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java
new file mode 100644
index 0000000000..abe750ee51
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.nontransferable;
+
+import com.yahoo.elide.annotation.NonTransferable;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * Package level shareable bean.
+ */
+@Entity
+@NonTransferable(enabled = false)
+public class ShareableWithPackageShare {
+    private long id;
+    private ContainerWithPackageShare container;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    public ContainerWithPackageShare getContainerWithPackageShare() {
+        return container;
+    }
+
+    public void setContainerWithPackageShare(ContainerWithPackageShare container) {
+        this.container = container;
+    }
+}
diff --git a/elide-core/src/test/java/example/nontransferable/StrictNoTransfer.java b/elide-core/src/test/java/example/nontransferable/StrictNoTransfer.java
new file mode 100644
index 0000000000..ce9d522287
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/StrictNoTransfer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.nontransferable;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
+import example.BaseId;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+@Entity
+@Include(name = "strictNoShare")
+@NonTransferable(strict = true)
+public class StrictNoTransfer extends BaseId {
+    private StrictNoTransfer other;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    public StrictNoTransfer getOther() {
+        return other;
+    }
+
+    public void setOther(StrictNoTransfer other) {
+        this.other = other;
+    }
+}
diff --git a/elide-core/src/test/java/example/nontransferable/Untransferable.java b/elide-core/src/test/java/example/nontransferable/Untransferable.java
new file mode 100644
index 0000000000..a0b4e5886b
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/Untransferable.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.nontransferable;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * Entity level Unshareable bean.
+ */
+@Entity
+public class Untransferable {
+    private long id;
+    private ContainerWithPackageShare container;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    public ContainerWithPackageShare getContainerWithPackageShare() {
+        return container;
+    }
+
+    public void setContainerWithPackageShare(ContainerWithPackageShare container) {
+        this.container = container;
+    }
+}
diff --git a/elide-core/src/test/java/example/nontransferable/package-info.java b/elide-core/src/test/java/example/nontransferable/package-info.java
new file mode 100644
index 0000000000..084e7efb1e
--- /dev/null
+++ b/elide-core/src/test/java/example/nontransferable/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+@NonTransferable
+@Include
+package example.nontransferable;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
diff --git a/elide-core/src/test/java/nocreate/NoCreateEntity.java b/elide-core/src/test/java/nocreate/NoCreateEntity.java
index 0dca4a2f60..e563931027 100644
--- a/elide-core/src/test/java/nocreate/NoCreateEntity.java
+++ b/elide-core/src/test/java/nocreate/NoCreateEntity.java
@@ -14,7 +14,7 @@
 /**
  * Must inherit @CreatePermission from package.  Do not add here.
  */
-@Include(rootLevel = true, type = "nocreate") // optional here because class has this name
+@Include(name = "nocreate") // optional here because class has this name
 @Entity
 @Table(name = "nocreate")
 public class NoCreateEntity {
diff --git a/elide-core/src/test/java/nocreate/package-info.java b/elide-core/src/test/java/nocreate/package-info.java
index f7551a5cc9..e40a1f76be 100644
--- a/elide-core/src/test/java/nocreate/package-info.java
+++ b/elide-core/src/test/java/nocreate/package-info.java
@@ -3,8 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-@CreatePermission(all = { Role.NONE.class })
+@CreatePermission(expression = "Prefab.Role.None")
 package nocreate;
 
 import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
diff --git a/elide-core/src/test/resources/logback.xml b/elide-core/src/test/resources/logback.xml
index 551f1bd871..aca4d9eca0 100644
--- a/elide-core/src/test/resources/logback.xml
+++ b/elide-core/src/test/resources/logback.xml
@@ -6,12 +6,30 @@
   -->
 <configuration>
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter
+      class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}.%M\(%F:%L\) - %msg%n</pattern>
+      <pattern>%msg%n</pattern>
     </encoder>
   </appender>
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>target/trace.log</file>
+    <append>false</append>
+    <encoder>
+      <pattern>%msg%n</pattern>
+    </encoder>
+  </appender>
+  <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+    <appender-ref ref="FILE" />
+    <neverBlock>true</neverBlock>
+  </appender>
+
+  <logger name="com.yahoo.elide" level="TRACE" />
 
-  <root level="error">
+  <root level="INFO">
     <appender-ref ref="STDOUT" />
+    <appender-ref ref="ASYNC" />
   </root>
 </configuration>
diff --git a/elide-core/testng.xml b/elide-core/testng.xml
deleted file mode 100644
index e39b96e050..0000000000
--- a/elide-core/testng.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Suite">
-    <test name="com.yahoo.elide.core.PersistentResourceTest">
-        <classes>
-            <class name="com.yahoo.elide.core.PersistentResourceTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.core.EntityDictionaryTest">
-        <classes>
-            <class name="com.yahoo.elide.core.EntityDictionaryTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.core.PermissionAnnotationTest">
-        <classes>
-            <class name="com.yahoo.elide.core.PermissionAnnotationTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.audit.LogMessageTest">
-        <classes>
-            <class name="com.yahoo.elide.audit.LogMessageTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.endpoints.ResourceTest">
-        <classes>
-            <class name="com.yahoo.elide.endpoints.ResourceTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.jsonapi.JsonApiTest">
-        <classes>
-            <class name="com.yahoo.elide.jsonapi.JsonApiTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.jsonapi.document.processors.IncludedProcessorTest">
-        <classes>
-            <class name="com.yahoo.elide.jsonapi.document.processors.IncludedProcessorTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.jsonapi.document.processors.SortProcessorTest">
-        <classes>
-            <class name="com.yahoo.elide.jsonapi.document.processors.SortProcessorTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.jsonapi.models.PatchTest">
-        <classes>
-            <class name="com.yahoo.elide.jsonapi.models.PatchTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.core.filter.PredicateTest">
-        <classes>
-            <class name="com.yahoo.elide.core.filter.PredicateTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.core.filter.OperatorTest">
-        <classes>
-            <class name="com.yahoo.elide.core.filter.OperatorTest" />
-        </classes>
-    </test> <!-- Test -->
-    <test name="com.yahoo.elide.core.filter.expression.InMemoryFilterVisitorTest">
-        <classes>
-            <class name="com.yahoo.elide.core.filter.expression.InMemoryFilterVisitorTest" />
-        </classes>
-    </test> <!-- Test -->
-</suite> <!-- Suite -->
diff --git a/elide-datastore/elide-datastore-hibernate3/.gitignore b/elide-datastore/elide-datastore-aggregation/.gitignore
similarity index 100%
rename from elide-datastore/elide-datastore-hibernate3/.gitignore
rename to elide-datastore/elide-datastore-aggregation/.gitignore
diff --git a/elide-datastore/elide-datastore-aggregation/pom.xml b/elide-datastore/elide-datastore-aggregation/pom.xml
new file mode 100644
index 0000000000..031d4386b7
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/pom.xml
@@ -0,0 +1,251 @@
+<!--
+  ~ Copyright 2019, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-datastore-aggregation</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Data Store: Aggregation Data Store</name>
+    <description>Elide Data Store for Aggregation</description>
+    <url>https://github.com/yahoo/elide/tree/master/elide-datastore/elide-datastore-aggregation</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <!-- Requires Java 11 -->
+        <hikari.version>5.0.1</hikari.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jpa</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-multiplex</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-model-config</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Calcite -->
+        <dependency>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+            <version>1.29.0</version>
+            <exclusions>
+                <!-- Excluded for CVE errors -->
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <!-- Excluded for conflict with elide-async's version -->
+            </exclusions>
+        </dependency>
+        <!-- Avoid CVE-2020-13956 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.15</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Hibernate Entity Manager -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate5.version}</version>
+        </dependency>
+
+        <!-- Caffeine cache -->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <!-- Requires Java 11 -->
+            <version>3.0.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>${hikari.version}</version>
+        </dependency>
+
+        <!--  Redis cache -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>${jedis.version}</version>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>com.github.codemonstur</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>${embedded-redis.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- JUnit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Mockito -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>4.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- IntegrationTests -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-integration-tests</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <!-- Jetty -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Jersey -->
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStore.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStore.java
new file mode 100644
index 0000000000..ca88f8c2c2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStore.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.security.executors.AggregationStorePermissionExecutor;
+import com.yahoo.elide.core.type.AccessibleObject;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.cache.Cache;
+import com.yahoo.elide.datastores.aggregation.core.QueryLogger;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.modelconfig.validator.PermissionExpressionVisitor;
+import org.antlr.v4.runtime.tree.ParseTree;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.ToString;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * DataStore that supports Aggregation. Uses {@link QueryEngine} to return results.
+ */
+@Builder
+@ToString
+public class AggregationDataStore implements DataStore {
+    @NonNull private final QueryEngine queryEngine;
+    private final Cache cache;
+    private final Set<Type<?>> dynamicCompiledClasses;
+    private final QueryLogger queryLogger;
+
+    public static final Predicate<AccessibleObject> IS_FIELD_HIDDEN = (field -> {
+        ColumnMeta meta = field.getAnnotation(ColumnMeta.class);
+        Join join = field.getAnnotation(Join.class);
+
+        return (join != null || (meta != null && meta.isHidden()));
+    });
+
+    public static final Predicate<Type<?>> IS_TYPE_HIDDEN = (type -> {
+        TableMeta meta = type.getAnnotation(TableMeta.class);
+
+        return (meta != null && meta.isHidden());
+    });
+
+    private final Function<RequestScope, PermissionExecutor> aggPermissionExecutor =
+            AggregationStorePermissionExecutor::new;
+
+    /**
+     * These are the classes the Aggregation Store manages.
+     */
+    private static final List<Class<? extends Annotation>> AGGREGATION_STORE_CLASSES =
+            Arrays.asList(FromTable.class, FromSubquery.class);
+
+    /**
+     * Populate an {@link EntityDictionary} and use this dictionary to construct a {@link QueryEngine}.
+     * @param dictionary the dictionary
+     */
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+
+        if (dynamicCompiledClasses != null && dynamicCompiledClasses.size() != 0) {
+            dynamicCompiledClasses.stream()
+                    .filter((type) -> ! IS_TYPE_HIDDEN.test(type))
+                    .forEach(dynamicLoadedClass -> {
+                dictionary.bindEntity(dynamicLoadedClass, IS_FIELD_HIDDEN);
+                validateModelExpressionChecks(dictionary, dynamicLoadedClass);
+                dictionary.bindPermissionExecutor(dynamicLoadedClass, aggPermissionExecutor);
+            });
+        }
+
+        dictionary.getScanner().getAnnotatedClasses(AGGREGATION_STORE_CLASSES).stream()
+                .filter((type) -> ! IS_TYPE_HIDDEN.test(ClassType.of(type)))
+                .forEach(cls -> {
+                    dictionary.bindEntity(cls, IS_FIELD_HIDDEN);
+                    validateModelExpressionChecks(dictionary, ClassType.of(cls));
+                    dictionary.bindPermissionExecutor(cls, aggPermissionExecutor);
+                }
+        );
+
+        for (Table table : queryEngine.getMetaDataStore().getMetaData(ClassType.of(Table.class))) {
+            /* Add 'grain' argument to each TimeDimensionColumn */
+            for (TimeDimension timeDim : table.getAllTimeDimensions()) {
+                dictionary.addArgumentToAttribute(
+                        dictionary.getEntityClass(table.getName(), table.getVersion()),
+                        timeDim.getName(),
+                        new ArgumentType("grain", ClassType.STRING_TYPE, timeDim.getDefaultGrain().getGrain()));
+            }
+
+            /* Add argument to each Column */
+            for (Column col : table.getAllColumns()) {
+                for (ArgumentDefinition arg : col.getArgumentDefinitions()) {
+                    dictionary.addArgumentToAttribute(
+                            dictionary.getEntityClass(table.getName(), table.getVersion()),
+                            col.getName(),
+                            new ArgumentType(arg.getName(), ValueType.getType(arg.getType()), arg.getDefaultValue()));
+                }
+            }
+
+            /* Add argument to each Table */
+            for (ArgumentDefinition arg : table.getArgumentDefinitions()) {
+                dictionary.addArgumentToEntity(
+                        dictionary.getEntityClass(table.getName(), table.getVersion()),
+                        new ArgumentType(arg.getName(), ValueType.getType(arg.getType()), arg.getDefaultValue()));
+            }
+        }
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new AggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+    }
+
+    /**
+     * Validates The security Check expression type for both Table and all its fields.
+     * Table Security Check Condition - User Checks and Filter Expression Checks
+     * Field Security Check Condition - User Checks
+     * @param dictionary - Entity Dictionary
+     * @param clz - Model Type.
+     */
+    private void validateModelExpressionChecks(EntityDictionary dictionary, Type<?> clz) {
+        PermissionExpressionVisitor visitor = new PermissionExpressionVisitor();
+        ParseTree parseTree = dictionary.getPermissionsForClass(clz, ReadPermission.class);
+        if (parseTree != null) {
+            validateExpression(dictionary,
+                    visitor.visit(parseTree),
+                    (checkClass) -> UserCheck.class.isAssignableFrom(checkClass)
+                            || FilterExpressionCheck.class.isAssignableFrom(checkClass),
+                    "Table Can only have User Check and Filter Expression Check."
+                    + "Operation Checks Not allowed. given - %s");
+        }
+
+        dictionary.getAllExposedFields(clz).stream()
+                .map(field -> dictionary.getPermissionsForField(clz, field, ReadPermission.class))
+                .filter(Objects::nonNull)
+                .forEach(tree ->
+                        validateExpression(dictionary,
+                                visitor.visit(tree),
+                                (checkClass) -> UserCheck.class.isAssignableFrom(checkClass),
+                                "Fields Can only have User checks. Given - %s"));
+    }
+
+    /**
+     * Validates the Expression Check class to check whether it complies with the given predicate.
+     * @param dictionary - Entity dictionary
+     * @param expressionChecksIdentifiers - Set of identifiers for whose the security check class is validated
+     * @param validCheckPredicate - Predicate that takes security check class as argument.
+     * @param errorMsgFormat - Error message format for the exception when predicate fails.
+     * @throws IllegalStateException
+     */
+    private void validateExpression(EntityDictionary dictionary,
+                                    Set<String> expressionChecksIdentifiers,
+                                    Predicate<Class> validCheckPredicate,
+                                    String errorMsgFormat) throws IllegalStateException {
+        expressionChecksIdentifiers.stream()
+                .filter(check -> dictionary.getRoleCheck(check) == null)  // skip all role checks
+                .forEach(check -> {
+                    Class<? extends Check> checkClass = dictionary.getCheck(check);
+                    if (!validCheckPredicate.test(checkClass)) {
+                        throw new IllegalStateException(String.format(errorMsgFormat,
+                                "(" + check + "-" + checkClass + ")"));
+                    }
+                });
+    }
+
+    /**
+     * Determines if a model is managed by the aggregation data store.
+     * @param model The model in question.
+     * @return True if the model is managed by the aggregation data store.  False otherwise.
+     */
+    public static final boolean isAggregationStoreModel(Type<?> model) {
+        return AGGREGATION_STORE_CLASSES.stream()
+                .anyMatch((annotation) -> model.getDeclaredAnnotation(annotation) != null);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransaction.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransaction.java
new file mode 100644
index 0000000000..a954d70ece
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransaction.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.cache.Cache;
+import com.yahoo.elide.datastores.aggregation.cache.QueryKeyExtractor;
+import com.yahoo.elide.datastores.aggregation.core.QueryLogger;
+import com.yahoo.elide.datastores.aggregation.core.QueryResponse;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.MatchesTemplateVisitor;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.RequiresFilter;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.compress.utils.Lists;
+import lombok.ToString;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Transaction handler for {@link AggregationDataStore}.
+ */
+@ToString
+public class AggregationDataStoreTransaction implements DataStoreTransaction {
+    private final QueryEngine queryEngine;
+    private final Cache cache;
+    private final QueryEngine.Transaction queryEngineTransaction;
+    private final QueryLogger queryLogger;
+    private final MetaDataStore metaDataStore;
+
+    public AggregationDataStoreTransaction(QueryEngine queryEngine, Cache cache,
+                                           QueryLogger queryLogger) {
+        this.queryEngine = queryEngine;
+        this.cache = cache;
+        this.queryEngineTransaction = queryEngine.beginTransaction();
+        this.queryLogger = queryLogger;
+        this.metaDataStore = queryEngine.getMetaDataStore();
+    }
+
+    @Override
+    public <T> void save(T entity, RequestScope scope) {
+        throwReadOnlyException(entity);
+    }
+
+    @Override
+    public <T> void delete(T entity, RequestScope scope) {
+        throwReadOnlyException(entity);
+    }
+
+    @Override
+    public void flush(RequestScope scope) {
+
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        queryEngineTransaction.close();
+    }
+
+    @Override
+    public <T> void createObject(T entity, RequestScope scope) {
+        throwReadOnlyException(entity);
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection entityProjection, RequestScope scope) {
+        QueryResult result = null;
+        QueryResponse response = null;
+        String cacheKey = null;
+        try {
+
+            //Convert multivalued map to map.
+            Map<String, String> headers = scope.getRequestHeaders().entrySet()
+                    .stream()
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            (entry) -> entry.getValue().stream().collect(Collectors.joining(" "))
+                    ));
+
+            queryLogger.acceptQuery(scope.getRequestId(), scope.getUser(), headers,
+                    scope.getApiVersion(), scope.getQueryParams(), scope.getPath());
+            Query query = buildQuery(entityProjection, scope);
+            Table table = (Table) query.getSource();
+            if (cache != null && !query.isBypassingCache()) {
+                String tableVersion = queryEngine.getTableVersion(table, queryEngineTransaction);
+                tableVersion = tableVersion == null ? "" : tableVersion;
+
+                cacheKey = tableVersion + ';' + QueryKeyExtractor.extractKey(query);
+                result = cache.get(cacheKey);
+            }
+
+            boolean isCached = result != null;
+            List<String> queryText = queryEngine.explain(query);
+            queryLogger.processQuery(scope.getRequestId(), query, queryText, isCached);
+            if (result == null) {
+                result = queryEngine.executeQuery(query, queryEngineTransaction);
+                if (cacheKey != null) {
+
+                    //The query result needs to be streamed into an in memory list before caching.
+                    //TODO - add a cap to how many records can be streamed back.  If this is exceeded, abort caching
+                    //and return the results.
+                    QueryResult cacheableResult = QueryResult.builder()
+                            .data(Lists.newArrayList(result.getData().iterator()))
+                            .pageTotals(result.getPageTotals())
+                            .build();
+                    cache.put(cacheKey, cacheableResult);
+                    result = cacheableResult;
+                }
+            }
+            if (entityProjection.getPagination() != null && entityProjection.getPagination().returnPageTotals()) {
+                entityProjection.getPagination().setPageTotals(result.getPageTotals());
+            }
+            response = new QueryResponse(HttpStatus.SC_OK, result.getData(), null);
+            return new DataStoreIterableBuilder(result.getData()).build();
+        } catch (HttpStatusException e) {
+            response = new QueryResponse(e.getStatus(), null, e.getMessage());
+            throw e;
+        } catch (Exception e) {
+            response = new QueryResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, null, e.getMessage());
+            throw e;
+        } finally {
+            queryLogger.completeQuery(scope.getRequestId(), response);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        queryEngineTransaction.close();
+    }
+
+    @VisibleForTesting
+    Query buildQuery(EntityProjection entityProjection, RequestScope scope) {
+        Table table = metaDataStore.getTable(
+                scope.getDictionary().getJsonAliasFor(entityProjection.getType()),
+                scope.getApiVersion());
+        String bypassCacheStr = scope.getRequestHeaderByName("bypasscache");
+        Boolean bypassCache = "true".equals(bypassCacheStr);
+
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                queryEngine,
+                table,
+                entityProjection,
+                scope,
+                bypassCache);
+
+        Query query = translator.getQuery();
+
+        Query modifiedQuery = addTableFilterArguments(table, query, scope.getDictionary());
+        modifiedQuery = addColumnFilterArguments(table, modifiedQuery, scope.getDictionary());
+
+        return modifiedQuery;
+    }
+
+    @VisibleForTesting
+    Query addTableFilterArguments(Table table, Query query, EntityDictionary dictionary) {
+        FilterExpression filterTemplate = table.getRequiredFilter(dictionary);
+
+        Query modifiedQuery = query;
+        if (filterTemplate != null) {
+            Map<String, Argument> allArguments = validateRequiredFilter(filterTemplate, query, table);
+
+            if (!allArguments.isEmpty()) {
+                if (query.getArguments() != null) {
+                    allArguments.putAll(query.getArguments());
+                }
+
+                modifiedQuery = Query.builder()
+                        .query(query)
+                        .arguments(allArguments)
+                        .build();
+            }
+        }
+
+        return modifiedQuery;
+    }
+
+    @VisibleForTesting
+    Query addColumnFilterArguments(Table table, Query query, EntityDictionary dictionary) {
+
+        Query.QueryBuilder queryBuilder = Query.builder();
+
+        query.getColumnProjections().stream().forEach(projection -> {
+            Column column = table.getColumn(Column.class, projection.getName());
+
+            FilterExpression requiredFilter = column.getRequiredFilter(dictionary);
+
+            if (requiredFilter != null) {
+                Map<String, Argument> allArguments = validateRequiredFilter(requiredFilter, query, column);
+                if (projection.getArguments() != null) {
+                    allArguments.putAll(projection.getArguments());
+                }
+                queryBuilder.column(projection.withArguments(allArguments));
+            } else {
+                queryBuilder.column(projection);
+            }
+        });
+
+        return queryBuilder
+                .arguments(query.getArguments())
+                .havingFilter(query.getHavingFilter())
+                .whereFilter(query.getWhereFilter())
+                .sorting(query.getSorting())
+                .pagination(query.getPagination())
+                .bypassingCache(query.isBypassingCache())
+                .source(query.getSource())
+                .scope(query.getScope())
+                .build();
+    }
+
+    private Map<String, Argument> validateRequiredFilter(
+            FilterExpression filterTemplate,
+            Query query,
+            RequiresFilter requiresFilter
+    ) {
+        Map<String, Argument> templateFilterArguments = new HashMap<>();
+        if (!MatchesTemplateVisitor.isValid(filterTemplate, query.getWhereFilter(), templateFilterArguments)
+                && (!MatchesTemplateVisitor.isValid(filterTemplate, query.getHavingFilter(),
+                templateFilterArguments))) {
+            String message = String.format("Querying %s requires a mandatory filter: %s",
+                    requiresFilter.getName(), requiresFilter.getRequiredFilter());
+
+            throw new BadRequestException(message);
+        }
+
+        return templateFilterArguments;
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        queryLogger.cancelQuery(scope.getRequestId());
+        queryEngineTransaction.cancel();
+    }
+
+    private <T> void throwReadOnlyException(T entity) {
+        EntityDictionary dictionary = metaDataStore.getMetadataDictionary();
+        Type<?> type  = dictionary.getType(entity);
+        throw new InvalidOperationException(dictionary.getJsonAliasFor(type) + " is read only.");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidator.java
new file mode 100644
index 0000000000..4a320d3c21
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidator.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import static com.yahoo.elide.datastores.aggregation.query.Queryable.extractFilterProjections;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Class that checks whether a constructed {@link Query} object can be executed.
+ * Checks include validate sorting, having clause and make sure there is at least 1 metric queried.
+ */
+public class DefaultQueryValidator implements QueryValidator {
+    private static final Set<Operator> REGEX_OPERATORS = Stream.of(Operator.INFIX, Operator.INFIX_CASE_INSENSITIVE,
+            Operator.POSTFIX, Operator.POSTFIX_CASE_INSENSITIVE, Operator.PREFIX, Operator.PREFIX_CASE_INSENSITIVE)
+        .collect(Collectors.toCollection(HashSet::new));
+
+    protected EntityDictionary dictionary;
+
+    public DefaultQueryValidator(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    @Override
+    public void validateHavingClause(Query query) {
+        FilterExpression havingClause = query.getHavingFilter();
+
+        if (havingClause == null) {
+            return;
+        }
+
+        havingClause.accept(new PredicateExtractionVisitor()).forEach(predicate -> {
+            Path path = predicate.getPath();
+
+            if (path.getPathElements().size() > 1) {
+                throw new InvalidOperationException("Relationship traversal not supported for analytic queries.");
+            }
+
+            validatePredicate(query, predicate);
+
+            extractFilterProjections(query, havingClause).stream().forEach(projection -> {
+
+                Predicate<ColumnProjection> filterByNameAndArgs =
+                        (column) -> (column.getAlias().equals(projection.getAlias())
+                                || column.getName().equals(projection.getName()))
+                                && column.getArguments().equals(projection.getArguments());
+
+                //Query by (alias or name) and arguments.   The filter may or may not be using the alias.
+                if (query.getColumnProjection(filterByNameAndArgs) == null) {
+
+                    Predicate<ColumnProjection> filterByName =
+                            (column) -> (column.getAlias().equals(projection.getAlias())
+                                    || column.getName().equals(projection.getName()));
+
+                    //The column wasn't projected at all.
+                    if (query.getColumnProjection(filterByName) == null) {
+                        throw new InvalidOperationException(String.format(
+                                "Post aggregation filtering on '%s' requires the field to be projected in the response",
+                                projection.getAlias()));
+
+                    //The column was projected but arguments didn't match.
+                    } else {
+                        throw new InvalidOperationException(String.format(
+                                "Post aggregation filtering on '%s' requires the field to be projected "
+                                        + "in the response with matching arguments",
+                                projection.getAlias()));
+                    }
+                }
+            });
+        });
+    }
+
+
+    @Override
+    public void validateWhereClause(Query query) {
+
+        FilterExpression whereClause = query.getWhereFilter();
+
+        if (whereClause == null) {
+            return;
+        }
+
+        whereClause.accept(new PredicateExtractionVisitor()).forEach(predicate -> {
+            Path path = predicate.getPath();
+            if (path.getPathElements().size() > 1) {
+                throw new InvalidOperationException("Relationship traversal not supported for analytic queries.");
+            }
+
+            validatePredicate(query, predicate);
+        });
+    }
+
+    protected void validatePredicate(Query query, FilterPredicate predicate) {
+        SQLTable table = (SQLTable) query.getSource();
+        Set<ColumnProjection> projections = extractFilterProjections(query, predicate);
+
+        if (projections.isEmpty()) {
+            return;
+        }
+
+        ColumnProjection projection = projections.iterator().next();
+
+        validateColumn(query, projection);
+
+        Column column = table.getColumn(Column.class, projection.getName());
+
+        if (column.getValueType().equals(ValueType.ID)) {
+            throw new InvalidOperationException("Filtering by ID is not supported on " + query.getSource().getName());
+        }
+
+        if (column.getValues() == null || column.getValues().isEmpty()) {
+            return;
+        }
+
+        if (REGEX_OPERATORS.contains(predicate.getOperator())) {
+            return;
+        }
+
+        predicate.getValues().forEach(value -> {
+            if (! column.getValues().contains(value)) {
+                throw new InvalidOperationException(String.format(
+                        "Column '%s' values must match one of these values: %s",
+                        projection.getAlias(),
+                        column.getValues()));
+            }
+        });
+    }
+
+    @Override
+    public void validateSorting(Query query) {
+        Sorting sorting = query.getSorting();
+
+        if (sorting == null) {
+            return;
+        }
+
+        Map<Path, Sorting.SortOrder> sortClauses = sorting.getSortingPaths();
+        Set<String> allFields = query.getColumnProjections()
+                .stream()
+                .map(ColumnProjection::getAlias)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        sortClauses.keySet().forEach((path) -> validateSortingPath(path, allFields));
+    }
+
+    /**
+     * Verifies that the current path can be sorted on.
+     * @param path The path that we are validating
+     * @param allFields Set of all field names included in initial query
+     */
+    protected void validateSortingPath(Path path, Set<String> allFields) {
+        List<Path.PathElement> pathElements = path.getPathElements();
+
+        if (pathElements.size() > 1) {
+            throw new InvalidOperationException("Relationship traversal not supported for analytic queries.");
+        }
+
+        Path.PathElement currentElement = pathElements.get(0);
+        String currentField = currentElement.getAlias();
+        Type<?> currentClass = currentElement.getType();
+
+        // TODO: support sorting using alias
+        if (allFields.stream().noneMatch(currentField::equals)) {
+            throw new InvalidOperationException("Can not sort on " + currentField + " as it is not present in query");
+        }
+        if (dictionary.getIdFieldName(currentClass).equals(currentField)
+                || currentField.equals(EntityDictionary.REGULAR_ID_NAME)) {
+            throw new InvalidOperationException("Sorting on id field is not permitted");
+        }
+    }
+
+
+    @Override
+    public void validateProjectedColumns(Query query) {
+
+        //TODO - We should generate ID metric columns as ROW_NUMBER() if they do not exist.
+        boolean onlyId = query.getColumnProjections().stream()
+                .allMatch(column -> column.getValueType().equals(ValueType.ID));
+
+        if (onlyId) {
+            throw new InvalidOperationException("Cannot query a table only by ID");
+        }
+
+        query.getColumnProjections().forEach(column -> validateColumn(query, column));
+    }
+
+    @Override
+    public void validateQueryArguments(Query query) {
+        SQLTable table = (SQLTable) query.getSource();
+
+        table.getArgumentDefinitions().forEach(tableArgument -> {
+            Argument clientArgument = query.getArguments().get(tableArgument.getName());
+
+            validateArgument(Optional.ofNullable(clientArgument), tableArgument,
+                    "table '" + query.getSource().getName() + "'");
+        });
+    }
+
+    protected void validateColumn(Query query, ColumnProjection projection) {
+        validateColumnArguments(query, projection);
+    }
+
+    protected void validateColumnArguments(Query query, ColumnProjection projection) {
+        SQLTable table = (SQLTable) query.getSource();
+        Column column = table.getColumn(Column.class, projection.getName());
+
+        column.getArgumentDefinitions().forEach(columnArgument -> {
+            Argument clientArgument = projection.getArguments().get(columnArgument.getName());
+
+            validateArgument(Optional.ofNullable(clientArgument), columnArgument,
+                    "column '" + projection.getAlias() + "'");
+        });
+    }
+
+    protected void validateArgument(
+            Optional<Argument> clientArgument,
+            ArgumentDefinition argumentDefinition,
+            String context
+    ) {
+
+        if (! clientArgument.isPresent()) {
+            if (argumentDefinition.isRequired()) {
+                throw new InvalidOperationException(String.format("Argument '%s' for %s is required",
+                        argumentDefinition.getName(),
+                        context
+                ));
+            }
+            return;
+        }
+
+        if (argumentDefinition.getValues() != null && ! argumentDefinition.getValues().isEmpty()) {
+            if (! argumentDefinition.getValues().contains(clientArgument.get().getValue().toString())) {
+                throw new InvalidOperationException(String.format(
+                        "Argument '%s' for %s must match one of these values: %s",
+                        argumentDefinition.getName(),
+                        context,
+                        argumentDefinition.getValues()));
+            }
+        }
+
+        Object clientArgumentValue = clientArgument.get().getValue();
+        boolean isValid = argumentDefinition.getType().matches(clientArgumentValue.toString());
+
+        if (!isValid) {
+            throw new InvalidOperationException(String.format("Argument '%s' for %s has an invalid value: %s",
+                    argumentDefinition.getName(),
+                    context,
+                    clientArgumentValue));
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslator.java
new file mode 100644
index 0000000000..0afdd6f2aa
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslator.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import static com.yahoo.elide.core.request.Argument.getArgumentMapFromArgumentSet;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.FilterConstraints;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.SplitFilterExpressionVisitor;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.ImmutablePagination;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.google.common.collect.Sets;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Helper for Aggregation Data Store which does the work associated with extracting {@link Query}.
+ */
+public class EntityProjectionTranslator {
+    private Table queriedTable;
+    private QueryEngine engine;
+
+    private EntityProjection entityProjection;
+    private Set<DimensionProjection> dimensionProjections;
+    private Set<TimeDimensionProjection> timeDimensions;
+    private List<MetricProjection> metrics;
+    private FilterExpression whereFilter;
+    private FilterExpression havingFilter;
+    private Boolean bypassCache;
+    private RequestScope scope;
+
+    public EntityProjectionTranslator(QueryEngine engine, Table table,
+                                      EntityProjection entityProjection, RequestScope scope,
+                                      Boolean bypassCache) {
+        this.engine = engine;
+        this.queriedTable = table;
+        this.entityProjection = entityProjection;
+        this.bypassCache  = bypassCache;
+        this.scope = scope;
+        dimensionProjections = resolveNonTimeDimensions();
+        timeDimensions = resolveTimeDimensions();
+        metrics = resolveMetrics();
+        splitFilters();
+        addHavingMetrics();
+    }
+
+    /**
+     * Builds the query from internal state.
+     * @return {@link Query} query object with all the parameters provided by user.
+     */
+    public Query getQuery() {
+        Query query = Query.builder()
+                .source(queriedTable.toQueryable())
+                .metricProjections(metrics)
+                .dimensionProjections(dimensionProjections)
+                .timeDimensionProjections(timeDimensions)
+                .whereFilter(whereFilter)
+                .havingFilter(havingFilter)
+                .sorting(entityProjection.getSorting())
+                .pagination(ImmutablePagination.from(entityProjection.getPagination()))
+                .arguments(getArgumentMapFromArgumentSet(entityProjection.getArguments()))
+                .bypassingCache(bypassCache)
+                .scope(scope)
+                .build();
+
+        QueryValidator validator = engine.getValidator();
+        validator.validate(query);
+        return query;
+    }
+
+    /**
+     * Gets whereFilter and havingFilter based on provided filter expression from {@link EntityProjection}.
+     */
+    private void splitFilters() {
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+        if (filterExpression == null) {
+            whereFilter = null;
+            havingFilter = null;
+            return;
+        }
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(queriedTable);
+        FilterConstraints constraints = filterExpression.accept(visitor);
+        whereFilter = constraints.getWhereExpression();
+        havingFilter = constraints.getHavingExpression();
+    }
+
+    /**
+     * Adds to the list of queried metrics any metric in the HAVING filter that has not been explicitly requested
+     * by the client.
+     */
+    private void addHavingMetrics() {
+        if (havingFilter == null) {
+            return;
+        }
+
+        //Flatten the HAVING filter expression into a list of predicates...
+        havingFilter.accept(new PredicateExtractionVisitor()).forEach(filterPredicate -> {
+            String fieldName = filterPredicate.getField();
+
+            //If the predicate field is a metric
+            if (queriedTable.getMetric(fieldName) != null) {
+
+                //If the query doesn't contain this metric.
+                if (metrics.stream().noneMatch((metric -> metric.getName().equals(fieldName)))) {
+
+                    //Construct a new projection and add it to the query.
+                    MetricProjection havingMetric = engine.constructMetricProjection(
+                            queriedTable.getMetric(fieldName), fieldName, new HashMap<>());
+
+                    metrics.add(havingMetric);
+                }
+            }
+        });
+    }
+
+    /**
+     * Gets time dimensions based on relationships and attributes from {@link EntityProjection}.
+     *
+     * @return projections for time dimension columns
+     * @throws InvalidOperationException Thrown if a requested time grain is not supported.
+     */
+    private Set<TimeDimensionProjection> resolveTimeDimensions() {
+        return entityProjection.getAttributes().stream()
+                .filter(attribute -> queriedTable.getTimeDimension(attribute.getName()) != null)
+                .map(timeDimAttr -> {
+                    TimeDimension timeDim = queriedTable.getTimeDimension(timeDimAttr.getName());
+
+                    return engine.constructTimeDimensionProjection(
+                            timeDim,
+                            timeDimAttr.getAlias(),
+                            getArgumentMapFromArgumentSet(timeDimAttr.getArguments()));
+                })
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Gets dimensions except time dimensions based on relationships and attributes from {@link EntityProjection}.
+     */
+    private Set<DimensionProjection> resolveNonTimeDimensions() {
+        Set<DimensionProjection> attributes = entityProjection.getAttributes().stream()
+                .filter(attribute -> queriedTable.getTimeDimension(attribute.getName()) == null)
+                .map(dimAttr -> {
+                    Dimension dimension = queriedTable.getDimension(dimAttr.getName());
+                    return dimension == null
+                            ? null
+                            : engine.constructDimensionProjection(
+                                    dimension,
+                                    dimAttr.getAlias(),
+                                    getArgumentMapFromArgumentSet(dimAttr.getArguments()));
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        Set<DimensionProjection> relationships = entityProjection.getRelationships().stream()
+                .map(dimAttr -> {
+                    Dimension dimension = queriedTable.getDimension(dimAttr.getName());
+                    return dimension == null
+                            ? null
+                            : engine.constructDimensionProjection(
+                                dimension,
+                                dimAttr.getAlias(),
+                                Collections.emptyMap());
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        return Sets.union(attributes, relationships);
+    }
+
+    /**
+     * Gets metrics based on attributes from {@link EntityProjection}.
+     */
+    private List<MetricProjection> resolveMetrics() {
+        return entityProjection.getAttributes().stream()
+                .filter(attribute -> queriedTable.isMetric(attribute.getName()))
+                .map(attribute -> engine.constructMetricProjection(
+                        queriedTable.getMetric(attribute.getName()),
+                        attribute.getAlias(),
+                        getArgumentMapFromArgumentSet(attribute.getArguments())))
+                .collect(Collectors.toList());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryEngine.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryEngine.java
new file mode 100644
index 0000000000..babb586be5
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryEngine.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TableSource;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A {@link QueryEngine} is an abstraction that an AggregationDataStore leverages to run analytic queries (OLAP style)
+ * against an underlying persistence layer.
+ * <p>
+ * The purpose of {@link QueryEngine} is to allow a single {@link DataStore} to utilize multiple query frameworks, such
+ * as JPA on SQL or NoSQL query engine on Druid shown below.
+ * <pre>
+ *        +-----------+
+ *        |           |
+ *        | DataStore |
+ *        |           |
+ *        +-----+-----+
+ *              |
+ *              |
+ *   +----------v-----------+
+ *   |                      |
+ *   | DataStoreTransaction |
+ *   |                      |
+ *   +----------+-----------+
+ *              |
+ *              |
+ *       +------v------+
+ *       |             |
+ *       | QueryEngine |
+ *       |             |
+ *       +------+------+
+ *              |
+ *              |
+ *     +--------+---------+
+ *     |                  |
+ * +---v---+          +---v---+
+ * |       |          |       |
+ * | Druid |          | MySQL |
+ * |       |          |       |
+ * +-------+          +-------+
+ * </pre>
+ * Implementor must assume that {@link DataStoreTransaction} will never keep reference to any internal state of a
+ * {@link QueryEngine} object. This ensures the plugability of various {@link QueryEngine} implementations.
+ */
+public abstract class QueryEngine {
+    @Getter
+    protected MetaDataStore metaDataStore;
+
+    protected EntityDictionary metadataDictionary;
+
+    protected QueryEngine() {
+    }
+    /**
+     * QueryEngine is constructed with a metadata store and is responsible for constructing all Tables and Entities
+     * metadata in this metadata store.
+     *  @param metaDataStore a metadata store
+     *
+     */
+    public QueryEngine(MetaDataStore metaDataStore) {
+        this.metaDataStore = metaDataStore;
+        this.metadataDictionary = metaDataStore.getMetadataDictionary();
+        populateMetaData(metaDataStore);
+    }
+
+    /**
+     * Construct namespace metadata.
+     *
+     * @param namespacePackage NamespacePackage Type
+     * @return constructed Namespace
+     */
+    protected abstract Namespace constructNamespace(NamespacePackage namespacePackage);
+
+    /**
+     *
+     * Construct Table metadata for an entity.
+     *
+     * @param namespace The table namespace
+     * @param entityClass entity class
+     * @param metaDataDictionary metadata dictionary
+     * @return constructed Table
+     */
+    protected abstract Table constructTable (
+            Namespace namespace,
+            Type<?> entityClass,
+            EntityDictionary metaDataDictionary
+    );
+
+    /**
+     * Construct a parameterized instance of a Column.
+     * @param dimension The dimension column.
+     * @param alias The client provide alias.
+     * @param arguments The client provided parameterized arguments.
+     * @return DimensionProjection
+     */
+    public abstract DimensionProjection constructDimensionProjection(Dimension dimension,
+                                                                     String alias,
+                                                                     Map<String, Argument> arguments);
+
+    /**
+     * Construct a parameterized instance of a Column.
+     * @param dimension The dimension column.
+     * @param alias The client provide alias.
+     * @param arguments The client provided parameterized arguments.
+     * @return TimeDimensionProjection
+     */
+    public abstract TimeDimensionProjection constructTimeDimensionProjection(TimeDimension dimension,
+                                                                             String alias,
+                                                                             Map<String, Argument> arguments);
+    /**
+     * Construct a parameterized instance of a Column.
+     * @param metric The metric column.
+     * @param alias The client provide alias.
+     * @param arguments The client provided parameterized arguments.
+     * @return MetricProjection
+     */
+    public abstract MetricProjection constructMetricProjection(Metric metric,
+                                                               String alias,
+                                                               Map<String, Argument> arguments);
+
+    /**
+     * Query engine is responsible for constructing all Tables and Entities metadata in this metadata store.
+     *
+     * @param metaDataStore metadata store to populate
+     */
+    protected void populateMetaData(MetaDataStore metaDataStore) {
+        metaDataStore.getNamespacesToBind().stream()
+                .map(this::constructNamespace)
+                .forEach(metaDataStore::addNamespace);
+
+        metaDataStore.getModelsToBind()
+                .forEach(model -> {
+                    if (!metadataDictionary.isJPAEntity(model)
+                            && !metadataDictionary.getRelationships(model).isEmpty()) {
+                        throw new BadRequestException(
+                                "Non-JPA entities " + model.getSimpleName() + " is not allowed to have relationship.");
+                    }
+                });
+
+        metaDataStore.getModelsToBind().stream()
+                .map(model -> constructTable(metaDataStore.getNamespace(model), model, metadataDictionary))
+                .forEach(metaDataStore::addTable);
+
+        //Populate table sources.
+        metaDataStore.getTables().forEach(table -> {
+            table.getArgumentDefinitions().forEach(argument -> {
+                argument.setTableSource(TableSource.fromDefinition(
+                        argument.getTableSourceDefinition(),
+                        table.getVersion(),
+                        metaDataStore
+                ));
+            });
+
+            table.getAllColumns().forEach(column -> {
+
+                //Populate column sources.
+                column.setTableSource(TableSource.fromDefinition(
+                        column.getTableSourceDefinition(),
+                        table.getVersion(),
+                        metaDataStore
+                ));
+
+                //Populate column argument sources.
+                column.getArgumentDefinitions().forEach(argument -> {
+                    argument.setTableSource(TableSource.fromDefinition(
+                            argument.getTableSourceDefinition(),
+                            table.getVersion(),
+                            metaDataStore
+                    ));
+                });
+            });
+        });
+
+        // Verify populated tables in metadata store.
+        verifyMetaData(metaDataStore);
+    }
+
+    /**
+     * Verifies all tables in metadata store after they are constructed by {@link #populateMetaData(MetaDataStore)}.
+     * @param metaDataStore metadata store to verify.
+     */
+    protected abstract void verifyMetaData(MetaDataStore metaDataStore);
+
+    /**
+     * Contains state necessary for query execution.
+     */
+    public interface Transaction extends AutoCloseable {
+        @Override
+        void close();
+
+        /**
+         * Cancels running transaction.
+         */
+        void cancel();
+    }
+
+    public abstract Transaction beginTransaction();
+
+    /**
+     * Executes the specified {@link Query} against a specific persistent storage, which understand the provided
+     * {@link Query}. Results may be taken from a cache, if configured.
+     *
+     * @param query The query customized for a particular persistent storage or storage client
+     * @param transaction transaction
+     * @return query results
+     */
+    public abstract QueryResult executeQuery(Query query, Transaction transaction);
+
+    /**
+     * Get a serial number or other token indicating the version of the data in the table.
+     * No particular semantics are required, though it must change if the data changes.
+     * If one is not available, returns null, which will prevent caching this table.
+     * @param table The table to get version of
+     * @param transaction The transaction to use for the lookup
+     * @return a version token, or null if not available.
+     */
+    public abstract String getTableVersion(Table table, Transaction transaction);
+
+    /**
+     * Returns the actual query string(s) that would be executed for the input {@link Query}.
+     *
+     * @param query The query customized for a particular persistent storage or storage client.
+     * @return List of SQL string(s) corresponding to the given query.
+     */
+    public abstract List<String> explain(Query query);
+
+    public abstract QueryValidator getValidator();
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryValidator.java
new file mode 100644
index 0000000000..9c052ec457
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/QueryValidator.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation;
+
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+
+public interface QueryValidator {
+
+    default void validate(Query query) throws HttpStatusException {
+        validateWhereClause(query);
+        validateHavingClause(query);
+        validateSorting(query);
+        validateProjectedColumns(query);
+        validateQueryArguments(query);
+    }
+
+    /**
+     * Ensures that no filter predicates tries not navigate a relationship.
+     * @param query The client query to validate.
+     */
+    void validateWhereClause(Query query);
+
+
+    /**
+     * Validate the having clause before execution. Having clause is not as flexible as where clause,
+     * the fields in having clause must be either or these two:
+     * 1. A grouped by dimension in this query
+     * 2. An aggregated metric in this query
+     *
+     * All grouped by dimensions are defined in the entity bean, so the last entity class of a filter path
+     * must match entity class of the query.
+     *
+     * @param query The client query to validate.
+     */
+    void validateHavingClause(Query query);
+
+    /**
+     * Method to verify that all the sorting options provided by the user are valid and supported.
+     * @param query The client query to validate.
+     */
+    void validateSorting(Query query);
+
+    /**
+     * Validates that the requested set of columns can be queried together.
+     * @param query The client query to validate.
+     */
+    void validateProjectedColumns(Query query);
+
+    /**
+     * Validates that the arguments sent in the query.
+     * @param query The client query to validate.
+     */
+    void validateQueryArguments(Query query);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ArgumentDefinition.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ArgumentDefinition.java
new file mode 100644
index 0000000000..496b3de99e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ArgumentDefinition.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+
+/**
+ * The definition of Argument.
+ */
+public @interface ArgumentDefinition {
+    String name() default "";
+    String description() default "";
+    ValueType type() default ValueType.TEXT;
+    TableSource tableSource() default @TableSource(table = "", column = "");
+    String [] values() default {};
+    String defaultValue() default "";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/CardinalitySize.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/CardinalitySize.java
new file mode 100644
index 0000000000..4b8926af5b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/CardinalitySize.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+/**
+ * A set of constants that indicates how big a dimension is.
+ */
+public enum CardinalitySize {
+
+    /**
+     * Size for a tiny dimension table.
+     * <p>
+     * TODO: define size range
+     */
+    TINY,
+    /**
+     * Size for a small dimension table.
+     * <p>
+     * TODO: define size range
+     */
+    SMALL,
+
+    /**
+     * Size for a medium sized dimension table.
+     * <p>
+     * TODO: define size range
+     */
+    MEDIUM,
+
+    /**
+     * Size for a large dimension table.
+     * <p>
+     * TODO: define size range
+     */
+    LARGE,
+
+    /**
+     * Size for a huge dimension table.
+     * <p>
+     * TODO: define size range
+     */
+    HUGE,
+
+    /**
+     * If size indicator is not provided.
+     */
+    UNKNOWN
+    ;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ColumnMeta.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ColumnMeta.java
new file mode 100644
index 0000000000..1916685065
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/ColumnMeta.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the specified entity field has a configured long name and field description for human to read on UI.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ColumnMeta {
+    String friendlyName() default "";
+    String description() default "";
+    String category() default "";
+    TableSource tableSource() default @TableSource(table = "", column = "");
+    String [] tags() default {};
+    String [] values() default {};
+
+    /**
+     * Controls whether this column is exposed through the Metadata store.
+     * @return true or false.
+     */
+    boolean isHidden() default false;
+
+    /**
+     * Whether or not querying this column requires a client provided filter.
+     * @return The required filter template.
+     */
+    String filterTemplate() default "";
+
+    /**
+     * Indicates the cardinality for the column.
+     * @return size
+     */
+    CardinalitySize size() default CardinalitySize.UNKNOWN;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/DimensionFormula.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/DimensionFormula.java
new file mode 100644
index 0000000000..7a7ada7d4d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/DimensionFormula.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a field is computed via a {@link #value()} custom dimension formula expression}, such as Calcite
+ * SQL. This is similar to {@link MetricFormula}, except that dimension formula would be applied before aggregation.
+ * <p>
+ * Example: {@literal @}DimensionFormula("IF({{reference}} &ge; 0, 'positive', 'negative')").
+ *
+ * Rules:
+ * 1. The provided references should can be other dimension field defined in the same class, physical column in current
+ *    physical table or a dot separated join path represent a logical dimension field defined in another table.
+ * 2. Avoid cycle-reference.
+ * 3. Sql expression can be carried when used with @JoinTo, the outer layer expression would be applied after the
+ *    initial joined to sql expression.
+ * <p>
+ *
+ * {@code expression} can also be composite. After {@link Dimension} construction, it will substitute attribute names
+ * in the provided expression with either:
+ * <ul>
+ *     <li> The column field name for that column in the query, or
+ *     <li> a physical column name that doesn't conflict with any field name
+ *     <li> Another {@link DimensionFormula} expression - recursively expanding expressions until every referenced
+ *          field is not computed.
+ * </ul>
+ * For example, considering the following entity:
+ * <pre>
+ * {@code
+ * public class FactTable {
+ *     {@literal @}DimensionFormula( "CASE WHEN {{overallRating}} = 'Good' THEN 1 ELSE 2 END")
+ *     public int getPlayerLevel() {
+ *         return playerLevel;
+ *     }
+ *
+ *     {@literal @}JoinTo(path = "country.inUsa")
+ *     public boolean isInUsa() {
+ *         return inUsa;
+ *     }
+ *
+ *     {@literal @}DimensionFormula( "CASE WHEN {{country.inUsa}} THEN 'true' ELSE 'false' END")
+ *     public String getCountryIsInUsa() {
+ *         return countryIsInUsa;
+ *     }
+ * }
+ * }
+ * </pre>
+ * After {@link Dimension} construction, {@code countryIsInUsa} the provided expression will be substituted with
+ * {@code country.inUsa}.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DimensionFormula {
+    /**
+     * The custom dimension expression that represents this dimension formula logic.
+     *
+     * @return dimension formula
+     */
+    String value();
+
+    /**
+     * The arguments accepted by this table.
+     * @return arguments for the dimension
+     */
+    ArgumentDefinition[] arguments() default {};
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/FriendlyName.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/FriendlyName.java
new file mode 100644
index 0000000000..ae8e06597d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/FriendlyName.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that an annotated field is a friendlyName or human displayable column for that dimension.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FriendlyName {
+
+    // intentionally left blank
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Join.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Join.java
new file mode 100644
index 0000000000..3e000c8889
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Join.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Join {
+    /**
+     * Join ON clause constraint for customizing relationship joins. {{..}} is used for column references.
+     *
+     * @return join constraint like <code>{{col1}} = {{joinField.col2}}</code>
+     */
+    String value();
+
+    /**
+     * Join type.
+     * @return join type like {@code left, inner, full or cross}
+     */
+    JoinType type() default JoinType.LEFT;
+
+    /**
+     * Whether this joins to one or to many rows.
+     * @return true if it joins to one row.
+     */
+    boolean toOne() default false;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/JoinType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/JoinType.java
new file mode 100644
index 0000000000..6481a5811b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/JoinType.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+/**
+ * A set of constants that indicates type fo Join.
+ */
+public enum JoinType {
+
+    LEFT,
+    INNER,
+    FULL,
+    CROSS;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/MetricFormula.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/MetricFormula.java
new file mode 100644
index 0000000000..7338e7fe54
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/MetricFormula.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.query.DefaultMetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a field is computed via a {@link #value() custom metric formula expression}, such as Calcite SQL.
+ * Metric formula is resolved as a new aggregation function, so it won't convert the value to a different format before
+ * or after aggregation.
+ * <p>
+ * Example: {@literal @}MetricFormula("({{field1}} * {{field2}}) / 100").
+ * <p>
+ *
+ * Rules:
+ * 1. The provided references should only be other logical metric field defined in the same class or a physical column
+ *    in current physical table.
+ * 2. Avoid cycle-reference.
+ * 3. Can't apply formula to metric functions that don't have single literal expression, such as YearOverYear.
+ * <p>
+ * {@code expression} can also be composite. During {@link Metric} construction, it will substitute attribute names in
+ * the provided expression with either:
+ * <ul>
+ *     <li> The column field name for that column in the query, or
+ *     <li> Another {@link MetricFormula} expression - recursively expanding expressions until every referenced
+ *          field is not computed.
+ * </ul>
+ * For example, considering the following entity:
+ * <pre>
+ * {@code
+ * public class FactTable {
+ *
+ *     {@literal @}MetricFormula("SUM({{sessions}})")
+ *     Long sessions
+ *
+ *     {@literal @}MetricFormula("SUM({{timeSpent}})")
+ *     Long timeSpent
+ *
+ *     {@literal @}MetricFormula("{{timeSpent}} / {{sessions}}")
+ *     Float timeSpentPerSession
+ *
+ *     {@literal @}MetricFormula("{{timeSpentPerSession}} / 100")
+ *     Float timeSpentPerGame
+ * }
+ * }
+ * </pre>
+ * During {@link Metric} construction, {@code timeSpentPerSession} the provided expression will be substituted with
+ * {@code timeSpent / sessions}.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MetricFormula {
+    /**
+     * The custom metric expression that represents this metric computation logic.
+     *
+     * @return metric formula
+     */
+    String value() default "";
+
+    /**
+     * Function which constructs a projection for this given metric.
+     * @return metric maker class.
+     */
+    Class<? extends MetricProjectionMaker> maker() default DefaultMetricProjectionMaker.class;
+
+    /**
+     * The arguments accepted by this table.
+     * @return arguments for the metric
+     */
+    ArgumentDefinition[] arguments() default {};
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableMeta.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableMeta.java
new file mode 100644
index 0000000000..1999cb8edd
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableMeta.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the specified entity field has a configured long name and field description for human to read on UI.
+ */
+@Documented
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TableMeta {
+
+    String friendlyName() default "";
+    String description() default "";
+    String category() default "";
+
+    String [] tags() default {};
+
+    /**
+     * Optimizer and query planning hints.
+     * @return The list of supported hints.
+     */
+    String [] hints() default {};
+
+    /**
+     * Whether or not querying this table requires a client provided filter.
+     * @return The required filter template.
+     */
+    String filterTemplate() default "";
+
+    /**
+     * Whether or not this table is a fact table.
+     * @return true or false.
+     */
+    boolean isFact() default true;
+
+    /**
+     * Controls whether this table is exposed through the Metadata store.
+     * @return true or false.
+     */
+    boolean isHidden() default false;
+
+    /**
+     * Indicates the size of the table.
+     * @return size
+     */
+    CardinalitySize size() default CardinalitySize.UNKNOWN;
+
+    /**
+     * The arguments accepted by this table.
+     * @return arguments for the table
+     */
+    ArgumentDefinition[] arguments() default {};
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableSource.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableSource.java
new file mode 100644
index 0000000000..7c87527d79
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TableSource.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT;
+
+/**
+ * The definition of TableSource.
+ */
+public @interface TableSource {
+    String table();
+    String namespace() default DEFAULT;
+    String column();
+    String [] suggestionColumns() default {};
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Temporal.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Temporal.java
new file mode 100644
index 0000000000..41b1496583
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Temporal.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.TimeZone;
+
+/**
+ * Indicates that the annotated entity field is a temporal field and is backed by a temporal column in persistent
+ * storage.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Temporal {
+
+    /**
+     * The time grain supported by this time dimension.
+     *
+     * @return time grain.
+     */
+    TimeGrainDefinition[] grains() default {
+        @TimeGrainDefinition(grain = TimeGrain.DAY, expression = "{{$$column.expr}}")
+    };
+
+    /**
+     * The timezone in {@link String} of the column.
+     * <p>
+     * The String format can be expressed by
+     * <ul>
+     *     <li> an abbreviation such as "PST", or
+     *     <li> a full name such as "America/Los_Angeles", or
+     *     <li> a custom ID such as "GMT-8:00"
+     * </ul>
+     * The timezone will be parsed using {@link TimeZone#getTimeZone(String)}.
+     *
+     * @return data timezone
+     */
+    String timeZone() default "UTC";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TimeGrainDefinition.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TimeGrainDefinition.java
new file mode 100644
index 0000000000..d52d507532
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/TimeGrainDefinition.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation;
+
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+/**
+ * A time grain that a time based dimension can be converted to.
+ */
+public @interface TimeGrainDefinition {
+
+    /**
+     * The unit into which temporal column can be divided.
+     *
+     * @return One of the supported time grains of a persistent storage column
+     */
+    TimeGrain grain() default TimeGrain.DAY;
+
+    /**
+     * Optional expression used by the QueryEngine to represent the grain natively.
+     * The value is query engine specific.
+     *
+     * @return An expression which defines the grain and is meaningful to the Query Engine.
+     */
+    String expression() default "{{$$column.expr}}";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/Cache.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/Cache.java
new file mode 100644
index 0000000000..e9814135f9
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/Cache.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+
+/**
+ * A cache for {@link QueryResult}s.
+ */
+public interface Cache {
+    /**
+     * Load QueryResult from cache. Exceptions should be passed through.
+     *
+     * @param key    a key to look up in the cache.
+     * @return query results from cache, or null if not found.
+     */
+    QueryResult get(Object key);
+
+    /**
+     * Insert results into cache.
+     *
+     * @param key    the key to associate with the query
+     * @param result the result to cache with the key
+     */
+    void put(Object key, QueryResult result);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/CaffeineCache.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/CaffeineCache.java
new file mode 100644
index 0000000000..3941f665b8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/CaffeineCache.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A basic local-only cache.
+ */
+public class CaffeineCache implements Cache {
+    public static final int DEFAULT_MAXIMUM_ENTRIES = 1024;
+
+    private final com.github.benmanes.caffeine.cache.Cache<Object, QueryResult> cache;
+
+    public CaffeineCache(int maximumSize, long defaultExprirationMinutes) {
+        cache = Caffeine.newBuilder()
+                .maximumSize(maximumSize)
+                .expireAfterWrite(defaultExprirationMinutes, TimeUnit.MINUTES)
+                .recordStats()
+                .build();
+    }
+
+    @Override
+    public QueryResult get(Object key) {
+        return cache.getIfPresent(key);
+    }
+
+    @Override
+    public void put(Object key, QueryResult result) {
+        cache.put(key, result);
+    }
+
+    public com.github.benmanes.caffeine.cache.Cache<Object, QueryResult> getImplementation() {
+        return cache;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractor.java
new file mode 100644
index 0000000000..26ffd3a7b1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractor.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+
+import java.util.Comparator;
+import java.util.Map;
+
+/**
+ * Generate a cache key for a given Query.
+ */
+public final class QueryKeyExtractor implements FilterExpressionVisitor<Object> {
+    private static final char DELIMITER = ';'; // delimit fields
+
+    // Since fields may contain a variable number of values, potentially nested,
+    // we need a way to denote structure to prevent ambiguity.
+    private static final char BEGIN_GROUP = '{';
+    private static final char END_GROUP = '}';
+
+    private static final int ESTIMATED_KEY_SIZE = 128;
+
+    private final StringBuilder keyBuilder;
+
+    private QueryKeyExtractor() {
+        keyBuilder = new StringBuilder(ESTIMATED_KEY_SIZE);
+    }
+
+    public static String extractKey(Query query) {
+        QueryKeyExtractor extractor = new QueryKeyExtractor();
+        extractor.visit(query);
+        return extractor.keyBuilder.toString();
+    }
+
+    private void visit(Query query) {
+        visit(query.getSource());
+
+        beginGroup();
+        // `metrics` is a list - don't sort
+        query.getMetricProjections().forEach(this::visit);
+        endGroup();
+        beginGroup();
+        // `groupByDimensions` is an unordered set - sort
+        query.getDimensionProjections().stream().sorted(Comparator.comparing(ColumnProjection::getSafeAlias))
+                .forEachOrdered(this::visit);
+        endGroup();
+        beginGroup();
+        // `timeDimensions` is an unordered set - sort
+        query.getTimeDimensionProjections().stream().sorted(Comparator.comparing(ColumnProjection::getSafeAlias))
+                .forEachOrdered(this::visit);
+        endGroup();
+
+        visitExpression(query.getWhereFilter());
+        visitExpression(query.getHavingFilter());
+        visit(query.getSorting());
+        visit(query.getPagination());
+        // eliding `scope` and `bypassingCache` fields
+    }
+
+    // Query Components
+    private void visit(Queryable source) {
+        visit(source.getAlias());
+    }
+
+    private void visit(ColumnProjection columnProjection) {
+        visit(columnProjection.getSafeAlias());
+        visit(columnProjection.getArguments());
+    }
+
+    private void visit(Map<String, Argument> arguments) {
+        beginGroup();
+        // `arguments` is an unordered map - sort by key
+        arguments.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(e -> {
+            visit(e.getKey());
+            visit(e.getValue().getName());
+            visit(e.getValue().getValue().toString());
+        });
+        endGroup();
+    }
+
+    private void visit(Sorting sorting) {
+        if (sorting == null) {
+            keyBuilder.append(DELIMITER);
+            return;
+        }
+        beginGroup();
+        visit(sorting.getType());
+        // `sortingPaths` is an ordered map - don't sort
+        sorting.getSortingPaths().forEach((path, order) -> {
+            visit(path);
+            visit(order.toString());
+        });
+        endGroup();
+    }
+
+    private void visit(Path path) {
+        beginGroup();
+        // `pathElements` is a list - don't sort
+        path.getPathElements().forEach(this::visit);
+        endGroup();
+    }
+
+    private void visit(Path.PathElement element) {
+        beginGroup();
+        visit(element.getType());
+        visit(element.getFieldType());
+        visit(element.getFieldName());
+        endGroup();
+    }
+
+    private void visit(Pagination pagination) {
+        if (pagination == null) {
+            keyBuilder.append(DELIMITER);
+            return;
+        }
+        beginGroup();
+        visit(pagination.getOffset());
+        visit(pagination.getLimit());
+        visit(pagination.returnPageTotals() ? "1" : "0");
+        endGroup();
+    }
+
+    // Filter Expressions
+    //
+    private void visitExpression(FilterExpression expr) {
+        if (expr != null) {
+            expr.accept(this);
+        } else {
+            keyBuilder.append(DELIMITER);
+        }
+    }
+
+    @Override
+    public Object visitPredicate(FilterPredicate filterPredicate) {
+        beginGroup();
+        visit("P");
+        visit(filterPredicate.getPath());
+        visit(filterPredicate.getOperator().toString());
+        // `values` is list - don't sort
+        filterPredicate.getValues().forEach(this::visitObject);
+        endGroup();
+        // `field` and `fieldPath` are derived from path
+        return null;
+    }
+
+    @Override
+    public Object visitAndExpression(AndFilterExpression expression) {
+        beginGroup();
+        visit("A");
+        expression.getLeft().accept(this);
+        expression.getRight().accept(this);
+        endGroup();
+        return null;
+    }
+
+    @Override
+    public Object visitOrExpression(OrFilterExpression expression) {
+        beginGroup();
+        visit("O");
+        expression.getLeft().accept(this);
+        expression.getRight().accept(this);
+        endGroup();
+        return null;
+    }
+
+    @Override
+    public Object visitNotExpression(NotFilterExpression expression) {
+        beginGroup();
+        visit("N");
+        expression.getNegated().accept(this);
+        endGroup();
+        return null;
+    }
+
+    // Basic types
+    //
+    private void visit(Type<?> type) {
+        keyBuilder.append(type.getCanonicalName()).append(DELIMITER);
+    }
+
+    private void visit(String string) {
+        keyBuilder.append(string).append(DELIMITER);
+    }
+
+    private void visit(int value) {
+        keyBuilder.append(value).append(DELIMITER);
+    }
+
+    private void visitObject(Object object) {
+        String string = object.toString();
+        keyBuilder.append(string.length()).append(DELIMITER);
+        keyBuilder.append(string).append(DELIMITER);
+    }
+
+    private void beginGroup() {
+        keyBuilder.append(BEGIN_GROUP);
+    }
+
+    private void endGroup() {
+        keyBuilder.append(END_GROUP);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/RedisCache.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/RedisCache.java
new file mode 100644
index 0000000000..d5cbeef214
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/cache/RedisCache.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+
+import org.springframework.util.SerializationUtils;
+
+import lombok.Setter;
+import redis.clients.jedis.UnifiedJedis;
+
+/**
+ * A Redis cache.
+ */
+public class RedisCache implements Cache {
+    @Setter private UnifiedJedis jedis;
+    @Setter private long defaultExprirationMinutes;
+
+    /**
+     * Constructor.
+     * @param jedis Jedis Connection Pool to Redis clusteer.
+     * @param defaultExprirationMinutes Expiration Time for results on Redis.
+     */
+    public RedisCache(UnifiedJedis jedis, long defaultExprirationMinutes) {
+        this.jedis = jedis;
+        this.defaultExprirationMinutes = defaultExprirationMinutes;
+    }
+
+    @Override
+    public QueryResult get(Object key) {
+        return (QueryResult) SerializationUtils.deserialize(jedis.get(SerializationUtils.serialize(key)));
+    }
+
+    @Override
+    public void put(Object key, QueryResult result) {
+        byte[] keyBytes = SerializationUtils.serialize(key);
+        jedis.set(keyBytes, SerializationUtils.serialize(result));
+        jedis.expire(keyBytes, defaultExprirationMinutes * 60);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/JoinPath.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/JoinPath.java
new file mode 100644
index 0000000000..04accdcfc0
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/JoinPath.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * JoinPath extends {@link Path} to allow navigation through {@link Join} annotation.
+ */
+public class JoinPath extends Path {
+    private MetaDataStore store;
+
+    public JoinPath(List<PathElement> pathElements, MetaDataStore store) {
+        super(pathElements);
+        this.store = store;
+    }
+
+    public JoinPath(Type<?> entityClass, MetaDataStore store, String dotSeparatedPath) {
+        this.store = store;
+        pathElements = resolvePathElements(entityClass, store.getMetadataDictionary(), dotSeparatedPath);
+    }
+
+    @Override
+    protected boolean needNavigation(Type<?> entityClass, String fieldName, EntityDictionary dictionary) {
+        return dictionary.isRelation(entityClass, fieldName)
+                || SQLTable.isTableJoin(store, entityClass, fieldName);
+    }
+
+    /**
+     * Extend this path with a extension dot separated path.
+     *
+     * @param extensionPath extension path append to this join path
+     * @return expended join path e.g. <code>[A.B]/[B.C] + C.D = [A.B]/[B.C]/[C.D]</code>
+     */
+    public JoinPath extend(String extensionPath) {
+        return extendJoinPath(this, new JoinPath(lastElement().get().getType(), store, extensionPath), store);
+    }
+
+    /**
+     * Append an extension path to an original path, the last element of original path should be the same as the
+     * first element of extension path.
+     *
+     * @param path original path, e.g. <code>[A.B]/[B.C]</code>
+     * @param extension extension path, e.g. <code>[B.C]/[C.D]</code>
+     * @param <P> path extension
+     * @return extended path <code>[A.B]/[B.C]/[C.D]</code>
+     */
+    private static <P extends Path> JoinPath extendJoinPath(Path path, P extension, MetaDataStore store) {
+        List<Path.PathElement> toExtend = new ArrayList<>(path.getPathElements());
+        toExtend.remove(toExtend.size() - 1);
+        toExtend.addAll(extension.getPathElements());
+        return new JoinPath(toExtend, store);
+    }
+
+    @Override
+    protected PathElement resolvePathAttribute(Type<?> entityClass,
+                                               String fieldName,
+                                               String alias,
+                                               Set<Argument> arguments,
+                                               EntityDictionary dictionary) {
+        Type<?> attributeClass = ClassType.OBJECT_TYPE;
+        if (dictionary.isAttribute(entityClass, fieldName)
+                        || fieldName.equals(dictionary.getIdFieldName(entityClass))) {
+            attributeClass = dictionary.getType(entityClass, fieldName);
+            return new PathElement(entityClass, attributeClass, fieldName, alias, arguments);
+        }
+        // Physical Column Reference starts with $
+        if (fieldName.indexOf('$') == 0) {
+            return new PathElement(entityClass, attributeClass, fieldName, alias, arguments);
+        }
+
+        String entityAlias = dictionary.getJsonAliasFor(entityClass);
+        throw new InvalidValueException(entityAlias + " does not contain the field " + fieldName);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryLogger.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryLogger.java
new file mode 100644
index 0000000000..e3b00700eb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryLogger.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Query Logger Interface for Elide.
+ */
+public interface QueryLogger {
+
+    /**
+     * Accepts the incoming JSON API query and notes the start time for the query.
+     * @param queryId The RequestScope requestId.
+     * @param user The Principal user
+     * @param headers Http Request Headers
+     * @param apiVer API Version
+     * @param queryParams QueryParams for the incoming JSON API query
+     * @param path The apiQuery endpoint path for the incoming query
+     */
+    void acceptQuery(UUID queryId, User user, Map<String, String> headers, String apiVer,
+                     MultivaluedMap<String, String> queryParams, String path);
+
+    /**
+     * Processes and logs all the queries from QueryDetail.
+     * @param queryId The RequestScope requestId.
+     * @param query The underlying Query
+     * @param apiQuery The output querytext
+     * @param isCached Whether the result came from a cache or not
+     */
+    void processQuery(UUID queryId, Query query, List<String> apiQuery, boolean isCached);
+
+    /**
+     * Cancels all queries currently running for a particular requestId.
+     * Implementation must be thread-safe.
+     * @param queryId The RequestScope requestId.
+     */
+    void cancelQuery(UUID queryId);
+
+    /**
+     * Registers the endtime for a query and logs it out.
+     * @param queryId The RequestScope requestId.
+     * @param response The ElideResponse object
+     */
+    void completeQuery(UUID queryId, QueryResponse response);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryResponse.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryResponse.java
new file mode 100644
index 0000000000..4cae8ec8d4
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/QueryResponse.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * QueryLogger Response Class.
+ */
+@AllArgsConstructor
+public class QueryResponse {
+    @Getter private final int responseCode;
+
+    @Getter private final Iterable<Object> data;
+
+    @Getter private final String errorMessage;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLogger.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLogger.java
new file mode 100644
index 0000000000..fabf5679bc
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLogger.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Default Slf4j Logging Implementation of QueryLogger for Elide.
+ */
+@Slf4j
+public class Slf4jQueryLogger implements QueryLogger {
+
+    private static final String ID = "id";
+
+    private final ObjectMapper mapper;
+    private final Logger logger;
+
+    @FunctionalInterface
+    public interface Logger {
+        void log(String template, JsonNode value);
+    }
+
+    public Slf4jQueryLogger() {
+        mapper = new ObjectMapper();
+        this.logger = this::log;
+    }
+
+
+    public Slf4jQueryLogger(Logger logger) {
+        mapper = new ObjectMapper();
+        this.logger = logger;
+    }
+
+    @Override
+    public void acceptQuery(UUID queryId, User user, Map<String, String> headers, String apiVer,
+                            MultivaluedMap<String, String> queryParams, String path) {
+        ObjectNode rootNode = mapper.createObjectNode();
+
+        rootNode.put(ID, queryId.toString());
+        rootNode.put("user", (user != null && user.getName() != null) ? user.getName() : "Unknown");
+        if (!queryParams.isEmpty()) {
+            ObjectNode queryParamNode = rootNode.putObject("queryParams");
+            queryParams.forEach((key, values) -> {
+                ArrayNode listNode = queryParamNode.putArray(key);
+                values.stream().forEach(listNode::add);
+            });
+        }
+
+        rootNode.put("apiVersion", apiVer);
+        rootNode.put("path", path);
+        ObjectNode headerNode = rootNode.putObject("headers");
+        headers.forEach(headerNode::put);
+
+        logger.log("QUERY ACCEPTED: {}", rootNode);
+    }
+
+    @Override
+    public void processQuery(UUID queryId, Query query, List<String> apiQuery, boolean isCached) {
+        ObjectNode rootNode = mapper.createObjectNode();
+
+        rootNode.put(ID, queryId.toString());
+        ArrayNode dbQueryNode = rootNode.putArray("queries");
+        apiQuery.stream().forEach(dbQueryNode::add);
+        rootNode.put("isCached", isCached);
+        logger.log("QUERY RUNNING: {}", rootNode);
+    }
+
+    @Override
+    public void cancelQuery(UUID queryId) {
+        ObjectNode rootNode = mapper.createObjectNode();
+        rootNode.put(ID, queryId.toString());
+        logger.log("QUERY CANCELED: {}", rootNode);
+    }
+
+    @Override
+    public void completeQuery(UUID queryId, QueryResponse response) {
+        ObjectNode rootNode = mapper.createObjectNode();
+        rootNode.put(ID, queryId.toString());
+        rootNode.put("status", response.getResponseCode());
+        rootNode.put("error", response.getErrorMessage());
+        logger.log("QUERY COMPLETE: {}", rootNode);
+    }
+
+    protected void log(String template, JsonNode value) {
+        log.debug(template, value);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/DynamicModelInstance.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/DynamicModelInstance.java
new file mode 100644
index 0000000000..2ece1f3880
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/DynamicModelInstance.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import com.yahoo.elide.core.type.Dynamic;
+import com.yahoo.elide.core.type.ParameterizedModel;
+import com.yahoo.elide.core.type.Type;
+
+/**
+ * Base model instance returned by AggregationStore for dynamic types.
+ */
+public class DynamicModelInstance extends ParameterizedModel implements Dynamic {
+    protected TableType tableType;
+
+    public DynamicModelInstance(TableType type) {
+        this.tableType = type;
+    }
+
+    @Override
+    public Type getType() {
+        return tableType;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/FieldType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/FieldType.java
new file mode 100644
index 0000000000..769889fc28
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/FieldType.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import static java.lang.reflect.Modifier.PUBLIC;
+import com.yahoo.elide.core.exceptions.InvalidParameterizedAttributeException;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.core.type.ParameterizedModel;
+import com.yahoo.elide.core.type.Type;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * A dynamic Elide model field that wraps a deserialized HJSON measure or dimension.
+ */
+public class FieldType implements Field {
+    private Map<Class<? extends Annotation>, Annotation> annotations;
+    private String name;
+    private Type type;
+
+    public FieldType(String name, Type type, Map<Class<? extends Annotation>, Annotation> annotations) {
+        this.name = name;
+        this.annotations = annotations;
+        this.type = type;
+    }
+    @Override
+    public Object get(Object obj) throws IllegalArgumentException, IllegalAccessException {
+        if (! ParameterizedModel.class.isAssignableFrom(obj.getClass())) {
+            throw new IllegalArgumentException("Class is not a dynamic type: " + obj.getClass());
+        }
+
+        ParameterizedModel model = (ParameterizedModel) obj;
+
+        try {
+            return model.invoke(Attribute.builder()
+                    .name(name)
+                    .type(type)
+                    .alias(name)
+                    .build());
+        } catch (InvalidParameterizedAttributeException e) {
+
+            //Return default value if the field has not been set.
+            return null;
+        }
+    }
+
+    @Override
+    public Type<?> getType() {
+        return type;
+    }
+
+    @Override
+    public Type<?> getParameterizedType(Type<?> parentType, Optional<Integer> index) {
+        return type;
+    }
+
+    @Override
+    public void set(Object obj, Object value) throws IllegalArgumentException, IllegalAccessException {
+        if (! ParameterizedModel.class.isAssignableFrom(obj.getClass())) {
+            throw new IllegalArgumentException("Class is not a dynamic type: " + obj.getClass());
+        }
+
+        ParameterizedModel model = (ParameterizedModel) obj;
+
+        model.addAttributeValue(Attribute.builder().name(name).type(type).alias(name).build(), value);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return annotations.containsKey(annotationClass);
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        if (annotations.containsKey(annotationClass)) {
+            return (T) annotations.get(annotationClass);
+        }
+        return null;
+    }
+
+    @Override
+    public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+        if (annotations.containsKey(annotationClass)) {
+            T[] result = (T[]) Array.newInstance(annotationClass, 1);
+            result[0] = (T) annotations.get(annotationClass);
+            return result;
+        }
+        return (T[]) Array.newInstance(annotationClass, 0);
+    }
+
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        return getAnnotations();
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return annotations.values().toArray(new Annotation[0]);
+    }
+
+    @Override
+    public int getModifiers() {
+        return PUBLIC;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackage.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackage.java
new file mode 100644
index 0000000000..31d9dfd518
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackage.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.annotation.ApiVersion;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.type.Package;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+
+import lombok.EqualsAndHashCode;
+
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A dynamic Elide model that wraps a deserialized HJSON Namespace.
+ */
+@EqualsAndHashCode
+public class NamespacePackage implements Package {
+
+    public static final String EMPTY = "";
+    public static final String DEFAULT = "default";
+    public static NamespacePackage DEFAULT_NAMESPACE =
+            new NamespacePackage(EMPTY, "Default Namespace", DEFAULT, NO_VERSION);
+
+    protected NamespaceConfig namespace;
+    private Map<Class<? extends Annotation>, Annotation> annotations;
+
+    public NamespacePackage(NamespaceConfig namespace) {
+        if (namespace.getName().equals(DEFAULT)) {
+            this.namespace = NamespaceConfig.builder()
+                    .name(EMPTY)
+                    .friendlyName(namespace.getFriendlyName())
+                    .description(namespace.getDescription())
+                    .apiVersion(namespace.getApiVersion())
+                    .build() ;
+        } else {
+            this.namespace = namespace;
+        }
+        this.annotations = buildAnnotations(this.namespace);
+    }
+
+    public NamespacePackage(String name, String description, String friendlyName, String version) {
+        this(NamespaceConfig.builder()
+                .name(name)
+                .friendlyName(friendlyName)
+                .description(description)
+                .apiVersion(version)
+                .build());
+    }
+
+    @Override
+    public <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass) {
+        if (annotations.containsKey(annotationClass)) {
+            return (A) annotations.get(annotationClass);
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return namespace.getName();
+    }
+
+    @Override
+    public Package getParentPackage() {
+        return null;
+    }
+
+    private static Map<Class<? extends Annotation>, Annotation> buildAnnotations(NamespaceConfig namespace) {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+
+        annotations.put(ReadPermission.class, new ReadPermission() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return ReadPermission.class;
+            }
+
+            @Override
+            public String expression() {
+                return namespace.getReadAccess();
+            }
+
+        });
+
+        annotations.put(Include.class, new Include() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Include.class;
+            }
+
+            @Override
+            public boolean rootLevel() {
+                return true;
+            }
+
+            @Override
+            public String description() {
+                return namespace.getDescription();
+            }
+
+            @Override
+            public String friendlyName() {
+                return namespace.getFriendlyName();
+            }
+
+            @Override
+            public String name() {
+                return namespace.getName();
+            }
+        });
+
+        annotations.put(ApiVersion.class, new ApiVersion() {
+            @Override
+            public String version() {
+                return namespace.getApiVersion();
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return ApiVersion.class;
+            }
+        });
+
+        return annotations;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/TableType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/TableType.java
new file mode 100644
index 0000000000..0f9d6d9662
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/dynamic/TableType.java
@@ -0,0 +1,939 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import static com.yahoo.elide.core.type.ClassType.BIGDECIMAL_TYPE;
+import static com.yahoo.elide.core.type.ClassType.BOOLEAN_TYPE;
+import static com.yahoo.elide.core.type.ClassType.LONG_TYPE;
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT_NAMESPACE;
+import static com.yahoo.elide.datastores.aggregation.timegrains.Time.TIME_TYPE;
+import static com.yahoo.elide.modelconfig.model.Type.BOOLEAN;
+import static com.yahoo.elide.modelconfig.model.Type.COORDINATE;
+import static com.yahoo.elide.modelconfig.model.Type.DECIMAL;
+import static com.yahoo.elide.modelconfig.model.Type.ENUM_ORDINAL;
+import static com.yahoo.elide.modelconfig.model.Type.ENUM_TEXT;
+import static com.yahoo.elide.modelconfig.model.Type.INTEGER;
+import static com.yahoo.elide.modelconfig.model.Type.MONEY;
+import static com.yahoo.elide.modelconfig.model.Type.TEXT;
+import static com.yahoo.elide.modelconfig.model.Type.TIME;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.core.type.Method;
+import com.yahoo.elide.core.type.Package;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.TableSource;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.DefaultMetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.modelconfig.model.Argument;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.Grain;
+import com.yahoo.elide.modelconfig.model.Join;
+import com.yahoo.elide.modelconfig.model.Measure;
+import com.yahoo.elide.modelconfig.model.Table;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * A dynamic Elide model that wraps a deserialized HJSON table.
+ */
+public class TableType implements Type<DynamicModelInstance> {
+    public static final Pattern REFERENCE_PARENTHESES = Pattern.compile("\\{\\{(.+?)}}");
+    private static final String SPACE = " ";
+    private static final String PERIOD = ".";
+    public static final Pattern NEWLINE = Pattern.compile(System.lineSeparator(), Pattern.LITERAL);
+
+    protected Table table;
+    private Map<Class<? extends Annotation>, Annotation> annotations;
+    private Map<String, Field> fields;
+    private Package namespace;
+
+    public TableType(Table table) {
+        this(table, DEFAULT_NAMESPACE);
+    }
+
+    public TableType(Table table, Package namespace) {
+        this.namespace = namespace;
+        this.table = table;
+        this.annotations = buildAnnotations(table);
+        this.fields = buildFields(table);
+    }
+
+    @Override
+    public String getCanonicalName() {
+        return getPackage().getName().concat(PERIOD).concat(getName());
+    }
+
+    @Override
+    public String getSimpleName() {
+        return getName();
+    }
+
+    @Override
+    public String getName() {
+        return table.getName();
+    }
+
+    @Override
+    public Type<?> getSuperclass() {
+        return null;
+    }
+
+    @Override
+    public boolean isPrimitive() {
+        return false;
+    }
+
+    @Override
+    public Package getPackage() {
+        return namespace;
+    }
+
+    @Override
+    public Method[] getMethods() {
+        return new Method[0];
+    }
+
+    @Override
+    public Method[] getDeclaredMethods() {
+        return new Method[0];
+    }
+
+    @Override
+    public Field[] getFields() {
+        return fields.values().toArray(new Field[0]);
+    }
+
+    @Override
+    public Field[] getDeclaredFields() {
+        return getFields();
+    }
+
+    @Override
+    public Field getDeclaredField(String name) throws NoSuchFieldException {
+        if (fields.containsKey(name)) {
+            return fields.get(name);
+        }
+        return null;
+    }
+
+    @Override
+    public Method[] getConstructors() {
+        return new Method[0];
+    }
+
+    @Override
+    public boolean isParameterized() {
+        return false;
+    }
+
+    @Override
+    public boolean hasSuperType() {
+        return false;
+    }
+
+    @Override
+    public DynamicModelInstance newInstance() throws InstantiationException, IllegalAccessException {
+        return new DynamicModelInstance(this);
+    }
+
+    @Override
+    public boolean isEnum() {
+        return false;
+    }
+
+    @Override
+    public DynamicModelInstance[] getEnumConstants() {
+        return null;
+    }
+
+    @Override
+    public Optional<Class<DynamicModelInstance>> getUnderlyingClass() {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean isAssignableFrom(Type cls) {
+        return false;
+    }
+
+    @Override
+    public boolean isAnnotationPresent(Class annotationClass) {
+        return annotations.containsKey(annotationClass);
+    }
+
+    @Override
+    public Annotation getAnnotation(Class annotationClass) {
+        if (annotations.containsKey(annotationClass)) {
+            return annotations.get(annotationClass);
+        }
+        return null;
+    }
+
+    @Override
+    public Annotation getDeclaredAnnotation(Class annotationClass) {
+        return getAnnotation(annotationClass);
+    }
+
+    @Override
+    public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationClass) {
+        if (annotations.containsKey(annotationClass)) {
+            A[] result = (A[]) Array.newInstance(annotationClass, 1);
+            result[0] = (A) annotations.get(annotationClass);
+            return result;
+        }
+        return (A[]) Array.newInstance(annotationClass, 0);
+    }
+
+    @Override
+    public Method getMethod(String name, Type<?>... parameterTypes) throws NoSuchMethodException {
+        throw new NoSuchMethodException();
+    }
+
+    /**
+     * Must be called post construction of all the dynamic types to initialize table join fields.
+     * @param tableTypes A map of table name to type.
+     */
+    public void resolveJoins(Map<String, Type<?>> tableTypes) {
+        table.getJoins().forEach(join -> {
+            Type joinTableType = tableTypes.get(join.getTo());
+            fields.put(join.getName(),
+                    new FieldType(join.getName(), joinTableType, buildAnnotations(join)));
+        });
+    }
+
+    private static Map<Class<? extends Annotation>, Annotation> buildAnnotations(Join join) {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+        annotations.put(com.yahoo.elide.datastores.aggregation.annotation.Join.class,
+                new com.yahoo.elide.datastores.aggregation.annotation.Join() {
+                    @Override
+                    public Class<? extends Annotation> annotationType() {
+                        return com.yahoo.elide.datastores.aggregation.annotation.Join.class;
+                    }
+
+                    @Override
+                    public String value() {
+                        return trimColumnReferences(join.getDefinition());
+                    }
+
+                    @Override
+                    public JoinType type() {
+                        if (join.getType() == null) {
+                            return JoinType.LEFT;
+                        }
+                        return JoinType.valueOf(join.getType().name());
+                    }
+
+                    @Override
+                    public boolean toOne() {
+                        return join.getKind() == Join.Kind.TOONE;
+                    }
+                });
+        return annotations;
+    }
+
+    private static Map<Class<? extends Annotation>, Annotation> buildAnnotations(Table table) {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+
+        annotations.put(Include.class, getIncludeAnnotation(table));
+
+        if (table.getSql() != null && !table.getSql().isEmpty()) {
+            annotations.put(FromSubquery.class, new FromSubquery() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return FromSubquery.class;
+                }
+
+                @Override
+                public String sql() {
+                    return table.getSql();
+                }
+
+                @Override
+                public String dbConnectionName() {
+                    return table.getDbConnectionName();
+                }
+            });
+        } else {
+            annotations.put(FromTable.class, new FromTable() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return FromTable.class;
+                }
+
+                @Override
+                public String name() {
+                    String tableName = table.getTable();
+                    if (table.getSchema() != null && ! table.getSchema().isEmpty()) {
+                        return table.getSchema() + "." + tableName;
+
+                    }
+                    return tableName;
+                }
+
+                @Override
+                public String dbConnectionName() {
+                    return table.getDbConnectionName();
+                }
+            });
+        }
+
+        annotations.put(TableMeta.class, new TableMeta() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return TableMeta.class;
+            }
+
+            @Override
+            public String friendlyName() {
+                return table.getFriendlyName();
+            }
+
+            @Override
+            public String description() {
+                return table.getDescription();
+            }
+
+            @Override
+            public String category() {
+                return table.getCategory();
+            }
+
+            @Override
+            public String[] hints() {
+                return table.getHints().toArray(new String[0]);
+            }
+
+            @Override
+            public String[] tags() {
+                return table.getTags().toArray(new String[0]);
+            }
+
+            @Override
+            public String filterTemplate() {
+                return table.getFilterTemplate();
+            }
+
+            @Override
+            public boolean isFact() {
+                return table.getIsFact();
+            }
+
+            @Override
+            public boolean isHidden() {
+                return table.getHidden() != null && table.getHidden();
+            }
+
+            @Override
+            public CardinalitySize size() {
+                if (table.getCardinality() == null || table.getCardinality().isEmpty()) {
+                    return CardinalitySize.UNKNOWN;
+                }
+                return CardinalitySize.valueOf(table.getCardinality().toUpperCase(Locale.ENGLISH));
+            }
+
+            @Override
+            public ArgumentDefinition[] arguments() {
+                return getArgumentDefinitions(table.getArguments());
+            }
+        });
+
+        String readPermission = table.getReadAccess();
+        if (StringUtils.isNotEmpty(readPermission)) {
+            annotations.put(ReadPermission.class, new ReadPermission() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return ReadPermission.class;
+                }
+
+                @Override
+                public String expression() {
+                    return readPermission;
+                }
+            });
+        }
+        return annotations;
+    }
+
+    private static ArgumentDefinition[] getArgumentDefinitions(List<Argument> arguments) {
+        int numArguments = arguments == null ? 0 : arguments.size();
+        ArgumentDefinition[] definitions = new ArgumentDefinition[numArguments];
+        for (int idx = 0; idx < numArguments; idx++) {
+            Argument argument = arguments.get(idx);
+            definitions[idx] = new ArgumentDefinition() {
+
+                @Override
+                public String name() {
+                    return argument.getName();
+                }
+
+                @Override
+                public String description() {
+                    return argument.getDescription();
+                }
+
+                @Override
+                public ValueType type() {
+                    return ValueType.valueOf(argument.getType().toUpperCase(Locale.ROOT));
+                }
+
+                @Override
+                public TableSource tableSource() {
+                    return buildTableSource(argument.getTableSource());
+                }
+
+                @Override
+                public String[] values() {
+                    return argument.getValues().toArray(new String[0]);
+                }
+
+                @Override
+                public String defaultValue() {
+                    Object value = argument.getDefaultValue();
+                    return value == null ? null : value.toString();
+                }
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return ArgumentDefinition.class;
+                }
+            };
+        }
+        return definitions;
+    }
+    private static Map<Class<? extends Annotation>, Annotation> buildAnnotations(Measure measure) {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+
+        annotations.put(ColumnMeta.class, new ColumnMeta() {
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return ColumnMeta.class;
+            }
+
+            @Override
+            public String friendlyName() {
+                return measure.getFriendlyName();
+            }
+
+            @Override
+            public String description() {
+                return measure.getDescription();
+            }
+
+            @Override
+            public String category() {
+                return measure.getCategory();
+            }
+
+            @Override
+            public TableSource tableSource() {
+                return buildTableSource(null);
+            }
+
+            @Override
+            public String[] tags() {
+                return measure.getTags().toArray(new String[0]);
+            }
+
+            @Override
+            public String[] values() {
+                return new String[0];
+            }
+
+            @Override
+            public boolean isHidden() {
+                return measure.getHidden() != null && measure.getHidden();
+            }
+
+            @Override
+            public String filterTemplate() {
+                return measure.getFilterTemplate();
+            }
+
+            @Override
+            public CardinalitySize size() {
+                return CardinalitySize.UNKNOWN;
+            }
+        });
+
+        annotations.put(MetricFormula.class, new MetricFormula() {
+            @Override
+            public ArgumentDefinition[] arguments() {
+                return getArgumentDefinitions(measure.getArguments());
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return MetricFormula.class;
+            }
+
+            @Override
+            public String value() {
+                if (measure.getDefinition() != null) {
+                    return trimColumnReferences(measure.getDefinition());
+                } else {
+                    return "";
+                }
+            }
+
+            @Override
+            public Class<? extends MetricProjectionMaker> maker() {
+                if (measure.getMaker() == null || measure.getMaker().isEmpty()) {
+                    return DefaultMetricProjectionMaker.class;
+                }
+
+                try {
+                    return (Class<? extends MetricProjectionMaker>) Class.forName(measure.getMaker());
+                } catch (ClassNotFoundException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        });
+
+        String readPermission = measure.getReadAccess();
+        if (StringUtils.isNotEmpty(readPermission)) {
+            annotations.put(ReadPermission.class, new ReadPermission() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return ReadPermission.class;
+                }
+
+                @Override
+                public String expression() {
+                    return readPermission;
+                }
+            });
+        }
+
+        return annotations;
+    }
+
+    private static TableSource buildTableSource(com.yahoo.elide.modelconfig.model.TableSource source) {
+        if (source == null) {
+            return buildTableSource(
+                    new com.yahoo.elide.modelconfig.model.TableSource("", DEFAULT, "", new HashSet<>()));
+        }
+        return new TableSource() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return TableSource.class;
+            }
+
+            @Override
+            public String table() {
+                return source.getTable();
+            }
+
+            @Override
+            public String namespace() {
+                return source.getNamespace();
+            }
+
+            @Override
+            public String column() {
+                return source.getColumn();
+            }
+
+            @Override
+            public String[] suggestionColumns() {
+                return source.getSuggestionColumns().toArray(new String[0]);
+            }
+        };
+    }
+
+    private static Map<Class<? extends Annotation>, Annotation> buildAnnotations(Dimension dimension) {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+
+        annotations.put(ColumnMeta.class, new ColumnMeta() {
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return ColumnMeta.class;
+            }
+
+            @Override
+            public String friendlyName() {
+                return dimension.getFriendlyName();
+            }
+
+            @Override
+            public String description() {
+                return dimension.getDescription();
+            }
+
+            @Override
+            public String category() {
+                return dimension.getCategory();
+            }
+
+            @Override
+            public TableSource tableSource() {
+                return buildTableSource(dimension.getTableSource());
+            }
+
+            @Override
+            public String[] tags() {
+                return dimension.getTags().toArray(new String[0]);
+            }
+
+            @Override
+            public String[] values() {
+                return dimension.getValues().toArray(new String[0]);
+            }
+
+            @Override
+            public boolean isHidden() {
+                return dimension.getHidden() != null && dimension.getHidden();
+            }
+
+            @Override
+            public String filterTemplate() {
+                return dimension.getFilterTemplate();
+            }
+
+            @Override
+            public CardinalitySize size() {
+                if (dimension.getCardinality() == null || dimension.getCardinality().isEmpty()) {
+                    return CardinalitySize.UNKNOWN;
+                }
+                return CardinalitySize.valueOf(dimension.getCardinality().toUpperCase(Locale.ENGLISH));
+            }
+        });
+
+        annotations.put(DimensionFormula.class, new DimensionFormula() {
+            @Override
+            public ArgumentDefinition[] arguments() {
+                return getArgumentDefinitions(dimension.getArguments());
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return DimensionFormula.class;
+            }
+
+            @Override
+            public String value() {
+                return trimColumnReferences(dimension.getDefinition());
+            }
+        });
+
+        String readPermission = dimension.getReadAccess();
+        if (StringUtils.isNotEmpty(readPermission)) {
+            annotations.put(ReadPermission.class, new ReadPermission() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return ReadPermission.class;
+                }
+
+                @Override
+                public String expression() {
+                    return readPermission;
+                }
+            });
+        }
+
+        if (dimension.getType().toUpperCase(Locale.ROOT).equals(ENUM_ORDINAL)) {
+            annotations.put(Enumerated.class, getEnumeratedAnnotation(EnumType.ORDINAL));
+        }
+
+        if (dimension.getType().toUpperCase(Locale.ROOT).equals(TIME)) {
+            annotations.put(Temporal.class, new Temporal() {
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return Temporal.class;
+                }
+
+                @Override
+                public TimeGrainDefinition[] grains() {
+                    int numGrains = dimension.getGrains() == null ? 0 : dimension.getGrains().size();
+                    TimeGrainDefinition[] definitions = new TimeGrainDefinition[numGrains];
+                    for (int idx = 0; idx < numGrains; idx++) {
+                        Grain grain = dimension.getGrains().get(idx);
+                        definitions[idx] = new TimeGrainDefinition() {
+
+                            @Override
+                            public Class<? extends Annotation> annotationType() {
+                                return TimeGrainDefinition.class;
+                            }
+
+                            @Override
+                            public TimeGrain grain() {
+                                if (grain.getType() == null) {
+                                    return TimeGrain.DAY;
+                                }
+                                return TimeGrain.valueOf(grain.getType().name());
+                            }
+
+                            @Override
+                            public String expression() {
+                                String sql = grain.getSql();
+                                if (StringUtils.isEmpty(sql)) {
+                                    return "{{$$column.expr}}";
+                                }
+                                return grain.getSql();
+                            }
+                        };
+                    }
+                    return definitions;
+                }
+
+                @Override
+                public String timeZone() {
+                    return "UTC";
+                }
+            });
+        }
+
+        return annotations;
+    }
+
+    private static Enumerated getEnumeratedAnnotation(EnumType type) {
+        return new Enumerated() {
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Enumerated.class;
+            }
+
+            @Override
+            public EnumType value() {
+                return EnumType.ORDINAL;
+            }
+        };
+    }
+
+    private static Map<String, Field> buildFields(Table table) {
+        Map<String, Field> fields = new HashMap<>();
+        fields.put("id", buildIdField());
+
+        table.getDimensions().forEach(dimension ->
+            fields.put(dimension.getName(),
+                    new FieldType(dimension.getName(), getFieldType(dimension.getType()), buildAnnotations(dimension)))
+        );
+
+        table.getMeasures().forEach(measure ->
+            fields.put(measure.getName(),
+                    new FieldType(measure.getName(), getFieldType(measure.getType()), buildAnnotations(measure)))
+        );
+
+        return fields;
+    }
+
+    private static Field buildIdField() {
+        Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+        annotations.put(Id.class, new Id() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Id.class;
+            }
+        });
+
+        annotations.put(GeneratedValue.class, new GeneratedValue() {
+
+            @Override
+            public GenerationType strategy() {
+                return GenerationType.AUTO;
+            }
+
+            @Override
+            public String generator() {
+                return "";
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return GeneratedValue.class;
+            }
+        });
+
+        annotations.put(ColumnMeta.class, new ColumnMeta() {
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return ColumnMeta.class;
+            }
+
+            @Override
+            public String friendlyName() {
+                return "Row Number";
+            }
+
+            @Override
+            public String description() {
+                return "Row number for each record returned by a query.";
+            }
+
+            @Override
+            public String category() {
+                return null;
+            }
+
+            @Override
+            public TableSource tableSource() {
+                return buildTableSource(null);
+            }
+
+            @Override
+            public String[] tags() {
+                return new String[0];
+            }
+
+            @Override
+            public String[] values() {
+                return new String[0];
+            }
+
+            @Override
+            public boolean isHidden() {
+                return false;
+            }
+
+            @Override
+            public String filterTemplate() {
+                return "";
+            }
+
+            @Override
+            public CardinalitySize size() {
+                return CardinalitySize.UNKNOWN;
+            }
+        });
+
+        return new FieldType("id", LONG_TYPE, annotations);
+    }
+
+    private static Type getFieldType(String inputType) {
+        switch (inputType.toUpperCase(Locale.ROOT)) {
+            case TIME:
+                return TIME_TYPE;
+            case TEXT:
+            case ENUM_ORDINAL:
+            case ENUM_TEXT:
+                return STRING_TYPE;
+            case MONEY:
+                return BIGDECIMAL_TYPE;
+            case BOOLEAN:
+                return BOOLEAN_TYPE;
+            case DECIMAL:
+                return BIGDECIMAL_TYPE;
+            case INTEGER:
+                return LONG_TYPE;
+            case COORDINATE:
+                return STRING_TYPE;
+            default:
+                return STRING_TYPE;
+        }
+    }
+
+    /**
+     * Removes whitespace around column references.
+     * @param str eg: {{ playerCountry.id}} = {{country_id}}
+     * @return String without whitespace around column references eg: {{playerCountry.id}} = {{country_id}}
+     */
+    private static String trimColumnReferences(String str) {
+        String expr = replaceNewlineWithSpace(str);
+
+        Matcher matcher = REFERENCE_PARENTHESES.matcher(expr);
+        while (matcher.find()) {
+            String reference = matcher.group(1);
+            expr = expr.replace(reference, reference.trim());
+        }
+        return expr;
+    }
+
+    private static String replaceNewlineWithSpace(String str) {
+        return (str == null) ? null : NEWLINE.matcher(str).replaceAll(SPACE);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("TableType{ name=%s }", table.getGlobalName());
+    }
+
+    private static Include getIncludeAnnotation(Table table) {
+        return new Include() {
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Include.class;
+            }
+
+            @Override
+            public boolean rootLevel() {
+                return true;
+            }
+
+            @Override
+            public String description() {
+                return table.getDescription();
+            }
+
+            @Override
+            public String friendlyName() {
+                return table.getFriendlyName();
+            }
+
+            @Override
+            public String name() {
+                return table.getName();
+            }
+        };
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TableType tableType = (TableType) o;
+        return table.equals(tableType.table) && namespace.equals(tableType.namespace);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(table, namespace);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraints.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraints.java
new file mode 100644
index 0000000000..f2fdd7c15a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraints.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * {@link FilterConstraints} is an auxiliary class for {@link SplitFilterExpressionVisitor} that wraps a {@code WHERE}
+ * filter expression and {@code HAVING} filter expression.
+ * <p>
+ * {@link FilterConstraints} is thread-safe and can be accessed by multiple threads.
+ */
+public class FilterConstraints {
+
+    /**
+     * Creates a new {@link FilterConstraints} instance that wraps a specified {@code HAVING} filter expression only.
+     *
+     * @param havingExpression  A pure {@code HAVING} filter expression
+     *
+     * @return a new instance of {@link FilterConstraints}
+     *
+     * @throws NullPointerException if the provided {@code HAVING} filter expression is {@code null}
+     */
+    public static FilterConstraints pureHaving(FilterExpression havingExpression) {
+        return new FilterConstraints(
+                null,
+                Objects.requireNonNull(havingExpression, "havingExpression")
+        );
+    }
+
+    /**
+     * Creates a new {@link FilterConstraints} instance that wraps a specified {@code WHERE} filter expression only.
+     *
+     * @param whereExpression  A pure {@code WHERE} filter expression
+     *
+     * @return a new instance of {@link FilterConstraints}
+     *
+     * @throws NullPointerException if the provided {@code WHERE} filter expression is {@code null}
+     */
+    public static FilterConstraints pureWhere(FilterExpression whereExpression) {
+        return new FilterConstraints(
+                Objects.requireNonNull(whereExpression, "whereExpression"),
+                null
+        );
+    }
+
+    /**
+     * Creates a new {@link FilterConstraints} instance that wraps a pair of specified {@code WHERE} filter expression
+     * and {@code HAVING} filter expression.
+     *
+     * @param whereExpression  A pure {@code HAVING} filter expression
+     * @param havingExpression  A pure {@code WHERE} filter expression
+     *
+     * @return a new instance of {@link FilterConstraints}
+     *
+     * @throws NullPointerException if the provided {@code WHERE} or {@code HAVING} filter expression is {@code null}
+     */
+    public static FilterConstraints withWhereAndHaving(
+            FilterExpression whereExpression,
+            FilterExpression havingExpression
+    ) {
+        return new FilterConstraints(
+                Objects.requireNonNull(whereExpression, "whereExpression"),
+                Objects.requireNonNull(havingExpression, "havingExpression")
+        );
+    }
+
+    @Getter
+    private final FilterExpression whereExpression;
+
+    @Getter
+    private final FilterExpression havingExpression;
+
+    /**
+     * Private constructor.
+     *
+     * @param whereExpression
+     * @param havingExpression
+     */
+    private FilterConstraints(FilterExpression whereExpression, FilterExpression havingExpression) {
+        this.whereExpression = whereExpression;
+        this.havingExpression = havingExpression;
+    }
+
+    /**
+     * Returns whether or not this {@link FilterConstraints} filter expression pair contains only a {@code HAVING}
+     * expression, i.e. no {@code WHERE} clause.
+     *
+     * @return {@code true} if there is {@code HAVING} expression only and not {@code WHERE} expression.
+     */
+    public boolean isPureHaving() {
+        return getWhereExpression() == null && getHavingExpression() != null;
+    }
+
+    /**
+     * Returns whether or not this {@link FilterConstraints} filter expression pair contains only a {@code WHERE}
+     * expression, i.e. no {@code HAVING} clause.
+     *
+     * @return {@code true} if there is {@code HAVING} expression only and not {@code WHERE} expression.
+     */
+    public boolean isPureWhere() {
+        return getWhereExpression() != null && getHavingExpression() == null;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitor.java
new file mode 100644
index 0000000000..d8e9f7d691
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitor.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.FilterExpressionNormalizationVisitor;
+import com.yahoo.elide.core.request.Argument;
+import com.google.common.base.Preconditions;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Validates whether a client provided filter either:
+ * 1. Directly matches a template filter.
+ * 2. Contains through conjunction (logical AND) a filter expression that matches a template filter.
+ * This is used to enforce table filter constraints.
+ *
+ * Any matching template variables are extracted from the filter expression.
+ */
+public class MatchesTemplateVisitor implements FilterExpressionVisitor<Boolean> {
+    private static final Pattern TEMPLATE_PATTERN = Pattern.compile("\\{\\{(\\w+)\\}\\}");
+
+    private FilterExpression expressionToMatch;
+    private Map<String, Argument> arguments;
+
+    public MatchesTemplateVisitor(FilterExpression expressionToMatch) {
+        this.expressionToMatch = expressionToMatch;
+        this.arguments = new HashMap<>();
+    }
+
+    @Override
+    public Boolean visitPredicate(FilterPredicate filterPredicate) {
+        return matches(expressionToMatch, filterPredicate);
+    }
+
+    @Override
+    public Boolean visitAndExpression(AndFilterExpression expression) {
+        return matches(expressionToMatch, expression)
+                || expression.getLeft().accept(this)
+                || expression.getRight().accept(this);
+    }
+
+    @Override
+    public Boolean visitOrExpression(OrFilterExpression expression) {
+        return matches(expressionToMatch, expression);
+    }
+
+    @Override
+    public Boolean visitNotExpression(NotFilterExpression expression) {
+        return matches(expressionToMatch, expression);
+    }
+
+    private boolean matches(FilterExpression a, FilterExpression b) {
+        if (! a.getClass().equals(b.getClass())) {
+            return false;
+        }
+
+        if (a instanceof AndFilterExpression) {
+            AndFilterExpression andA = (AndFilterExpression) a;
+            AndFilterExpression andB = (AndFilterExpression) b;
+
+            return matches(andA.getLeft(), andB.getLeft()) && matches(andA.getRight(), andB.getRight());
+        }
+        if (a instanceof OrFilterExpression) {
+            OrFilterExpression orA = (OrFilterExpression) a;
+            OrFilterExpression orB = (OrFilterExpression) b;
+
+            return matches(orA.getLeft(), orB.getLeft()) && matches(orA.getRight(), orB.getRight());
+        }
+        if (a instanceof NotFilterExpression) {
+            NotFilterExpression notA = (NotFilterExpression) a;
+            NotFilterExpression notB = (NotFilterExpression) b;
+
+            return matches(notA.getNegated(), notB.getNegated());
+        }
+        FilterPredicate predicateA = (FilterPredicate) a;
+        FilterPredicate predicateB = (FilterPredicate) b;
+
+        boolean valueMatches = predicateA.getValues().equals(predicateB.getValues());
+        boolean operatorMatches = predicateA.getOperator().equals(predicateB.getOperator());
+        boolean pathMatches = pathMatches(predicateA.getPath(), predicateB.getPath());
+
+        boolean usingTemplate = false;
+
+        if (predicateA.getValues().size() == 1) {
+            String value = predicateA.getValues().get(0).toString();
+            Matcher matcher = TEMPLATE_PATTERN.matcher(value);
+
+            usingTemplate = matcher.matches();
+
+            if (usingTemplate && pathMatches & operatorMatches) {
+                String argumentName = matcher.group(1);
+
+                arguments.put(argumentName, Argument.builder()
+                        .name(argumentName)
+                        .value(predicateB.getValues().size() == 1
+                                ? predicateB.getValues().get(0)
+                                : predicateB.getValues())
+                        .build());
+            }
+        }
+
+        return (operatorMatches && pathMatches && (valueMatches || usingTemplate));
+    }
+
+    private boolean pathMatches(Path a, Path b) {
+        if (a.getPathElements().size() != b.getPathElements().size()) {
+            return false;
+        }
+
+        for (int idx = 0; idx < a.getPathElements().size(); idx++) {
+            Path.PathElement aElement = a.getPathElements().get(idx);
+            Path.PathElement bElement = b.getPathElements().get(idx);
+
+            if (! aElement.getType().equals(bElement.getType())) {
+                return false;
+            }
+
+            if (! aElement.getFieldName().equals(bElement.getFieldName())) {
+                return false;
+            }
+
+            //We only compare path arguments if Path a (the template) has them.
+            if (aElement.getArguments().size() > 0 && ! aElement.getArguments().equals(bElement.getArguments())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Determines if a client filter matches or contains a subexpression that matches a template filter.
+     * @param templateFilter A templated filter expression
+     * @param clientFilter The client provided filter expression.
+     * @param arguments If the client filter matches, extract any table arguments.
+     * @return True if the client filter matches.  False otherwise.
+     */
+    public static boolean isValid(
+            FilterExpression templateFilter,
+            FilterExpression clientFilter,
+            Map<String, Argument> arguments
+    ) {
+        Preconditions.checkNotNull(templateFilter);
+
+        if (clientFilter == null) {
+            return false;
+        }
+
+        //First we normalize the filters so any NOT clauses are pushed down immediately in front of a predicate.
+        //This lets us treat logical AND and OR without regard for any preceding NOT clauses.
+        FilterExpression normalizedTemplateFilter = templateFilter.accept(new FilterExpressionNormalizationVisitor());
+        FilterExpression normalizedClientFilter = clientFilter.accept(new FilterExpressionNormalizationVisitor());
+
+        MatchesTemplateVisitor templateVisitor = new MatchesTemplateVisitor(normalizedTemplateFilter);
+        boolean matches = normalizedClientFilter.accept(templateVisitor);
+
+        if (matches) {
+            arguments.putAll(templateVisitor.arguments);
+        }
+
+        return matches;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitor.java
new file mode 100644
index 0000000000..55a44155ed
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitor.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.FilterExpressionNormalizationVisitor;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Objects;
+
+/**
+ * {@link SplitFilterExpressionVisitor} splits the {@link FilterExpression} into a {@code WHERE} expression and a
+ * {@code Having} expression.
+ * <p>
+ * {@link SplitFilterExpressionVisitor} is leveraged by the AggregationStore to construct the JPQL query.
+ * {@link FilterExpression} for AggregationDataStore must be split into those that apply to metric aggregations
+ * ({@code HAVING} clauses) and those that apply to dimensions ({@code WHERE} clauses), although only a single
+ * {@link FilterExpression} is passed to the datastore in each query. The split groups {@code HAVING} clauses and
+ * {@code WHERE} clauses separately. For example:
+ * <pre>
+ * +-------------------+-----------------------------+------------------------+
+ * |    Expression     |             SQL             | WHERE-clause Promotion |
+ * +-------------------+-----------------------------+------------------------+
+ * | H1 AND W1 AND H2  | WHERE W1 HAVING (H1 AND H2) | No                     |
+ * | (H1 OR H2) AND W1 | WHERE W1 HAVING (H1 OR H2)  | No                     |
+ * | H1 OR W1          | HAVING (H1 OR W1)           | Yes                    |
+ * | (W1 AND H1) OR W2 | HAVING ((W1 AND H1) OR W2)  | Yes                    |
+ * +-------------------+-----------------------------+------------------------+
+ * </pre>
+ * Note that {@link SplitFilterExpressionVisitor} might incur more-than-expected network I/O in the case of WHERE-clause
+ * promotion.
+ * <p>
+ * {@link SplitFilterExpressionVisitor} splits by storing {@code WHERE} and {@code HAVING} clauses in
+ * {@link Pair#getLeft() left} and {@link Pair#getRight() right} of a {@link Pair}, respectively. For example:
+ * <pre>
+ * {@code
+ * Pair<FilterExpression, FilterExpression> filterPair = filterExpression.accept(splitFilterExpressionVisitor);
+ *
+ * FilterExpression whereClauseFilter = filterPair.getLeft();
+ * FilterExpression havingClauseFilter = filterPair.getRight();
+ * }
+ * </pre>
+ * {@link SplitFilterExpressionVisitor} is thread-safe and can be accessed by multiple threads at the same time.
+ */
+@Slf4j
+public class SplitFilterExpressionVisitor implements FilterExpressionVisitor<FilterConstraints> {
+
+    @Getter(value = AccessLevel.PRIVATE)
+    private final Table table;
+
+    @Getter(value = AccessLevel.PRIVATE)
+    private final FilterExpressionNormalizationVisitor normalizationVisitor;
+
+    /**
+     * Constructor.
+     *
+     * @param table  Object that offers meta information about an entity field
+     *
+     * @throws NullPointerException if any one of the argument is {@code null}
+     */
+    public SplitFilterExpressionVisitor(final Table table) {
+        this.table = Objects.requireNonNull(table, "table");
+        this.normalizationVisitor = new FilterExpressionNormalizationVisitor();
+    }
+
+    @Override
+    public FilterConstraints visitPredicate(final FilterPredicate filterPredicate) {
+        return isHavingPredicate(filterPredicate)
+                ? FilterConstraints.pureHaving(filterPredicate) // this filterPredicate belongs to a HAVING clause
+                : FilterConstraints.pureWhere(filterPredicate); // this filterPredicate belongs to a WHERE clause
+    }
+
+    @Override
+    public FilterConstraints visitAndExpression(final AndFilterExpression expression) {
+        /*
+         * Definition:
+         *     C = condition
+         *     pure-W = WHERE C
+         *     pure-H = HAVING C
+         *     mix-HW = WHERE C HAVING C'
+         *
+         * Given that L and R operands of an AndFilterExpression can only be one of "pure-H", "pure-W", or "mix-HW",
+         * then:
+         *
+         *     pure-W1 AND pure-W2 = WHERE C1 AND WHERE C2 = WHERE (C1 AND C2)    = pure-W
+         *     pure-H1 AND pure-H2 = HAVING C1 AND HAVING C2 = HAVING (C1 AND C2) = pure-H
+         *
+         *     pure-H1 AND pureW2 = HAVING C1 AND WHERE C2 = WHERE C2 HAVING C1   = mix-HW
+         *     pure-W1 AND pureH2                          = WHERE C1 HAVING C2   = mix-HW
+         *
+         *     mix-HW1 AND pure-W2 = WHERE C1 HAVING C1' AND WHERE C2 = WHERE (C1 & C2) HAVING C1'  = mix-HW
+         *     mix-HW1 AND pure-H2 = WHERE C1 HAVING C1' AND HAVING C2 = WHERE C1 HAVING (C1' & C2) = mix-HW
+         *
+         *     mix-HW1 AND mim-HW2 = WHERE C1 HAVING C1' AND WHERE C2 HAVING C2' = WHERE (C1 & C2) HAVING (C1' & C2')
+         *                         = mix-HW
+         */
+
+        FilterConstraints left = expression.getLeft().accept(this);
+        FilterConstraints right = expression.getRight().accept(this);
+
+        if (left.isPureWhere() && right.isPureWhere()) {
+            // pure-W1 AND pure-W2 = WHERE (C1 & C2) = pure-W
+            return FilterConstraints.pureWhere(
+                    new AndFilterExpression(
+                            left.getWhereExpression(),
+                            right.getWhereExpression()
+                    )
+            );
+        }
+        if (left.isPureHaving() && right.isPureHaving()) {
+            // pure-H1 AND pure-H2 = HAVING (C1 AND C2) = pure-H
+            return FilterConstraints.pureHaving(
+                    new AndFilterExpression(
+                            left.getHavingExpression(),
+                            right.getHavingExpression()
+                    )
+            );
+        }
+        // all of the rests are mix-HW
+        return FilterConstraints.withWhereAndHaving(
+                AndFilterExpression.fromPair(
+                        left.getWhereExpression(),
+                        right.getWhereExpression()
+                ),
+                AndFilterExpression.fromPair(
+                        left.getHavingExpression(),
+                        right.getHavingExpression()
+                )
+        );
+    }
+
+    @Override
+    public FilterConstraints visitOrExpression(final OrFilterExpression expression) {
+        /*
+         * Definition:
+         *     C = condition
+         *     pure-W = WHERE C
+         *     pure-H = HAVING C
+         *     mix-HW = WHERE C HAVING C'
+         *
+         * Given that L and R operands of an OrFilterExpression can only be one of "pure-H", "pure-W", or "mix-HW",
+         * then:
+         *
+         *     pure-W1 OR pure-W2 = WHERE C1 OR WHERE C2 = WHERE (C1 OR C2)    = pure-W
+         *     pure-H1 OR pure-H2 = HAVING C1 OR HAVING C2 = HAVING (C1 OR C2) = pure-H
+         *
+         *     pure-H1 OR pureW2 = HAVING C1 OR WHERE C2 = HAVING (C1 OR C2)   = pure-H
+         *     pure-W1 OR pureH2 = WHERE C1 OR HAVING C2 = HAVING (C1 OR C2)   = pure-H
+         *
+         *     mix-HW1 OR pure-W2 = (WHERE C1 HAVING C1') OR WHERE C2 = HAVING (C1 & C1' | C2)  = pure-H
+         *     mix-HW1 OR pure-H2 = (WHERE C1 HAVING C1') OR HAVING C2 = HAVING (C1 & C1' | C2) = pure-H
+         *
+         *     mix-HW1 OR mim-HW2 = (WHERE C1 HAVING C1') OR (WHERE C2 HAVING C2') = HAVING ((C1 & C1') | (C2 & C2'))
+         *                        = pure-H
+         */
+
+        FilterConstraints left = expression.getLeft().accept(this);
+        FilterConstraints right = expression.getRight().accept(this);
+
+        if (left.isPureWhere() && right.isPureWhere()) {
+            // pure-W1 OR pure-W2 = WHERE (C1 OR C2) = pure-W
+            return FilterConstraints.pureWhere(
+                    OrFilterExpression.fromPair(
+                            left.getWhereExpression(),
+                            right.getWhereExpression()
+                    )
+            );
+        }
+        // all of the rests are pure-H
+        return FilterConstraints.pureHaving(
+                OrFilterExpression.fromPair(
+                        AndFilterExpression.fromPair(
+                                left.getWhereExpression(),
+                                left.getHavingExpression()
+                        ),
+                        AndFilterExpression.fromPair(
+                                right.getWhereExpression(),
+                                right.getHavingExpression()
+                        )
+                )
+        );
+    }
+
+    @Override
+    public FilterConstraints visitNotExpression(NotFilterExpression expression) {
+        FilterExpression normalized = getNormalizationVisitor().visitNotExpression(expression);
+
+        if (normalized instanceof AndFilterExpression) {
+            return visitAndExpression((AndFilterExpression) normalized);
+        }
+        if (normalized instanceof OrFilterExpression) {
+            return visitOrExpression((OrFilterExpression) normalized);
+        }
+        if (normalized instanceof NotFilterExpression) {
+            FilterConstraints negatedConstraint = visitNotExpression((NotFilterExpression) normalized);
+
+            if (negatedConstraint.isPureWhere()) {
+                return FilterConstraints.pureWhere(new NotFilterExpression(negatedConstraint.getWhereExpression()));
+            }
+            // It is not possible to have a mixed where/having for a NotFilterExpression after normalization
+            // so this must be a pure HAVING
+            return FilterConstraints.pureHaving(new NotFilterExpression(negatedConstraint.getHavingExpression()));
+        }
+        return visitPredicate((FilterPredicate) normalized);
+    }
+
+    /**
+     * Returns whether or not a {@link FilterPredicate} corresponds to a {@code HAVING} clause in JPQL query.
+     * <p>
+     * A {@link FilterPredicate} corresponds to a {@code HAVING} clause iff the predicate field has
+     * {@link MetricFormula} annotation on it.
+     *
+     * @param filterPredicate  The terminal filter expression to check for
+     *
+     * @return {@code true} if the {@link FilterPredicate} is a HAVING clause
+     */
+    private boolean isHavingPredicate(final FilterPredicate filterPredicate) {
+        String fieldName = filterPredicate.getField();
+
+        return getTable().isMetric(fieldName);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContext.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContext.java
new file mode 100644
index 0000000000..8279a06336
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContext.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.core.request.Argument.getArgumentMapFromString;
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.datastores.aggregation.query.ColumnProjection.createSafeAlias;
+import static java.util.Collections.emptyMap;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLJoin;
+import com.github.jknack.handlebars.EscapingStrategy;
+import com.github.jknack.handlebars.Formatter;
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.HandlebarsException;
+import com.github.jknack.handlebars.Options;
+import com.github.jknack.handlebars.Template;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Context for resolving all handlebars in provided expression.
+ */
+@Getter
+@ToString
+@Builder
+public class ColumnContext extends HashMap<String, Object> {
+
+    public static final String COL_PREFIX = "$$column";
+    public static final String TBL_PREFIX = "$$table";
+    public static final String ARGS_KEY = "args";
+    public static final String EXPR_KEY = "expr";
+    public static final String PERIOD = ".";
+
+    protected final MetaDataStore metaDataStore;
+    protected final Queryable queryable;
+    protected final String alias;
+    protected final ColumnProjection column;
+    protected final Map<String, Argument> tableArguments;
+
+    private final Handlebars handlebars = new Handlebars()
+            .with(EscapingStrategy.NOOP)
+            .with((Formatter) (value, next) -> {
+                if (value instanceof com.yahoo.elide.core.request.Argument) {
+                    return ((com.yahoo.elide.core.request.Argument) value).getValue();
+                }
+                return next.format(value);
+            })
+            .registerHelper("sql", this::resolveSQLHandlebar);
+
+    public Object get(Object key) {
+
+        String keyStr = key.toString();
+
+        // Physical References starts with $
+        if (keyStr.lastIndexOf('$') == 0) {
+            return resolvePhysicalReference(this, keyStr);
+        }
+
+        if (keyStr.equals(TBL_PREFIX)) {
+            return TableSubContext.tableSubContextBuilder()
+                            .tableArguments(this.tableArguments)
+                            .build();
+        }
+
+        if (keyStr.equals(COL_PREFIX)) {
+            return ColumnSubContext.columnSubContextBuilder()
+                            .queryable(this.getQueryable())
+                            .alias(this.getAlias())
+                            .metaDataStore(this.getMetaDataStore())
+                            .column(this.getColumn())
+                            .tableArguments(this.getTableArguments())
+                            .build();
+        }
+
+        if (this.queryable.hasJoin(keyStr)) {
+            return getJoinContext(keyStr);
+        }
+
+        // Check if key exists in Map.
+        Object value = getOrDefault(key, null);
+        if (value != null) {
+            return value;
+        }
+
+        // In case of colA references colB and user query has both colA and colB,
+        // we should use default arguments for colB while resolving colA instead of user provided argument for colB.
+        // so taking colB's details from current queryable's source.
+        ColumnProjection column = this.getQueryable().getSource().getColumnProjection(keyStr);
+        if (column != null) {
+
+            ColumnProjection newColumn = column.withArguments(
+                            mergedArgumentMap(column.getArguments(),
+                                              this.getColumn().getArguments()));
+
+            return getNewContext(this, newColumn).resolve(newColumn.getExpression());
+        }
+
+        throw new HandlebarsException(new Throwable("Couldn't find: " + keyStr));
+    }
+
+    protected String resolvePhysicalReference(ColumnContext context, String key) {
+        String resolvedExpr = context.getAlias() + PERIOD + key.substring(1);
+        return applyQuotes(resolvedExpr, context.getQueryable().getDialect());
+    }
+
+    protected ColumnContext getJoinContext(String key) {
+        SQLJoin sqlJoin = this.queryable.getJoin(key);
+
+        String joinExpression = sqlJoin.getJoinExpression();
+        PhysicalRefColumnContext context = PhysicalRefColumnContext.physicalRefContextBuilder()
+                        .queryable(this.getQueryable())
+                        .metaDataStore(this.getMetaDataStore())
+                        .column(this.getColumn())
+                        .tableArguments(this.getTableArguments())
+                        .build();
+
+        // This will resolve everything within join expression except Physical References, Use this resolved value
+        // to create alias for join dynamically.
+        String resolvedJoinExpr = context.resolve(joinExpression);
+        String joinAlias = createSafeAlias(appendAlias(this.alias, key), resolvedJoinExpr);
+
+        Queryable joinQueryable = metaDataStore.getTable(sqlJoin.getJoinTableType());
+        ColumnContext joinCtx = ColumnContext.builder()
+                        .queryable(joinQueryable)
+                        .alias(joinAlias)
+                        .metaDataStore(this.metaDataStore)
+                        .column(this.column)
+                        .tableArguments(mergedArgumentMap(joinQueryable.getArguments(),
+                                                          this.getTableArguments()))
+                        .build();
+
+        return joinCtx;
+    }
+
+    protected ColumnContext getNewContext(ColumnContext context, ColumnProjection newColumn) {
+        return ColumnContext.builder()
+                        .queryable(context.getQueryable())
+                        .alias(context.getAlias())
+                        .metaDataStore(context.getMetaDataStore())
+                        .column(newColumn)
+                        .tableArguments(context.getTableArguments())
+                        .build();
+    }
+
+    /**
+     * Resolves the handlebars with in expression.
+     * @param expression Expression to resolve.
+     * @return fully resolved expression.
+     * @throws IllegalStateException for any handlebars error.
+     */
+    public String resolve(String expression) {
+        try {
+            Template template = handlebars.compileInline(expression);
+            return template.apply(this);
+        } catch (IOException e) {
+            throw new IllegalStateException(e.getMessage());
+        }
+    }
+
+    private Object resolveSQLHandlebar(final Object context, final Options options)
+                    throws UnsupportedEncodingException {
+        String from = options.hash("from");
+        String columnName = options.hash("column");
+        int argsIndex = columnName.indexOf('[');
+        String invokedColumnName = columnName;
+
+        ColumnContext currentCtx = (ColumnContext) context;
+        // 'from' is optional, so if not provided use the same table context.
+        ColumnContext invokedCtx = isBlank(from) ? currentCtx
+                                                 : (ColumnContext) currentCtx.get(from);
+
+        Map<String, Argument> pinnedArgs = new HashMap<>();
+
+        if (argsIndex >= 0) {
+            pinnedArgs = getArgumentMapFromString(columnName.substring(argsIndex));
+            invokedColumnName = columnName.substring(0, argsIndex);
+        }
+
+        // Physical References starts with $
+        if (invokedColumnName.lastIndexOf('$') == 0) {
+            return resolvePhysicalReference(invokedCtx, invokedColumnName);
+        }
+
+        ColumnProjection column = invokedCtx.getQueryable().getSource().getColumnProjection(invokedColumnName);
+        if (column != null) {
+
+            ColumnProjection newColumn = column.withArguments(
+                            mergedArgumentMap(column.getArguments(),
+                                              invokedCtx.getColumn().getArguments(),
+                                              pinnedArgs));
+
+            return getNewContext(invokedCtx, newColumn).resolve(newColumn.getExpression());
+        }
+
+        throw new HandlebarsException(new Throwable("Couldn't find: " + invokedColumnName));
+    }
+
+    /**
+     * Checks if referenced {@link ColumnProjection} or {@link Queryable} arguments are available in either calling
+     * object's arguments or in fixed arguments. If yes, use that value. Fixed arguments gets preference over calling
+     * object's arguments.
+     * @param referencedObjectArgs referenced {@link ColumnProjection} or {@link Queryable} arguments.
+     * @param callingObjectArgs calling {@link ColumnProjection} or {@link Queryable} arguments.
+     * @param fixedArgs Fixed arguments.
+     * @return Available arguments for referenced {@link ColumnProjection} or {@link Queryable}.
+     */
+    public static Map<String, Argument> mergedArgumentMap(Map<String, Argument> referencedObjectArgs,
+                                                          Map<String, Argument> callingObjectArgs,
+                                                          Map<String, Argument> fixedArgs) {
+
+        Map<String, Argument> columnArgMap = new HashMap<>();
+
+        referencedObjectArgs.forEach((argName, arg) -> {
+            if (fixedArgs.containsKey(argName)) {
+                columnArgMap.put(argName, fixedArgs.get(argName));
+            } else if (callingObjectArgs.containsKey(argName)) {
+                columnArgMap.put(argName, callingObjectArgs.get(argName));
+            } else {
+                columnArgMap.put(argName, arg);
+            }
+        });
+
+        return columnArgMap;
+    }
+
+    /**
+     * Checks if referenced {@link ColumnProjection} or {@link Queryable} arguments are available in calling
+     * object's arguments. If yes, use that value.
+     * @param referencedObjectArgs referenced {@link ColumnProjection} or {@link Queryable} arguments.
+     * @param callingObjectArgs calling {@link ColumnProjection} or {@link Queryable} arguments.
+     * @return Available arguments for referenced {@link ColumnProjection} or {@link Queryable}.
+     */
+    public static Map<String, Argument> mergedArgumentMap(Map<String, Argument> referencedObjectArgs,
+                    Map<String, Argument> callingObjectArgs) {
+        return mergedArgumentMap(referencedObjectArgs, callingObjectArgs, emptyMap());
+    }
+
+    /**
+     * Split a string on ".", append quotes around each split and join it back.
+     * eg: game.order_details to `game`.`order_details` .
+     *
+     * @param str column name / alias
+     * @param beginQuote prefix char
+     * @param endQuote suffix char
+     * @return quoted string
+     */
+    private static String applyQuotes(String str, char beginQuote, char endQuote) {
+        if (isBlank(str)) {
+            return str;
+        }
+        if (str.contains(PERIOD)) {
+            return beginQuote + str.trim().replace(PERIOD, endQuote + PERIOD + beginQuote) + endQuote;
+        }
+        return beginQuote + str.trim() + endQuote;
+    }
+
+    /**
+     * Split a string on ".", append quotes around each split and join it back.
+     * eg: game.order_details to `game`.`order_details` .
+     *
+     * @param str column name / alias
+     * @param dialect Elide SQL dialect
+     * @return quoted string
+     */
+    public static String applyQuotes(String str, SQLDialect dialect) {
+        return applyQuotes(str, dialect.getBeginQuote(), dialect.getEndQuote());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnSubContext.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnSubContext.java
new file mode 100644
index 0000000000..fe425b4744
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnSubContext.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.github.jknack.handlebars.HandlebarsException;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Map;
+
+/**
+ * Context for resolving args, expr etc under $$column. eg: {{$$column.args.arg1}}, {{$$column.expr}}.
+ */
+@Getter
+@ToString
+public class ColumnSubContext extends ColumnContext {
+
+    @Builder(builderMethodName = "columnSubContextBuilder")
+    public ColumnSubContext(MetaDataStore metaDataStore, Queryable queryable, String alias,
+                    ColumnProjection column, Map<String, Argument> tableArguments) {
+        super(metaDataStore, queryable, alias, column, tableArguments);
+    }
+
+    @Override
+    public Object get(Object key) {
+
+        if (key.equals(ARGS_KEY)) {
+            return this.getColumn().getArguments();
+        }
+
+        if (key.equals(EXPR_KEY)) {
+            return ColumnContext.builder()
+                            .queryable(this.getQueryable())
+                            .alias(this.getAlias())
+                            .metaDataStore(this.getMetaDataStore())
+                            .column(this.getColumn())
+                            .tableArguments(this.getTableArguments())
+                            .build()
+                            .resolve(this.getColumn().getExpression());
+        }
+
+        throw new HandlebarsException(new Throwable("Couldn't find: " + key));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/FormulaValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/FormulaValidator.java
new file mode 100644
index 0000000000..a30a1c6d99
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/FormulaValidator.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * FormulaValidator check whether a column defined with {@link MetricFormula} or
+ * {@link DimensionFormula} has reference loop. If so, throw out exception.
+ */
+public class FormulaValidator extends ExpressionParser {
+    private final LinkedHashSet<String> visited = new LinkedHashSet<>();
+
+    private static String getColumnId(Queryable parent, ColumnProjection column) {
+        return parent.getName() + "." + column.getName();
+    }
+
+    public FormulaValidator(MetaDataStore metaDataStore) {
+        super(metaDataStore);
+    }
+
+    @Override
+    public List<Reference> parse(Queryable source, ColumnProjection column) {
+        String columnId = getColumnId(source, column);
+
+        if (!visited.add(columnId)) {
+            throw new IllegalArgumentException(referenceLoopMessage(visited, source, column));
+        }
+        List<Reference> references = parse(source, column.getExpression());
+        visited.remove(columnId);
+
+        return references;
+    }
+
+    /**
+     * Construct reference loop message.
+     */
+    private static String referenceLoopMessage(LinkedHashSet<String> visited, Queryable source,
+                                               ColumnProjection conflict) {
+        return "Formula reference loop found: "
+                + visited.stream()
+                    .collect(Collectors.joining("->"))
+                + "->" + getColumnId(source, conflict);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStore.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStore.java
new file mode 100644
index 0000000000..99f6969e67
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStore.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static com.yahoo.elide.datastores.aggregation.AggregationDataStore.IS_FIELD_HIDDEN;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT_NAMESPACE;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.EMPTY;
+import com.yahoo.elide.annotation.ApiVersion;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.DuplicateMappingException;
+import com.yahoo.elide.core.exceptions.InternalServerErrorException;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage;
+import com.yahoo.elide.datastores.aggregation.dynamic.TableType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TableSource;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimensionGrain;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Versioned;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import org.apache.commons.lang3.tuple.Pair;
+import org.hibernate.annotations.Subselect;
+import lombok.Getter;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.persistence.Entity;
+
+/**
+ * MetaDataStore is a in-memory data store that manage data models for an {@link AggregationDataStore}.
+ */
+public class MetaDataStore implements DataStore {
+
+    private static final Package META_DATA_PACKAGE = Table.class.getPackage();
+
+    private static final List<Class<? extends Annotation>> METADATA_STORE_ANNOTATIONS =
+            Arrays.asList(FromTable.class, FromSubquery.class, Subselect.class, javax.persistence.Table.class,
+                    javax.persistence.Entity.class);
+
+    private static final Function<String, HashMapDataStore> SERVER_ERROR = key -> {
+        throw new InternalServerErrorException("API version " + key + " not found");
+    };
+
+    @Getter
+    private final Set<Type<?>> modelsToBind;
+
+    private final Map<Pair<String, String>, NamespacePackage> namespacesToBind = new HashMap<>();
+
+    @Getter
+    private boolean enableMetaDataStore = false;
+
+    private Map<Type<?>, Table> tables = new HashMap<>();
+    private Set<Namespace> namespaces = new HashSet<>();
+
+    @Getter
+    private final EntityDictionary metadataDictionary;
+
+    @Getter
+    private Map<String, HashMapDataStore> hashMapDataStores = new HashMap<>();
+
+    private final Set<Class<?>> metadataModelClasses;
+
+    public MetaDataStore(
+            ClassScanner scanner,
+            Collection<com.yahoo.elide.modelconfig.model.Table> tables,
+            boolean enableMetaDataStore) {
+        this(scanner, tables, new HashSet<>(), enableMetaDataStore);
+    }
+
+    public MetaDataStore(ClassScanner scanner, Collection<com.yahoo.elide.modelconfig.model.Table> tables,
+            Collection<com.yahoo.elide.modelconfig.model.NamespaceConfig> namespaceConfigs,
+            boolean enableMetaDataStore) {
+        this(scanner, getClassType(getAllAnnotatedClasses(scanner)), enableMetaDataStore);
+
+        Map<String, Type<?>> typeMap = new HashMap<>();
+        Set<String> joinNames = new HashSet<>();
+        Set<Type<?>> dynamicTypes = new HashSet<>();
+
+        Map<String, NamespacePackage> namespaceMap = new HashMap<>();
+        //Convert namespaces into packages.
+
+        namespaceConfigs.stream().forEach(namespace -> {
+            NamespacePackage namespacePackage = new NamespacePackage(namespace);
+            ApiVersion apiVersion = namespacePackage.getDeclaredAnnotation(ApiVersion.class);
+            String apiVersionName = apiVersion != null ? apiVersion.version() : NO_VERSION;
+
+            Pair<String, String> registration = Pair.of(namespacePackage.getName(), apiVersionName);
+            namespacesToBind.put(registration, namespacePackage);
+        });
+
+        //Convert tables into types.
+        tables.stream().forEach(table -> {
+
+            //TODO - when table versions are added, use the table version.
+            Pair<String, String> registration = Pair.of(table.getNamespace(), NO_VERSION);
+
+            if (! namespacesToBind.containsKey(registration)) {
+                if (table.getNamespace() != DEFAULT) {
+                    throw new IllegalStateException("No matching namespace found: " + table.getNamespace());
+                }
+
+                registration = Pair.of(EMPTY, NO_VERSION);
+                namespacesToBind.put(registration, DEFAULT_NAMESPACE);
+            }
+
+            TableType tableType = new TableType(table, namespacesToBind.get(registration));
+            dynamicTypes.add(tableType);
+            typeMap.put(table.getGlobalName(), tableType);
+            table.getJoins().stream().forEach(join ->
+                joinNames.add(join.getTo())
+            );
+        });
+
+        //Built a list of static types referenced from joins in the dynamic types.
+        metadataDictionary.getBindings().stream()
+                .filter(binding -> joinNames.contains(binding.getJsonApiType()))
+                .forEach(staticType ->
+                    typeMap.put(staticType.getJsonApiType(), staticType.getEntityClass())
+                );
+
+        //Resolve the join fields & bind the dynamic types.
+        dynamicTypes.stream().forEach(table -> {
+            ((TableType) table).resolveJoins(typeMap);
+            String version = EntityDictionary.getModelVersion(table);
+            HashMapDataStore hashMapDataStore = hashMapDataStores.computeIfAbsent(version,
+                    getHashMapDataStoreInitializer(scanner));
+            hashMapDataStore.getDictionary().bindEntity(table, IS_FIELD_HIDDEN);
+            this.metadataDictionary.bindEntity(table, IS_FIELD_HIDDEN);
+            this.modelsToBind.add(table);
+            this.hashMapDataStores.putIfAbsent(version, hashMapDataStore);
+        });
+    }
+
+    public MetaDataStore(ClassScanner scanner, boolean enableMetaDataStore) {
+        this(scanner, getClassType(getAllAnnotatedClasses(scanner)), enableMetaDataStore);
+    }
+
+    /**
+     * get all MetaDataStore supported annotated classes.
+     * @return Set of Class with specific annotations.
+     */
+    private static Set<Class<?>> getAllAnnotatedClasses(ClassScanner scanner) {
+        return scanner.getAnnotatedClasses(METADATA_STORE_ANNOTATIONS,
+                clazz -> clazz.getAnnotation(Entity.class) == null || clazz.getAnnotation(Include.class) != null);
+    }
+
+    public Set<Type<?>> getDynamicTypes() {
+        return modelsToBind.stream()
+                .filter(type -> type instanceof TableType)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Construct MetaDataStore with data models, namespaces.
+     *
+     * @param modelsToBind models to bind
+     * @param enableMetaDataStore If Enable MetaDataStore
+     */
+    public MetaDataStore(ClassScanner scanner, Set<Type<?>> modelsToBind, boolean enableMetaDataStore) {
+
+        metadataDictionary = EntityDictionary.builder()
+                .scanner(scanner)
+                .build();
+
+        //Hardcoded to avoid ClassGraph scan.
+        this.metadataModelClasses = new HashSet<>(Arrays.asList(
+                Column.class,
+                Metric.class,
+                ArgumentDefinition.class,
+                TableSource.class,
+                Dimension.class,
+                TimeDimension.class,
+                TimeDimensionGrain.class,
+                Table.class,
+                Versioned.class,
+                Namespace.class
+        ));
+
+        this.enableMetaDataStore = enableMetaDataStore;
+
+        modelsToBind.forEach(cls -> {
+            String version = EntityDictionary.getModelVersion(cls);
+            HashMapDataStore hashMapDataStore = hashMapDataStores.computeIfAbsent(version,
+                    getHashMapDataStoreInitializer(scanner));
+            hashMapDataStore.getDictionary().bindEntity(cls, IS_FIELD_HIDDEN);
+            this.metadataDictionary.bindEntity(cls, IS_FIELD_HIDDEN);
+            this.hashMapDataStores.putIfAbsent(version, hashMapDataStore);
+
+            Include include = (Include) EntityDictionary.getFirstPackageAnnotation(cls, Arrays.asList(Include.class));
+
+            //Register all the default namespaces.
+            if (include == null) {
+                Pair<String, String> registration = Pair.of(EMPTY, version);
+                namespacesToBind.put(registration,
+                        new NamespacePackage(EMPTY, "Default Namespace", DEFAULT, version));
+            } else {
+                Pair<String, String> registration = Pair.of(include.name(), version);
+                namespacesToBind.put(registration,
+                        new NamespacePackage(
+                                include.name(),
+                                include.description(),
+                                include.friendlyName(),
+                                version));
+            }
+        });
+
+        // bind external data models in the package.
+        this.modelsToBind = modelsToBind;
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        if (enableMetaDataStore) {
+            metadataModelClasses.forEach(
+                cls -> dictionary.bindEntity(cls, IS_FIELD_HIDDEN)
+            );
+        }
+    }
+
+    private final Function<String, HashMapDataStore> getHashMapDataStoreInitializer(ClassScanner scanner) {
+        return key -> {
+            HashMapDataStore hashMapDataStore = new HashMapDataStore(metadataModelClasses);
+            EntityDictionary dictionary = EntityDictionary.builder().scanner(scanner).build();
+            metadataModelClasses.forEach(dictionary::bindEntity);
+            hashMapDataStore.populateEntityDictionary(dictionary);
+            return hashMapDataStore;
+        };
+    }
+
+    /**
+     * Add a table metadata object.
+     *
+     * @param table table metadata
+     */
+    public void addTable(Table table) {
+        String version = table.getVersion();
+        EntityDictionary dictionary = hashMapDataStores.computeIfAbsent(version, SERVER_ERROR).getDictionary();
+        tables.put(dictionary.getEntityClass(table.getName(), version), table);
+        if (! table.isHidden()) {
+            addMetaData(table, version);
+        }
+        table.getAllColumns().stream()
+                .forEach(this::addColumn);
+
+        table.getArgumentDefinitions().forEach(arg -> addArgument(arg, version));
+    }
+
+    /**
+     * Add a namespace metadata object.
+     *
+     * @param namespace Namespace metadata
+     */
+    public void addNamespace(Namespace namespace) {
+        String version = namespace.getVersion();
+        namespaces.add(namespace);
+        addMetaData(namespace, version);
+    }
+
+    /**
+     * Get a table metadata object.
+     *
+     * @param tableClass table class
+     * @return meta data table
+     */
+    public <T extends Table> T getTable(Type<?> tableClass) {
+        return (T) tables.get(tableClass);
+    }
+
+    /**
+     * Get a namespace object.
+     *
+     * @param modelType the model type
+     * @return the namespace
+     */
+    public Namespace getNamespace(Type<?> modelType) {
+        String apiVersionName = EntityDictionary.getModelVersion(modelType);
+        Include include = (Include) EntityDictionary.getFirstPackageAnnotation(modelType, Arrays.asList(Include.class));
+
+        String namespaceName;
+        if (include != null && ! include.name().isEmpty()) {
+            namespaceName = include.name();
+        } else {
+            namespaceName = DEFAULT;
+        }
+
+        return namespaces
+                 .stream()
+                 .filter(namespace -> namespace.getName().equals(namespaceName))
+                 .filter(namespace -> namespace.getVersion().equals(apiVersionName))
+                 .findFirst()
+                 .orElse(null);
+    }
+
+    /**
+     * Returns the table for a given name and version.
+     * @param name The name of the table
+     * @param version The version of the table.
+     * @return The table that matches or null.
+     */
+    public Table getTable(String name, String version) {
+        return tables.values().stream()
+                .filter(table -> table.getName().equals(name) && table.getVersion().equals(version))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Returns the complete set of tables.
+     * @return a set of tables.
+     */
+    public Set<Table> getTables() {
+        return new HashSet<>(tables.values());
+    }
+
+    /**
+     * Get a {@link Column} from a table.
+     *
+     * @param tableClass table class
+     * @param fieldName field name
+     * @return meta data column
+     */
+    public final Column getColumn(Type<?> tableClass, String fieldName) {
+        return getTable(tableClass).getColumnMap().get(fieldName);
+    }
+
+    /**
+     * Get a {@link Column} for the last field in a {@link Path}.
+     *
+     * @param path path to a field
+     * @return meta data column
+     */
+    public final Column getColumn(Path path) {
+        Path.PathElement last = path.lastElement().get();
+
+        return getColumn(last.getType(), last.getFieldName());
+    }
+
+    /**
+     * Returns all the discovered namespaces.
+     * @return all discovered namespaces.
+     */
+    public Set<NamespacePackage> getNamespacesToBind() {
+        return new HashSet<>(namespacesToBind.values());
+    }
+
+    /**
+     * Add a column metadata object.
+     *
+     * @param column column metadata
+     */
+    private void addColumn(Column column) {
+        String version = column.getVersion();
+        if (! column.isHidden()) {
+            addMetaData(column, version);
+        }
+
+        if (column instanceof TimeDimension) {
+            TimeDimension timeDimension = (TimeDimension) column;
+            for (TimeDimensionGrain grain : timeDimension.getSupportedGrains()) {
+                addTimeDimensionGrain(grain, version);
+            }
+        }
+
+        column.getArgumentDefinitions().forEach(arg -> addArgument(arg, version));
+    }
+
+    /**
+     * Add a argument metadata object.
+     *
+     * @param argument argument metadata
+     */
+    private void addArgument(ArgumentDefinition argument, String version) {
+        addMetaData(argument, version);
+    }
+
+    /**
+     * Add a time dimension grain metadata object.
+     *
+     * @param timeDimensionGrain time dimension grain metadata
+     */
+    private void addTimeDimensionGrain(TimeDimensionGrain timeDimensionGrain, String version) {
+        addMetaData(timeDimensionGrain, version);
+    }
+
+    /**
+     * Add a meta data object into this data store, check for duplication.
+     *
+     * @param object a meta data object
+     */
+    private void addMetaData(Object object, String version) {
+
+        HashMapDataStore hashMapDataStore = hashMapDataStores.computeIfAbsent(version, SERVER_ERROR);
+        EntityDictionary dictionary = hashMapDataStore.getDictionary();
+        Type<?> cls = dictionary.lookupBoundClass(EntityDictionary.getType(object));
+        String id = dictionary.getId(object);
+
+        if (hashMapDataStore.get(cls).containsKey(id)) {
+            if (!hashMapDataStore.get(cls).get(id).equals(object)) {
+                throw new DuplicateMappingException("Duplicated " + cls.getSimpleName() + " metadata " + id);
+            }
+        } else {
+            hashMapDataStore.get(cls).put(id, object);
+        }
+    }
+
+    /**
+     * Get all metadata of a specific metadata class.
+     *
+     * @param cls metadata class
+     * @param <T> metadata class
+     * @return all metadata of given class
+     */
+    public <T> Set<T> getMetaData(Type<T> cls) {
+        String version = EntityDictionary.getModelVersion(cls);
+        HashMapDataStore hashMapDataStore = hashMapDataStores.computeIfAbsent(version, SERVER_ERROR);
+        return hashMapDataStore.get(cls).values().stream().map(obj -> (T) obj).collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns whether or not an entity field is a metric field.
+     * <p>
+     * A field is a metric field if that field is annotated by
+     * <ol>
+     *     <li> {@link MetricFormula}
+     * </ol>
+     *
+     * @param dictionary entity dictionary in current Elide instance
+     * @param cls entity class
+     * @param fieldName The entity field
+     *
+     * @return {@code true} if the field is a metric field
+     */
+    public static boolean isMetricField(EntityDictionary dictionary, Type<?> cls, String fieldName) {
+        return dictionary.attributeOrRelationAnnotationExists(cls, fieldName, MetricFormula.class);
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new MetaDataStoreTransaction(hashMapDataStores);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTransaction.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTransaction.java
new file mode 100644
index 0000000000..85a6c1c706
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTransaction.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * MetaDataStore transaction handler.
+ */
+public class MetaDataStoreTransaction implements DataStoreTransaction {
+
+    private static final Function<String, HashMapDataStore> REQUEST_ERROR = key -> {
+        throw new BadRequestException("API version " + key + " not found");
+    };
+
+    private final Map<String, HashMapDataStore> hashMapDataStores;
+
+    public MetaDataStoreTransaction(Map<String, HashMapDataStore> hashMapDataStores) {
+        this.hashMapDataStores = hashMapDataStores;
+    }
+
+    @Override
+    public void flush(RequestScope requestScope) {
+        // Do nothing
+    }
+
+    @Override
+    public void save(Object object, RequestScope requestScope) {
+        throw new InvalidOperationException("save not supported for metadatastore");
+    }
+
+    @Override
+    public void delete(Object object, RequestScope requestScope) {
+        throw new InvalidOperationException("delete not supported for metadatastore");
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        // Do nothing
+    }
+
+    @Override
+    public void createObject(Object entity, RequestScope scope) {
+        // Do nothing
+    }
+
+    @Override
+    public DataStoreIterable<Object> getToManyRelation(
+            DataStoreTransaction relationTx,
+            Object entity,
+            Relationship relationship,
+            RequestScope scope
+    ) {
+        return hashMapDataStores
+                        .computeIfAbsent(scope.getApiVersion(), REQUEST_ERROR)
+                        .beginTransaction()
+                        .getToManyRelation(relationTx, entity, relationship, scope);
+    }
+
+    @Override
+    public Object getToOneRelation(
+            DataStoreTransaction relationTx,
+            Object entity,
+            Relationship relationship,
+            RequestScope scope
+    ) {
+        return hashMapDataStores
+                .computeIfAbsent(scope.getApiVersion(), REQUEST_ERROR)
+                .beginTransaction()
+                .getToOneRelation(relationTx, entity, relationship, scope);
+    }
+
+    @Override
+    public DataStoreIterable<Object> loadObjects(EntityProjection projection, RequestScope scope) {
+        return hashMapDataStores
+                        .computeIfAbsent(scope.getApiVersion(), REQUEST_ERROR)
+                        .beginTransaction()
+                        .loadObjects(projection, scope);
+    }
+
+    @Override
+    public Object loadObject(EntityProjection projection, Serializable id, RequestScope scope) {
+        return hashMapDataStores
+                        .computeIfAbsent(scope.getApiVersion(), REQUEST_ERROR)
+                        .beginTransaction()
+                        .loadObject(projection, id, scope);
+    }
+
+    @Override
+    public void close() throws IOException {
+        // Do nothing
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        // Do nothing
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContext.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContext.java
new file mode 100644
index 0000000000..ced8072c36
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContext.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLJoin;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Map;
+
+/**
+ * Context for resolving all handlebars in provided expression except physical references. Keeps physical references as
+ * is.
+ */
+@Getter
+@ToString
+public class PhysicalRefColumnContext extends ColumnContext {
+
+    private static final String HANDLEBAR_PREFIX = "{{";
+    private static final String HANDLEBAR_SUFFIX = "}}";
+
+    @Builder(builderMethodName = "physicalRefContextBuilder")
+    public PhysicalRefColumnContext(MetaDataStore metaDataStore, Queryable queryable, String alias,
+                    ColumnProjection column, Map<String, Argument> tableArguments) {
+        super(metaDataStore, queryable, alias, column, tableArguments);
+    }
+
+    @Override
+    protected ColumnContext getNewContext(ColumnContext context, ColumnProjection newColumn) {
+        return PhysicalRefColumnContext.physicalRefContextBuilder()
+                        .queryable(context.getQueryable())
+                        .alias(context.getAlias())
+                        .metaDataStore(context.getMetaDataStore())
+                        .column(newColumn)
+                        .tableArguments(context.getTableArguments())
+                        .build();
+    }
+
+    @Override
+    protected ColumnContext getJoinContext(String key) {
+        SQLJoin sqlJoin = this.queryable.getJoin(key);
+        Queryable joinQueryable = metaDataStore.getTable(sqlJoin.getJoinTableType());
+        String joinPath = isBlank(this.alias) ? key : this.alias + PERIOD + key;
+
+        PhysicalRefColumnContext joinCtx = PhysicalRefColumnContext.physicalRefContextBuilder()
+                        .queryable(joinQueryable)
+                        .alias(joinPath)
+                        .metaDataStore(this.metaDataStore)
+                        .column(this.column)
+                        .tableArguments(mergedArgumentMap(joinQueryable.getArguments(),
+                                                          this.getTableArguments()))
+                        .build();
+
+        return joinCtx;
+    }
+
+    @Override
+    protected String resolvePhysicalReference(ColumnContext context, String keyStr) {
+        return isBlank(context.getAlias()) ? HANDLEBAR_PREFIX + keyStr + HANDLEBAR_SUFFIX
+                                           : HANDLEBAR_PREFIX + context.getAlias() + PERIOD + keyStr + HANDLEBAR_SUFFIX;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableContext.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableContext.java
new file mode 100644
index 0000000000..cf0ba6bd42
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableContext.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.TBL_PREFIX;
+import com.yahoo.elide.core.request.Argument;
+import com.github.jknack.handlebars.EscapingStrategy;
+import com.github.jknack.handlebars.Formatter;
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.HandlebarsException;
+import com.github.jknack.handlebars.Template;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Context for resolving table arguments in provided expression.
+ */
+@Getter
+@ToString
+@Builder
+public class TableContext extends HashMap<String, Object> {
+
+    protected final Map<String, Argument> tableArguments;
+
+    private final Handlebars handlebars = new Handlebars()
+                    .with(EscapingStrategy.NOOP)
+                    .with((Formatter) (value, next) -> {
+                        if (value instanceof com.yahoo.elide.core.request.Argument) {
+                            return ((com.yahoo.elide.core.request.Argument) value).getValue();
+                        }
+                        return next.format(value);
+                    });
+
+    public Object get(Object key) {
+
+        if (key.equals(TBL_PREFIX)) {
+            return TableSubContext.tableSubContextBuilder()
+                            .tableArguments(this.tableArguments)
+                            .build();
+        }
+
+        throw new HandlebarsException(new Throwable("Couldn't find: " + key));
+    }
+
+    /**
+     * Resolves the handlebars with in expression.
+     * @param expression Expression to resolve.
+     * @return fully resolved expression.
+     * @throws IllegalStateException for any handlebars error.
+     */
+    public String resolve(String expression) {
+        try {
+            Template template = handlebars.compileInline(expression);
+            return template.apply(this);
+        } catch (IOException e) {
+            throw new IllegalStateException(e.getMessage());
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableSubContext.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableSubContext.java
new file mode 100644
index 0000000000..09273f5d4a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/TableSubContext.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.ARGS_KEY;
+import com.yahoo.elide.core.request.Argument;
+import com.github.jknack.handlebars.HandlebarsException;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Map;
+
+/**
+ * Context for resolving args under $$table. eg: {{$$table.args.arg1}}.
+ */
+@Getter
+@ToString
+public class TableSubContext extends TableContext {
+
+    @Builder(builderMethodName = "tableSubContextBuilder")
+    public TableSubContext(Map<String, Argument> tableArguments) {
+        super(tableArguments);
+    }
+
+    @Override
+    public Object get(Object key) {
+
+        if (key.equals(ARGS_KEY)) {
+            return this.getTableArguments();
+        }
+
+        throw new HandlebarsException(new Throwable("Couldn't find: " + key));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ColumnType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ColumnType.java
new file mode 100644
index 0000000000..06debea822
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ColumnType.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+/**
+ * Type of a logical column based on its physical reference type.
+ */
+public enum ColumnType {
+    FIELD, // reference to a physical field
+    FORMULA // reference to a logical formula expression
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/Format.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/Format.java
new file mode 100644
index 0000000000..1c164e8025
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/Format.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+/**
+ * Format of a value field, e.g. decimal for numbers
+ */
+public enum Format {
+    NONE
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/FunctionArgumentType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/FunctionArgumentType.java
new file mode 100644
index 0000000000..20a27addfb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/FunctionArgumentType.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+/**
+ * Actual value type of a data type.
+ */
+public enum FunctionArgumentType {
+    REFERENCE,
+    PRIMITIVE;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/TimeGrain.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/TimeGrain.java
new file mode 100644
index 0000000000..13abaf29e6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/TimeGrain.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Hour;
+import com.yahoo.elide.datastores.aggregation.timegrains.ISOWeek;
+import com.yahoo.elide.datastores.aggregation.timegrains.Minute;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import com.yahoo.elide.datastores.aggregation.timegrains.Quarter;
+import com.yahoo.elide.datastores.aggregation.timegrains.Second;
+import com.yahoo.elide.datastores.aggregation.timegrains.Week;
+import com.yahoo.elide.datastores.aggregation.timegrains.Year;
+import lombok.Getter;
+
+/**
+ * {@link TimeGrain} is a set of concrete {@link TimeGrain} implementations which support "natural" time buckets.
+ */
+public enum TimeGrain {
+
+    SECOND(Second.FORMAT),
+    MINUTE(Minute.FORMAT),
+    HOUR(Hour.FORMAT),
+    DAY(Day.FORMAT),
+    ISOWEEK(ISOWeek.FORMAT),
+    WEEK(Week.FORMAT),
+    MONTH(Month.FORMAT),
+    QUARTER(Quarter.FORMAT),
+    YEAR(Year.FORMAT)
+    ;
+
+    @Getter private final String format;
+
+    TimeGrain(final String format) {
+        this.format = format;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueSourceType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueSourceType.java
new file mode 100644
index 0000000000..d6f8bfab65
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueSourceType.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+import com.yahoo.elide.datastores.aggregation.annotation.TableSource;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Set;
+
+/**
+ * Where to source values for type-ahead search.
+ */
+public enum ValueSourceType {
+    ENUM,
+    TABLE,
+    NONE;
+
+    public static ValueSourceType getValueSourceType(Set<String> values, TableSource tableSource) {
+        if (CollectionUtils.isNotEmpty(values)) {
+            return ValueSourceType.ENUM;
+        }
+        if (tableSource != null && ! tableSource.table().isEmpty()) {
+            return ValueSourceType.TABLE;
+        }
+        return ValueSourceType.NONE;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueType.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueType.java
new file mode 100644
index 0000000000..b36ab92159
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueType.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+import static com.yahoo.elide.core.type.ClassType.BIGDECIMAL_TYPE;
+import static com.yahoo.elide.core.type.ClassType.BOOLEAN_TYPE;
+import static com.yahoo.elide.core.type.ClassType.LONG_TYPE;
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static com.yahoo.elide.datastores.aggregation.timegrains.Time.TIME_TYPE;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.google.common.collect.ImmutableMap;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/**
+ * Actual value type of a data type.
+ */
+public enum ValueType {
+
+    TIME("^[-0-9:TZ]+$"),
+    INTEGER("^[+-]?\\d+$"),
+    DECIMAL("^[+-]?((\\d+(\\.\\d+)?)|(\\.\\d+))$"),
+    MONEY("^[+-]?((\\d+(\\.\\d+)?)|(\\.\\d+))$"),
+    TEXT("^[a-zA-Z0-9_-]+$"),  //Very restricted to prevent SQL Injection
+    COORDINATE("^(-?\\d+(\\.\\d+)?)|(-?\\d+(\\.\\d+)?),\\s*(-?\\d+(\\.\\d+)?)$"),
+    BOOLEAN("^(?i)true|false(?-i)|0|1$"),
+    ID("^[a-zA-Z0-9_]+$"),
+    UNKNOWN("^$");
+
+    private Pattern pattern;
+
+    ValueType(String regexRestriction) {
+        pattern = Pattern.compile(regexRestriction);
+    }
+
+    public boolean matches(String input) {
+        if (this.equals(UNKNOWN)) {
+            return false;
+        }
+
+        try {
+            CoerceUtil.coerce(input, getType(this));
+        } catch (InvalidValueException e) {
+            return false;
+        }
+        return pattern.matcher(input).matches();
+    }
+
+    private static final Map<Type<?>, ValueType> SCALAR_TYPES = ImmutableMap.<Type<?>, ValueType>builder()
+        .put(ClassType.of(short.class), INTEGER)
+        .put(ClassType.of(Short.class), INTEGER)
+        .put(ClassType.of(int.class), INTEGER)
+        .put(ClassType.of(Integer.class), INTEGER)
+        .put(ClassType.of(long.class), INTEGER)
+        .put(ClassType.of(Long.class), INTEGER)
+        .put(ClassType.of(BigDecimal.class), DECIMAL)
+        .put(ClassType.of(float.class), DECIMAL)
+        .put(ClassType.of(Float.class), DECIMAL)
+        .put(ClassType.of(double.class), DECIMAL)
+        .put(ClassType.of(Double.class), DECIMAL)
+        .put(ClassType.of(boolean.class), BOOLEAN)
+        .put(ClassType.of(Boolean.class), BOOLEAN)
+        .put(ClassType.of(char.class), TEXT)
+        .put(ClassType.of(String.class), TEXT)
+        .build();
+
+    public static ValueType getScalarType(Type<?> fieldClass) {
+        return SCALAR_TYPES.getOrDefault(fieldClass, TEXT);
+    }
+
+    public static Type<?> getType(ValueType valueType) {
+        switch (valueType) {
+            case TIME:
+                return TIME_TYPE;
+            case TEXT:
+                return STRING_TYPE;
+            case INTEGER:
+                return LONG_TYPE;
+            case MONEY:
+                return BIGDECIMAL_TYPE;
+            case DECIMAL:
+                return BIGDECIMAL_TYPE;
+            case COORDINATE:
+                return STRING_TYPE;
+            case BOOLEAN:
+                return BOOLEAN_TYPE;
+            default:
+                return STRING_TYPE;
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/ArgumentDefinition.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/ArgumentDefinition.java
new file mode 100644
index 0000000000..420374e007
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/ArgumentDefinition.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueSourceType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.modelconfig.model.Named;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+/**
+ * Arguments that can be provided into a table/column.
+ */
+@Include(rootLevel = false, name = "argument")
+@Data
+@ToString
+@AllArgsConstructor
+public class ArgumentDefinition implements Named {
+    @Id
+    private String id;
+
+    private String name;
+
+    private String description;
+
+    private ValueType type;
+
+    private final ValueSourceType valueSourceType;
+
+    private Set<String> values;
+
+    @OneToOne
+    private TableSource tableSource;
+
+    @Exclude
+    private com.yahoo.elide.datastores.aggregation.annotation.TableSource tableSourceDefinition;
+
+    private Object defaultValue;
+
+    public boolean isRequired() {
+        return (defaultValue == null || defaultValue.toString().equals(""));
+    }
+
+    public ArgumentDefinition(String idPrefix,
+                              com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition argument) {
+        this.id = idPrefix + "." + argument.name();
+        this.name = argument.name();
+        this.description = argument.description();
+        this.type = argument.type();
+        this.values = new HashSet<>(Arrays.asList(argument.values()));
+        this.tableSourceDefinition = argument.tableSource();
+        this.defaultValue = argument.defaultValue();
+        this.valueSourceType = ValueSourceType.getValueSourceType(this.values, this.tableSourceDefinition);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Column.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Column.java
new file mode 100644
index 0000000000..04ac78df89
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Column.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType.FIELD;
+import static com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType.FORMULA;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ToOne;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueSourceType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.modelconfig.model.Named;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+/**
+ * Column is the super class of a field in a table, it can be either dimension or metric.
+ */
+@Include(rootLevel = false, name = "column")
+@Getter
+@EqualsAndHashCode
+@ToString
+public abstract class Column implements Versioned, Named, RequiresFilter {
+
+    @Id
+    private final String id;
+
+    private final String name;
+
+    private final String friendlyName;
+
+    private final String category;
+
+    private final String description;
+
+    private final CardinalitySize cardinality;
+
+    private final boolean hidden;
+
+    @ToOne
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
+    private final Table table;
+
+    private final ValueType valueType;
+
+    private final ColumnType columnType;
+
+    private final String expression;
+
+    private final ValueSourceType valueSourceType;
+
+    private final LinkedHashSet<String> values;
+
+    private String requiredFilter;
+
+    @OneToOne
+    @Setter
+    private TableSource tableSource = null;
+
+    @Exclude
+    private com.yahoo.elide.datastores.aggregation.annotation.TableSource tableSourceDefinition;
+
+    @OneToMany
+    @ToString.Exclude
+    @Getter(value = AccessLevel.NONE)
+    private final Set<ArgumentDefinition> arguments;
+
+    public Set<ArgumentDefinition> getArgumentDefinitions() {
+        return this.arguments;
+    }
+
+    @ToString.Exclude
+    private final Set<String> tags;
+
+    protected Column(Table table, String fieldName, EntityDictionary dictionary) {
+        this.table = table;
+        Type<?> tableClass = dictionary.getEntityClass(table.getName(), table.getVersion());
+
+        this.id = constructColumnName(tableClass, fieldName, dictionary);
+        this.name = fieldName;
+
+        String idField = dictionary.getIdFieldName(tableClass);
+        if (idField != null && idField.equals(fieldName)) {
+            this.hidden = false;
+        } else {
+            this.hidden = !dictionary.getAllExposedFields(tableClass).contains(fieldName);
+        }
+
+        ColumnMeta meta = dictionary.getAttributeOrRelationAnnotation(tableClass, ColumnMeta.class, fieldName);
+        if (meta != null) {
+            this.friendlyName = meta.friendlyName() != null && !meta.friendlyName().isEmpty()
+                    ? meta.friendlyName()
+                    : name;
+            this.description = meta.description();
+            this.category = meta.category();
+            this.values = new LinkedHashSet<>(Arrays.asList(meta.values()));
+            this.tags = new LinkedHashSet<>(Arrays.asList(meta.tags()));
+            this.tableSourceDefinition = meta.tableSource();
+            this.valueSourceType = ValueSourceType.getValueSourceType(this.values, this.tableSourceDefinition);
+            this.cardinality = meta.size();
+            this.requiredFilter = meta.filterTemplate();
+        } else {
+            this.friendlyName = name;
+            this.description = null;
+            this.category = null;
+            this.values = null;
+            this.tags = new LinkedHashSet<>();
+            this.tableSourceDefinition = null;
+            this.valueSourceType = ValueSourceType.NONE;
+            this.cardinality = CardinalitySize.UNKNOWN;
+            this.requiredFilter = null;
+        }
+
+        if (dictionary.attributeOrRelationAnnotationExists(tableClass, fieldName, MetricFormula.class)) {
+            columnType = FORMULA;
+            MetricFormula metricFormula = dictionary.getAttributeOrRelationAnnotation(tableClass, MetricFormula.class,
+                    fieldName);
+            this.expression = metricFormula.value();
+            this.arguments = Arrays.stream(metricFormula.arguments())
+                    .map(argument -> new ArgumentDefinition(getId(), argument))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        } else if (dictionary.attributeOrRelationAnnotationExists(tableClass, fieldName, DimensionFormula.class)) {
+            columnType = FORMULA;
+            DimensionFormula dimensionFormula = dictionary.getAttributeOrRelationAnnotation(tableClass,
+                    DimensionFormula.class, fieldName);
+            this.expression = dimensionFormula.value();
+            this.arguments = Arrays.stream(dimensionFormula.arguments())
+                    .map(argument -> new ArgumentDefinition(getId(), argument))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        } else {
+            columnType = FIELD;
+            expression = "{{$" + dictionary.getAnnotatedColumnName(tableClass, fieldName) + "}}";
+            this.arguments = new LinkedHashSet<>();
+        }
+
+        this.valueType = getValueType(tableClass, fieldName, dictionary);
+
+        if (valueType == ValueType.UNKNOWN) {
+            throw new IllegalArgumentException("Unknown data type for " + this.id);
+        }
+    }
+
+    /**
+     * Construct a column name as meta data.
+     *
+     * @param tableClass table class
+     * @param fieldName field name
+     * @param dictionary entity dictionary to use
+     * @return <code>tableAlias.fieldName</code>
+     */
+    protected static String constructColumnName(Type<?> tableClass, String fieldName, EntityDictionary dictionary) {
+        return dictionary.getJsonAliasFor(tableClass) + "." + fieldName;
+    }
+
+    /**
+     * Resolve the value type of a field.
+     *
+     * @param tableClass table class
+     * @param fieldName field name
+     * @param dictionary meta data dictionary
+     * @return field value type
+     */
+    public static ValueType getValueType(Type<?> tableClass, String fieldName, EntityDictionary dictionary) {
+        if (dictionary.isRelation(tableClass, fieldName)) {
+            return ValueType.UNKNOWN;
+        }
+        Type<?> fieldClass = dictionary.getType(tableClass, fieldName);
+
+        if (fieldName.equals(dictionary.getIdFieldName(tableClass))) {
+            return ValueType.ID;
+        }
+
+        if (ClassType.DATE_TYPE.isAssignableFrom(fieldClass)) {
+            return ValueType.TIME;
+        }
+
+        if (fieldClass.isEnum()) {
+            return ValueType.TEXT;
+        }
+
+        return ValueType.getScalarType(fieldClass);
+    }
+
+    public ColumnProjection toProjection() {
+        return table.toQueryable().getColumnProjection(getName());
+    }
+
+    @Override
+    public String getVersion() {
+        return table.getVersion();
+    }
+
+    public boolean hasArgumentDefinition(String argName) {
+        return hasName(this.arguments, argName);
+    }
+
+    public ArgumentDefinition getArgumentDefinition(String argName) {
+        return this.arguments.stream()
+                        .filter(arg -> arg.getName().equals(argName))
+                        .findFirst()
+                        .orElse(null);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Dimension.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Dimension.java
new file mode 100644
index 0000000000..0d570f214e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Dimension.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Regular field in tables, can be grouped by.
+ */
+@Include(rootLevel = false, name = "dimension")
+@EqualsAndHashCode(callSuper = true)
+public class Dimension extends Column {
+    public Dimension(Table table, String fieldName, EntityDictionary dictionary) {
+        super(table, fieldName, dictionary);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Metric.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Metric.java
new file mode 100644
index 0000000000..959c956b30
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Metric.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * Column which supports aggregation.
+ */
+@Include(rootLevel = false, name = "metric")
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString
+public class Metric extends Column {
+    @Exclude
+    @ToString.Exclude
+    private final MetricProjectionMaker metricProjectionMaker;
+
+    public Metric(MetricProjectionMaker maker, Table table, String fieldName, EntityDictionary dictionary) {
+        super(table, fieldName, dictionary);
+        this.metricProjectionMaker = maker;
+    }
+
+    public Metric(Table table, String fieldName, EntityDictionary dictionary) {
+        super(table, fieldName, dictionary);
+        Type<?> tableClass = dictionary.getEntityClass(table.getName(), table.getVersion());
+
+        MetricFormula formula = dictionary.getAttributeOrRelationAnnotation(tableClass, MetricFormula.class, fieldName);
+
+        verifyFormula(formula);
+        this.metricProjectionMaker = dictionary.getInjector().instantiate(formula.maker());
+
+        dictionary.getInjector().inject(this.metricProjectionMaker);
+    }
+
+    private void verifyFormula(MetricFormula formula) {
+        if (formula == null) {
+            throw new IllegalStateException("Trying to construct metric field " + getId() + " without @MetricFormula.");
+        }
+
+        String defaultValue;
+        Class<?> defaultMaker;
+
+        try {
+            defaultValue = (String) MetricFormula.class.getDeclaredMethod("value").getDefaultValue();
+            defaultMaker = (Class<?>) MetricFormula.class.getDeclaredMethod("maker").getDefaultValue();
+        } catch (NoSuchMethodException | SecurityException e) {
+            throw new IllegalStateException("Error encountered while constructing metric field: " + getId()
+                            + ". " + e.getMessage());
+        }
+
+        if (formula.value().equals(defaultValue) && formula.maker().equals(defaultMaker)) {
+            throw new IllegalStateException("Trying to construct metric field " + getId()
+                            + " with default values. Provide either value or maker in @MetricFormula.");
+        }
+
+        if (!formula.value().equals(defaultValue) && !formula.maker().equals(defaultMaker)) {
+            throw new IllegalStateException("Trying to construct metric field " + getId()
+                            + " with value and maker. Provide either one in @MetricFormula, both are not allowed.");
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Namespace.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Namespace.java
new file mode 100644
index 0000000000..89eac7a7af
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Namespace.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT;
+import com.yahoo.elide.annotation.ApiVersion;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * Namespace for organizing related tables together.
+ */
+@Include(name = "namespace")
+@Getter
+@EqualsAndHashCode
+@ToString
+public class Namespace {
+    @Id
+    private final String id;
+
+    private final String name;
+
+    private final String friendlyName;
+
+    private final String description;
+
+    @Exclude
+    private final String version;
+
+    @Exclude
+    private final NamespacePackage pkg;
+
+    @EqualsAndHashCode.Exclude
+    @ToString.Exclude
+    @Exclude
+    private Set<Table> tables;
+
+    @OneToMany
+    @ComputedRelationship
+    public Set<Table> getTables() {
+        return tables.stream().filter(table -> !table.isHidden()).collect(Collectors.toSet());
+    }
+
+    public Namespace(NamespacePackage pkg) {
+        this.pkg = pkg;
+        name = pkg.getName().isEmpty() ? DEFAULT : pkg.getName();
+        id = name;
+        tables = new HashSet<>();
+
+        Include include = pkg.getDeclaredAnnotation(Include.class);
+        if (include != null) {
+            friendlyName = (include.friendlyName() == null || include.friendlyName().isEmpty()) ? name
+                    : include.friendlyName();
+            description = include.description();
+        } else {
+            friendlyName = name;
+            description = null;
+        }
+
+        ApiVersion apiVersion = pkg.getDeclaredAnnotation(ApiVersion.class);
+        version = (apiVersion == null) ? EntityDictionary.NO_VERSION : apiVersion.version();
+    }
+
+    public void addTable(Table table) {
+        this.tables.add(table);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/RequiresFilter.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/RequiresFilter.java
new file mode 100644
index 0000000000..8190b9b52d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/RequiresFilter.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.modelconfig.model.Named;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Metadata models that require a client filter.
+ */
+public interface RequiresFilter extends Named {
+    Table getTable();
+
+    String getRequiredFilter();
+
+    default FilterExpression getRequiredFilter(EntityDictionary dictionary) {
+        Type<?> cls = dictionary.getEntityClass(getTable().getName(), getTable().getVersion());
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder()
+                .dictionary(dictionary)
+                .addDefaultArguments(false)
+                .build();
+
+        if (StringUtils.isNotEmpty(getRequiredFilter())) {
+            try {
+                return filterDialect.parseFilterExpression(getRequiredFilter(), cls, false, true);
+            } catch (ParseException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+        return null;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Table.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Table.java
new file mode 100644
index 0000000000..dd9f56271a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Table.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore.isMetricField;
+import static com.yahoo.elide.datastores.aggregation.metadata.models.Column.getValueType;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.TypeHelper;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.modelconfig.model.Named;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+/**
+ * Super class of all logical or physical tables.
+ */
+@Include(name = "table")
+@Getter
+@EqualsAndHashCode
+@ToString
+public abstract class Table implements Versioned, Named, RequiresFilter {
+
+    @Id
+    private final String id;
+
+    private final String name;
+
+    private final String friendlyName;
+
+    private final String category;
+
+    @Exclude
+    private final String version;
+
+    private final String description;
+
+    private final CardinalitySize cardinality;
+
+    private final String requiredFilter;
+
+    private final boolean isFact;
+
+    private final boolean hidden;
+
+    @ManyToOne
+    private final Namespace namespace;
+
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
+    @Exclude
+    private final Set<Column> columns;
+
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
+    @Exclude
+    private final Set<Metric> metrics;
+
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
+    @Exclude
+    private final Set<Dimension> dimensions;
+
+    @EqualsAndHashCode.Exclude
+    @Exclude
+    private final Set<TimeDimension> timeDimensions;
+
+    @ToString.Exclude
+    private final Set<String> tags;
+
+    @ToString.Exclude
+    @Exclude
+    private final Set<String> hints;
+
+    @Exclude
+    @ToString.Exclude
+    private final Map<String, Column> columnMap;
+
+    @Exclude
+    private final String alias;
+
+    @OneToMany
+    @ToString.Exclude
+    @Getter(value = AccessLevel.NONE)
+    private final Set<ArgumentDefinition> arguments;
+
+    public Set<ArgumentDefinition> getArgumentDefinitions() {
+        return this.arguments;
+    }
+
+    @Exclude
+    private Type<?> model;
+
+    public Table(Namespace namespace, Type<?> cls, EntityDictionary dictionary) {
+        if (!dictionary.getBoundClasses().contains(cls)) {
+            throw new IllegalArgumentException(
+                    String.format("Table class {%s} is not defined in dictionary.", cls));
+        }
+
+        this.namespace = namespace;
+        namespace.addTable(this);
+
+        this.name = dictionary.getJsonAliasFor(cls);
+        this.version = EntityDictionary.getModelVersion(cls);
+        this.model = cls;
+
+        this.alias = TypeHelper.getTypeAlias(cls);
+
+        this.id = this.name;
+
+        TableMeta meta = cls.getAnnotation(TableMeta.class);
+        this.isFact = isFact(cls, meta);
+
+        this.columns = constructColumns(cls, dictionary);
+        this.columnMap = this.columns.stream().collect(Collectors.toMap(Column::getName, Function.identity()));
+
+        this.metrics = this.columns.stream()
+                .filter(col -> col instanceof Metric)
+                .map(Metric.class::cast)
+                .collect(Collectors.toSet());
+        this.dimensions = this.columns.stream()
+                .filter(col -> !(col instanceof Metric || col instanceof TimeDimension))
+                .map(Dimension.class::cast)
+                .collect(Collectors.toSet());
+        this.timeDimensions = this.columns.stream()
+                .filter(col -> (col instanceof TimeDimension))
+                .map(TimeDimension.class::cast)
+                .collect(Collectors.toSet());
+
+        if (meta != null) {
+            this.friendlyName = meta.friendlyName() != null && !meta.friendlyName().isEmpty()
+                    ? meta.friendlyName()
+                    : name;
+            this.description = meta.description();
+            this.category = meta.category();
+            this.hidden = meta.isHidden();
+            this.requiredFilter = meta.filterTemplate();
+            this.tags = new HashSet<>(Arrays.asList(meta.tags()));
+            this.hints = new LinkedHashSet<>(Arrays.asList(meta.hints()));
+            this.cardinality = meta.size();
+            if (meta.arguments().length == 0) {
+                this.arguments = new HashSet<>();
+            } else {
+                this.arguments = Arrays.stream(meta.arguments())
+                        .map(argument -> new ArgumentDefinition(getId(), argument))
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
+            }
+        } else {
+            this.friendlyName = name;
+            this.description = null;
+            this.category = null;
+            this.hidden = false;
+            this.requiredFilter = null;
+            this.tags = new HashSet<>();
+            this.hints = new LinkedHashSet<>();
+            this.cardinality = CardinalitySize.UNKNOWN;
+            this.arguments = new HashSet<>();
+        }
+    }
+
+    @OneToMany
+    @ComputedRelationship
+    public Set<Column> getColumns() {
+        return columns.stream().filter(column -> !column.isHidden()).collect(Collectors.toSet());
+    }
+
+    @OneToMany
+    @ComputedRelationship
+    public Set<Dimension> getDimensions() {
+        return dimensions.stream().filter(dimension -> !dimension.isHidden()).collect(Collectors.toSet());
+    }
+
+    @OneToMany
+    @ComputedRelationship
+    public Set<Metric> getMetrics() {
+        return metrics.stream().filter(metric -> !metric.isHidden()).collect(Collectors.toSet());
+    }
+
+    @OneToMany
+    @ComputedRelationship
+    public Set<TimeDimension> getTimeDimensions() {
+        return timeDimensions.stream().filter(timeDimension -> !timeDimension.isHidden()).collect(Collectors.toSet());
+    }
+
+    public Set<Column> getAllColumns() {
+        return columns;
+    }
+
+    public Set<Dimension> getAllDimensions() {
+        return dimensions;
+    }
+
+    public Set<Metric> getAllMetrics() {
+        return metrics;
+    }
+
+    public Set<TimeDimension> getAllTimeDimensions() {
+        return timeDimensions;
+    }
+
+    private boolean isFact(Type<?> cls, TableMeta meta) {
+        if (meta != null) {
+            return meta.isFact();
+        }
+
+        // If FromTable or FromSubquery Annotation exists then assume its fact table.
+        boolean existsAggAnnotations = (cls.getAnnotation(FromTable.class) != null
+                || cls.getAnnotation(FromSubquery.class) != null);
+
+        return existsAggAnnotations;
+    }
+
+    /**
+     * Construct all columns of this table.
+     *
+     * @param cls table class
+     * @param dictionary dictionary contains the table class
+     * @return all resolved column metadata
+     */
+    private Set<Column> constructColumns(Type<?> cls, EntityDictionary dictionary) {
+        EntityBinding binding = dictionary.getEntityBinding(cls);
+
+        Set<Column> columns = new HashSet<>();
+
+        //TODO - refactor entity binding to have classes for attributes & relationships.
+        binding.fieldsToValues.forEach((name, field) -> {
+            if (EntityBinding.isIdField(field)) {
+                return;
+            }
+
+            ValueType valueType = getValueType(cls, name, dictionary);
+            if (valueType == ValueType.UNKNOWN) {
+                return;
+            }
+
+            if (isMetricField(dictionary, cls, name)) {
+                columns.add(constructMetric(name, dictionary));
+            } else if (dictionary.attributeOrRelationAnnotationExists(cls, name, Temporal.class)) {
+                columns.add(constructTimeDimension(name, dictionary));
+            } else {
+                columns.add(constructDimension(name, dictionary));
+            }
+        });
+
+        // add id field if exists
+        if (dictionary.getIdFieldName(cls) != null) {
+
+            String idFieldName = dictionary.getIdFieldName(cls);
+            if (AggregationDataStore.isAggregationStoreModel(cls)) {
+                columns.add(constructMetric(idFieldName, dictionary));
+            } else {
+                columns.add(constructDimension(idFieldName, dictionary));
+            }
+        }
+        return columns;
+    }
+
+    /**
+     * Construct a Metric instance.
+     *
+     * @param fieldName field name
+     * @param dictionary dictionary contains the table class
+     * @return Metric metadata instance
+     */
+    protected Metric constructMetric(String fieldName, EntityDictionary dictionary) {
+        return new Metric(this, fieldName, dictionary);
+    }
+
+    /**
+     * Construct a Dimension instance.
+     *
+     * @param fieldName field name
+     * @param dictionary dictionary contains the table class
+     * @return Dimension metadata instance
+     */
+    protected TimeDimension constructTimeDimension(String fieldName, EntityDictionary dictionary) {
+        return new TimeDimension(this, fieldName, dictionary);
+    }
+
+    /**
+     * Construct a TimeDimension instance.
+     *
+     * @param fieldName field name
+     * @param dictionary dictionary contains the table class
+     * @return TimeDimension metadata instance
+     */
+    protected Dimension constructDimension(String fieldName, EntityDictionary dictionary) {
+        return new Dimension(this, fieldName, dictionary);
+    }
+
+    /**
+     * Get all columns of a specific class, can be {@link Metric}, {@link TimeDimension} or {@link Dimension}.
+     *
+     * @param cls metadata class
+     * @param <T> metadata class
+     * @return columns as requested type if found
+     */
+    public <T extends ColumnProjection> Set<T> getColumns(Class<T> cls) {
+        return columns.stream()
+                .filter(col -> cls.isAssignableFrom(col.getClass()))
+                .map(cls::cast)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Get a field column as a specific class, can be {@link Metric}, {@link TimeDimension} or {@link Dimension}.
+     *
+     * @param cls metadata class
+     * @param fieldName logical column name
+     * @param <T> metadata class
+     * @return column as requested type if found
+     */
+    public final <T extends Column> T getColumn(Class<T> cls, String fieldName) {
+        Column column = columnMap.get(fieldName);
+        return column != null && cls.isAssignableFrom(column.getClass()) ? cls.cast(column) : null;
+    }
+
+    /**
+     * Returns the metric associated with the given field name.
+     * @param fieldName The field to lookup.
+     * @return The corresponding metric or null.
+     */
+    public Metric getMetric(String fieldName) {
+        return getColumn(Metric.class, fieldName);
+    }
+
+    /**
+     * Returns the dimension associated with the given field name.
+     * @param fieldName The field to lookup.
+     * @return The corresponding dimension or null.
+     */
+    public Dimension getDimension(String fieldName) {
+        return getColumn(Dimension.class, fieldName);
+    }
+
+    /**
+     * Returns the time dimension associated with the given field name.
+     * @param fieldName The field to lookup.
+     * @return The corresponding time dimension or null.
+     */
+    public TimeDimension getTimeDimension(String fieldName) {
+        return getColumn(TimeDimension.class, fieldName);
+    }
+
+    public boolean isMetric(String fieldName) {
+        return getMetric(fieldName) != null;
+    }
+
+    @Override
+    public Table getTable() {
+        return this;
+    }
+
+    public boolean hasArgumentDefinition(String argName) {
+        return hasName(this.arguments, argName);
+    }
+
+    public ArgumentDefinition getArgumentDefinition(String argName) {
+        return this.arguments.stream()
+                        .filter(arg -> arg.getName().equals(argName))
+                        .findFirst()
+                        .orElse(null);
+    }
+
+    public abstract Queryable toQueryable();
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TableSource.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TableSource.java
new file mode 100644
index 0000000000..2046f9fe39
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TableSource.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.google.common.base.Preconditions;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+
+/**
+ * Pointer to a table column where a particular argument/column has its values defined.
+ */
+@Include(rootLevel = false, name = "tableSource")
+@Data
+@ToString
+public class TableSource {
+    @Id
+    private String id;
+
+    @OneToOne
+    private Column valueSource;
+
+    @ManyToMany
+    Set<Column> suggestionColumns;
+
+    public TableSource(Column valueSource, Set<Column> suggestionColumns) {
+        this.id = valueSource.getId();
+        this.valueSource = valueSource;
+        this.suggestionColumns = suggestionColumns;
+    }
+
+    /**
+     * Converts from a table source annotation to a table source metadata model.
+     * @param sourceDefinition The source annotation.
+     * @param apiVersion The api version.
+     * @param metaDataStore The metadata store.
+     * @return A new Table Source metadata model.
+     */
+    public static TableSource fromDefinition(
+            com.yahoo.elide.datastores.aggregation.annotation.TableSource sourceDefinition,
+            String apiVersion,
+            MetaDataStore metaDataStore
+    ) {
+        if (sourceDefinition == null || sourceDefinition.table() == null || sourceDefinition.table().isEmpty()) {
+            return null;
+        }
+
+        String sourceModelName = com.yahoo.elide.modelconfig.model.Table.getModelName(
+                sourceDefinition.table(), sourceDefinition.namespace());
+
+        com.yahoo.elide.datastores.aggregation.metadata.models.Table sourceTable =
+                metaDataStore.getTable(sourceModelName, apiVersion);
+
+        Preconditions.checkNotNull(sourceTable, "Unable to locate table Source table: "
+                + sourceModelName);
+
+        Column sourceColumn = sourceTable.getDimension(sourceDefinition.column());
+
+        Preconditions.checkNotNull(sourceColumn, "Unable to locate table Source column: "
+                + sourceDefinition.column());
+
+        Set<Column> suggestionColumns = new HashSet<>();
+        if (sourceDefinition.suggestionColumns().length > 0) {
+            for (int idx = 0; idx < sourceDefinition.suggestionColumns().length; idx++) {
+                String suggestionColumnName = sourceDefinition.suggestionColumns()[idx];
+                Column suggestionColumn = sourceTable.getDimension(suggestionColumnName);
+
+                Preconditions.checkNotNull(sourceTable, "Unable to locate table suggestion column: "
+                        + suggestionColumnName);
+
+                suggestionColumns.add(suggestionColumn);
+            }
+        }
+
+        return new TableSource(sourceColumn, suggestionColumns);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimension.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimension.java
new file mode 100644
index 0000000000..93edec3739
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimension.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.Value;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
+import javax.persistence.ManyToMany;
+
+/**
+ * TimeDimension is a column that represents time value.
+ * This type of column can be used to support time period (DAILY, MONTHLY, etc) aggregation.
+ */
+@EqualsAndHashCode(callSuper = true)
+@Include(rootLevel = false, name = "timeDimension")
+@Value
+public class TimeDimension extends Column {
+    @ManyToMany
+    @ToString.Exclude
+    LinkedHashSet<TimeDimensionGrain> supportedGrains;
+
+    TimeZone timezone;
+
+    public TimeDimension(Table table, String fieldName, EntityDictionary dictionary) {
+        super(table, fieldName, dictionary);
+        timezone = TimeZone.getTimeZone("UTC");
+
+        Temporal temporal = dictionary.getAttributeOrRelationAnnotation(
+                dictionary.getEntityClass(table.getName(), table.getVersion()),
+                Temporal.class,
+                fieldName);
+
+        if (temporal.grains().length == 0) {
+            this.supportedGrains = new LinkedHashSet<>(Arrays.asList(new TimeDimensionGrain(getId(), TimeGrain.DAY)));
+        } else {
+            this.supportedGrains = Arrays.stream(temporal.grains())
+                    .map(grain -> new TimeDimensionGrain(getId(), grain))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        }
+    }
+
+    public TimeDimensionGrain getDefaultGrain() {
+        return supportedGrains.iterator().next();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimensionGrain.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimensionGrain.java
new file mode 100644
index 0000000000..ce29bb0c1d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/TimeDimensionGrain.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import lombok.Value;
+
+import java.util.Locale;
+import javax.persistence.Id;
+
+/**
+ * Defines how to extract a time dimension for a specific grain from a table.
+ */
+@Include(rootLevel = false, name = "timeDimensionGrain")
+@Value
+public class TimeDimensionGrain {
+    @Id private final String id;
+    private final TimeGrain grain;
+    private final String expression;
+    private final String format;
+
+    public TimeDimensionGrain(String fieldName, TimeGrainDefinition definition) {
+        this.id = getId(fieldName, definition.grain());
+        this.grain = definition.grain();
+        this.expression = definition.expression();
+        this.format = definition.grain().getFormat();
+    }
+
+    public TimeDimensionGrain(String fieldName, TimeGrain grain) {
+        this.id = getId(fieldName, grain);
+        this.grain = grain;
+        this.expression = "{{$$column.expr}}";
+        this.format = grain.getFormat();
+    }
+
+    private static String getId(String fieldName, TimeGrain grain) {
+        return fieldName + "." + grain.name().toLowerCase(Locale.ENGLISH);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Versioned.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Versioned.java
new file mode 100644
index 0000000000..b865b38ef6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Versioned.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+
+/**
+ * Versioned interface for Metadata models.
+ */
+public interface Versioned {
+    public String getVersion();
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/package-info.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/package-info.java
new file mode 100644
index 0000000000..b8fe764f99
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+/**
+ * Models Package.
+ */
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.None")
+@CreatePermission(expression = "Prefab.Role.None")
+package com.yahoo.elide.datastores.aggregation.metadata.models;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ColumnProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ColumnProjection.java
new file mode 100644
index 0000000000..cc17eec40e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ColumnProjection.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.io.Serializable;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Represents a projected column as an alias in a query.
+ */
+public interface ColumnProjection extends Serializable {
+
+    /**
+     * Get the projection alias.
+     *
+     * @return alias
+     */
+    default String getAlias() {
+        return getName();
+    }
+
+    /**
+     * Get the safe alias (an alias that is not vulnerable to injection).
+     *
+     * @return an alias for column that is not vulnerable to injection
+     */
+    default String getSafeAlias() {
+        String alias = getAlias();
+        String name = getName();
+        if (name.equals(alias)) {
+            return name;
+        }
+        return createSafeAlias(name, alias);
+    }
+
+    /**
+     * Returns the name of the column.
+     * @return the name of the column.
+     */
+    String getName();
+
+    /**
+     * Returns the query engine specific definition of the column.
+     * @return the definition of the column.
+     */
+    String getExpression();
+
+    /**
+     * Returns the value type of the column.
+     * @return the value type of the column.
+     */
+    ValueType getValueType();
+
+    /**
+     * Returns the column type of the column.
+     * @return the column type of the column.
+     */
+    ColumnType getColumnType();
+
+    /**
+     * Get all arguments provided for this metric function.
+     *
+     * @return request arguments
+     */
+    default Map<String, Argument> getArguments() {
+        return Collections.emptyMap();
+    }
+
+    // force implementations to define equals/hashCode
+    @Override
+    boolean equals(Object other);
+    @Override
+    int hashCode();
+
+    /**
+     * Creates an alias that is not vulnerable to injection.
+     * @param name projected column's name
+     * @param alias projected column's alias
+     * @return an alias for projected column that is not vulnerable to injection
+     */
+    public static String createSafeAlias(String name, String alias) {
+        return name + "_" + (Base64.getEncoder().encodeToString(alias.getBytes()).hashCode() & 0xfffffff);
+    }
+
+    /**
+     * Whether or not a given projection can be nested into an inner query and outer query.
+     * @param source The source of this projection.
+     * @param metaDataStore MetaDataStore.
+     * @return true if the projection can be nested.
+     */
+    default boolean canNest(Queryable source, MetaDataStore metaDataStore) {
+        return true;
+    }
+
+    /**
+     * Translate a column into outer and inner query columns for a two-pass aggregation.
+     * @param source The source query of this projection.
+     * @param metaDataStore MetaDataStore.
+     * @param joinInOuter If possible, skip required joins in inner query and do the join in the outer query.
+     * @return A pair consisting of the outer column projection and a set of inner column projections.
+     */
+    Pair<ColumnProjection, Set<ColumnProjection>> nest(Queryable source,
+                                                       MetaDataStore metaDataStore,
+                                                       boolean joinInOuter);
+
+    /**
+     * Clones the projection and marks it as either projected or not projected.
+     * @param projected Whether or not this projection should be returned in the result.
+     * @param <T> The subclass of ColumnProjection.
+     * @return The cloned column.
+     */
+    <T extends ColumnProjection> T withProjected(boolean projected);
+
+    /**
+     * Clones the projection with provided arguments.
+     * @param arguments A map of String and {@link Argument}
+     * @return The cloned column.
+     */
+    ColumnProjection withArguments(Map<String, Argument> arguments);
+
+    /**
+     * Returns whether or not this column is projected in the output (included in SELECT) or
+     * only referenced in a filter expression.
+     * @return True if part of the output projection.  False otherwise.
+     */
+    default boolean isProjected() {
+        return true;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultMetricProjectionMaker.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultMetricProjectionMaker.java
new file mode 100644
index 0000000000..a7978427d2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultMetricProjectionMaker.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+
+import java.util.Map;
+
+/**
+ * Default maker which constructs a SQLMetricProjection.
+ */
+public class DefaultMetricProjectionMaker implements MetricProjectionMaker {
+    @Override
+    public MetricProjection make(Metric metric, String alias, Map<String, Argument> arguments) {
+        return new SQLMetricProjection(metric, alias, arguments);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMerger.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMerger.java
new file mode 100644
index 0000000000..f64377e3b9
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMerger.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Streams;
+
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Default implementation of logic to merge two or more query plans into one.
+ */
+public class DefaultQueryPlanMerger implements QueryPlanMerger {
+    MetaDataStore metaDataStore;
+
+    public DefaultQueryPlanMerger(MetaDataStore metaDataStore) {
+        this.metaDataStore = metaDataStore;
+    }
+
+    @Override
+    public boolean canMerge(QueryPlan a, QueryPlan b) {
+        Preconditions.checkNotNull(a);
+        Preconditions.checkNotNull(b);
+
+        if (a.nestDepth() != b.nestDepth()) {
+            if (a.nestDepth() > b.nestDepth() && !b.canNest(metaDataStore)) {
+                return false;
+            }
+
+            if (b.nestDepth() > a.nestDepth() && !a.canNest(metaDataStore)) {
+                return false;
+            }
+
+            a = nestToDepth(a, b.nestDepth());
+            b = nestToDepth(b, a.nestDepth());
+        }
+
+        boolean result = canMergeMetrics(a, b);
+        if (! result) {
+            return false;
+        }
+
+        result = canMergeFilter(a, b);
+        if (! result) {
+            return false;
+        }
+
+        result = canMergeDimensions(a, b);
+        if (! result) {
+            return false;
+        }
+
+        result = canMergeTimeDimensions(a, b);
+
+        if (!result) {
+            return false;
+        }
+
+        if (a.isNested()) {
+            result = canMerge((QueryPlan) a.getSource(), (QueryPlan) b.getSource());
+        }
+
+        return result;
+    }
+
+    protected boolean canMergeMetrics(QueryPlan a, QueryPlan b) {
+        /*
+         * Metrics can always coexist provided they have different aliases (which is enforced by the API).
+         */
+        return true;
+    }
+
+    protected boolean canMergeDimensions(QueryPlan a, QueryPlan b) {
+        for (DimensionProjection dimension : a.getDimensionProjections()) {
+            DimensionProjection otherDimension = b.getDimensionProjection(dimension.getName());
+
+            if (otherDimension != null && ! Objects.equals(otherDimension.getArguments(), dimension.getArguments())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected boolean canMergeTimeDimensions(QueryPlan a, QueryPlan b) {
+        for (TimeDimensionProjection dimension : a.getTimeDimensionProjections()) {
+            TimeDimensionProjection otherDimension = b.getTimeDimensionProjection(dimension.getName());
+
+            if (otherDimension != null && ! Objects.equals(otherDimension.getArguments(), dimension.getArguments())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected boolean canMergeFilter(QueryPlan a, QueryPlan b) {
+        if (! Objects.equals(a.getWhereFilter(), b.getWhereFilter())) {
+            return false;
+        }
+        return true;
+    }
+
+    protected FilterExpression mergeFilter(QueryPlan a, QueryPlan b) {
+        return a.getWhereFilter();
+    }
+
+    protected Set<MetricProjection> mergeMetrics(QueryPlan a, QueryPlan b) {
+        return Streams.concat(b.getMetricProjections().stream(),
+                a.getMetricProjections().stream()).collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    protected Set<DimensionProjection> mergeDimension(QueryPlan a, QueryPlan b) {
+        return Streams.concat(b.getDimensionProjections().stream(),
+                a.getDimensionProjections().stream()).collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    protected Set<TimeDimensionProjection> mergeTimeDimension(QueryPlan a, QueryPlan b) {
+        return Streams.concat(b.getTimeDimensionProjections().stream(),
+                a.getTimeDimensionProjections().stream()).collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    @Override
+    public QueryPlan merge(QueryPlan a, QueryPlan b) {
+        Preconditions.checkNotNull(a);
+        Preconditions.checkNotNull(b);
+
+        a = nestToDepth(a, b.nestDepth());
+        b = nestToDepth(b, a.nestDepth());
+
+        assert (a.isNested() || a.getSource().equals(b.getSource()));
+
+        Set<MetricProjection> metrics = mergeMetrics(a, b);
+        Set<TimeDimensionProjection> timeDimensions = mergeTimeDimension(a, b);
+        Set<DimensionProjection> dimensions = mergeDimension(a, b);
+
+        if (!a.isNested()) {
+            return QueryPlan.builder()
+                    .source(a.getSource())
+                    .metricProjections(metrics)
+                    .dimensionProjections(dimensions)
+                    .whereFilter(mergeFilter(a, b))
+                    .timeDimensionProjections(timeDimensions)
+                    .build();
+        }
+        Queryable mergedSource = merge((QueryPlan) a.getSource(), (QueryPlan) b.getSource());
+        return QueryPlan.builder()
+                .source(mergedSource)
+                .metricProjections(metrics)
+                .dimensionProjections(dimensions)
+                .timeDimensionProjections(timeDimensions)
+                .build();
+    }
+
+    private QueryPlan nestToDepth(QueryPlan plan, int depth) {
+        while (plan.nestDepth() < depth) {
+            plan = plan.nest(metaDataStore);
+        }
+        return plan;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DimensionProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DimensionProjection.java
new file mode 100644
index 0000000000..1bf55e76d1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/DimensionProjection.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+/**
+ * Represents a projected dimension column as an alias in a query.
+ */
+public interface DimensionProjection extends ColumnProjection {
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ImmutablePagination.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ImmutablePagination.java
new file mode 100644
index 0000000000..bed35df257
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/ImmutablePagination.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.request.Pagination;
+import lombok.Value;
+
+/**
+ * An immutable Pagination. Doesn't support getPageTotals/setPageTotals; page totals must be returned via QueryResult.
+ */
+@Value
+public class ImmutablePagination implements Pagination {
+
+    private int offset;
+    private int limit;
+    private boolean defaultInstance;
+    private boolean returnPageTotals;
+
+    public static ImmutablePagination from(Pagination src) {
+        if (src instanceof ImmutablePagination) {
+            return (ImmutablePagination) src;
+        }
+        if (src != null) {
+            return new ImmutablePagination(
+                    src.getOffset(), src.getLimit(), src.isDefaultInstance(), src.returnPageTotals());
+        }
+        return null;
+    }
+
+    @Override
+    public boolean returnPageTotals() {
+        return returnPageTotals;
+    }
+
+    @Override
+    public Long getPageTotals() {
+        return null;
+    }
+
+    @Override
+    public void setPageTotals(Long pageTotals) {
+        throw new UnsupportedOperationException("ImmutablePagination does not support setPageTotals");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjection.java
new file mode 100644
index 0000000000..ebfab54353
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjection.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+/**
+ * Represents a projected metric column as an alias in a query.
+ */
+public interface MetricProjection extends ColumnProjection {
+
+    /**
+     * Resolves the query plan that would fetch this particular metric.
+     * @param query The parent query
+     * @return the resolved query plan.
+     */
+    QueryPlan resolve(Query query);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjectionMaker.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjectionMaker.java
new file mode 100644
index 0000000000..7c3dac92dd
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/MetricProjectionMaker.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+
+import java.util.Map;
+
+/**
+ * Creates a metric projection for a given metric and client arguments.
+ */
+@FunctionalInterface
+public interface MetricProjectionMaker {
+
+    /**
+     * Constructs a metric projection from a Metric, alias, and arguments.
+     * @param metric the metric that is being projected.
+     * @param alias the client assigned alias.
+     * @param arguments The client provided arguments.
+     * @return A new metric projection.
+     */
+    MetricProjection make(Metric metric, String alias, Map<String, Argument> arguments);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Optimizer.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Optimizer.java
new file mode 100644
index 0000000000..587ddca31c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Optimizer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+/**
+ * Optimizes query plans.
+ */
+public interface Optimizer {
+
+    /**
+     * Returns the hint that identifies this optimizations.
+     * @return The hint which enables this optimization.
+     */
+    String hint();
+
+    /**
+     * Returns the hint that disables this optimization.
+     * @return The hint which turns off this optimization.
+     */
+    default String negateHint() {
+        return "No" + hint();
+    }
+
+    /**
+     * Verifies if this optimizer can execute on the given query.
+     * @return True if the query can be optimized by this optimizer.
+     */
+    boolean canOptimize(Query query);
+
+    /**
+     * Optimizes the query.
+     * @param query The query to optimize.
+     * @return A new optimized query.
+     */
+    Query optimize(Query query);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Query.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Query.java
new file mode 100644
index 0000000000..e544ded99a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Query.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.Singular;
+import lombok.Value;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * A {@link Query} is an object representing a query executed by {@link QueryEngine}.
+ */
+@Value
+@Builder
+public class Query implements Queryable {
+
+    @NonNull
+    private Queryable source;
+
+    @Singular
+    @NonNull
+    private List<MetricProjection> metricProjections;
+
+    @Singular
+    @NonNull
+    private List<DimensionProjection> dimensionProjections;
+
+    @Singular
+    @NonNull
+    private List<TimeDimensionProjection> timeDimensionProjections;
+
+    private FilterExpression whereFilter;
+    private FilterExpression havingFilter;
+    private Sorting sorting;
+    private ImmutablePagination pagination;
+
+    @Builder.Default
+    private Map<String, Argument> arguments = new HashMap<>();
+
+    @EqualsAndHashCode.Exclude
+    private RequestScope scope;
+
+    /**
+     * Whether to bypass the {@link QueryEngine} cache for this query.
+     */
+    @EqualsAndHashCode.Exclude
+    private boolean bypassingCache;
+
+    @Override
+    public <T> T accept(QueryVisitor<T> visitor) {
+        return visitor.visitQuery(this);
+    }
+
+    /**
+     * Returns all the dimensions regardless of type.
+     * @return All the dimensions.
+     */
+    public List<ColumnProjection> getAllDimensionProjections() {
+        return Stream.concat(getDimensionProjections().stream(), getTimeDimensionProjections().stream())
+                .collect(Collectors.toCollection(ArrayList::new));
+    }
+
+    public static class QueryBuilder {
+
+        public QueryBuilder column(ColumnProjection column) {
+            if (column instanceof MetricProjection) {
+                metricProjection((MetricProjection) column);
+            } else if (column instanceof DimensionProjection) {
+                dimensionProjection((DimensionProjection) column);
+            } else {
+                timeDimensionProjection((TimeDimensionProjection) column);
+            }
+
+            return this;
+        }
+
+        /**
+         * Initializes the builder from another query (copy).
+         * @param query What to copy.
+         * @return A new query builder.
+         */
+        public QueryBuilder query(Query query) {
+            this.source(query.getSource());
+            this.metricProjections(query.getMetricProjections());
+            this.dimensionProjections(query.getDimensionProjections());
+            this.timeDimensionProjections(query.getTimeDimensionProjections());
+            this.arguments(query.getArguments());
+            this.sorting(query.getSorting());
+            this.pagination(query.getPagination());
+            this.whereFilter(query.getWhereFilter());
+            this.havingFilter(query.getHavingFilter());
+            this.bypassingCache(query.isBypassingCache());
+            this.scope(query.getScope());
+
+            return this;
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlan.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlan.java
new file mode 100644
index 0000000000..2f73a57ae3
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlan.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Singular;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * A {@link QueryPlan} is a partial Query bound to a particular Metric.
+ */
+@Builder
+public class QueryPlan implements Queryable {
+
+    @NonNull
+    @Getter
+    private Queryable source;
+
+    @Singular
+    @NonNull
+    @Getter
+    private List<MetricProjection> metricProjections;
+
+    @Singular
+    @NonNull
+    @Getter
+    private List<DimensionProjection> dimensionProjections;
+
+    @Singular
+    @NonNull
+    @Getter
+    private List<TimeDimensionProjection> timeDimensionProjections;
+
+    @Getter
+    private FilterExpression whereFilter;
+
+    /**
+     * Tests whether or not this plan can be nested.
+     * @param metaDataStore MetaDataStore.
+     * @return True if the projection can be nested.  False otherwise.
+     */
+    public boolean canNest(MetaDataStore metaDataStore) {
+        return getColumnProjections().stream().allMatch(projection -> projection.canNest(source, metaDataStore));
+    }
+
+    /**
+     * Breaks a flat query into a nested query.  There are multiple approaches for how to do this, but
+     * this kind of nesting requires aggregation to happen both in the inner and outer queries.  This allows
+     * query plans with two-pass aggregations to be merged with simpler one-pass aggregation plans.
+     *
+     * The nesting performed here attempts to perform all joins in the inner query.
+     *
+     * @param metaDataStore MetaDataStore.
+     * @return A nested query plan.
+     */
+    public QueryPlan nest(MetaDataStore metaDataStore) {
+        if (!canNest(metaDataStore)) {
+            throw new UnsupportedOperationException("Cannot nest this query plan");
+        }
+
+        Set<Pair<ColumnProjection, Set<ColumnProjection>>> nestedMetrics = metricProjections.stream()
+                .map(projection -> projection.nest(source, metaDataStore, false))
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        Set<Pair<ColumnProjection, Set<ColumnProjection>>> nestedDimensions = dimensionProjections.stream()
+                .map(projection -> projection.nest(source, metaDataStore, false))
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        Set<Pair<ColumnProjection, Set<ColumnProjection>>> nestedTimeDimensions = timeDimensionProjections.stream()
+                .map(projection -> projection.nest(source, metaDataStore, false))
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        QueryPlan inner = QueryPlan.builder()
+                .source(this.getSource())
+                .whereFilter(whereFilter)
+                .metricProjections(nestedMetrics.stream()
+                        .map(Pair::getRight)
+                        .flatMap(Set::stream)
+                        .map(MetricProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .dimensionProjections(nestedDimensions.stream()
+                        .map(Pair::getRight)
+                        .flatMap(Set::stream)
+                        .map(DimensionProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .timeDimensionProjections(nestedTimeDimensions.stream()
+                        .map(Pair::getRight)
+                        .flatMap(Set::stream)
+                        .map(TimeDimensionProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .build();
+
+        return QueryPlan.builder()
+                .source(inner)
+                .metricProjections(nestedMetrics.stream()
+                        .map(Pair::getLeft)
+                        .map(MetricProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .dimensionProjections(nestedDimensions.stream()
+                        .map(Pair::getLeft)
+                        .map(DimensionProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .timeDimensionProjections(nestedTimeDimensions.stream()
+                        .map(Pair::getLeft)
+                        .map(TimeDimensionProjection.class::cast)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)))
+                .build();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlanMerger.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlanMerger.java
new file mode 100644
index 0000000000..1e606859f1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryPlanMerger.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Merges multiple query plans into a smaller set (one if possible).
+ */
+public interface QueryPlanMerger {
+
+    /**
+     * Determines if two plans can be merged.
+     * @param a plan A.
+     * @param b plan B.
+     * @return True if the plans can be merged.  False otherwise.
+     */
+    public boolean canMerge(QueryPlan a, QueryPlan b);
+
+    /**
+     * Merges two plans.
+     * @param a plan A.
+     * @param b plan B.
+     * @return A new query plan resulting from the merge of A and B.
+     */
+    public QueryPlan merge(QueryPlan a, QueryPlan b);
+
+    /**
+     * Collapses a list of query plans into a potentially smaller list of merged plans.
+     * @param plans The list of plans to merge.
+     * @return A list of merged plans - ideally containing a single merged plan.
+     */
+    default List<QueryPlan> merge(List<QueryPlan> plans) {
+        QueryPlan mergedPlan = null;
+
+        List<QueryPlan> result = new LinkedList<>();
+
+        for (QueryPlan plan: plans) {
+            if (mergedPlan == null) {
+                mergedPlan = plan;
+            } else {
+                if (canMerge(mergedPlan, plan)) {
+                    mergedPlan = merge(plan, mergedPlan);
+                } else {
+                    result.add(plan);
+                }
+            }
+        }
+
+        result.add(0, mergedPlan);
+        return result;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryResult.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryResult.java
new file mode 100644
index 0000000000..b78d4fb2c3
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryResult.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+import java.io.Serializable;
+
+/**
+ * A {@link QueryResult} contains the results from {@link QueryEngine#executeQuery(Query, QueryEngine.Transaction)}.
+ * @param <T> The type/model of data being returned.
+ */
+@Value
+@Builder
+public class QueryResult<T> implements Serializable {
+    private static final long serialVersionUID = -3748307200186480683L;
+
+    @NonNull
+    private Iterable<T> data;
+
+    /**
+     * Total record count. Null unless Query had Pagination with {@link Pagination#returnPageTotals()} set.
+     */
+    private Long pageTotals;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryVisitor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryVisitor.java
new file mode 100644
index 0000000000..1a2a41da89
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/QueryVisitor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+/**
+ * Visits a query object hierarchy to construct a type T.  Useful for building translators, validators, etc.
+ * @param <T> The type the visitor returns after walking the AST.
+ */
+public interface QueryVisitor<T> {
+
+    /**
+     * Visit the query node.
+     * @param query The query.
+     * @return The type T.
+     */
+    public T visitQuery(Query query);
+
+    /**
+     * Visit the table node.
+     * @param table The table.
+     * @return The type T.
+     */
+    public T visitQueryable(Queryable table);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Queryable.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Queryable.java
new file mode 100644
index 0000000000..67858a9b69
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/Queryable.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLJoin;
+import com.google.common.collect.Streams;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Represents something that can be queried.  There are generally, three kinds:
+ * - Tables
+ * - Queries (a subquery)
+ * - Joins (a join between multiple tables or subqueries).
+ */
+public interface Queryable {
+
+    /**
+     * Returns the source of this queryable's data.  The source could be itself.
+     * @return The data source.
+     */
+    Queryable getSource();
+
+    /**
+     * Every queryable needs an alias which uniquely identifies the queryable in an individual query.
+     * @return The alias
+     */
+    default String getAlias() {
+        //Eliminate any negative hash codes.
+        return getSource().getAlias() + "_" + (hashCode() & 0x7fffffff);
+    }
+
+    /**
+     * The name of the queryable.
+     * @return The name
+     */
+    default String getName() {
+        return getAlias();
+    }
+
+    /**
+     * The version of the queryable.
+     * @return The version
+     */
+    default String getVersion() {
+        return "";
+    }
+
+    /**
+     * Retrieves a column by name.
+     * @param name The alias of the column.
+     * @return The column.
+     */
+    default ColumnProjection getColumnProjection(String name) {
+        return getColumnProjections().stream()
+                .filter(dim -> dim.getAlias().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves a column by name and arguments.
+     * @param name The alias of the column.
+     * @param arguments Arguments provided for the column.
+     * @return The column.
+     */
+    default ColumnProjection getColumnProjection(String name, Map<String, Argument> arguments, boolean isProjected) {
+        return getColumnProjections().stream()
+                .filter(dim -> dim.isProjected() == isProjected)
+                .filter(dim -> dim.getAlias().equals(name) && dim.getArguments().equals(arguments))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves a column by name and arguments.
+     * @param name The alias of the column.
+     * @param arguments Arguments provided for the column.
+     * @return The column.
+     */
+    default ColumnProjection getColumnProjection(String name, Map<String, Argument> arguments) {
+        return getColumnProjections().stream()
+                .filter(dim -> dim.getAlias().equals(name) && dim.getArguments().equals(arguments))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves a column by filter predicate
+     * @param filterPredicate A predicate to search for column projections.
+     * @return The column.
+     */
+    default ColumnProjection getColumnProjection(Predicate<ColumnProjection> filterPredicate) {
+        return getColumnProjections().stream()
+                .filter(filterPredicate)
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves a non-time dimension by name.
+     * @param name The name of the dimension.
+     * @return The dimension.
+     */
+    default DimensionProjection getDimensionProjection(String name) {
+        return getDimensionProjections().stream()
+                .filter(dim -> dim.getAlias().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves all the non-time dimensions.
+     * @return The non-time dimensions.
+     */
+    List<DimensionProjection> getDimensionProjections();
+
+    /**
+     * Retrieves a metric by name.
+     * @param name The name of the metric.
+     * @return The metric.
+     */
+    default MetricProjection getMetricProjection(String name) {
+        return getMetricProjections().stream()
+                .filter(metric -> metric.getAlias().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves all the metrics.
+     * @return The metrics.
+     */
+    List<MetricProjection> getMetricProjections();
+
+    /**
+     * Retrieves a time dimension by name.
+     * @param name The name of the time dimension.
+     * @return The time dimension.
+     */
+    default TimeDimensionProjection getTimeDimensionProjection(String name) {
+        return getTimeDimensionProjections().stream()
+                .filter(dim -> dim.getAlias().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Retrieves all the time dimensions.
+     * @return The time dimensions.
+     */
+    List<TimeDimensionProjection> getTimeDimensionProjections();
+
+    /**
+     * Returns all the columns.
+     * @return the columns.
+     */
+    default List<ColumnProjection> getColumnProjections() {
+        return Streams.concat(
+                getTimeDimensionProjections().stream(),
+                getDimensionProjections().stream(),
+                getMetricProjections().stream())
+                .collect(Collectors.toList());
+    }
+
+
+    default <T extends ColumnProjection> List<T> getFilterProjections(
+            FilterExpression expression,
+            Class<T> columnType
+    ) {
+        return getFilterProjections(expression).stream()
+                .filter(columnType::isInstance)
+                .map(columnType::cast)
+                .collect(Collectors.toList());
+    }
+
+    default FilterExpression getWhereFilter() {
+        return null;
+    }
+
+    default List<ColumnProjection> getFilterProjections(FilterExpression expression) {
+        List<ColumnProjection> results = new ArrayList<>();
+        if (expression == null) {
+            return results;
+        }
+
+        Collection<FilterPredicate> predicates = expression.accept(new PredicateExtractionVisitor());
+
+        predicates.stream().forEach((predicate -> {
+            Map<String, Argument> arguments = new HashMap<>();
+
+            predicate.getPath().lastElement().get().getArguments().forEach(argument ->
+                    arguments.put(argument.getName(), argument)
+            );
+
+            ColumnProjection projection = getSource().getColumnProjection(predicate.getField(), arguments);
+
+            results.add(projection);
+        }));
+
+        return results;
+    }
+
+    /**
+     * Returns the connection details where this queryable is sourced from.
+     * @return the connectinon details
+     */
+    default ConnectionDetails getConnectionDetails() {
+        return getRoot().getConnectionDetails();
+    }
+
+    /**
+     * Execute a visitor on this query.
+     * @param visitor The visitor to execute.
+     * @param <T> The return type of the visitor.
+     * @return Something that the visitor is constructing.
+     */
+    default <T> T accept(QueryVisitor<T> visitor) {
+        return visitor.visitQueryable(this);
+    }
+
+    /**
+     * Determines if this queryable is nested from another queryable.
+     * @return true if the source is another queryable.  False otherwise.
+     */
+    default boolean isNested() {
+        Queryable source = getSource();
+
+        //A table with no source is not nested.  Neither is a query with a source table.
+        return (source != null && source.getSource() != source);
+    }
+
+    /**
+     * Gets the root table for the queryable.
+     * @return the root table.
+     */
+    default Queryable getRoot() {
+        Queryable current = this;
+        while (current.isNested()) {
+            current = current.getSource();
+        }
+
+        return current.getSource();
+    }
+
+    /**
+     * Determines if this queryable is root table.
+     * @return true if this queryable is root table.
+     */
+    default boolean isRoot() {
+        return this == this.getRoot();
+    }
+
+    /**
+     * Returns the depth of the nesting of this Queryable.
+     * @return 0 for unnested.  Positive integer for nested..
+     */
+    default int nestDepth() {
+        int depth = 0;
+        Queryable current = this;
+        while (current.isNested()) {
+            depth++;
+            current = current.getSource();
+        }
+        return depth;
+    }
+
+    /**
+     * Get the joins associated with table source of this queryable.
+     * @return A map of join name and {@link SQLJoin}.
+     */
+    default Map<String, SQLJoin> getJoins() {
+        return this.getRoot().getJoins();
+    }
+
+    /**
+     * Get the join info for the given join column.
+     * @param joinName Join Name.
+     * @return {@link SQLJoin} for the given join column.
+     */
+    default SQLJoin getJoin(String joinName) {
+        return getJoins().get(joinName);
+    }
+
+    /**
+     * Check if table source of this queryable has the given join column.
+     * @param joinName Join Name.
+     * @return true if table source of this queryable has the given join column.
+     */
+    default boolean hasJoin(String joinName) {
+        return getJoins().containsKey(joinName);
+    }
+
+    /**
+     * Get the dialect info for the table source of this queryable.
+     * @return {@link SQLDialect} for the table source.
+     */
+    default SQLDialect getDialect() {
+        return getConnectionDetails().getDialect();
+    }
+
+    /**
+     * Converts a filter expression into a set of ColumnProjections.
+     * @param query The parent query.
+     * @param expression The filter expression to extract.
+     * @return A set of zero or more column projections with their arguments.
+     */
+    static Set<ColumnProjection> extractFilterProjections(Queryable query, FilterExpression expression) {
+        if (expression == null) {
+            return new LinkedHashSet<>();
+        }
+
+        Collection<FilterPredicate> predicates = expression.accept(new PredicateExtractionVisitor());
+
+        Set<ColumnProjection> filterProjections = new LinkedHashSet<>();
+        predicates.stream().forEach((predicate -> {
+            Map<String, Argument> arguments = new HashMap<>();
+
+            predicate.getPath().lastElement().get().getArguments().forEach(argument ->
+                    arguments.put(argument.getName(), argument)
+            );
+
+            ColumnProjection projection = query.getSource().getColumnProjection(predicate.getField(), arguments);
+
+            if (projection != null) {
+                filterProjections.add(projection);
+            }
+        }));
+
+        return filterProjections;
+    }
+
+    /**
+     * Gets the available arguments for this queryable.
+     * @return available arguments for this queryable as map of String and {@link Argument}.
+     */
+    default Map<String, Argument> getArguments() {
+        return Collections.emptyMap();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/TimeDimensionProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/TimeDimensionProjection.java
new file mode 100644
index 0000000000..6bd1a94861
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/query/TimeDimensionProjection.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.util.TimeZone;
+
+/**
+ * Represents a requested time dimension in a query.
+ */
+public interface TimeDimensionProjection extends ColumnProjection {
+
+    /**
+     * Get the requested time grain.
+     *
+     * @return time grain
+     */
+    TimeGrain getGrain();
+
+    /**
+     * Get the requested time zone.
+     *
+     * @return time zone
+     */
+    TimeZone getTimeZone();
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ConnectionDetails.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ConnectionDetails.java
new file mode 100644
index 0000000000..569d210b36
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ConnectionDetails.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import javax.sql.DataSource;
+
+/**
+ * Custom class to abstract {@link DataSource} and {@link SQLDialect}.
+ */
+@Data
+@AllArgsConstructor
+public class ConnectionDetails {
+    private DataSource dataSource;
+    private SQLDialect dialect;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DataSourceConfiguration.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DataSourceConfiguration.java
new file mode 100644
index 0000000000..fb69f3b12a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DataSourceConfiguration.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import com.yahoo.elide.modelconfig.DBPasswordExtractor;
+import com.yahoo.elide.modelconfig.model.DBConfig;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import javax.sql.DataSource;
+
+/**
+ * Interface for providing DataSource to use for connection pooling.
+ */
+public interface DataSourceConfiguration {
+    /**
+     * Provides DataSource to use for connection pooling.
+     * @param dbConfig DB Config POJO.
+     * @param dbPasswordExtractor Password Extractor Implementation.
+     * @return DataSource Object.
+     */
+    default DataSource getDataSource(DBConfig dbConfig, DBPasswordExtractor dbPasswordExtractor) {
+        HikariConfig config = new HikariConfig();
+
+        config.setJdbcUrl(dbConfig.getUrl());
+        config.setUsername(dbConfig.getUser());
+        config.setPassword(dbPasswordExtractor.getDBPassword(dbConfig));
+        config.setDriverClassName(dbConfig.getDriver());
+        dbConfig.getPropertyMap().forEach((k, v) -> config.addDataSourceProperty(k, v));
+
+        return new HikariDataSource(config);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydrator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydrator.java
new file mode 100644
index 0000000000..f22d5b8d20
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydrator.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.ParameterizedModel;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Hour;
+import com.yahoo.elide.datastores.aggregation.timegrains.ISOWeek;
+import com.yahoo.elide.datastores.aggregation.timegrains.Minute;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import com.yahoo.elide.datastores.aggregation.timegrains.Quarter;
+import com.yahoo.elide.datastores.aggregation.timegrains.Second;
+import com.yahoo.elide.datastores.aggregation.timegrains.Week;
+import com.yahoo.elide.datastores.aggregation.timegrains.Year;
+import org.apache.commons.lang3.mutable.MutableInt;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
+
+/**
+ * {@link EntityHydrator} hydrates the entity loaded by
+ * {@link QueryEngine#executeQuery(Query, QueryEngine.Transaction)}.
+ */
+@Slf4j
+public class EntityHydrator implements Iterable<Object> {
+
+    @Getter(AccessLevel.PROTECTED)
+    private final EntityDictionary entityDictionary;
+
+    @Getter(AccessLevel.PRIVATE)
+    private final Query query;
+
+    private ResultSet resultSet;
+
+    private Map<String, String> projections;
+
+    public EntityHydrator(ResultSet resultSet, Query query, EntityDictionary entityDictionary) {
+        this.query = query;
+        this.entityDictionary = entityDictionary;
+        this.resultSet = resultSet;
+
+        //Get all the projections from the client query.
+        projections = this.query.getMetricProjections().stream()
+                .map(SQLMetricProjection.class::cast)
+                .filter(SQLColumnProjection::isProjected)
+                .filter(projection -> ! projection.getValueType().equals(ValueType.ID))
+                .collect(Collectors.toMap(MetricProjection::getAlias, MetricProjection::getSafeAlias));
+
+        projections.putAll(this.query.getAllDimensionProjections().stream()
+                .map(SQLColumnProjection.class::cast)
+                .filter(SQLColumnProjection::isProjected)
+                .collect(Collectors.toMap(ColumnProjection::getAlias, ColumnProjection::getSafeAlias)));
+    }
+
+    /**
+     * Coerces results from a {@link Query} into an Object.
+     *
+     * @param result a fieldName-value map
+     * @param counter Monotonically increasing number to generate IDs.
+     * @return A hydrated entity object.
+     */
+    protected Object coerceObjectToEntity(Map<String, Object> result, MutableInt counter) {
+        Table table = getBaseTable(query);
+        Type<?> entityClass = entityDictionary.getEntityClass(table.getName(), table.getVersion());
+
+        //Construct the object.
+        Object entityInstance;
+        try {
+            entityInstance = entityClass.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
+
+        result.forEach((fieldName, value) -> {
+            ColumnProjection columnProjection = query.getColumnProjection(fieldName);
+            Column column = table.getColumn(Column.class, columnProjection.getName());
+
+            Type<?> fieldType = getType(entityClass, columnProjection);
+            Attribute attribute = projectionToAttribute(columnProjection, fieldType);
+
+            ValueType valueType = column.getValueType();
+
+            if (entityInstance instanceof ParameterizedModel) {
+
+                // This is an ENUM_TEXT or ENUM_ORDINAL type.
+                if (! fieldType.isEnum() //Java enums can be coerced directly via CoerceUtil - so skip them.
+                        && valueType == ValueType.TEXT
+                        && column.getValues() != null
+                        && !column.getValues().isEmpty()) {
+                    value = convertToEnumValue(value, column.getValues());
+                }
+
+                ((ParameterizedModel) entityInstance).addAttributeValue(
+                    attribute,
+                    CoerceUtil.coerce(value, fieldType));
+            } else {
+                    getEntityDictionary().setValue(entityInstance, fieldName, value);
+            }
+        });
+
+        //Set the ID (it must be coerced from an integer)
+        getEntityDictionary().setValue(
+                entityInstance,
+                getEntityDictionary().getIdFieldName(entityClass),
+                counter.getAndIncrement()
+        );
+
+        return entityInstance;
+    }
+
+    private Table getBaseTable(Query query) {
+        Queryable next = query;
+        while (next.isNested()) {
+            next = next.getSource();
+        }
+
+        return (Table) next.getSource();
+    }
+
+    private Attribute projectionToAttribute(ColumnProjection projection, Type valueType) {
+        return Attribute.builder()
+                .alias(projection.getAlias())
+                .name(projection.getName())
+                .arguments(projection.getArguments().values())
+                .type(valueType)
+                .build();
+    }
+
+    private Type getType(Type modelType, ColumnProjection column) {
+        if (! (column instanceof TimeDimensionProjection)) {
+            return entityDictionary.getType(modelType, column.getName());
+        }
+
+        switch (((TimeDimensionProjection) column).getGrain()) {
+            case SECOND:
+                return ClassType.of(Second.class);
+            case MINUTE:
+                return ClassType.of(Minute.class);
+            case HOUR:
+                return ClassType.of(Hour.class);
+            case DAY:
+                return ClassType.of(Day.class);
+            case ISOWEEK:
+                return ClassType.of(ISOWeek.class);
+            case WEEK:
+                return ClassType.of(Week.class);
+            case MONTH:
+                return ClassType.of(Month.class);
+            case QUARTER:
+                return ClassType.of(Quarter.class);
+            case YEAR:
+                return ClassType.of(Year.class);
+            default:
+                throw new IllegalStateException("Invalid grain type");
+        }
+    }
+
+    private String convertToEnumValue(Object value, LinkedHashSet<String> enumValues) {
+        if (value == null) {
+            return null;
+        }
+
+        if (Integer.class.isAssignableFrom(value.getClass())) {
+            Integer valueIndex = (Integer) value;
+            if (valueIndex < enumValues.size()) {
+                return enumValues.toArray(new String[0])[valueIndex];
+            }
+        }
+        else if (enumValues.contains(value.toString())) {
+            return value.toString();
+        }
+
+        throw new InvalidValueException(value, "Value must map to a value in: " + enumValues);
+    }
+
+    @Override
+    public Iterator<Object> iterator() {
+        return new Iterator<> () {
+
+            Object next = null;
+            MutableInt counter = new MutableInt(0);
+
+            @Override
+            public boolean hasNext() {
+                if (next == null) {
+                    try {
+                        next = next();
+                    } catch (NoSuchElementException e) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            @Override
+            public Object next() {
+
+                if (next != null) {
+                    Object result = next;
+                    next = null;
+                    return result;
+                }
+
+                try {
+                    boolean hasNext = resultSet.next();
+                    if (! hasNext) {
+                        throw new NoSuchElementException();
+                    }
+                    Map<String, Object> row = new LinkedHashMap<>();
+
+                    for (Map.Entry<String, String> entry : projections.entrySet()) {
+                        Object value = resultSet.getObject(entry.getValue());
+                        row.put(entry.getKey(), value);
+                    }
+
+                    return coerceObjectToEntity(row, counter);
+                } catch (SQLException e) {
+                    log.error("Error iterating over results {}", e.getMessage());
+                }
+                throw new NoSuchElementException();
+            }
+        };
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/NamedParamPreparedStatement.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/NamedParamPreparedStatement.java
new file mode 100644
index 0000000000..f63ab8f569
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/NamedParamPreparedStatement.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import lombok.Getter;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Wrapper Class to support named parameter substitution for {@link PreparedStatement}.
+ */
+public class NamedParamPreparedStatement {
+
+    /**
+     * Parameter Pattern as defined in {@link FilterPredicate#getParameters()}.
+     * examples:
+     * :overallRating_c82e10a5_0
+     * :lowScore_7c4e440_0
+     */
+    private static final Pattern PARAMETER_PATTERN = Pattern.compile("(?<!')(:[\\w]+_[0-9A-Fa-f]+_[\\d]+)(?!')");
+
+    @Getter
+    private PreparedStatement preparedStatement;
+    private List<String> fields = new ArrayList<>();
+
+    public NamedParamPreparedStatement(Connection conn, String namedParamQuery) throws SQLException {
+
+        Matcher matcher = PARAMETER_PATTERN.matcher(namedParamQuery);
+        while (matcher.find()) {
+            fields.add(matcher.group().substring(1));
+        }
+        preparedStatement = conn.prepareStatement(namedParamQuery.replaceAll(PARAMETER_PATTERN.pattern(), "?"));
+    }
+
+    public ResultSet executeQuery() throws SQLException {
+        return preparedStatement.executeQuery();
+    }
+
+    public void close() throws SQLException {
+        preparedStatement.close();
+    }
+
+    public void cancel() throws SQLException {
+        preparedStatement.cancel();
+    }
+
+    public boolean isClosed() throws SQLException {
+        return preparedStatement.isClosed();
+    }
+
+    public void setObject(String paramName, Object paramValue) throws SQLException {
+        preparedStatement.setObject(getIndex(paramName), paramValue);
+    }
+
+    private int getIndex(String paramName) {
+        return fields.indexOf(paramName) + 1;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SQLQueryEngine.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SQLQueryEngine.java
new file mode 100644
index 0000000000..48b0aec9d6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SQLQueryEngine.java
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.applyQuotes;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.TimedFunction;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.QueryValidator;
+import com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage;
+import com.yahoo.elide.datastores.aggregation.metadata.FormulaValidator;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlan;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.VersionQuery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.NativeQuery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.QueryPlanTranslator;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.QueryTranslator;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLTimeDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import com.yahoo.elide.datastores.aggregation.validator.ColumnArgumentValidator;
+import com.yahoo.elide.datastores.aggregation.validator.TableArgumentValidator;
+import com.google.common.base.Preconditions;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.annotation.Annotation;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.sql.DataSource;
+
+/**
+ * QueryEngine for SQL backed stores.
+ */
+@Slf4j
+public class SQLQueryEngine extends QueryEngine {
+
+    @Getter
+    private final Set<Optimizer> optimizers;
+    private final QueryValidator validator;
+    private final FormulaValidator formulaValidator;
+    private final Function<String, ConnectionDetails> connectionDetailsLookup;
+    private final QueryPlanMerger merger;
+
+    public SQLQueryEngine(MetaDataStore metaDataStore, Function<String, ConnectionDetails> connectionDetailsLookup) {
+        this(metaDataStore, connectionDetailsLookup, new HashSet<>(), new DefaultQueryPlanMerger(metaDataStore),
+                new DefaultQueryValidator(metaDataStore.getMetadataDictionary()));
+    }
+
+    /**
+     * Constructor.
+     * @param metaDataStore : MetaDataStore.
+     * @param connectionDetailsLookup : maps a connection name to meta info about the connection.
+     * @param optimizers The set of enabled optimizers.
+     * @param merger Merges multiple plans into a smaller set (one if possible)
+     * @param validator Validates each incoming client query.
+     */
+    public SQLQueryEngine(
+            MetaDataStore metaDataStore,
+            Function<String, ConnectionDetails> connectionDetailsLookup,
+            Set<Optimizer> optimizers,
+            QueryPlanMerger merger,
+            QueryValidator validator
+    ) {
+
+        Preconditions.checkNotNull(connectionDetailsLookup);
+
+        this.connectionDetailsLookup = connectionDetailsLookup;
+        this.metaDataStore = metaDataStore;
+        this.validator = validator;
+        this.formulaValidator = new FormulaValidator(metaDataStore);
+        this.metadataDictionary = metaDataStore.getMetadataDictionary();
+        populateMetaData(metaDataStore);
+        this.optimizers = optimizers;
+        this.merger = merger;
+    }
+
+    private static final Function<ResultSet, Object> SINGLE_RESULT_MAPPER = rs -> {
+        try {
+            if (rs.next()) {
+                return rs.getObject(1);
+            }
+            return null;
+        } catch (SQLException e) {
+            throw new IllegalStateException(e);
+        }
+    };
+
+    @Override
+    protected Namespace constructNamespace(NamespacePackage namespacePackage) {
+        return new Namespace(namespacePackage);
+    }
+
+    @Override
+    protected Table constructTable(Namespace namespace, Type<?> entityClass, EntityDictionary metaDataDictionary) {
+        String dbConnectionName = null;
+        Annotation annotation = EntityDictionary.getFirstAnnotation(entityClass,
+                        Arrays.asList(FromTable.class, FromSubquery.class));
+        if (annotation instanceof FromTable) {
+            dbConnectionName = ((FromTable) annotation).dbConnectionName();
+        } else if (annotation instanceof FromSubquery) {
+            dbConnectionName = ((FromSubquery) annotation).dbConnectionName();
+        }
+
+        ConnectionDetails connectionDetails = connectionDetailsLookup.apply(dbConnectionName);
+        return new SQLTable(namespace, entityClass, metaDataDictionary, connectionDetails);
+    }
+
+    @Override
+    public DimensionProjection constructDimensionProjection(Dimension dimension,
+                                                            String alias,
+                                                            Map<String, Argument> arguments) {
+        return new SQLDimensionProjection(dimension, alias, arguments, true);
+    }
+
+    @Override
+    public TimeDimensionProjection constructTimeDimensionProjection(TimeDimension dimension,
+                                                                    String alias,
+                                                                    Map<String, Argument> arguments) {
+        return new SQLTimeDimensionProjection(dimension, dimension.getTimezone(), alias, arguments, true);
+    }
+
+    @Override
+    public MetricProjection constructMetricProjection(Metric metric,
+                                                      String alias,
+                                                      Map<String, Argument> arguments) {
+        return metric.getMetricProjectionMaker().make(metric, alias, arguments);
+    }
+
+    @Override
+    protected void verifyMetaData(MetaDataStore metaDataStore) {
+        metaDataStore.getTables().forEach(table -> {
+            SQLTable sqlTable = (SQLTable) table;
+
+            checkForCycles(sqlTable);
+
+            TableArgumentValidator tableArgValidator = new TableArgumentValidator(metaDataStore, sqlTable);
+            tableArgValidator.validate();
+
+            sqlTable.getAllColumns().forEach(column -> {
+                ColumnArgumentValidator colArgValidator = new ColumnArgumentValidator(metaDataStore, sqlTable, column);
+                colArgValidator.validate();
+            });
+        });
+    }
+
+    /**
+     * Verify that there is no reference loop for given {@link SQLTable}.
+     * @param sqlTable Queryable to validate.
+     */
+    private void checkForCycles(SQLTable sqlTable) {
+        sqlTable.getColumnProjections().forEach(column -> formulaValidator.parse(sqlTable, column));
+    }
+
+    /**
+     * State needed for SQLQueryEngine to execute queries.
+     */
+    static class SqlTransaction implements QueryEngine.Transaction {
+
+        private Connection conn;
+        private final List<NamedParamPreparedStatement> stmts = new ArrayList<>();
+
+        private void initializeConnection(DataSource dataSource) {
+            try {
+                this.conn = dataSource.getConnection();
+            } catch (SQLException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        public NamedParamPreparedStatement initializeStatement(String namedParamQuery, DataSource dataSource) {
+            NamedParamPreparedStatement stmt;
+            try {
+                if (conn == null || !conn.isValid(10)) {
+                    initializeConnection(dataSource);
+                }
+                stmt = new NamedParamPreparedStatement(conn, namedParamQuery);
+                stmts.add(stmt);
+            } catch (SQLException e) {
+                throw new IllegalStateException(e);
+            }
+            return stmt;
+        }
+
+        @Override
+        public void close() {
+            stmts.forEach(SQLQueryEngine::cancelAndCloseSoftly);
+            closeSoftly(conn);
+        }
+
+        @Override
+        public void cancel() {
+            stmts.forEach(SQLQueryEngine::cancelSoftly);
+        }
+    }
+
+    @Override
+    public QueryEngine.Transaction beginTransaction() {
+        return new SqlTransaction();
+    }
+
+    @Override
+    public QueryResult executeQuery(Query query, Transaction transaction) {
+        SqlTransaction sqlTransaction = (SqlTransaction) transaction;
+        ConnectionDetails details = query.getConnectionDetails();
+        DataSource dataSource = details.getDataSource();
+        SQLDialect dialect = details.getDialect();
+
+        Query expandedQuery = expandMetricQueryPlans(query);
+
+        // Translate the query into SQL.
+        NativeQuery sql = toSQL(expandedQuery, dialect);
+        String queryString = sql.toString();
+
+        QueryResult.QueryResultBuilder resultBuilder = QueryResult.builder();
+        NamedParamPreparedStatement stmt;
+
+        Pagination pagination = query.getPagination();
+        if (returnPageTotals(pagination)) {
+            resultBuilder.pageTotals(getPageTotal(expandedQuery, sql, query, sqlTransaction));
+        }
+
+        log.debug("SQL Query: " + queryString);
+        stmt = sqlTransaction.initializeStatement(queryString, dataSource);
+
+        // Supply the query parameters to the query
+        supplyFilterQueryParameters(query, stmt, dialect);
+
+        // Run the primary query and log the time spent.
+        ResultSet resultSet = runQuery(stmt, queryString, Function.identity());
+
+        resultBuilder.data(new EntityHydrator(resultSet, query, metadataDictionary));
+        return resultBuilder.build();
+    }
+
+    private long getPageTotal(Query expandedQuery, NativeQuery sql, Query clientQuery, SqlTransaction sqlTransaction) {
+        ConnectionDetails details = expandedQuery.getConnectionDetails();
+        DataSource dataSource = details.getDataSource();
+        SQLDialect dialect = details.getDialect();
+        NativeQuery paginationSQL = toPageTotalSQL(expandedQuery, sql, dialect);
+
+        if (paginationSQL == null) {
+            // The query returns the aggregated metric without any dimension.
+            // Only 1 record will be returned.
+            return 1;
+        }
+
+        NamedParamPreparedStatement stmt = sqlTransaction.initializeStatement(paginationSQL.toString(), dataSource);
+
+        // Supply the query parameters to the query
+        supplyFilterQueryParameters(clientQuery, stmt, dialect);
+
+        // Run the Pagination query and log the time spent.
+        Long result = CoerceUtil.coerce(runQuery(stmt, paginationSQL.toString(), SINGLE_RESULT_MAPPER), Long.class);
+
+        return (result != null) ? result : 0;
+    }
+
+    @Override
+    public String getTableVersion(Table table, Transaction transaction) {
+
+        String tableVersion = null;
+        SQLTable sqlTable = (SQLTable) table;
+        Type<?> tableClass = metadataDictionary.getEntityClass(table.getName(), table.getVersion());
+        VersionQuery versionAnnotation = tableClass.getAnnotation(VersionQuery.class);
+        if (versionAnnotation != null) {
+            String versionQueryString = versionAnnotation.sql();
+            SqlTransaction sqlTransaction = (SqlTransaction) transaction;
+            ConnectionDetails details = sqlTable.getConnectionDetails();
+            DataSource dataSource = details.getDataSource();
+            NamedParamPreparedStatement stmt = sqlTransaction.initializeStatement(versionQueryString, dataSource);
+            tableVersion = CoerceUtil.coerce(runQuery(stmt, versionQueryString, SINGLE_RESULT_MAPPER), String.class);
+        }
+        return tableVersion;
+    }
+
+    private <R> R runQuery(NamedParamPreparedStatement stmt, String queryString, Function<ResultSet, R> resultMapper) {
+
+        // Run the query and log the time spent.
+        return new TimedFunction<>(() -> {
+            try {
+                ResultSet rs = stmt.executeQuery();
+                return resultMapper.apply(rs);
+            } catch (SQLException e) {
+                throw new IllegalStateException(e);
+            }
+        }, "Running Query: " + queryString
+        ).get();
+    }
+
+    /**
+     * Returns the actual query string(s) that would be executed for the input {@link Query}.
+     *
+     * @param query The query customized for a particular persistent storage or storage client.
+     * @param dialect SQL dialect to use for this storage.
+     * @return List of SQL string(s) corresponding to the given query.
+     */
+    public List<String> explain(Query query, SQLDialect dialect) {
+        List<String> queries = new ArrayList<>();
+        Query expandedQuery = expandMetricQueryPlans(query);
+        NativeQuery sql = toSQL(expandedQuery, dialect);
+
+        Pagination pagination = query.getPagination();
+        if (returnPageTotals(pagination)) {
+            NativeQuery paginationSql = toPageTotalSQL(expandedQuery, sql, dialect);
+            if (paginationSql != null) {
+                queries.add(paginationSql.toString());
+            }
+        }
+        queries.add(sql.toString());
+        return queries;
+    }
+
+    @Override
+    public List<String> explain(Query query) {
+        return explain(query, query.getConnectionDetails().getDialect());
+    }
+
+    @Override
+    public QueryValidator getValidator() {
+        return validator;
+    }
+
+    /**
+     * Translates the client query into SQL.
+     *
+     * @param query the transformed client query.
+     * @param sqlDialect the SQL dialect.
+     * @return the SQL query.
+     */
+    private NativeQuery toSQL(Query query, SQLDialect sqlDialect) {
+        QueryTranslator translator = new QueryTranslator(metaDataStore, sqlDialect, query);
+
+        return query.accept(translator).build();
+    }
+
+    /**
+     * Transforms a client query into a potentially nested/complex query by expanding each metric into
+     * its respective query plan - and then merging the plans together into a consolidated query.
+     * @param query The client query.
+     * @return A query that reflects each metric's individual query plan.
+     */
+    private Query expandMetricQueryPlans(Query query) {
+
+        //Expand each metric into its own query plan.
+        List<QueryPlan> toMerge = query.getMetricProjections().stream()
+                .map(projection -> projection.resolve(query))
+                .collect(Collectors.toList());
+
+        //Merge all the queries together.
+        List<QueryPlan> mergedPlans = merger.merge(toMerge);
+
+        //TODO - Support joins across plans rather than rejecting plans that don't merge.
+        if (mergedPlans.size() != 1) {
+            throw new UnsupportedOperationException("Incompatible metrics in client query.  Cannot merge "
+                    + "into a single query");
+        }
+
+        QueryPlan mergedPlan = mergedPlans.get(0);
+
+        QueryPlanTranslator queryPlanTranslator = new QueryPlanTranslator(query, metaDataStore, merger);
+
+        Query merged = (mergedPlan == null)
+                ? QueryPlanTranslator.addHiddenProjections(metaDataStore, query).build()
+                : queryPlanTranslator.translate(mergedPlan);
+
+        for (Optimizer optimizer : optimizers) {
+            SQLTable table = (SQLTable) query.getSource();
+
+            //TODO - support hints in table joins & query header.  Query Header hints override join hints which
+            //override table hints.
+            if (table.getHints().contains(optimizer.negateHint())) {
+                continue;
+            }
+
+            if (! table.getHints().contains(optimizer.hint())) {
+                continue;
+            }
+
+            if (optimizer.canOptimize(merged)) {
+                merged = optimizer.optimize(merged);
+            }
+        }
+
+        return merged;
+    }
+
+    /**
+     * Given a Prepared Statement, replaces any parameters with their values from client query.
+     *
+     * @param query The client query
+     * @param stmt Customized Prepared Statement
+     * @param dialect the SQL dialect
+     */
+    private void supplyFilterQueryParameters(Query query, NamedParamPreparedStatement stmt, SQLDialect dialect) {
+
+        Collection<FilterPredicate> predicates = new ArrayList<>();
+        if (query.getWhereFilter() != null) {
+            predicates.addAll(query.getWhereFilter().accept(new PredicateExtractionVisitor()));
+        }
+
+        if (query.getHavingFilter() != null) {
+            predicates.addAll(query.getHavingFilter().accept(new PredicateExtractionVisitor()));
+        }
+
+        for (FilterPredicate filterPredicate : predicates) {
+            Column column = metaDataStore.getColumn(filterPredicate.getEntityType(), filterPredicate.getField());
+            if (filterPredicate.getOperator().isParameterized()) {
+                boolean shouldEscape = filterPredicate.isMatchingOperator();
+                filterPredicate.getParameters().forEach(param -> {
+                    try {
+                        Object value = param.getValue();
+
+                        value = convertForJdbc(filterPredicate.getEntityType(), column, value, dialect);
+
+                        stmt.setObject(param.getName(), shouldEscape ? param.escapeMatching() : value);
+                    } catch (SQLException e) {
+                        throw new IllegalStateException(e);
+                    }
+                });
+            }
+        }
+    }
+
+    private Object convertForJdbc(Type<?> parent, Column column, Object value, SQLDialect dialect) {
+        if (column.getValueType().equals(ValueType.TIME) && (Time.class).isAssignableFrom(value.getClass())) {
+            return dialect.translateTimeToJDBC((Time) value);
+        }
+
+        if (value.getClass().isEnum()) {
+            Enumerated enumerated =
+                    metadataDictionary.getAttributeOrRelationAnnotation(parent, Enumerated.class, column.getName());
+
+            if (enumerated != null && enumerated.value().equals(EnumType.ORDINAL)) {
+                return ((Enum) value).ordinal();
+            } else {
+                return value.toString();
+            }
+        }
+
+        if ((column.getValueType().equals(ValueType.TEXT)
+                && column.getValues() != null
+                && column.getValues().isEmpty() == false)) {
+            Enumerated enumerated =
+                    metadataDictionary.getAttributeOrRelationAnnotation(parent, Enumerated.class, column.getName());
+
+            if (enumerated != null && enumerated.value().equals(EnumType.ORDINAL)) {
+
+                String [] enumValues = column.getValues().toArray(new String[0]);
+                for (int idx = 0; idx < column.getValues().size(); idx++) {
+                    if (enumValues[idx].equals(value)) {
+                        return idx;
+                    }
+                }
+
+                throw new IllegalStateException(String.format("Invalid value %s for column %s",
+                        value, column.getName()));
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Takes a SQLQuery and creates a new clone that instead returns the total number of records of the original
+     * query.
+     *
+     * @param query The client query
+     * @param sql The generated SQL query
+     * @param sqlDialect the SQL dialect
+     * @return A new query that returns the total number of records.
+     */
+    private NativeQuery toPageTotalSQL(Query query, NativeQuery sql, SQLDialect sqlDialect) {
+
+        // TODO: refactor this method
+        String groupByDimensions =
+                query.getAllDimensionProjections()
+                        .stream()
+                        .map(SQLColumnProjection.class::cast)
+                        .filter(SQLColumnProjection::isProjected)
+                        .map((column) -> column.toSQL(query, metaDataStore))
+                        .collect(Collectors.joining(", "));
+
+        if (groupByDimensions.isEmpty()) {
+            // When no dimension projection is available, assume that metric projection is used.
+            // Metric projection without group by dimension will return onely 1 record.
+            return null;
+        }
+
+        NativeQuery innerQuery =  NativeQuery.builder()
+                .projectionClause(groupByDimensions)
+                .fromClause(sql.getFromClause())
+                .joinClause(sql.getJoinClause())
+                .whereClause(sql.getWhereClause())
+                .groupByClause(String.format("GROUP BY %s", groupByDimensions))
+                .havingClause(sql.getHavingClause())
+                .build();
+
+        return NativeQuery.builder()
+                .projectionClause("COUNT(*)")
+                .fromClause(QueryTranslator.getFromClause("(" + innerQuery + ")",
+                                                          applyQuotes("pagination_subquery", sqlDialect),
+                                                          sqlDialect))
+                .build();
+    }
+
+    private static boolean returnPageTotals(Pagination pagination) {
+        return pagination != null && pagination.returnPageTotals();
+    }
+
+    /**
+     * Cancels NamedParamPreparedStatement, hides and logs any SQLException.
+     * @param stmt NamedParamPreparedStatement to cancel.
+     */
+    private static void cancelSoftly(NamedParamPreparedStatement stmt) {
+        try {
+            if (stmt != null && !stmt.isClosed()) {
+                stmt.cancel();
+            }
+        } catch (SQLException e) {
+            log.error("Exception encountered during cancel statement.", e);
+        }
+    }
+
+    /**
+     * Cancels and Closes NamedParamPreparedStatement, hides and logs any SQLException.
+     * @param stmt NamedParamPreparedStatement to close.
+     */
+    private static void cancelAndCloseSoftly(NamedParamPreparedStatement stmt) {
+        cancelSoftly(stmt);
+        try {
+            if (stmt != null && !stmt.isClosed()) {
+                stmt.close();
+            }
+        } catch (SQLException e) {
+            log.error("Exception encountered during close statement.", e);
+        }
+    }
+
+    /**
+     * Closes Connection, hides and logs any SQLException.
+     * @param conn Connection to close.
+     */
+    private static void closeSoftly(Connection conn) {
+        try {
+            if (conn != null) {
+                conn.close();
+            }
+        } catch (SQLException e) {
+            log.error("Exception encountered during close connection.", e);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromSubquery.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromSubquery.java
new file mode 100644
index 0000000000..59ffd2e2fc
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromSubquery.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the entity or field is derived from a native SQL subquery.
+ */
+@Documented
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface FromSubquery {
+
+    /**
+     * The SQL subquery.
+     *
+     * @return The SQL subquery.
+     */
+    String sql();
+
+    /**
+     * DB Connection Name for this query.
+     * @return String DB Connection Name
+     */
+    // TO DO
+    String dbConnectionName() default "";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromTable.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromTable.java
new file mode 100644
index 0000000000..2751ab590a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/FromTable.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the entity is derived directly from a physical table or view in the database.
+ */
+@Documented
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface FromTable {
+
+    /**
+     * The table or view name.
+     *
+     * @return The table or view name.
+     */
+    String name();
+
+    /**
+     * DB Connection Name for this table.
+     * @return String DB Connection Name
+     */
+    // TO DO
+    String dbConnectionName() default "";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/VersionQuery.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/VersionQuery.java
new file mode 100644
index 0000000000..e086651aba
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/annotation/VersionQuery.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Provides a SQL query for getting a table version string.
+ */
+@Documented
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface VersionQuery {
+
+    /**
+     * A String containing an SQL SELECT statement.
+     * @return SQL query String
+     */
+    String sql();
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractor.java
new file mode 100644
index 0000000000..6dfb21d9f9
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractor.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.util.SqlBasicVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Parses a column expression and extracts all aggregation functions as separate expressions for
+ * an inner query.  Aggregation functions that cannot be nested (like AVG(expression) are rewritten
+ * with simpler aggregations that can be: [SUM(expression), COUNT(expression)].  The list of
+ * inner query expressions will be leveraged in the outer query post aggregation expression.
+ */
+public class CalciteInnerAggregationExtractor extends SqlBasicVisitor<List<List<String>>> {
+
+    private SQLDialect dialect;
+
+    public CalciteInnerAggregationExtractor(SQLDialect dialect) {
+        this.dialect = dialect;
+    }
+
+    @Override
+    public List<List<String>> visit(SqlCall call) {
+        String operatorName = call.getOperator().getName();
+
+        List<List<String>> result = new ArrayList<>();
+
+        SupportedAggregation operator = dialect.getSupportedAggregation(operatorName);
+        if (operator != null) {
+            List<String> operands = call.getOperandList().stream()
+                    .map(operand -> operand.toSqlString(dialect.getCalciteDialect()).getSql())
+                    .collect(Collectors.toList());
+
+            result.add(operator.getInnerAggregations(operands.toArray(new String[0])));
+
+            return result;
+        }
+
+        for (SqlNode node : call.getOperandList()) {
+            if (node == null) {
+                continue;
+            }
+            List<List<String>> operandResults = node.accept(this);
+            if (operandResults != null) {
+                result.addAll(operandResults);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public List<List<String>> visit(SqlNodeList nodeList) {
+        List<List<String>> result = new ArrayList<>();
+        for (SqlNode node : nodeList) {
+            if (node == null) {
+                continue;
+            }
+            List<List<String>> inner = node.accept(this);
+            if (inner != null) {
+                result.addAll(inner);
+            }
+        }
+        return result;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractor.java
new file mode 100644
index 0000000000..fd502edfae
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractor.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlDataTypeSpec;
+import org.apache.calcite.sql.SqlDynamicParam;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlIntervalQualifier;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.sql.util.SqlBasicVisitor;
+
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Queue;
+import java.util.stream.Collectors;
+
+/**
+ * Parses a column expression and rewrites the post aggregation expression AST to reference
+ * new aliases defined in the inner query.  Aggregation functions that cannot be nested (like AVG(expression) are
+ * rewritten with simpler aggregations that can be: SUM(INNER_LABEL) / COUNT(INNER_LABEL).
+ */
+public class CalciteOuterAggregationExtractor extends SqlBasicVisitor<SqlNode> {
+
+    private SQLDialect dialect;
+    private Queue<List<String>> substitutions;
+
+    public CalciteOuterAggregationExtractor(SQLDialect dialect, List<List<String>> substitutions) {
+        this.dialect = dialect;
+        this.substitutions = new ArrayDeque<>();
+        this.substitutions.addAll(substitutions);
+    }
+
+    @Override
+    public SqlNode visit(SqlCall call) {
+        String operatorName = call.getOperator().getName();
+
+        SupportedAggregation operator = dialect.getSupportedAggregation(operatorName);
+        if (operator != null) {
+            List<String> expressionsSubs = substitutions.remove();
+            String postAggExpression = operator.getOuterAggregation(expressionsSubs.toArray(new String[0]));
+
+            SqlParser sqlParser = SqlParser.create(postAggExpression, CalciteUtils.constructParserConfig(dialect));
+
+            try {
+                return sqlParser.parseExpression();
+            } catch (SqlParseException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+        for (int idx = 0; idx < call.getOperandList().size(); idx++) {
+            SqlNode operand = call.getOperandList().get(idx);
+            call.setOperand(idx, operand == null ? null : operand.accept(this));
+        }
+
+        return call;
+    }
+
+    @Override
+    public SqlNode visit(SqlNodeList nodeList) {
+
+        return SqlNodeList.of(SqlParserPos.ZERO,
+                nodeList.getList().stream()
+                    .map(sqlNode -> sqlNode == null ? null : sqlNode.accept(this))
+                    .collect(Collectors.toList()));
+    }
+
+    @Override
+    public SqlNode visit(SqlLiteral literal) {
+        return literal;
+    }
+
+    @Override
+    public SqlNode visit(SqlIdentifier id) {
+        return id;
+    }
+
+    @Override
+    public SqlNode visit(SqlDataTypeSpec type) {
+        return type;
+    }
+
+    @Override
+    public SqlNode visit(SqlDynamicParam param) {
+        return param;
+    }
+
+    @Override
+    public SqlNode visit(SqlIntervalQualifier intervalQualifier) {
+        return intervalQualifier;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteUtils.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteUtils.java
new file mode 100644
index 0000000000..77b1050c92
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteUtils.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.BACKTICK;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.DOUBLE_QUOTE;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import org.apache.calcite.avatica.util.Quoting;
+import org.apache.calcite.config.CharLiteralStyle;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.parser.SqlParser;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+/**
+ * Utility functions for Calcite parsing.
+ */
+public class CalciteUtils {
+
+    /**
+     * Converts an elide dialect into a Calcite parser configuration.
+     * @param dialect An elide dialect.
+     * @return A new parser configuration.
+     */
+    public static SqlParser.Config constructParserConfig(SQLDialect dialect) {
+        SqlDialect calciteDialect = dialect.getCalciteDialect();
+
+        Quoting quoting;
+        switch (dialect.getBeginQuote()) {
+            case BACKTICK: {
+                quoting = Quoting.BACK_TICK;
+                break;
+            }
+            case DOUBLE_QUOTE: {
+                quoting = Quoting.DOUBLE_QUOTE;
+                break;
+            }
+            case '[': {
+                quoting = Quoting.BRACKET;
+                break;
+            }
+            default: {
+                throw new IllegalStateException("Unrecognized identifier quotation mark");
+            }
+        }
+        return SqlParser.config()
+                .withQuoting(quoting)
+                .withConformance(calciteDialect.getConformance())
+                .withUnquotedCasing(calciteDialect.getUnquotedCasing())
+                .withQuotedCasing(calciteDialect.getQuotedCasing())
+                .withCharLiteralStyles(new HashSet<>(Arrays.asList(CharLiteralStyle.STANDARD)))
+                .withCaseSensitive(calciteDialect.isCaseSensitive());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedAggregation.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedAggregation.java
new file mode 100644
index 0000000000..18ab334d1a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedAggregation.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Singular;
+import lombok.Value;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * SQL Aggregation function along with templates to support nesting.
+ */
+@Value
+@Builder
+public class SupportedAggregation {
+    //The SQL name
+    @NonNull
+    private String name;
+
+    //Set of inner query templates to translate the aggregation function to alternative functions that can be nested.
+    @Singular
+    @NonNull
+    private List<String> innerTemplates;
+
+    //Outer query template to translate the aggregation function to alternative functions that can be nested.
+    @NonNull
+    private String outerTemplate;
+
+    public List<String> getInnerAggregations(String ...operands) {
+        List<String> innerAggregations = new ArrayList<>();
+
+        for (String innerTemplate : innerTemplates) {
+            innerAggregations.add(String.format(innerTemplate, (Object[]) operands));
+        }
+
+        return innerAggregations;
+    }
+
+    public String getOuterAggregation(String ... operands) {
+        return String.format(outerTemplate, (Object[]) operands);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedOperation.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedOperation.java
new file mode 100644
index 0000000000..9bf92e193f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SupportedOperation.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+@Value
+@Builder
+public class SupportedOperation {
+    @NonNull
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifier.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifier.java
new file mode 100644
index 0000000000..9cc6c54645
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifier.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlDataTypeSpec;
+import org.apache.calcite.sql.SqlDynamicParam;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlIntervalQualifier;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.calcite.sql.util.SqlBasicVisitor;
+import lombok.Getter;
+
+/**
+ * Verifies whether Elide can parse a SQL expression with Calcite AND that
+ * all operators and aggregation functions are fully supported by the given dialect.
+ */
+public class SyntaxVerifier extends SqlBasicVisitor<Boolean> {
+    private SQLDialect dialect;
+
+    @Getter
+    private String lastError;
+
+    public SyntaxVerifier(SQLDialect dialect) {
+        this.dialect = dialect;
+    }
+
+    public boolean verify(String expression) {
+        SqlParser sqlParser = SqlParser.create(expression, CalciteUtils.constructParserConfig(dialect));
+
+        SqlNode node;
+        try {
+            node = sqlParser.parseExpression();
+        } catch (SqlParseException e) {
+            lastError = e.getMessage();
+            return false;
+        }
+
+        return node.accept(this);
+    }
+
+    @Override
+    public Boolean visit(SqlLiteral literal) {
+        return true;
+    }
+
+    @Override
+    public Boolean visit(SqlCall call) {
+        String operatorName = call.getOperator().getName();
+
+        SupportedAggregation aggregation = dialect.getSupportedAggregation(operatorName);
+
+        if (aggregation == null) {
+            SupportedOperation operator = dialect.getSupportedOperation(operatorName);
+
+            //We don't understand the operator so we can't nest safely.
+            if (operator == null) {
+                lastError = "Unknown operator: " + operatorName;
+                return false;
+            }
+        }
+
+        boolean result = true;
+        for (int idx = 0; idx < call.getOperandList().size(); idx++) {
+            SqlNode operand = call.getOperandList().get(idx);
+            if (operand == null) {
+                continue;
+            }
+            result &= operand.accept(this);
+        }
+        return result;
+    }
+
+    @Override
+    public Boolean visit(SqlNodeList nodeList) {
+        return true;
+    }
+
+    @Override
+    public Boolean visit(SqlIdentifier id) {
+        return true;
+    }
+
+    @Override
+    public Boolean visit(SqlDataTypeSpec type) {
+        return true;
+    }
+
+    @Override
+    public Boolean visit(SqlDynamicParam param) {
+        return true;
+    }
+
+    @Override
+    public Boolean visit(SqlIntervalQualifier intervalQualifier) {
+        return true;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/AbstractSqlDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/AbstractSqlDialect.java
new file mode 100644
index 0000000000..3e7ba040eb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/AbstractSqlDialect.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects;
+
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.SupportedAggregation;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.SupportedOperation;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Common code for {@link SQLDialect} implementations.
+ */
+public abstract class AbstractSqlDialect implements SQLDialect {
+
+    public static final String OFFSET = "OFFSET ";
+    public static final String LIMIT = "LIMIT ";
+    public static final char BACKTICK = '`';
+    public static final char DOUBLE_QUOTE = '"';
+    public static final char SPACE = ' ';
+    public static final char COMMA = ',';
+    public static final String LEFT_JOIN_SYNTAX = "LEFT OUTER JOIN";
+    public static final String INNER_JOIN_SYNTAX = "INNER JOIN";
+    public static final String FULL_JOIN_SYNTAX = "FULL OUTER JOIN";
+    public static final String CROSS_JOIN_SYNTAX = "CROSS JOIN";
+
+    protected HashMap<String, SupportedAggregation> supportedAggregations;
+    protected HashMap<String, SupportedOperation> supportedOperations;
+
+    //TODO - Break this out by dialect and add other dialect specific operators.
+    protected static SupportedOperation[] STANDARD_OPERATIONS = {
+            SupportedOperation.builder().name("/").build(),
+            SupportedOperation.builder().name("+").build(),
+            SupportedOperation.builder().name("-").build(),
+            SupportedOperation.builder().name("*").build(),
+            SupportedOperation.builder().name("%").build(),
+            SupportedOperation.builder().name("UNION").build(),
+            SupportedOperation.builder().name("INTERSECT").build(),
+            SupportedOperation.builder().name("ANY").build(),
+            SupportedOperation.builder().name("SOME").build(),
+            SupportedOperation.builder().name("ALL").build(),
+            SupportedOperation.builder().name("IN").build(),
+            SupportedOperation.builder().name("NOT IN").build(),
+            SupportedOperation.builder().name(">").build(),
+            SupportedOperation.builder().name("<").build(),
+            SupportedOperation.builder().name(">=").build(),
+            SupportedOperation.builder().name("<=").build(),
+            SupportedOperation.builder().name("=").build(),
+            SupportedOperation.builder().name("<>").build(),
+            SupportedOperation.builder().name("OR").build(),
+            SupportedOperation.builder().name("AND").build(),
+            SupportedOperation.builder().name("NOT").build(),
+            SupportedOperation.builder().name("LIKE").build(),
+            SupportedOperation.builder().name("BETWEEN").build(),
+            SupportedOperation.builder().name("BIN").build(),
+            SupportedOperation.builder().name("BINARY").build(),
+            SupportedOperation.builder().name("CASE").build(),
+            SupportedOperation.builder().name("CAST").build(),
+            SupportedOperation.builder().name("IF").build(),
+            SupportedOperation.builder().name("IFNULL").build(),
+            SupportedOperation.builder().name("NULLIF").build(),
+            SupportedOperation.builder().name("COALESCE").build(),
+            SupportedOperation.builder().name("EXISTS").build(),
+            SupportedOperation.builder().name("IS NULL").build(),
+            SupportedOperation.builder().name("ISNULL").build(),
+            SupportedOperation.builder().name("IS NOT NULL").build(),
+            SupportedOperation.builder().name("IS TRUE").build(),
+            SupportedOperation.builder().name("IS NOT TRUE").build(),
+            SupportedOperation.builder().name("IS FALSE").build(),
+            SupportedOperation.builder().name("IS NOT FALSE").build(),
+
+            //String Functions
+            SupportedOperation.builder().name("ASCII").build(),
+            SupportedOperation.builder().name("CHAR_LENGTH").build(),
+            SupportedOperation.builder().name("CHARACTER_LENGTH").build(),
+            SupportedOperation.builder().name("CONCAT").build(),
+            SupportedOperation.builder().name("CONCAT_WS").build(),
+            SupportedOperation.builder().name("FIELD").build(),
+            SupportedOperation.builder().name("FIND_IN_SET").build(),
+            SupportedOperation.builder().name("FORMAT").build(),
+            SupportedOperation.builder().name("INSTR").build(),
+            SupportedOperation.builder().name("LCASE").build(),
+            SupportedOperation.builder().name("LEFT").build(),
+            SupportedOperation.builder().name("LENGTH").build(),
+            SupportedOperation.builder().name("LOCATE").build(),
+            SupportedOperation.builder().name("LOWER").build(),
+            SupportedOperation.builder().name("LPAD").build(),
+            SupportedOperation.builder().name("LTRIM").build(),
+            SupportedOperation.builder().name("MID").build(),
+            SupportedOperation.builder().name("POSITION").build(),
+            SupportedOperation.builder().name("REPEAT").build(),
+            SupportedOperation.builder().name("REPLACE").build(),
+            SupportedOperation.builder().name("REVERSE").build(),
+            SupportedOperation.builder().name("RIGHT").build(),
+            SupportedOperation.builder().name("RPAD").build(),
+            SupportedOperation.builder().name("RTRIM").build(),
+            SupportedOperation.builder().name("SPACE").build(),
+            SupportedOperation.builder().name("STRCMP").build(),
+            SupportedOperation.builder().name("SUBSTR").build(),
+            SupportedOperation.builder().name("SUBSTRING").build(),
+            SupportedOperation.builder().name("SUBSTRING_INDEX").build(),
+            SupportedOperation.builder().name("TRIM").build(),
+            SupportedOperation.builder().name("UCASE").build(),
+            SupportedOperation.builder().name("UPPER").build(),
+
+            //Math Functions
+            SupportedOperation.builder().name("ABS").build(),
+            SupportedOperation.builder().name("ACOS").build(),
+            SupportedOperation.builder().name("ASIN").build(),
+            SupportedOperation.builder().name("ATAN").build(),
+            SupportedOperation.builder().name("ATAN2").build(),
+            SupportedOperation.builder().name("CEIL").build(),
+            SupportedOperation.builder().name("CEILING").build(),
+            SupportedOperation.builder().name("COS").build(),
+            SupportedOperation.builder().name("COT").build(),
+            SupportedOperation.builder().name("DEGREES").build(),
+            SupportedOperation.builder().name("DIV").build(),
+            SupportedOperation.builder().name("EXP").build(),
+            SupportedOperation.builder().name("FLOOR").build(),
+            SupportedOperation.builder().name("GREATEST").build(),
+            SupportedOperation.builder().name("LEAST").build(),
+            SupportedOperation.builder().name("LN").build(),
+            SupportedOperation.builder().name("LOG").build(),
+            SupportedOperation.builder().name("LOG10").build(),
+            SupportedOperation.builder().name("LOG2").build(),
+            SupportedOperation.builder().name("MOD").build(),
+            SupportedOperation.builder().name("PI").build(),
+            SupportedOperation.builder().name("POW").build(),
+            SupportedOperation.builder().name("POWER").build(),
+            SupportedOperation.builder().name("RADIANS").build(),
+            SupportedOperation.builder().name("RAND").build(),
+            SupportedOperation.builder().name("ROUND").build(),
+            SupportedOperation.builder().name("SIGN").build(),
+            SupportedOperation.builder().name("SQRT").build(),
+            SupportedOperation.builder().name("TAN").build(),
+            SupportedOperation.builder().name("TRUNCATE").build(),
+
+            //Time Functions.
+            SupportedOperation.builder().name("ADDDATE").build(),
+            SupportedOperation.builder().name("ADDTIME").build(),
+            SupportedOperation.builder().name("CURDATE").build(),
+            SupportedOperation.builder().name("CURRENT_DATE").build(),
+            SupportedOperation.builder().name("CURRENT_TIME").build(),
+            SupportedOperation.builder().name("CURRENT_TIMESTAMP").build(),
+            SupportedOperation.builder().name("CURTIME").build(),
+            SupportedOperation.builder().name("DATE").build(),
+            SupportedOperation.builder().name("DATEDIFF").build(),
+            SupportedOperation.builder().name("DATE_ADD").build(),
+            SupportedOperation.builder().name("DATE_FORMAT").build(),
+            SupportedOperation.builder().name("DATE_SUB").build(),
+            SupportedOperation.builder().name("DAY").build(),
+            SupportedOperation.builder().name("DAYNAME").build(),
+            SupportedOperation.builder().name("DAYOFMONTH").build(),
+            SupportedOperation.builder().name("DAYOFWEEK").build(),
+            SupportedOperation.builder().name("DAYOFYEAR").build(),
+            SupportedOperation.builder().name("EXTRACT").build(),
+            SupportedOperation.builder().name("FROM_DAYS").build(),
+            SupportedOperation.builder().name("HOUR").build(),
+            SupportedOperation.builder().name("LAST_DAY").build(),
+            SupportedOperation.builder().name("LOCALTIME").build(),
+            SupportedOperation.builder().name("LOCALTIMESTAMP").build(),
+            SupportedOperation.builder().name("MAKEDATE").build(),
+            SupportedOperation.builder().name("MAKETIME").build(),
+            SupportedOperation.builder().name("MICROSECOND").build(),
+            SupportedOperation.builder().name("MINUTE").build(),
+            SupportedOperation.builder().name("MONTH").build(),
+            SupportedOperation.builder().name("MONTHNAME").build(),
+            SupportedOperation.builder().name("NOW").build(),
+            SupportedOperation.builder().name("PERIOD_ADD").build(),
+            SupportedOperation.builder().name("PERIOD_DIFF").build(),
+            SupportedOperation.builder().name("QUARTER").build(),
+            SupportedOperation.builder().name("SECOND").build(),
+            SupportedOperation.builder().name("SEC_TO_TIME").build(),
+            SupportedOperation.builder().name("STR_TO_DATE").build(),
+            SupportedOperation.builder().name("SUBDATE").build(),
+            SupportedOperation.builder().name("SUBTIME").build(),
+            SupportedOperation.builder().name("SYSDATE").build(),
+            SupportedOperation.builder().name("TIME").build(),
+            SupportedOperation.builder().name("TIME_FORMAT").build(),
+            SupportedOperation.builder().name("TIME_TO_SEC").build(),
+            SupportedOperation.builder().name("TIMEDIFF").build(),
+            SupportedOperation.builder().name("TIMESTAMP").build(),
+            SupportedOperation.builder().name("TO_DAYS").build(),
+            SupportedOperation.builder().name("WEEK").build(),
+            SupportedOperation.builder().name("WEEKDAY").build(),
+            SupportedOperation.builder().name("WEEKOFYEAR").build(),
+            SupportedOperation.builder().name("YEAR").build(),
+            SupportedOperation.builder().name("YEARWEEK").build(),
+            SupportedOperation.builder().name("PARSEDATETIME").build(),
+            SupportedOperation.builder().name("FORMATDATETIME").build()
+    };
+
+    protected static SupportedAggregation[] STANDARD_AGGREGATIONS = {
+            SupportedAggregation.builder()
+                    .name("SUM")
+                    .innerTemplate("SUM(%s)")
+                    .outerTemplate("SUM(%s)")
+                    .build(),
+            SupportedAggregation.builder()
+                    .name("COUNT")
+                    .innerTemplate("COUNT(%s)")
+                    .outerTemplate("COUNT(%s)")
+                    .build(),
+            SupportedAggregation.builder()
+                    .name("MAX")
+                    .innerTemplate("MAX(%s)")
+                    .outerTemplate("MAX(%s)")
+                    .build(),
+            SupportedAggregation.builder()
+                    .name("MIN")
+                    .innerTemplate("MIN(%s)")
+                    .outerTemplate("MIN(%s)")
+                    .build(),
+            SupportedAggregation.builder()
+                    .name("AVG")
+                    .innerTemplate("SUM(%1$s)")
+                    .innerTemplate("COUNT(%1$s)")
+                    .outerTemplate("SUM(%1$s)/COUNT(%1$s)")
+                    .build(),
+            SupportedAggregation.builder()
+                    .name("VAR_POP")
+                    .innerTemplate("SUM(%1$s * %1$s)")
+                    .innerTemplate("SUM(%1$s)")
+                    .innerTemplate("COUNT(%1$s)")
+                    .outerTemplate("(SUM(%1$s) - SUM(%2$s) * SUM(%2$s) / COUNT(%3$s)) / COUNT(%3$s)")
+                    .build()
+    };
+
+    public AbstractSqlDialect() {
+        supportedAggregations = Arrays.stream(STANDARD_AGGREGATIONS)
+                .collect(Collectors.toMap(SupportedAggregation::getName, Function.identity(),
+                        (a, b) -> a, HashMap::new));
+
+        supportedOperations = Arrays.stream(STANDARD_OPERATIONS)
+                .collect(Collectors.toMap(SupportedOperation::getName, Function.identity(),
+                        (a, b) -> a, HashMap::new));
+    }
+
+    @Override
+    public boolean useAliasForOrderByClause() {
+        return false;
+    }
+
+    @Override
+    public boolean useASBeforeTableAlias() {
+        return true;
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return OFFSET + offset + SPACE + LIMIT + limit;
+    }
+
+    @Override
+    public char getBeginQuote() {
+        return BACKTICK;
+    }
+
+    @Override
+    public char getEndQuote() {
+        return BACKTICK;
+    }
+
+    @Override
+    public String getJoinKeyword(JoinType joinType) {
+
+        switch (joinType) {
+            case LEFT:
+                return getLeftJoinKeyword();
+            case INNER:
+                return getInnerJoinKeyword();
+            case FULL:
+                return getFullJoinKeyword();
+            case CROSS:
+                return getCrossJoinKeyword();
+            default:
+                return getLeftJoinKeyword();
+        }
+    }
+
+    public String getLeftJoinKeyword() {
+        return LEFT_JOIN_SYNTAX;
+    }
+
+    public String getInnerJoinKeyword() {
+        return INNER_JOIN_SYNTAX;
+    }
+
+    public String getFullJoinKeyword() {
+        return FULL_JOIN_SYNTAX;
+    }
+
+    public String getCrossJoinKeyword() {
+        return CROSS_JOIN_SYNTAX;
+    }
+
+    @Override
+    public SupportedAggregation getSupportedAggregation(String name) {
+        return supportedAggregations.getOrDefault(name.toUpperCase(Locale.ENGLISH), null);
+    }
+
+    @Override
+    public SupportedOperation getSupportedOperation(String name) {
+        return supportedOperations.getOrDefault(name.toUpperCase(Locale.ENGLISH), null);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialect.java
new file mode 100644
index 0000000000..2820fe5416
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialect.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects;
+
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.SupportedAggregation;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.SupportedOperation;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import com.yahoo.elide.datastores.jpql.filter.JPQLPredicateGenerator;
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.sql.SqlDialect;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Interface for SQL Dialects used to customize SQL queries for specific persistent storage.
+ */
+public interface SQLDialect {
+
+    /**
+     * Returns the name of the Dialect.
+     * @return dialect name.
+     */
+    String getDialectType();
+
+    /**
+     * Checks whether we need to use alias for orderby.
+     * @return boolean.
+     */
+    boolean useAliasForOrderByClause();
+
+    /**
+     * Add "AS" before table/subquery aliases in generated SQL.
+     * @return boolean.
+     */
+    boolean useASBeforeTableAlias();
+
+    /**
+     * Generates required offset and limit clause.
+     * @param offset position of the first record.
+     * @param limit maximum number of record.
+     * @return the offset and limit clause.
+     */
+    String generateOffsetLimitClause(int offset, int limit);
+
+    /**
+     * Provides begin quote required for SQL identifiers.
+     * @return begin quote for SQL identifiers.
+     */
+    char getBeginQuote();
+
+    /**
+     * Provides end quote required for SQL identifiers.
+     * @return end quote for SQL identifiers.
+     */
+    char getEndQuote();
+
+    /**
+     * Provides keyword for requested Join Type.
+     * @param joinType {@link JoinType} enum
+     * @return the keyword for provided Join type.
+     */
+    String getJoinKeyword(JoinType joinType);
+
+    /**
+     * Translates Elide's {@link Time} object to the native JDBC date/time object supported
+     * by the underlying driver.
+     *
+     * @param time The elide time object.
+     * @return A type compatible with JDBC.
+     */
+    default Object translateTimeToJDBC(Time time) {
+        if (time.isSupportsHour()) {
+            return new java.sql.Timestamp(time.getTime());
+        }
+        return new java.sql.Date(time.getTime());
+    }
+
+    /**
+     * Fetches the Calcite dialect associated with this Elide dialect.
+     * @return Calcite dialect
+     */
+    default SqlDialect getCalciteDialect() {
+        String quotes = String.valueOf(getBeginQuote());
+        return new SqlDialect(SqlDialect.EMPTY_CONTEXT
+                .withIdentifierQuoteString(quotes)
+                .withCaseSensitive(true)
+                .withQuotedCasing(Casing.UNCHANGED)
+                .withUnquotedCasing(Casing.UNCHANGED));
+    }
+
+    /**
+     * Fetch the aggregation for the given SQL function name or NULL if not supported.
+     * @param name The name (case insensitive) of the aggregation function or UDF.
+     * @return The supported aggregation or NULL if not supported.
+     */
+    SupportedAggregation getSupportedAggregation(String name);
+
+    /**
+     * Fetch the operation for the given SQL function name or NULL if not supported.
+     * @param name The name (case insensitive) of the operation or UDF.
+     * @return The supported operation or NULL if not supported.
+     */
+    SupportedOperation getSupportedOperation(String name);
+
+    /**
+     * Returns a map of filter predicate operators to SQL/JPQL expression generators that
+     * will override the system defaults.
+     * @return SQL/JPQL expression generator overrides.
+     */
+    default Map<Operator, JPQLPredicateGenerator> getPredicateGeneratorOverrides() {
+        return new HashMap<>();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialectFactory.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialectFactory.java
new file mode 100644
index 0000000000..cc21d88e76
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/SQLDialectFactory.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.DruidDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.HiveDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.MySQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PostgresDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PrestoDBDialect;
+
+/**
+ * A class with static methods to create an instance of all Dialects.
+ */
+public class SQLDialectFactory {
+
+    private static final SQLDialect H2_DIALECT = new H2Dialect();
+    private static final SQLDialect HIVE_DIALECT = new HiveDialect();
+    private static final SQLDialect PRESTODB_DIALECT = new PrestoDBDialect();
+    private static final SQLDialect MYSQL_DIALECT = new MySQLDialect();
+    private static final SQLDialect POSTGRES_DIALECT = new PostgresDialect();
+    private static final SQLDialect DRUID_DIALECT = new DruidDialect();
+
+    public static SQLDialect getDefaultDialect() {
+        return getH2Dialect();
+    }
+
+    public static SQLDialect getH2Dialect() {
+        return H2_DIALECT;
+    }
+
+    public static SQLDialect getHiveDialect() {
+        return HIVE_DIALECT;
+    }
+
+    public static SQLDialect getPrestoDBDialect() {
+        return PRESTODB_DIALECT;
+    }
+
+    public static SQLDialect getMySQLDialect() {
+        return MYSQL_DIALECT;
+    }
+
+    public static SQLDialect getPostgresDialect() {
+        return POSTGRES_DIALECT;
+    }
+
+    public static SQLDialect getDruidDialect() {
+        return DRUID_DIALECT;
+    }
+
+    public static SQLDialect getDialect(String type) {
+        if (type.equalsIgnoreCase(H2_DIALECT.getDialectType())) {
+            return H2_DIALECT;
+        }
+        if (type.equalsIgnoreCase(HIVE_DIALECT.getDialectType())) {
+            return HIVE_DIALECT;
+        }
+        if (type.equalsIgnoreCase(PRESTODB_DIALECT.getDialectType())) {
+            return PRESTODB_DIALECT;
+        }
+        if (type.equalsIgnoreCase(MYSQL_DIALECT.getDialectType())) {
+            return MYSQL_DIALECT;
+        }
+        if (type.equalsIgnoreCase(POSTGRES_DIALECT.getDialectType())) {
+            return POSTGRES_DIALECT;
+        }
+        if (type.equalsIgnoreCase(DRUID_DIALECT.getDialectType())) {
+            return DRUID_DIALECT;
+        }
+        try {
+            return (SQLDialect) Class.forName(type).getConstructor().newInstance();
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException("Unsupported SQL Dialect: " + type, e);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Failed to instantiate SQL Dialect: " + type, e);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/DruidDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/DruidDialect.java
new file mode 100644
index 0000000000..1727f2fcb4
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/DruidDialect.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.sql.SqlDialect;
+
+public class DruidDialect extends AbstractSqlDialect {
+    @Override
+    public String getDialectType() {
+        return "Druid";
+    }
+
+    @Override
+    public boolean useAliasForOrderByClause() {
+        return true;
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return LIMIT + limit + SPACE + OFFSET + offset;
+    }
+
+    @Override
+    public char getBeginQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public char getEndQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return new SqlDialect(SqlDialect.EMPTY_CONTEXT
+                .withIdentifierQuoteString(String.valueOf(DOUBLE_QUOTE))
+                .withCaseSensitive(true)
+                .withQuotedCasing(Casing.UNCHANGED)
+                .withUnquotedCasing(Casing.UNCHANGED));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/H2Dialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/H2Dialect.java
new file mode 100644
index 0000000000..36228a3fd8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/H2Dialect.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.sql.SqlDialect;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+/**
+ * H2 SQLDialect.
+ */
+public class H2Dialect extends AbstractSqlDialect {
+    @Override
+    public String getDialectType() {
+        return "H2";
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return LIMIT + limit + SPACE + OFFSET + offset;
+    }
+
+    @Override
+    public Object translateTimeToJDBC(Time time) {
+        OffsetDateTime offsetDateTIme = OffsetDateTime.ofInstant(time.toInstant(), ZoneOffset.systemDefault());
+        return offsetDateTIme;
+    }
+
+    @Override
+    public String getFullJoinKeyword() {
+        throw new IllegalArgumentException("Full Join is not supported for: " + getDialectType());
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return new SqlDialect(SqlDialect.EMPTY_CONTEXT
+                .withIdentifierQuoteString(String.valueOf(getBeginQuote()))
+                .withQuotedCasing(Casing.UNCHANGED)
+                .withUnquotedCasing(Casing.UNCHANGED)
+                .withDatabaseProduct(SqlDialect.DatabaseProduct.H2));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/HiveDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/HiveDialect.java
new file mode 100644
index 0000000000..0f55bc04cb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/HiveDialect.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.apache.calcite.config.NullCollation;
+import org.apache.calcite.sql.SqlDialect;
+
+/**
+ * Hive SQLDialect.
+ */
+public class HiveDialect extends AbstractSqlDialect {
+
+    private static final char COMMA = ',';
+
+    @Override
+    public String getDialectType() {
+        return "Hive";
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return LIMIT + offset + COMMA + limit;
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return new SqlDialect(SqlDialect.EMPTY_CONTEXT
+                .withIdentifierQuoteString(String.valueOf(getBeginQuote()))
+                .withDatabaseProduct(SqlDialect.DatabaseProduct.HIVE)
+                .withNullCollation(NullCollation.LOW));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/MySQLDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/MySQLDialect.java
new file mode 100644
index 0000000000..477b8b382d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/MySQLDialect.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.dialect.MysqlSqlDialect;
+
+/**
+ * MySQL SQLDialect.
+ */
+public class MySQLDialect extends AbstractSqlDialect {
+
+    @Override
+    public String getDialectType() {
+        return "MySQL";
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return LIMIT + offset + COMMA + limit;
+    }
+
+    @Override
+    public String getFullJoinKeyword() {
+        throw new IllegalArgumentException("Full Join is not supported for: " + getDialectType());
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return MysqlSqlDialect.DEFAULT;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PostgresDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PostgresDialect.java
new file mode 100644
index 0000000000..207de6408c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PostgresDialect.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.dialect.PostgresqlSqlDialect;
+
+/**
+ * Postgres SQLDialect.
+ */
+public class PostgresDialect extends AbstractSqlDialect {
+    @Override
+    public String getDialectType() {
+        return "Postgres";
+    }
+
+    @Override
+    public boolean useAliasForOrderByClause() {
+        return true;
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        return LIMIT + limit + SPACE + OFFSET + offset;
+    }
+
+    @Override
+    public char getBeginQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public char getEndQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return PostgresqlSqlDialect.DEFAULT;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PrestoDBDialect.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PrestoDBDialect.java
new file mode 100644
index 0000000000..c4797f0e5e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/dialects/impl/PrestoDBDialect.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl;
+
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.dialect.PrestoSqlDialect;
+
+/**
+ * PrestoDB SQLDialect.
+ */
+public class PrestoDBDialect extends AbstractSqlDialect {
+    @Override
+    public String getDialectType() {
+        return "PrestoDB";
+    }
+
+    @Override
+    public boolean useAliasForOrderByClause() {
+        return true;
+    }
+
+    @Override
+    public String generateOffsetLimitClause(int offset, int limit) {
+        // offset is supported in prestosql but not in prestodb
+        return LIMIT + limit;
+    }
+
+    @Override
+    public char getBeginQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public char getEndQuote() {
+        return DOUBLE_QUOTE;
+    }
+
+    @Override
+    public SqlDialect getCalciteDialect() {
+        return PrestoSqlDialect.DEFAULT;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ColumnArgReference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ColumnArgReference.java
new file mode 100644
index 0000000000..372d408348
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ColumnArgReference.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+/**
+ * Handlebar Reference to a column argument.
+ * eg: {{$$column.args.argName}}
+ */
+@Value
+@Builder
+public class ColumnArgReference implements Reference {
+
+    @NonNull
+    private String argName;
+
+    @Override
+    public <T> T accept(ReferenceVisitor<T> visitor) {
+        return visitor.visitColumnArgReference(this);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParser.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParser.java
new file mode 100644
index 0000000000..c973269fb1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParser.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static com.yahoo.elide.core.request.Argument.getArgumentMapFromString;
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.PERIOD;
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.mergedArgumentMap;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.github.jknack.handlebars.EscapingStrategy;
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.google.common.base.Preconditions;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Parses a column or join expression and returns the reference abstract syntax tree for each discovered
+ * reference.
+ */
+public class ExpressionParser {
+
+    private static final Pattern REFERENCE_PARENTHESES = Pattern.compile("\\{\\{\\[?(.+?)\\]?}}");
+    private static final String SQL_HELPER_PREFIX = "sql ";
+    private static final String COLUMN_ARGS_PREFIX = "$$column.args.";
+    private static final String TABLE_ARGS_PREFIX = "$$table.args.";
+    private static final String COLUMN_EXPR = "$$column.expr";
+
+    private MetaDataStore metaDataStore;
+    private EntityDictionary dictionary;
+    private final Handlebars handlebars = new Handlebars()
+            .with(EscapingStrategy.NOOP)
+            .registerHelper("sql", (context, options) -> {
+                String from = options.hash("from");
+                String column = options.hash("column");
+
+                // Prefix column with join table name
+                return isEmpty(from) ? column : from + PERIOD + column;
+            });
+
+    public ExpressionParser(MetaDataStore store) {
+        this.dictionary = store.getMetadataDictionary();
+        this.metaDataStore = store;
+    }
+
+    /**
+     * Parses the column or join expression and returns the list of discovered references.
+     * @param source The source table where the column or join expression lives.
+     * @param column {@link ColumnProjection}
+     * @return A list of discovered references.
+     */
+    public List<Reference> parse(Queryable source, ColumnProjection column) {
+        return parse(source, column.getExpression(), column.getArguments());
+    }
+
+    /**
+     * Parses the column or join expression and returns the list of discovered references.
+     * @param source The source table where the column or join expression lives.
+     * @param expression The expression to parse.
+     * @return A list of discovered references.
+     */
+    public List<Reference> parse(Queryable source, String expression) {
+        return parse(source, expression, Collections.emptyMap());
+    }
+
+    /**
+     * Parses the column or join expression and returns the list of discovered references.
+     * @param source The source table where the column or join expression lives.
+     * @param expression The expression to parse.
+     * @param callingColumnArgs Arguments available with calling column.
+     * @return A list of discovered references.
+     */
+    public List<Reference> parse(Queryable source, String expression, Map<String, Argument> callingColumnArgs) {
+        List<String> referenceNames = resolveFormulaReferences(expression);
+
+        List<Reference> results = new ArrayList<>();
+        Map<String, Argument> fixedArguments = new HashMap<>();
+
+        for (String referenceName : referenceNames) {
+
+            // Change `sql from='joinName' column='columnName[a1:v1][a2:v2]'` to `joinName.columnName`
+            if (referenceName.startsWith(SQL_HELPER_PREFIX)) {
+                try {
+                    Template template = handlebars.compileInline(toFormulaReference(referenceName));
+                    referenceName = template.apply(Collections.emptyMap());
+                    int argsIndex = referenceName.indexOf('[');
+                    if (argsIndex >= 0) {
+                        fixedArguments = getArgumentMapFromString(referenceName.substring(argsIndex));
+                        referenceName = referenceName.substring(0, argsIndex);
+                    }
+                } catch (IOException e) {
+                    throw new IllegalStateException(e.getMessage());
+                }
+            }
+
+            // ignore $$column.expr
+            if (referenceName.equals(COLUMN_EXPR)) {
+                continue;
+            }
+
+            if (referenceName.startsWith(COLUMN_ARGS_PREFIX)) {
+                results.add(ColumnArgReference.builder()
+                                .argName(referenceName.substring(COLUMN_ARGS_PREFIX.length()))
+                                .build());
+            } else if (referenceName.startsWith(TABLE_ARGS_PREFIX)) {
+                results.add(TableArgReference.builder()
+                                .argName(referenceName.substring(TABLE_ARGS_PREFIX.length()))
+                                .build());
+            } else if (referenceName.startsWith("$")) {
+                results.add(PhysicalReference
+                        .builder()
+                        .source(source)
+                        .name(referenceName.substring(1))
+                        .build());
+            } else if (referenceName.contains(".")) {
+                results.add(buildJoin(source, referenceName, callingColumnArgs, fixedArguments));
+            } else {
+                ColumnProjection referencedColumn = source.getColumnProjection(referenceName);
+                Preconditions.checkNotNull(referencedColumn, String.format("Couldn't find column: '%s' for table: '%s'",
+                                referenceName, source.getName()));
+
+                ColumnProjection newColumn = referencedColumn.withArguments(
+                                mergedArgumentMap(referencedColumn.getArguments(),
+                                                  callingColumnArgs,
+                                                  fixedArguments));
+
+                List<Reference> references = buildReferenceForColumn(source, newColumn);
+
+                results.add(LogicalReference
+                        .builder()
+                        .source(source)
+                        .column(newColumn)
+                        .references(references)
+                        .build());
+            }
+        }
+
+        return results;
+    }
+
+    private List<Reference> buildReferenceForColumn(Queryable source, ColumnProjection column) {
+        if (column.getColumnType() == ColumnType.FIELD) {
+            return Arrays.asList(PhysicalReference
+                    .builder()
+                    .source(source)
+                    .name(column.getName())
+                    .build());
+        }
+        return parse(source, column);
+    }
+
+    private JoinReference buildJoin(Queryable source, String referenceName, Map<String, Argument> callingColumnArgs,
+                    Map<String, Argument> fixedArguments) {
+
+        Queryable root = source.getRoot();
+        Type<?> tableClass = dictionary.getEntityClass(root.getName(), root.getVersion());
+
+        JoinPath joinPath = new JoinPath(tableClass, metaDataStore, referenceName);
+
+        Path.PathElement lastElement = joinPath.lastElement().get();
+        Queryable joinSource = metaDataStore.getTable(lastElement.getType());
+        String fieldName = lastElement.getFieldName();
+
+        Reference reference;
+        if (fieldName.startsWith("$")) {
+            reference = PhysicalReference
+                    .builder()
+                    .source(joinSource)
+                    .name(fieldName.substring(1))
+                    .build();
+        } else {
+            ColumnProjection referencedColumn = joinSource.getColumnProjection(fieldName);
+            ColumnProjection newColumn = referencedColumn.withArguments(
+                            mergedArgumentMap(referencedColumn.getArguments(),
+                                              callingColumnArgs,
+                                              fixedArguments));
+
+            reference = LogicalReference
+                            .builder()
+                            .source(joinSource)
+                            .column(newColumn)
+                            .references(buildReferenceForColumn(joinSource, newColumn))
+                            .build();
+        }
+
+        return JoinReference
+                .builder()
+                .path(joinPath)
+                .source(source)
+                .reference(reference)
+                .build();
+    }
+
+    /**
+     * Use regex to get all references from a formula expression.
+     *
+     * @param expression expression
+     * @return references appear in the expression.
+     */
+    private static List<String> resolveFormulaReferences(String expression) {
+        List<String> references = new ArrayList<>();
+        if (! isEmpty(expression)) {
+            Matcher matcher = REFERENCE_PARENTHESES.matcher(expression);
+            while (matcher.find()) {
+                references.add(matcher.group(1).trim());
+            }
+        }
+
+        return references;
+    }
+
+    /**
+     * Convert a resolved formula reference back to a reference presented in formula format.
+     *
+     * @param reference referenced field
+     * @return formula reference, <code>{{reference}}</code>
+     */
+    private static String toFormulaReference(String reference) {
+        return "{{" + reference + "}}";
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitor.java
new file mode 100644
index 0000000000..09536fa894
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+/**
+ * Determines if the reference has at least one join.
+ */
+public class HasJoinVisitor implements ReferenceVisitor<Boolean> {
+    @Override
+    public Boolean visitPhysicalReference(PhysicalReference reference) {
+        return false;
+    }
+
+    @Override
+    public Boolean visitLogicalReference(LogicalReference reference) {
+        return reference.getReferences().stream().anyMatch(ref -> ref.accept(this));
+    }
+
+    @Override
+    public Boolean visitJoinReference(JoinReference reference) {
+        return true;
+    }
+
+    @Override
+    public Boolean visitColumnArgReference(ColumnArgReference reference) {
+        return false;
+    }
+
+    @Override
+    public Boolean visitTableArgReference(TableArgReference reference) {
+        return false;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractor.java
new file mode 100644
index 0000000000..ce64a12817
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractor.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.applyQuotes;
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.mergedArgumentMap;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable.hasSql;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable.resolveTableOrSubselect;
+import static java.util.Collections.emptySet;
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.metadata.ColumnContext;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.TableContext;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLJoin;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Provides Join Expressions for all the {@link JoinReference} in a given reference tree.
+ */
+public class JoinExpressionExtractor implements ReferenceVisitor<Set<String>> {
+
+    private static final String ON = "ON ";
+    private static final String OPEN_BRACKET = "(";
+    private static final String CLOSE_BRACKET = ")";
+
+    private final Set<String> joinExpressions = new LinkedHashSet<>();
+
+    private final ColumnContext context;
+
+    private final MetaDataStore metaDataStore;
+    private final EntityDictionary dictionary;
+
+    public JoinExpressionExtractor(ColumnContext context) {
+        this.context = context;
+        this.metaDataStore = context.getMetaDataStore();
+        this.dictionary = context.getMetaDataStore().getMetadataDictionary();
+    }
+
+    @Override
+    public Set<String> visitPhysicalReference(PhysicalReference reference) {
+        return joinExpressions;
+    }
+
+    @Override
+    public Set<String> visitLogicalReference(LogicalReference reference) {
+
+        /**
+         * For the scenario: col1:{{col2}}, col2:{{col3}}, col3:{{join.col1}}
+         * Creating new visitor with new ColumnProjection.
+         */
+        ColumnProjection newColumn = reference.getColumn();
+
+        ColumnContext newCtx = ColumnContext.builder()
+                        .queryable(this.context.getQueryable())
+                        .alias(this.context.getAlias())
+                        .metaDataStore(this.context.getMetaDataStore())
+                        .column(newColumn)
+                        .tableArguments(this.context.getTableArguments())
+                        .build();
+
+        JoinExpressionExtractor visitor = new JoinExpressionExtractor(newCtx);
+        reference.getReferences().forEach(ref -> {
+            joinExpressions.addAll(ref.accept(visitor));
+        });
+        return joinExpressions;
+    }
+
+    @Override
+    public Set<String> visitJoinReference(JoinReference reference) {
+
+        JoinPath joinPath = reference.getPath();
+        List<PathElement> pathElements = joinPath.getPathElements();
+
+        ColumnContext currentCtx = this.context;
+
+        for (int i = 0; i < pathElements.size() - 1; i++) {
+
+            PathElement pathElement = pathElements.get(i);
+            Type<?> joinClass = pathElement.getFieldType();
+            String joinFieldName = pathElement.getFieldName();
+
+            SQLJoin sqlJoin = currentCtx.getQueryable().getJoin(joinFieldName);
+
+            ColumnContext joinCtx;
+            String onClause;
+            JoinType joinType;
+            String fullExpression;
+
+            if (sqlJoin != null) {
+                joinType = sqlJoin.getJoinType();
+                joinCtx = (ColumnContext) currentCtx.get(joinFieldName);
+
+                if (joinType.equals(JoinType.CROSS)) {
+                    onClause = EMPTY;
+                } else {
+                    onClause = ON + currentCtx.resolve(sqlJoin.getJoinExpression());
+                }
+            } else {
+                joinType = JoinType.LEFT;
+                SQLTable table = metaDataStore.getTable(joinClass);
+                joinCtx = ColumnContext.builder()
+                                .queryable(table)
+                                .alias(appendAlias(currentCtx.getAlias(), joinFieldName))
+                                .metaDataStore(currentCtx.getMetaDataStore())
+                                .column(currentCtx.getColumn())
+                                .tableArguments(mergedArgumentMap(table.getArguments(),
+                                                                  currentCtx.getTableArguments()))
+                                .build();
+
+                onClause = ON + String.format("%s.%s = %s.%s",
+                                currentCtx.getAlias(),
+                                dictionary.getAnnotatedColumnName(pathElement.getType(), joinFieldName),
+                                joinCtx.getAlias(),
+                                dictionary.getAnnotatedColumnName(joinClass, dictionary.getIdFieldName(joinClass)));
+            }
+
+            SQLDialect sqlDialect = currentCtx.getQueryable().getDialect();
+            String joinAlias = applyQuotes(joinCtx.getAlias(), sqlDialect);
+            String joinKeyword = currentCtx.getQueryable().getDialect().getJoinKeyword(joinType);
+            String joinSource = constructTableOrSubselect(joinCtx, joinClass);
+
+            if (sqlDialect.useASBeforeTableAlias()) {
+                fullExpression = String.format("%s %s AS %s %s", joinKeyword, joinSource, joinAlias, onClause);
+            } else {
+                fullExpression = String.format("%s %s %s %s", joinKeyword, joinSource, joinAlias, onClause);
+            }
+            joinExpressions.add(fullExpression);
+
+            /**
+             * If this `for` loop runs more than once, context should be switched to join context.
+             */
+            currentCtx = joinCtx;
+        }
+
+        // If reference within current join reference is of type PhysicalReference, then below visitor doesn't matter.
+        // If it is of type LogicalReference, then visitLogicalReference method will recreate visitor with correct
+        // value of ColumnProjection in context.
+        JoinExpressionExtractor visitor = new JoinExpressionExtractor(currentCtx);
+        joinExpressions.addAll(reference.getReference().accept(visitor));
+        return joinExpressions;
+    }
+
+    /**
+     * Get the SELECT SQL or tableName for given entity.
+     * @param columnCtx {@link ColumnContext}.
+     * @param cls Entity class.
+     * @return resolved tableName or sql in Subselect/FromSubquery.
+     */
+    private String constructTableOrSubselect(ColumnContext columnCtx, Type<?> cls) {
+
+        if (hasSql(cls)) {
+            // Resolve any table arguments with in FromSubquery or Subselect
+            TableContext context = TableContext.builder().tableArguments(columnCtx.getTableArguments()).build();
+            String selectSql = context.resolve(resolveTableOrSubselect(dictionary, cls));
+            return OPEN_BRACKET + selectSql + CLOSE_BRACKET;
+        }
+
+        return applyQuotes(resolveTableOrSubselect(dictionary, cls), columnCtx.getQueryable().getDialect());
+    }
+
+    @Override
+    public Set<String> visitColumnArgReference(ColumnArgReference reference) {
+        return emptySet();
+    }
+
+    @Override
+    public Set<String> visitTableArgReference(TableArgReference reference) {
+        return emptySet();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinReference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinReference.java
new file mode 100644
index 0000000000..ee2ff508e3
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinReference.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+/**
+ * A reference to a column in another table ("author.books.title").
+ */
+@Value
+@Builder
+public class JoinReference implements Reference {
+
+    @NonNull
+    private Reference reference;
+
+    @NonNull
+    private Queryable source;
+
+    @NonNull
+    private JoinPath path;
+
+    @Override
+    public <T> T accept(ReferenceVisitor<T> visitor) {
+        return visitor.visitJoinReference(this);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReference.java
new file mode 100644
index 0000000000..09c2554563
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReference.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Singular;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * A reference to a logical column in the same table.
+ */
+@Value
+@Builder
+public class LogicalReference implements Reference {
+
+    @Singular
+    private List<Reference> references;
+
+    @NonNull
+    private Queryable source;
+
+    @NonNull
+    private ColumnProjection column;
+
+    @Override
+    public <T> T accept(ReferenceVisitor<T> visitor) {
+        return visitor.visitLogicalReference(this);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReference.java
new file mode 100644
index 0000000000..22185fe832
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReference.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+/**
+ * A reference to a column in the database: "$revenue".
+ */
+@Value
+@Builder
+public class PhysicalReference implements Reference {
+    @NonNull
+    private Queryable source;
+
+    @NonNull
+    private String name;
+
+    @Override
+    public <T> T accept(ReferenceVisitor<T> visitor) {
+        return visitor.visitPhysicalReference(this);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/Reference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/Reference.java
new file mode 100644
index 0000000000..7a999c0534
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/Reference.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+/**
+ * A reference to a column in a column or join expression.
+ */
+public interface Reference {
+
+    /**
+     * Accepts a visitor that walks the reference AST.
+     * @param visitor The visitor
+     * @param <T> The return type of the visitor
+     * @return a T
+     */
+    <T> T accept(ReferenceVisitor<T> visitor);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceExtractor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceExtractor.java
new file mode 100644
index 0000000000..0663f38c58
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceExtractor.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLJoin;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Extracts all the references of a particular type from the reference AST.
+ * @param <T> The reference type to extract.
+ */
+public class ReferenceExtractor<T extends Reference> implements ReferenceVisitor<Set<T>> {
+
+    private final Class<T> referenceType;
+    private final Set<T> references;
+    private MetaDataStore metaDataStore;
+    private Set<SQLJoin> visitedJoins;
+    private ExpressionParser parser;
+    private Mode mode;
+
+    public enum Mode {
+        ALL,
+        SAME_QUERY,
+        SAME_COLUMN,
+    }
+
+    /**
+     * Constructor.
+     * @param referenceType The reference type to extract.
+     * @param metaDataStore Metadata store.
+     */
+    public ReferenceExtractor(Class<T> referenceType, MetaDataStore metaDataStore) {
+        this(referenceType, metaDataStore, Mode.ALL);
+    }
+
+    /**
+     * Constructor.
+     * @param referenceType The reference type to extract.
+     * @param metaDataStore Metadata store.
+     * @param mode {@link Mode}.
+     */
+    public ReferenceExtractor(Class<T> referenceType, MetaDataStore metaDataStore, Mode mode) {
+        this.mode = mode;
+        this.referenceType = referenceType;
+        this.references = new LinkedHashSet<>();
+        this.metaDataStore = metaDataStore;
+        this.parser = new ExpressionParser(metaDataStore);
+        this.visitedJoins = new HashSet<>();
+    }
+
+    @Override
+    public Set<T> visitPhysicalReference(PhysicalReference reference) {
+        if (referenceType.equals(PhysicalReference.class)) {
+            references.add((T) reference);
+        }
+
+        return references;
+    }
+
+    @Override
+    public Set<T> visitLogicalReference(LogicalReference reference) {
+        if (referenceType.equals(LogicalReference.class)) {
+            references.add((T) reference);
+        }
+
+        if (mode != Mode.SAME_COLUMN) {
+            reference.getReferences().stream()
+                            .map(ref -> ref.accept(this))
+                            .flatMap(Set::stream)
+                            .forEach(references::add);
+        }
+
+        return references;
+    }
+
+    @Override
+    public Set<T> visitJoinReference(JoinReference reference) {
+
+        if (referenceType.equals(JoinReference.class)) {
+            references.add((T) reference);
+        }
+
+        JoinPath path = reference.getPath();
+
+        int pathLimit = (mode == Mode.SAME_QUERY) ? 1 : path.getPathElements().size() - 1;
+
+        for (int idx = 0; idx < pathLimit; idx++) {
+            Path.PathElement pathElement = path.getPathElements().get(idx);
+
+            String fieldName = pathElement.getFieldName();
+            Type<?> parentClass = pathElement.getType();
+
+            SQLTable table = metaDataStore.getTable(parentClass);
+            SQLJoin join = table.getJoin(fieldName);
+
+            if (visitedJoins.contains(join)) {
+                continue;
+            }
+            visitedJoins.add(join);
+
+            parser.parse(table, join.getJoinExpression()).stream().forEach(
+                    ref -> ref.accept(this));
+        }
+
+        if (mode != Mode.SAME_QUERY) {
+            return reference.getReference().accept(this);
+        }
+
+        return references;
+    }
+
+    @Override
+    public Set<T> visitColumnArgReference(ColumnArgReference reference) {
+        if (referenceType.equals(ColumnArgReference.class)) {
+            references.add((T) reference);
+        }
+
+        return references;
+    }
+
+    @Override
+    public Set<T> visitTableArgReference(TableArgReference reference) {
+        if (referenceType.equals(TableArgReference.class)) {
+            references.add((T) reference);
+        }
+
+        return references;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceVisitor.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceVisitor.java
new file mode 100644
index 0000000000..d67fbc5e9f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ReferenceVisitor.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+/**
+ * Walks a reference abstract syntax tree and builds a T.
+ * @param <T> The type the visitor constructs/returns.
+ */
+public interface ReferenceVisitor<T> {
+
+    /**
+     * Visits a physical reference.
+     * @param reference The physical reference
+     * @return a type T.
+     */
+    T visitPhysicalReference(PhysicalReference reference);
+
+    /**
+     * Visits a logical reference.
+     * @param reference The logical reference
+     * @return a type T.
+     */
+    T visitLogicalReference(LogicalReference reference);
+
+    /**
+     * Visits a join reference.
+     * @param reference The join reference
+     * @return a type T.
+     */
+    T visitJoinReference(JoinReference reference);
+
+    /**
+     * Visits a column argument reference.
+     * @param reference The column argument reference
+     * @return a type T.
+     */
+    T visitColumnArgReference(ColumnArgReference reference);
+
+    /**
+     * Visits a table argument reference.
+     * @param reference The table argument reference
+     * @return a type T.
+     */
+    T visitTableArgReference(TableArgReference reference);
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/TableArgReference.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/TableArgReference.java
new file mode 100644
index 0000000000..ba791c4f98
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/TableArgReference.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+/**
+ * Handlebar Reference to a table argument.
+ * eg: {{$$table.args.argName}}.
+ */
+@Value
+@Builder
+public class TableArgReference implements Reference {
+
+    @NonNull
+    private String argName;
+
+    @Override
+    public <T> T accept(ReferenceVisitor<T> visitor) {
+        return visitor.visitTableArgReference(this);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLJoin.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLJoin.java
new file mode 100644
index 0000000000..e7ff238a57
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLJoin.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata;
+
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder
+/**
+ * Forms relationships between two SQLTables.
+ */
+public class SQLJoin {
+    private String name;
+    private JoinType joinType;
+    private boolean toOne;
+    private Type<?> joinTableType;
+    private String joinExpression;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLTable.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLTable.java
new file mode 100644
index 0000000000..3da239355a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLTable.java
@@ -0,0 +1,376 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.PERIOD;
+import static java.util.Collections.emptyMap;
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLTimeDimensionProjection;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.Subselect;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * SQL extension of {@link Table} which also contains sql column meta data.
+ */
+@EqualsAndHashCode(callSuper = true)
+@Getter
+public class SQLTable extends Table implements Queryable {
+
+    private ConnectionDetails connectionDetails;
+
+    private Map<String, SQLJoin> joins;
+
+    private Map<String, Argument> arguments;
+
+    public SQLTable(Namespace namespace,
+                    Type<?> cls,
+                    EntityDictionary dictionary,
+                    ConnectionDetails connectionDetails) {
+        super(namespace, cls, dictionary);
+        this.connectionDetails = connectionDetails;
+        this.joins = new HashMap<>();
+        this.arguments = prepareArgMap(getArgumentDefinitions());
+
+        EntityBinding binding = dictionary.getEntityBinding(cls);
+        binding.fieldsToValues.forEach((name, field) -> {
+            if (field.isAnnotationPresent(Join.class)) {
+                Join join = field.getAnnotation(Join.class);
+                joins.put(name, SQLJoin.builder()
+                        .name(name)
+                        .joinType(join.type())
+                        .joinExpression(join.value())
+                        .joinTableType(dictionary.getParameterizedType(cls, name))
+                        .toOne(join.toOne())
+                        .build());
+            }
+        });
+    }
+
+    public SQLTable(Namespace namespace, Type<?> cls, EntityDictionary dictionary) {
+        this(namespace, cls, dictionary, null);
+    }
+
+    @Override
+    protected Metric constructMetric(String fieldName, EntityDictionary dictionary) {
+        if (dictionary.getIdFieldName(getModel()).equals(fieldName)) {
+            MetricProjectionMaker maker = (metric, alias, arguments) -> {
+                return SQLMetricProjection
+                        .builder()
+                        .projected(true)
+                        .alias(fieldName)
+                        .name(fieldName)
+                        .expression("")
+                        .valueType(ValueType.ID)
+                        .columnType(ColumnType.FIELD)
+                        .arguments(new HashMap<>())
+                        .build();
+
+            };
+            return new Metric(maker, this, fieldName, dictionary);
+        }
+        return new Metric(this, fieldName, dictionary);
+    }
+
+    @Override
+    public Queryable toQueryable() {
+        return this;
+    }
+
+    @Override
+    public MetricProjection getMetricProjection(String fieldName) {
+        return getMetricProjection(fieldName, emptyMap());
+    }
+
+    public MetricProjection getMetricProjection(String fieldName, String alias) {
+        return getMetricProjection(fieldName, alias, emptyMap());
+    }
+
+    public MetricProjection getMetricProjection(String fieldName, Map<String, Argument> arguments) {
+        return getMetricProjection(fieldName, fieldName, arguments);
+    }
+
+    public MetricProjection getMetricProjection(String fieldName, String alias, Map<String, Argument> arguments) {
+        Metric metric = super.getMetric(fieldName);
+        if (metric == null) {
+            return null;
+        }
+
+        return getMetricProjection(metric, alias, arguments);
+    }
+
+    public MetricProjection getMetricProjection(Metric metric, String alias, Map<String, Argument> arguments) {
+        return metric.getMetricProjectionMaker().make(metric, alias, arguments);
+    }
+
+    @Override
+    public List<MetricProjection> getMetricProjections() {
+        return super.getAllMetrics().stream()
+                .map(metric -> getMetricProjection(metric, metric.getName(),
+                                prepareArgMap(metric.getArgumentDefinitions())))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public DimensionProjection getDimensionProjection(String fieldName) {
+        return getDimensionProjection(fieldName, emptyMap());
+    }
+
+    public DimensionProjection getDimensionProjection(String fieldName, String alias) {
+        return getDimensionProjection(fieldName, alias, emptyMap());
+    }
+
+    public DimensionProjection getDimensionProjection(String fieldName, Map<String, Argument> arguments) {
+        return getDimensionProjection(fieldName, fieldName, arguments);
+    }
+
+    public DimensionProjection getDimensionProjection(String fieldName, String alias, Map<String, Argument> arguments) {
+        Dimension dimension = super.getDimension(fieldName);
+        if (dimension == null) {
+            return null;
+        }
+        return getDimensionProjection(dimension, alias, arguments);
+    }
+
+    public DimensionProjection getDimensionProjection(Dimension dimension, String alias,
+                    Map<String, Argument> arguments) {
+        return new SQLDimensionProjection(dimension, alias, arguments, true);
+    }
+
+    @Override
+    public List<DimensionProjection> getDimensionProjections() {
+        return super.getAllDimensions()
+                .stream()
+                .map(dimension -> getDimensionProjection(dimension, dimension.getName(),
+                                prepareArgMap(dimension.getArgumentDefinitions())))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public TimeDimensionProjection getTimeDimensionProjection(String fieldName) {
+        return getTimeDimensionProjection(fieldName, new HashMap<>());
+    }
+
+    public TimeDimensionProjection getTimeDimensionProjection(String fieldName, Map<String, Argument> arguments) {
+        return getTimeDimensionProjection(fieldName, fieldName, arguments);
+    }
+
+    public TimeDimensionProjection getTimeDimensionProjection(String fieldName, Set<Argument> arguments) {
+        Map<String, Argument> argumentMap =
+                arguments.stream().collect(Collectors.toMap(Argument::getName, argument -> argument));
+        return getTimeDimensionProjection(fieldName, fieldName, argumentMap);
+    }
+
+    public TimeDimensionProjection getTimeDimensionProjection(String fieldName, String alias,
+                                                              Map<String, Argument> arguments) {
+        TimeDimension dimension = super.getTimeDimension(fieldName);
+        if (dimension == null) {
+            return null;
+        }
+        return getTimeDimensionProjection(dimension, alias, arguments);
+    }
+
+    public TimeDimensionProjection getTimeDimensionProjection(TimeDimension dimension, String alias,
+                    Map<String, Argument> arguments) {
+        return new SQLTimeDimensionProjection(dimension, dimension.getTimezone(), alias, arguments, true);
+    }
+
+    @Override
+    public List<TimeDimensionProjection> getTimeDimensionProjections() {
+        return super.getAllTimeDimensions()
+                .stream()
+                .map(dimension -> getTimeDimensionProjection(dimension, dimension.getName(),
+                                prepareArgMap(dimension.getArgumentDefinitions())))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<ColumnProjection> getColumnProjections() {
+        return super.getAllColumns()
+                .stream()
+                .map(column -> getColumnProjection(column.getName()))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public ColumnProjection getColumnProjection(String name) {
+        Column column = super.getColumn(Column.class, name);
+
+        if (column == null) {
+            return null;
+        }
+
+        return getColumnProjection(column, prepareArgMap(column.getArgumentDefinitions()));
+    }
+
+    @Override
+    public ColumnProjection getColumnProjection(String name, Map<String, Argument> arguments) {
+        Column column = super.getColumn(Column.class, name);
+
+        if (column == null) {
+            return null;
+        }
+
+        return getColumnProjection(column, arguments);
+    }
+
+    private ColumnProjection getColumnProjection(Column column, Map<String, Argument> arguments) {
+        if (column instanceof TimeDimension) {
+            return getTimeDimensionProjection((TimeDimension) column, column.getName(), arguments);
+        }
+
+        if (column instanceof Metric) {
+            return getMetricProjection((Metric) column, column.getName(), arguments);
+        }
+
+        return getDimensionProjection((Dimension) column, column.getName(), arguments);
+    }
+
+    /**
+     * Looks up a join by name.
+     * @param joinName The join name.
+     * @return SQLJoin or null.
+     */
+    public SQLJoin getJoin(String joinName) {
+        return joins.get(joinName);
+    }
+
+    /**
+     * Looks up a join by name and returns the corresponding SQLTable being joined to.
+     * @param store The store where all the SQL tables live.
+     * @param joinName The join to lookup.
+     * @return SQLTable or null.
+     */
+    public SQLTable getJoinTable(MetaDataStore store, String joinName) {
+        SQLJoin join = getJoin(joinName);
+        if (join == null) {
+            return null;
+        }
+
+        return store.getTable(join.getJoinTableType());
+    }
+
+    /**
+     * Looks up to see if a given field is a join field or just an attribute.
+     * @param store The metadata store.
+     * @param modelType The model type in question.
+     * @param fieldName The field name in question.
+     * @return True if the field is a join field.  False otherwise.
+     */
+    public static boolean isTableJoin(MetaDataStore store, Type<?> modelType, String fieldName) {
+        SQLTable table = store.getTable(modelType);
+
+        return (table.getJoinTable(store, fieldName) != null);
+    }
+
+    @Override
+    public Queryable getSource() {
+        return this;
+    }
+
+    @Override
+    public Map<String, Argument> getArguments() {
+        return arguments;
+    }
+
+    /**
+     * Create a map of String and {@link Argument} using {@link Column}'s arguments.
+     * @param arguments Set of available {@link Column} arguments.
+     * @return A map of String and {@link Argument}
+     */
+    private static Map<String, Argument> prepareArgMap(Set<ArgumentDefinition> arguments) {
+        return arguments.stream()
+                        .map(arg -> Argument.builder()
+                                        .name(arg.getName())
+                                        .value(arg.getDefaultValue())
+                                        .build())
+                        .collect(Collectors.toMap(Argument::getName, Function.identity()));
+    }
+
+    /**
+     * Check whether a class is mapped to a subselect query instead of a physical table.
+     * @param cls The entity class.
+     * @return True if the class has {@link Subselect}/{@link FromSubquery} annotation.
+     */
+    public static boolean hasSql(Type<?> cls) {
+        return cls.isAnnotationPresent(Subselect.class) || cls.isAnnotationPresent(FromSubquery.class);
+    }
+
+    /**
+     * Maps an entity class to a physical table or subselect query, if neither {@link javax.persistence.Table}
+     * nor {@link Subselect} annotation is present on this class, try {@link FromTable} and {@link FromSubquery}.
+     * @param cls The entity class.
+     * @return The physical SQL table or subselect query.
+     */
+    public static String resolveTableOrSubselect(EntityDictionary dictionary, Type<?> cls) {
+        if (hasSql(cls)) {
+            if (cls.isAnnotationPresent(FromSubquery.class)) {
+                return dictionary.getAnnotation(cls, FromSubquery.class).sql();
+            }
+            return dictionary.getAnnotation(cls, Subselect.class).value();
+        }
+        javax.persistence.Table table = dictionary.getAnnotation(cls, javax.persistence.Table.class);
+
+        if (table != null) {
+            return resolveTableAnnotation(table);
+        }
+        FromTable fromTable = dictionary.getAnnotation(cls, FromTable.class);
+
+        return fromTable != null ? fromTable.name() : cls.getSimpleName();
+    }
+
+    /**
+     * Get the full table name from JPA {@link javax.persistence.Table} annotation.
+     * @param table table annotation.
+     * @return <code>catalog.schema.name</code>
+     */
+    private static String resolveTableAnnotation(javax.persistence.Table table) {
+        StringBuilder fullTableName = new StringBuilder();
+
+        if (StringUtils.isNotBlank(table.catalog())) {
+            fullTableName.append(table.catalog()).append(PERIOD);
+        }
+
+        if (StringUtils.isNotBlank(table.schema())) {
+            fullTableName.append(table.schema()).append(PERIOD);
+        }
+
+        return fullTableName.append(table.name()).toString();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizer.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizer.java
new file mode 100644
index 0000000000..61a1e3288f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizer.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static com.yahoo.elide.datastores.aggregation.query.Queryable.extractFilterProjections;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.query.QueryPlanTranslator.addHiddenProjections;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryVisitor;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.google.common.collect.Streams;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * This optimizer attempts to aggregate data prior to table joins by nesting the query into an inner query
+ * (where aggregation occurs) and an outer query (where joins occur).  This optimization works well when the
+ * join is not sparse (common case) but may underperform if the join is sparse (in which case joining first and
+ * then aggregating is preferred).
+ *
+ * It should be noted that this kind of query nesting is currently different than (and not compatible with) nesting
+ * that is done during query planning.  Query planning currently takes the opposite approach - perform joins in the
+ * inner query and avoid them in the outer query.
+ */
+public class AggregateBeforeJoinOptimizer implements Optimizer {
+    private MetaDataStore metaDataStore;
+
+    public AggregateBeforeJoinOptimizer(MetaDataStore metaDataStore) {
+        this.metaDataStore = metaDataStore;
+    }
+
+    private class OptimizerVisitor implements QueryVisitor<Queryable> {
+
+        @Override
+        public Queryable visitQuery(Query query) {
+            SubqueryFilterSplitter.SplitFilter splitWhere =
+                    SubqueryFilterSplitter.splitFilter(metaDataStore, query.getWhereFilter());
+
+            Set<ColumnProjection> allProjections = Streams.concat(
+                    query.getColumnProjections().stream(),
+                    extractFilterProjections(query, splitWhere.getOuter()).stream())
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+
+            Set<Pair<ColumnProjection, Set<ColumnProjection>>> allProjectionsNested = allProjections.stream()
+                    .map((projection) -> projection.nest(query, metaDataStore, true))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+
+            Set<ColumnProjection> allOuterProjections = allProjectionsNested.stream()
+                    .map(Pair::getLeft)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+
+            Set<ColumnProjection> allInnerProjections = allProjectionsNested.stream()
+                    .map(Pair::getRight)
+                    .flatMap(Set::stream)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+
+            Query.QueryBuilder inner = Query.builder()
+                    .source(query.getSource().accept(this))
+                    .metricProjections(allInnerProjections.stream()
+                                    .filter((predicate) -> predicate instanceof MetricProjection)
+                                    .map(MetricProjection.class::cast)
+                                    .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .dimensionProjections(allInnerProjections.stream()
+                            .filter((predicate) -> predicate instanceof DimensionProjection)
+                            .map(DimensionProjection.class::cast)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .timeDimensionProjections(allInnerProjections.stream()
+                            .filter((predicate) -> predicate instanceof TimeDimensionProjection)
+                            .map(SQLTimeDimensionProjection.class::cast)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .whereFilter(splitWhere.getInner());
+
+            addHiddenProjections(metaDataStore, inner, query);
+
+            Query outer = Query.builder()
+                    .metricProjections(allOuterProjections.stream()
+                            .filter((predicate) -> predicate instanceof MetricProjection)
+                            .map(MetricProjection.class::cast)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .dimensionProjections(allOuterProjections.stream()
+                            .filter((predicate) -> predicate instanceof DimensionProjection)
+                            .map(DimensionProjection.class::cast)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .timeDimensionProjections(allOuterProjections.stream()
+                            .filter((predicate) -> predicate instanceof TimeDimensionProjection)
+                            .map(TimeDimensionProjection.class::cast)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                    .whereFilter(splitWhere.getOuter())
+                    .havingFilter(query.getHavingFilter())
+                    .sorting(query.getSorting())
+                    .pagination(query.getPagination())
+                    .scope(query.getScope())
+                    .bypassingCache(query.isBypassingCache())
+                    .source(inner.build())
+                    .build();
+
+            return outer;
+        }
+
+       @Override
+        public Queryable visitQueryable(Queryable table) {
+            return table;
+        }
+    }
+
+    @Override
+    public String hint() {
+        return "AggregateBeforeJoin";
+    }
+
+    @Override
+    public boolean canOptimize(Query query) {
+        //For simplicity, we will not optimize an already nested query.
+        if (query.isNested()) {
+            return false;
+        }
+
+        //Every column must be nestable.
+        if (! query.getColumnProjections().stream()
+                .allMatch((projection) -> projection.canNest(query, metaDataStore))) {
+            return false;
+        }
+
+        //TODO - If any of the group by columns require a join across a toMany relationship,
+        //we cannot aggregate with joining first
+
+        //TODO - If a metric requires a join, the join could be required prior to aggregation or after aggregation
+        //depending on how the join is referenced in the SQL expression.  This requires a more complex understanding
+        //of the native SQL expression and outside the scope.  This will require Calcite parsing and also template
+        //substitution.
+
+        //There must be at least one join or there is no reason to optimize.  First check the where clause
+        //joins.  There is no need to check having clause or sort because those columns must also be in
+        //the projection and we check projections below.
+        if (query.getWhereFilter() != null) {
+            SubqueryFilterSplitter.SplitFilter splitFilter =
+                    SubqueryFilterSplitter.splitFilter(metaDataStore, query.getWhereFilter());
+
+            if (splitFilter.getOuter() != null) {
+                return true;
+            }
+        }
+
+        //Next check the projection for required joins.
+        for (ColumnProjection column: query.getColumnProjections()) {
+            boolean requiresJoin = SQLColumnProjection.requiresJoin(query.getSource(), column, metaDataStore);
+
+            if (requiresJoin) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public Query optimize(Query query) {
+        if (! canOptimize(query)) {
+            return query;
+        }
+
+        return (Query) query.accept(new OptimizerVisitor());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/NativeQuery.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/NativeQuery.java
new file mode 100644
index 0000000000..29c4e84a64
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/NativeQuery.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * Aids in constructing a SQL query from String fragments.
+ */
+@Data
+@Builder
+public class NativeQuery {
+
+    private static final String SPACE = " ";
+
+    @NonNull
+    private String fromClause;
+
+    @NonNull
+    private String projectionClause;
+
+    @Builder.Default
+    private String joinClause = "";
+    @Builder.Default
+    private String whereClause = "";
+    @Builder.Default
+    private String groupByClause = "";
+    @Builder.Default
+    private String havingClause = "";
+    @Builder.Default
+    private String orderByClause = "";
+    @Builder.Default
+    private String offsetLimitClause = "";
+
+    @Override
+    public String toString() {
+        return String.format("SELECT %s FROM %s", projectionClause, fromClause)
+                + SPACE + joinClause
+                + SPACE + whereClause
+                + SPACE + groupByClause
+                + SPACE + havingClause
+                + SPACE + orderByClause
+                + SPACE + offsetLimitClause;
+    }
+
+    //To avoid lombok javadoc errors.
+    public static class NativeQueryBuilder {
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryPlanTranslator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryPlanTranslator.java
new file mode 100644
index 0000000000..3f7ce76ad5
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryPlanTranslator.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlan;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.QueryVisitor;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.LogicalReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ReferenceExtractor;
+import com.google.common.collect.Streams;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Translates a merged query plan and a client query into query that can be executed.
+ *
+ * Column projection expressions originating from the query plan are left untouched.
+ * Column projection expressions originating from the client query are nested for outer queries.
+ */
+public class QueryPlanTranslator implements QueryVisitor<Query.QueryBuilder> {
+
+    private Query clientQuery;
+
+    //Whether or not this visitor has been invoked yet.
+    private boolean invoked = false;
+
+    private MetaDataStore metaDataStore;
+    private QueryPlanMerger merger;
+
+    public QueryPlanTranslator(Query clientQuery, MetaDataStore metaDataStore, QueryPlanMerger merger) {
+        this.metaDataStore = metaDataStore;
+        this.clientQuery = clientQuery;
+        this.merger = merger;
+    }
+
+    public QueryPlanTranslator(Query clientQuery, MetaDataStore metaDataStore) {
+        this(clientQuery, metaDataStore, new DefaultQueryPlanMerger(metaDataStore));
+    }
+
+    /**
+     * Translate a query plan into a query.
+     * @param plan the plan to translate.
+     * @return A runnable query incorporating elements from the client's original query.
+     */
+    public Query translate(QueryPlan plan) {
+
+        //Convert the client query into a dimension-only plan that can be nested.
+        QueryPlan clientQueryPlan = QueryPlan.builder()
+                .source(clientQuery.getSource())
+                .timeDimensionProjections(clientQuery.getTimeDimensionProjections())
+                .dimensionProjections(clientQuery.getDimensionProjections())
+                .build();
+
+        //Merge it with the metric plan.
+        if (plan.isNested() && !clientQueryPlan.canNest(metaDataStore)) {
+            throw new UnsupportedOperationException("Cannot nest one or more dimensions from the client query");
+        }
+
+        QueryPlan merged = merger.merge(clientQueryPlan, plan);
+
+        //Decorate the result with filters, sorting, and pagination.
+        return merged.accept(this).build();
+    }
+
+    @Override
+    public Query.QueryBuilder visitQuery(Query query) {
+        throw new UnsupportedOperationException("Visitor does not visit queries");
+    }
+
+    @Override
+    public Query.QueryBuilder visitQueryable(Queryable plan) {
+        if (! invoked) {
+            invoked = true;
+            if (plan.isNested()) {
+                return visitOuterQueryPlan(plan);
+            }
+            return visitUnnestedQueryPlan(plan);
+        }
+        if (plan.isNested()) {
+            return visitMiddleQueryPlan(plan);
+        }
+        return visitInnerQueryPlan(plan);
+    }
+
+    private Query.QueryBuilder visitInnerQueryPlan(Queryable plan)  {
+        Query.QueryBuilder builder = Query.builder()
+                .source(clientQuery.getSource())
+                .metricProjections(plan.getMetricProjections())
+                .dimensionProjections(plan.getDimensionProjections())
+                .timeDimensionProjections(plan.getTimeDimensionProjections())
+                .whereFilter(mergeFilters(plan, clientQuery))
+                .arguments(clientQuery.getArguments());
+
+        return addHiddenProjections(metaDataStore, builder, clientQuery);
+    }
+
+    private Query.QueryBuilder visitOuterQueryPlan(Queryable plan)  {
+        Query innerQuery = plan.getSource().accept(this).build();
+
+        //This assumes SORT & HAVING clauses must reference projection columns (verified in QueryValidator).
+        //Otherwise, the SORT & HAVING may reference joins that have not taken place in the inner query.
+        return Query.builder()
+                .source(innerQuery)
+                .metricProjections(plan.getMetricProjections())
+                .dimensionProjections(plan.getDimensionProjections())
+                .timeDimensionProjections(plan.getTimeDimensionProjections())
+                .havingFilter(clientQuery.getHavingFilter())
+                .sorting(clientQuery.getSorting())
+                .pagination(clientQuery.getPagination())
+                .scope(clientQuery.getScope())
+                .arguments(clientQuery.getArguments());
+    }
+
+    private Query.QueryBuilder visitMiddleQueryPlan(Queryable plan)  {
+        Query innerQuery = plan.getSource().accept(this).build();
+
+        //TODO - Add tests for middle.
+        return Query.builder()
+                .source(innerQuery)
+                .metricProjections(plan.getMetricProjections())
+                .dimensionProjections(plan.getDimensionProjections())
+                .timeDimensionProjections(plan.getTimeDimensionProjections());
+    }
+
+    private Query.QueryBuilder visitUnnestedQueryPlan(Queryable plan)  {
+
+        Query.QueryBuilder builder = Query.builder()
+                .source(clientQuery.getSource())
+                .metricProjections(plan.getMetricProjections())
+                .dimensionProjections(plan.getDimensionProjections())
+                .timeDimensionProjections(plan.getTimeDimensionProjections())
+                .havingFilter(clientQuery.getHavingFilter())
+                .whereFilter(mergeFilters(plan, clientQuery))
+                .sorting(clientQuery.getSorting())
+                .pagination(clientQuery.getPagination())
+                .scope(clientQuery.getScope())
+                .arguments(clientQuery.getArguments());
+
+        return addHiddenProjections(metaDataStore, builder, clientQuery);
+    }
+
+    public static Query.QueryBuilder addHiddenProjections(
+            MetaDataStore metaDataStore,
+            Query.QueryBuilder builder,
+            Query query
+    ) {
+
+        Set<ColumnProjection> directReferencedColumns = Streams.concat(
+                query.getColumnProjections().stream(),
+                query.getFilterProjections(query.getWhereFilter(), ColumnProjection.class).stream()
+        ).collect(Collectors.toSet());
+
+        ExpressionParser parser = new ExpressionParser(metaDataStore);
+        Set<ColumnProjection> indirectReferenceColumns = new HashSet<>();
+        directReferencedColumns.forEach(column -> {
+            parser.parse(query.getSource(), column).stream()
+                    .map(reference -> reference.accept(new ReferenceExtractor<LogicalReference>(
+                            LogicalReference.class,
+                            metaDataStore,
+                            ReferenceExtractor.Mode.SAME_QUERY)))
+                    .flatMap(Set::stream)
+                    .map(LogicalReference::getColumn)
+                    .forEach(indirectReferenceColumns::add);
+        });
+
+        Streams.concat(
+                directReferencedColumns.stream(),
+                indirectReferenceColumns.stream()
+        ).forEach(column -> {
+            if (query.getColumnProjection(column.getAlias(), column.getArguments()) == null) {
+                builder.column(column.withProjected(false));
+            }
+        });
+
+        return builder;
+    }
+
+    public static Query.QueryBuilder addHiddenProjections(MetaDataStore metaDataStore, Query query) {
+        Query.QueryBuilder builder = Query.builder()
+                        .source(query.getSource())
+                        .metricProjections(query.getMetricProjections())
+                        .dimensionProjections(query.getDimensionProjections())
+                        .timeDimensionProjections(query.getTimeDimensionProjections())
+                        .havingFilter(query.getHavingFilter())
+                        .whereFilter(query.getWhereFilter())
+                        .sorting(query.getSorting())
+                        .pagination(query.getPagination())
+                        .scope(query.getScope())
+                        .arguments(query.getArguments());
+
+        return addHiddenProjections(metaDataStore, builder, query);
+    }
+
+    private static FilterExpression mergeFilters(Queryable a, Queryable b) {
+        if (a.getWhereFilter() == null && b.getWhereFilter() == null) {
+            return null;
+        }
+
+        if (a.getWhereFilter() == null) {
+            return b.getWhereFilter();
+        }
+
+        if (b.getWhereFilter() == null) {
+            return a.getWhereFilter();
+        }
+
+        return new AndFilterExpression(a.getWhereFilter(), b.getWhereFilter());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryTranslator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryTranslator.java
new file mode 100644
index 0000000000..db808e3bc9
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/QueryTranslator.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.ColumnContext;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.TableContext;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryVisitor;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.JoinExpressionExtractor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Translates a client query into a SQL query.
+ */
+public class QueryTranslator implements QueryVisitor<NativeQuery.NativeQueryBuilder> {
+
+    private final MetaDataStore metaDataStore;
+    private final EntityDictionary dictionary;
+    private final SQLDialect dialect;
+    private FilterTranslator filterTranslator;
+    private final ExpressionParser parser;
+    private final Query clientQuery;
+
+    public QueryTranslator(MetaDataStore metaDataStore, SQLDialect sqlDialect, Query clientQuery) {
+        this.metaDataStore = metaDataStore;
+        this.dictionary = metaDataStore.getMetadataDictionary();
+        this.dialect = sqlDialect;
+        this.filterTranslator = new FilterTranslator(dictionary, sqlDialect.getPredicateGeneratorOverrides());
+        this.parser = new ExpressionParser(metaDataStore);
+        this.clientQuery = clientQuery;
+    }
+
+    @Override
+    public NativeQuery.NativeQueryBuilder visitQuery(Query query) {
+        NativeQuery.NativeQueryBuilder builder = query.getSource().accept(this);
+
+        if (query.isNested()) {
+            NativeQuery innerQuery = builder.build();
+
+            builder = NativeQuery.builder().fromClause(getFromClause("(" + innerQuery + ")",
+                                                                     applyQuotes(query.getSource().getAlias()),
+                                                                     dialect));
+        }
+
+        Set<String> joinExpressions = new LinkedHashSet<>();
+
+        builder.projectionClause(constructProjectionWithReference(query));
+
+        //Handles join for all type of column projects - dimensions, metrics and time dimention
+        joinExpressions.addAll(extractJoinExpressions(query));
+
+        Set<ColumnProjection> groupByDimensions = query.getAllDimensionProjections().stream()
+                .map(SQLColumnProjection.class::cast)
+                .filter(SQLColumnProjection::isProjected)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        if (!groupByDimensions.isEmpty()) {
+            if (!query.getMetricProjections().isEmpty()) {
+                builder.groupByClause("GROUP BY " + groupByDimensions.stream()
+                        .map(SQLColumnProjection.class::cast)
+                        .map((column) -> column.toSQL(query, metaDataStore))
+                        .collect(Collectors.joining(", ")));
+            }
+        }
+
+        if (query.getWhereFilter() != null) {
+            builder.whereClause("WHERE " + translateFilterExpression(
+                    query.getWhereFilter(),
+                    path -> generatePredicatePathReference(path, query)));
+
+            joinExpressions.addAll(extractJoinExpressions(query, query.getWhereFilter()));
+        }
+
+        if (query.getHavingFilter() != null) {
+            builder.havingClause("HAVING " + translateFilterExpression(
+                    query.getHavingFilter(),
+                    (path) -> constructHavingClauseWithReference(path, query)));
+
+            joinExpressions.addAll(extractJoinExpressions(query, query.getHavingFilter()));
+        }
+
+        if (query.getSorting() != null) {
+            Map<Path, Sorting.SortOrder> sortClauses = query.getSorting().getSortingPaths();
+            builder.orderByClause(extractOrderBy(sortClauses, query));
+
+            joinExpressions.addAll(extractJoinExpressions(query, sortClauses));
+        }
+
+        Pagination pagination = query.getPagination();
+        if (pagination != null) {
+            builder.offsetLimitClause(dialect.generateOffsetLimitClause(pagination.getOffset(), pagination.getLimit()));
+        }
+
+        return builder.joinClause(String.join(" ", joinExpressions));
+    }
+
+    @Override
+    public NativeQuery.NativeQueryBuilder visitQueryable(Queryable table) {
+        NativeQuery.NativeQueryBuilder builder = NativeQuery.builder();
+
+        Type<?> tableCls = dictionary.getEntityClass(table.getName(), table.getVersion());
+        String tableAlias = applyQuotes(table.getAlias());
+
+        TableContext context = TableContext.builder().tableArguments(clientQuery.getArguments()).build();
+
+        String tableStatement = tableCls.isAnnotationPresent(FromSubquery.class)
+                ? "(" + context.resolve(tableCls.getAnnotation(FromSubquery.class).sql()) + ")"
+                : tableCls.isAnnotationPresent(FromTable.class)
+                ? applyQuotes(tableCls.getAnnotation(FromTable.class).name())
+                : applyQuotes(table.getName());
+
+        return builder.fromClause(getFromClause(tableStatement, tableAlias, dialect));
+    }
+
+    /**
+     * Construct HAVING clause filter using physical column references. Metric fields need to be aggregated in HAVING.
+     *
+     * @param path a filter predicate path in HAVING clause
+     * @param query query
+     * @return an filter/constraint expression that can be put in HAVING clause
+     */
+    private String constructHavingClauseWithReference(Path path, Query query) {
+        Path.PathElement last = path.lastElement().get();
+        String fieldName = last.getFieldName();
+
+        if (path.getPathElements().size() > 1) {
+            throw new BadRequestException("The having clause can only reference fact table aggregations.");
+        }
+
+        SQLMetricProjection metric = query.getMetricProjections().stream()
+                .map(SQLMetricProjection.class::cast)
+                // TODO: filter predicate should support alias
+                .filter(invocation -> invocation.getAlias().equals(fieldName))
+                .findFirst()
+                .orElse(null);
+
+        if (metric != null) {
+            return metric.toSQL(query, metaDataStore);
+        }
+        return generatePredicatePathReference(path, query);
+    }
+
+    /**
+     * Construct SELECT statement expression with metrics and dimensions directly using physical table column
+     * references.
+     *
+     * @param query query
+     * @return <code>SELECT function(metric1) AS alias1, tb1.dimension1 AS alias2</code>
+     */
+    private String constructProjectionWithReference(Query query) {
+        // TODO: project metric field using table column reference
+        List<String> metricProjections = query.getMetricProjections().stream()
+                .map(SQLMetricProjection.class::cast)
+                .filter(SQLColumnProjection::isProjected)
+                .filter(projection -> ! projection.getValueType().equals(ValueType.ID))
+                .map(invocation -> invocation.toSQL(query, metaDataStore) + " AS "
+                                + applyQuotes(invocation.getSafeAlias()))
+                .collect(Collectors.toList());
+
+        List<String> dimensionProjections = query.getAllDimensionProjections().stream()
+                .map(SQLColumnProjection.class::cast)
+                .filter(SQLColumnProjection::isProjected)
+                .map(dimension -> dimension.toSQL(query, metaDataStore) + " AS "
+                                + applyQuotes(dimension.getSafeAlias()))
+                .collect(Collectors.toList());
+
+        if (metricProjections.isEmpty()) {
+            return "DISTINCT " + String.join(",", dimensionProjections);
+        }
+
+        return Stream.concat(metricProjections.stream(), dimensionProjections.stream())
+                .collect(Collectors.joining(","));
+    }
+
+    /**
+     * Given a list of columns to sort on, constructs an ORDER BY clause in SQL.
+     * @param sortClauses The list of sort columns and their sort order (ascending or descending).
+     * @return A SQL expression
+     */
+    private String extractOrderBy(Map<Path, Sorting.SortOrder> sortClauses, Query query) {
+        if (sortClauses.isEmpty()) {
+            return "";
+        }
+
+        //TODO - Ensure that order by columns are also present in the group by.
+
+        return " ORDER BY " + sortClauses.entrySet().stream()
+                .map((entry) -> {
+                    Path path = entry.getKey();
+                    Sorting.SortOrder order = entry.getValue();
+
+                    Path.PathElement last = path.lastElement().get();
+
+                    SQLColumnProjection projection = fieldToColumnProjection(query, last.getAlias());
+                    String orderByClause = (query.getColumnProjections().contains(projection)
+                            && dialect.useAliasForOrderByClause())
+                            ? applyQuotes(projection.getSafeAlias())
+                            : projection.toSQL(query, metaDataStore);
+
+                    return orderByClause + (order.equals(Sorting.SortOrder.desc) ? " DESC" : " ASC");
+                })
+                .collect(Collectors.joining(","));
+    }
+
+    /**
+     * Coverts a Path from a table to a join path.
+     * @param query query
+     * @param path The path object from the table that may contain a join.
+     * @return
+     */
+    private Set<String> extractJoinExpressions(Query query, Path path) {
+        SQLColumnProjection columnProj = pathToColumnProjection(path, query);
+        return extractJoinExpressions(columnProj, query);
+    }
+
+    /**
+     * Given a filter expression, extracts any entity relationship traversals that require joins.
+     *
+     * @param query query
+     * @param expression The filter expression
+     * @return A set of Join expressions that capture a relationship traversal.
+     */
+    private Set<String> extractJoinExpressions(Query query, FilterExpression expression) {
+        Collection<FilterPredicate> predicates = expression.accept(new PredicateExtractionVisitor());
+
+        return predicates.stream()
+                .map(FilterPredicate::getPath)
+                .map(path -> extractJoinExpressions(query, path))
+                .flatMap(Set::stream)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Given a list of columns to sort on, extracts any entity relationship traversals that require joins.
+     *
+     * @param query query
+     * @param sortClauses The list of sort columns and their sort order (ascending or descending).
+     * @return A set of Join expressions that capture a relationship traversal.
+     */
+    private Set<String> extractJoinExpressions(Query query, Map<Path, Sorting.SortOrder> sortClauses) {
+        return sortClauses.keySet().stream()
+                .map(path -> extractJoinExpressions(query, path))
+                .flatMap(Set::stream)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Get required join expressions for all the projected columns in given Query.
+     * @param query Expanded Query.
+     * @return A set of Join expressions that capture a relationship traversal.
+     */
+    private Set<String> extractJoinExpressions(Query query) {
+        return query.getColumnProjections().stream()
+                .filter(column -> column.isProjected())
+                .map(column -> extractJoinExpressions(column, query))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Get required join expressions for given column in given Query.
+     * @param column {@link ColumnProjection}
+     * @param query Expanded Query.
+     * @return A set of Join expressions that capture a relationship traversal.
+     */
+    private Set<String> extractJoinExpressions(ColumnProjection column, Query query) {
+        Set<String> joinExpressions = new LinkedHashSet<>();
+
+        ColumnContext context = ColumnContext.builder()
+                        .queryable(query)
+                        .alias(query.getSource().getAlias())
+                        .metaDataStore(metaDataStore)
+                        .column(column)
+                        .tableArguments(query.getArguments())
+                        .build();
+
+        JoinExpressionExtractor visitor = new JoinExpressionExtractor(context);
+        List<Reference> references = parser.parse(query.getSource(), column);
+        references.forEach(ref -> joinExpressions.addAll(ref.accept(visitor)));
+        return joinExpressions;
+    }
+
+    /**
+     * Translates a filter expression into SQL.
+     *
+     * @param expression The filter expression
+     * @param aliasGenerator A function which generates a column reference in SQL from a Path.
+     * @return A SQL expression
+     */
+    private String translateFilterExpression(FilterExpression expression,
+                                             Function<Path, String> aliasGenerator) {
+        return filterTranslator.apply(expression, aliasGenerator);
+    }
+
+    /**
+     * Converts a path into a SQL WHERE/HAVING clause column reference.
+     *
+     * @param path path to a field
+     * @param query query plan
+     * @return A SQL fragment that references a database column
+     */
+    private String generatePredicatePathReference(Path path, Query query) {
+        SQLColumnProjection projection = pathToColumnProjection(path, query);
+        return projection.toSQL(query, metaDataStore);
+    }
+
+    private SQLColumnProjection pathToColumnProjection(Path path, Query query) {
+        Path.PathElement last = path.lastElement().get();
+
+        Map<String, Argument> arguments = last.getArguments().stream()
+                        .collect(Collectors.toMap(Argument::getName, Function.identity()));
+
+        return fieldToColumnProjection(query, last.getAlias(), arguments);
+    }
+
+    private SQLColumnProjection fieldToColumnProjection(Query query, String fieldName) {
+        ColumnProjection projection = query.getColumnProjection(fieldName);
+
+        if (projection == null) {
+            projection = query.getSource().getColumnProjection(fieldName);
+        }
+        return (SQLColumnProjection) projection;
+    }
+
+    private SQLColumnProjection fieldToColumnProjection(Query query, String fieldName,
+                    Map<String, Argument> arguments) {
+
+        ColumnProjection projection = query.getColumnProjection(fieldName, arguments);
+
+        if (projection == null) {
+            projection = query.getSource().getColumnProjection(fieldName, arguments);
+        }
+        return (SQLColumnProjection) projection;
+    }
+
+    /**
+     * Quote column / table aliases using dialect specific quote characters.
+     *
+     * @param str alias
+     * @return quoted alias
+     */
+    private String applyQuotes(String str) {
+        return ColumnContext.applyQuotes(str, dialect);
+    }
+
+    /**
+     * Generates from clause with provided statement and alias.
+     * @param fromStatement table name / subquery.
+     * @param fromAlias alias for table name / subquery.
+     * @param sqlDialect SQLDialect.
+     * @return Generated from clause with or without "AS" before alias.
+     */
+    public static String getFromClause(String fromStatement, String fromAlias, SQLDialect sqlDialect) {
+
+        if (sqlDialect.useASBeforeTableAlias()) {
+            return String.format("%s AS %s", fromStatement, fromAlias);
+        }
+        return String.format("%s %s", fromStatement, fromAlias);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjection.java
new file mode 100644
index 0000000000..e19f340626
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjection.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.datastores.aggregation.metadata.ColumnContext;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.PhysicalRefColumnContext;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.SyntaxVerifier;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ColumnArgReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.HasJoinVisitor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.JoinReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.PhysicalReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ReferenceExtractor;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Column projection that can expand the column into a SQL projection fragment.
+ */
+public interface SQLColumnProjection extends ColumnProjection {
+    public static Logger LOGGER = LoggerFactory.getLogger(SQLColumnProjection.class);
+
+    /**
+     * Generate a SQL fragment for this combination column and client arguments.
+     * @param query current Queryable.
+     * @param metaDataStore MetaDataStore.
+     * @return SQL query String for this column
+     */
+    default String toSQL(Queryable query, MetaDataStore metaDataStore) {
+
+        ColumnContext context = ColumnContext.builder()
+                        .queryable(query)
+                        .alias(query.getSource().getAlias())
+                        .metaDataStore(metaDataStore)
+                        .column(this)
+                        .tableArguments(query.getArguments())
+                        .build();
+
+        return context.resolve(getExpression());
+    }
+
+    /**
+     * Generate a partially resolved string for current column's expression. Fully resolves arguments and logical
+     * references but keeps physical and join references as is.
+     * @param query current Queryable.
+     * @param metaDataStore MetaDataStore.
+     * @return A String with all arguments and logical references resolved.
+     */
+    default String toPhysicalReferences(Queryable query, MetaDataStore metaDataStore) {
+
+        PhysicalRefColumnContext context = PhysicalRefColumnContext.physicalRefContextBuilder()
+                        .queryable(query)
+                        .metaDataStore(metaDataStore)
+                        .alias("")
+                        .column(this)
+                        .tableArguments(query.getArguments())
+                        .build();
+
+        return context.resolve(getExpression());
+    }
+
+    @Override
+    default boolean canNest(Queryable source, MetaDataStore metaDataStore) {
+        SQLDialect dialect = source.getConnectionDetails().getDialect();
+        String sql = toSQL(source, metaDataStore);
+
+        SyntaxVerifier verifier = new SyntaxVerifier(dialect);
+        boolean canNest = verifier.verify(sql);
+        if (! canNest) {
+            LOGGER.debug("Unable to nest {} because {}", this.getName(), verifier.getLastError());
+
+            return false;
+        }
+
+        List<Reference> references = new ExpressionParser(metaDataStore).parse(source, this);
+
+        //Search for any join expression that contains $$column.  If found, we cannot nest
+        //because rewriting the SQL in the outer expression will lose the context of the calling $$column.
+        return references.stream()
+                .map(reference -> reference.accept(new ReferenceExtractor<JoinReference>(
+                                JoinReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY)))
+                .flatMap(Set::stream)
+                .map(reference -> reference.accept(
+                        new ReferenceExtractor<ColumnArgReference>(ColumnArgReference.class, metaDataStore)))
+                .flatMap(Set::stream)
+                .collect(Collectors.toSet())
+                .isEmpty();
+    }
+
+    @Override
+    default Pair<ColumnProjection, Set<ColumnProjection>> nest(Queryable source,
+                                                              MetaDataStore store,
+                                                              boolean joinInOuter) {
+        List<Reference> references = new ExpressionParser(store).parse(source, getExpression());
+
+        boolean requiresJoin = requiresJoin(references);
+
+        String columnId = source.isRoot() ? getName() : getAlias();
+        boolean inProjection = source.getColumnProjection(columnId, getArguments(), true) != null;
+
+        ColumnProjection outerProjection;
+        Set<ColumnProjection> innerProjections;
+
+        if (requiresJoin && joinInOuter) {
+            String outerProjectionExpression = toPhysicalReferences(source, store);
+            outerProjection = withExpression(outerProjectionExpression, inProjection);
+
+            innerProjections = extractPhysicalReferences(source, references, store);
+        } else {
+            outerProjection = withExpression("{{$" + this.getSafeAlias() + "}}", isProjected());
+            innerProjections = new LinkedHashSet<>(Arrays.asList(this));
+        }
+
+        return Pair.of(outerProjection, innerProjections);
+    }
+
+    <T extends ColumnProjection> T withExpression(String expression, boolean project);
+
+    /**
+     * Determines if a particular column projection requires a join to another table.
+     * @param source Source table.
+     * @param projection The column.
+     * @param store The metadata store.
+     * @return True if the column requires a join.  False otherwise.
+     */
+    static boolean requiresJoin(Queryable source, ColumnProjection projection, MetaDataStore store) {
+        List<Reference> references = new ExpressionParser(store).parse(source, projection.getExpression());
+        return requiresJoin(references);
+    }
+
+    /**
+     * Determines if a join is required amongst a list of column references.
+     * @param references The list of references.
+     * @return True if a join is required.  False otherwise.
+     */
+    static boolean requiresJoin(List<Reference> references) {
+        return references.stream().anyMatch(ref -> ref.accept(new HasJoinVisitor()));
+    }
+
+    /**
+     * Extracts all of the physical column projections that are referenced in a list of references.
+     * @param source The calling query.
+     * @param references The list of references.
+     * @param store The MetaDataStore.
+     * @return A set of physical column projections.
+     */
+    static Set<ColumnProjection> extractPhysicalReferences(
+            Queryable source,
+            List<Reference> references,
+            MetaDataStore store) {
+        return references.stream()
+                .map(ref -> ref.accept(new ReferenceExtractor<PhysicalReference>(
+                                PhysicalReference.class, store, ReferenceExtractor.Mode.SAME_QUERY)))
+                .flatMap(Set::stream)
+                .map(ref -> SQLPhysicalColumnProjection.builder()
+                        .name(ref.getName())
+                        .build())
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLDimensionProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLDimensionProjection.java
new file mode 100644
index 0000000000..fdc8ab18e0
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLDimensionProjection.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.Map;
+
+/**
+ * Dimension projection that can expand the dimension into a SQL projection fragment.
+ */
+@Value
+@Builder
+@AllArgsConstructor
+public class SQLDimensionProjection implements SQLColumnProjection, DimensionProjection {
+    private String name;
+    private ValueType valueType;
+    private ColumnType columnType;
+    private String expression;
+    private String alias;
+    private Map<String, Argument> arguments;
+    private boolean projected;
+
+    public SQLDimensionProjection(Dimension dimension,
+                                  String alias,
+                                  Map<String, Argument> arguments,
+                                  boolean projected) {
+        this.name = dimension.getName();
+        this.expression = dimension.getExpression();
+        this.valueType = dimension.getValueType();
+        this.columnType = dimension.getColumnType();
+        this.alias = alias;
+        this.arguments = arguments;
+        this.projected = projected;
+    }
+
+    @Override
+    public SQLDimensionProjection withExpression(String expression, boolean projected) {
+        return new SQLDimensionProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+
+    @Override
+    public boolean isProjected() {
+        return projected;
+    }
+
+    @Override
+    public SQLDimensionProjection withProjected(boolean projected) {
+        return new SQLDimensionProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+
+    @Override
+    public ColumnProjection withArguments(Map<String, Argument> arguments) {
+        return new SQLDimensionProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLMetricProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLMetricProjection.java
new file mode 100644
index 0000000000..f985e01809
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLMetricProjection.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlan;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.CalciteInnerAggregationExtractor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.CalciteOuterAggregationExtractor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite.CalciteUtils;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Metric projection that can expand the metric into a SQL projection fragment.
+ */
+@Data
+@Builder
+public class SQLMetricProjection implements MetricProjection, SQLColumnProjection {
+    private static final Pattern QUERY_PATTERN = Pattern.compile(".*\\{\\{.*\\}\\}.*");
+    private String name;
+    private ValueType valueType;
+    private ColumnType columnType;
+    private String expression;
+    private String alias;
+    private Map<String, Argument> arguments;
+
+    @Builder.Default
+    private boolean projected = true;
+
+    @Override
+    public QueryPlan resolve(Query query) {
+        return QueryPlan.builder()
+                .source(query.getSource())
+                .metricProjection(this)
+                .build();
+    }
+
+    @Builder
+    public SQLMetricProjection(String name,
+                               ValueType valueType,
+                               ColumnType columnType,
+                               String expression,
+                               String  alias,
+                               Map<String, Argument> arguments,
+                               boolean projected) {
+        this.name = name;
+        this.valueType = valueType;
+        this.columnType = columnType;
+        this.expression = expression;
+        this.alias = alias;
+        this.arguments = arguments;
+        this.projected = projected;
+    }
+
+    public SQLMetricProjection(Metric metric,
+                               String alias,
+                               Map<String, Argument> arguments) {
+        this(metric.getName(), metric.getValueType(),
+                metric.getColumnType(), metric.getExpression(), alias, arguments, true);
+    }
+
+    @Override
+    public String toSQL(Queryable query, MetaDataStore metaDataStore) {
+        if (QUERY_PATTERN.matcher(expression).matches()) {
+            return SQLColumnProjection.super.toSQL(query, metaDataStore);
+        }
+        return expression;
+    }
+
+    @Override
+    public boolean canNest(Queryable source, MetaDataStore store) {
+        boolean requiresJoin = SQLColumnProjection.requiresJoin(source, this, store);
+        if (requiresJoin) {
+            //We currently don't support nesting metrics with joins.
+            //A join could be part of the aggregation (inner) or post aggregation (outer) expression.
+            return false;
+        }
+
+        //TODO - Phase 2: return true if Calcite can parse & determine joins independently for inner & outer query
+        return SQLColumnProjection.super.canNest(source, store);
+    }
+
+    @Override
+    public Pair<ColumnProjection, Set<ColumnProjection>> nest(Queryable source,
+                                                              MetaDataStore metaDataStore,
+                                                              boolean joinInOuter) {
+        SQLDialect dialect = source.getConnectionDetails().getDialect();
+        String sql = toSQL(source, metaDataStore);
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+
+        SqlNode node;
+        try {
+            node = sqlParser.parseExpression();
+        } catch (SqlParseException e) {
+            throw new IllegalStateException(e);
+        }
+
+        CalciteInnerAggregationExtractor innerExtractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> innerAggExpressions = node.accept(innerExtractor);
+
+        List<List<String>> innerAggLabels = innerAggExpressions.stream()
+                .map(list -> list.stream()
+                        .map((expression) -> getAggregationLabel(dialect.getCalciteDialect(), expression))
+                        .collect(Collectors.toList()))
+                .collect(Collectors.toList());
+
+        Set<ColumnProjection> innerAggProjections = new LinkedHashSet<>();
+
+        Iterator<String> labelIt = innerAggLabels.stream().flatMap(List::stream).iterator();
+        Iterator<String> expressionIt = innerAggExpressions.stream().flatMap(List::stream).iterator();
+
+        while (labelIt.hasNext() && expressionIt.hasNext()) {
+            String innerAggExpression = expressionIt.next();
+            String innerAggLabel = labelIt.next();
+
+            innerAggProjections.add(SQLMetricProjection.builder()
+                    .projected(true)
+                    .name(innerAggLabel)
+                    .alias(innerAggLabel)
+                    .expression(innerAggExpression)
+                    .columnType(columnType)
+                    .valueType(valueType)
+                    .arguments(arguments)
+                    .build());
+        }
+
+        CalciteOuterAggregationExtractor outerExtractor =
+                new CalciteOuterAggregationExtractor(dialect, innerAggLabels);
+
+        SqlNode transformedParseTree = node.accept(outerExtractor);
+
+        String outerAggExpression = transformedParseTree.toSqlString(dialect.getCalciteDialect()).getSql();
+
+        //replace INNER_AGG_... with {{$INNER_AGG...}}
+        outerAggExpression = outerAggExpression.replaceAll(
+                dialect.getBeginQuote()
+                        + "?(" + getAggregationLabelPrefix(dialect.getCalciteDialect()) + "\\w+)"
+                        + dialect.getEndQuote()
+                        + "?", "{{\\$" + "$1" + "}}");
+
+        String columnId = source.isRoot() ? getName() : getAlias();
+        boolean inProjection = source.getColumnProjection(columnId, arguments, true) != null;
+
+        ColumnProjection outerProjection = SQLMetricProjection.builder()
+                .projected(inProjection)
+                .expression(outerAggExpression)
+                .name(name)
+                .alias(alias)
+                .valueType(valueType)
+                .columnType(columnType)
+                .arguments(arguments)
+                .build();
+
+        return Pair.of(outerProjection, innerAggProjections);
+    }
+
+    @Override
+    public SQLMetricProjection withProjected(boolean projected) {
+        return new SQLMetricProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+
+    @Override
+    public boolean isProjected() {
+        return projected;
+    }
+
+    @Override
+    public SQLMetricProjection withExpression(String expression, boolean projected) {
+        return new SQLMetricProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+
+    private static String getAggregationLabelPrefix(SqlDialect dialect) {
+        if (dialect.getUnquotedCasing().equals(Casing.TO_LOWER)) {
+            return "inner_agg_";
+        }
+        return "INNER_AGG_";
+    }
+
+    private static String getAggregationLabel(SqlDialect dialect, String expression) {
+        return getAggregationLabelPrefix(dialect) + (expression.hashCode() & 0xfffffff);
+    }
+
+    @Override
+    public SQLMetricProjection withArguments(Map<String, Argument> arguments) {
+        return new SQLMetricProjection(name, valueType, columnType, expression, alias, arguments, projected);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLPhysicalColumnProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLPhysicalColumnProjection.java
new file mode 100644
index 0000000000..7f2babac31
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLPhysicalColumnProjection.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static com.yahoo.elide.datastores.aggregation.metadata.ColumnContext.applyQuotes;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.utils.TypeHelper;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+
+import java.util.Map;
+
+/**
+ * Represents a physical column to be projected as part of a subquery.
+ */
+@EqualsAndHashCode
+@Builder
+public class SQLPhysicalColumnProjection implements SQLColumnProjection, DimensionProjection {
+
+    private String name;
+
+    public SQLPhysicalColumnProjection(String name) {
+        // Physical Column Reference starts with '$'
+        if (name.indexOf('$') == 0) {
+            name = name.substring(1);
+        }
+        this.name = name;
+    }
+
+    @Override
+    public String toSQL(Queryable query, MetaDataStore metaDataStore) {
+        SQLDialect dialect = query.getConnectionDetails().getDialect();
+        return TypeHelper.getFieldAlias(applyQuotes(query.getSource().getAlias(), dialect), applyQuotes(name, dialect));
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getExpression() {
+        return null;
+    }
+
+    @Override
+    public ValueType getValueType() {
+        return null;
+    }
+
+    @Override
+    public ColumnType getColumnType() {
+        return ColumnType.FIELD;
+    }
+
+    @Override
+    public SQLPhysicalColumnProjection withProjected(boolean projected) {
+        return new SQLPhysicalColumnProjection(name);
+    }
+
+    @Override
+    public SQLPhysicalColumnProjection withExpression(String expression, boolean projected) {
+        return new SQLPhysicalColumnProjection(name);
+    }
+
+    @Override
+    public ColumnProjection withArguments(Map<String, Argument> arguments) {
+        return new SQLPhysicalColumnProjection(name);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLTimeDimensionProjection.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLTimeDimensionProjection.java
new file mode 100644
index 0000000000..ff46d1c6d7
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLTimeDimensionProjection.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.exceptions.InvalidParameterizedAttributeException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.ColumnContext;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ColumnType;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimensionGrain;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+/**
+ * Column projection that can expand the column into a SQL projection fragment.
+ */
+@Value
+@Builder
+@AllArgsConstructor
+public class SQLTimeDimensionProjection implements SQLColumnProjection, TimeDimensionProjection {
+
+    private String alias;
+    private String name;
+    private String expression;
+    private ValueType valueType;
+    private ColumnType columnType;
+    private TimeDimensionGrain grain;
+    private TimeZone timeZone;
+    private Map<String, Argument> arguments;
+    private boolean projected;
+
+    /**
+     * All argument constructor.
+     * @param column The column being projected.
+     * @param timeZone The selected time zone.
+     * @param alias The client provided alias.
+     * @param arguments List of client provided arguments.
+     * @param projected Whether or not this column is part of the projected output.
+     */
+    public SQLTimeDimensionProjection(TimeDimension column,
+                                      TimeZone timeZone,
+                                      String alias,
+                                      Map<String, Argument> arguments,
+                                      boolean projected) {
+        //TODO remove arguments
+        this.columnType = column.getColumnType();
+        this.valueType = column.getValueType();
+        this.expression = column.getExpression();
+        this.name = column.getName();
+        this.grain = getGrainFromArguments(arguments, column);
+        this.arguments = arguments;
+        this.alias = alias;
+        this.timeZone = timeZone;
+        this.projected = projected;
+    }
+
+    @Override
+    public String toSQL(Queryable query, MetaDataStore metaDataStore) {
+
+        ColumnContext context = ColumnContext.builder()
+                        .queryable(query)
+                        .alias(query.getSource().getAlias())
+                        .metaDataStore(metaDataStore)
+                        .column(this)
+                        .tableArguments(query.getArguments())
+                        .build();
+
+        return context.resolve(grain.getExpression());
+    }
+
+    @Override
+    public TimeGrain getGrain() {
+        return grain.getGrain();
+    }
+
+    @Override
+    public Pair<ColumnProjection, Set<ColumnProjection>> nest(Queryable source,
+                                                              MetaDataStore store,
+                                                              boolean joinInOuter) {
+
+        List<Reference> references = new ExpressionParser(store).parse(source, getExpression());
+
+        boolean requiresJoin = SQLColumnProjection.requiresJoin(references);
+
+        String columnId = source.isRoot() ? getName() : getAlias();
+        boolean inProjection = source.getColumnProjection(columnId, getArguments(), true) != null;
+
+        ColumnProjection outerProjection;
+        Set<ColumnProjection> innerProjections;
+
+        if (requiresJoin && joinInOuter) {
+            String outerProjectionExpression = toPhysicalReferences(source, store);
+            outerProjection = withExpression(outerProjectionExpression, inProjection);
+
+            innerProjections = SQLColumnProjection.extractPhysicalReferences(source, references, store);
+        } else {
+            outerProjection = SQLTimeDimensionProjection.builder()
+                    .name(name)
+                    .alias(alias)
+                    .valueType(valueType)
+                    .columnType(columnType)
+
+                    //This grain removes the extra time grain formatting on the outer query.
+                    .grain(new TimeDimensionGrain(
+                            this.getName(),
+                            grain.getGrain()))
+                    .expression("{{$" + this.getSafeAlias() + "}}")
+                    .projected(isProjected())
+                    .arguments(arguments)
+                    .timeZone(timeZone)
+                    .build();
+            innerProjections = new LinkedHashSet<>(Arrays.asList(this));
+        }
+
+        return Pair.of(outerProjection, innerProjections);
+    }
+
+    @Override
+    public SQLTimeDimensionProjection withProjected(boolean projected) {
+        return new SQLTimeDimensionProjection(alias, name, expression, valueType, columnType, grain, timeZone,
+                        arguments, projected);
+    }
+
+    @Override
+    public SQLTimeDimensionProjection withExpression(String expression, boolean projected) {
+        return new SQLTimeDimensionProjection(alias, name, expression, valueType, columnType, grain, timeZone,
+                        arguments, projected);
+    }
+
+    private TimeDimensionGrain getGrainFromArguments(Map<String, Argument> arguments, TimeDimension column) {
+        Argument grainArgument = arguments.get("grain");
+
+        if (grainArgument == null) {
+            return column.getDefaultGrain();
+        }
+
+        String grainName = grainArgument.getValue().toString().toLowerCase(Locale.ENGLISH);
+
+        return column.getSupportedGrains().stream()
+                .filter(grain -> grain.getGrain().name().toLowerCase(Locale.ENGLISH).equals(grainName))
+                .findFirst()
+                .orElseThrow(() -> new InvalidParameterizedAttributeException(name, grainArgument));
+    }
+
+    @Override
+    public boolean isProjected() {
+        return projected;
+    }
+
+    @Override
+    public ColumnProjection withArguments(Map<String, Argument> arguments) {
+        return new SQLTimeDimensionProjection(alias, name, expression, valueType, columnType, grain, timeZone,
+                        arguments, projected);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitter.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitter.java
new file mode 100644
index 0000000000..f4acad2f7e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.visitors.FilterExpressionNormalizationVisitor;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.HasJoinVisitor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Splits a filter expression into two parts:
+ * 1. A part that can be safely run on a nested subquery where no joins take place.
+ * 2. A part that must run on the outer query because of joins to other tables.
+ */
+public class SubqueryFilterSplitter
+        implements FilterExpressionVisitor<SubqueryFilterSplitter.SplitFilter> {
+
+    @Data
+    @Builder
+    public static class SplitFilter {
+        FilterExpression outer;
+        FilterExpression inner;
+    }
+
+    private MetaDataStore metaDataStore;
+    private ExpressionParser parser;
+
+    public SubqueryFilterSplitter(MetaDataStore metaDataStore) {
+        this.metaDataStore = metaDataStore;
+        this.parser = new ExpressionParser(metaDataStore);
+    }
+
+    public static SplitFilter splitFilter(
+            MetaDataStore metaDataStore,
+            FilterExpression expression) {
+
+        if (expression == null) {
+            return SplitFilter.builder().build();
+        }
+
+        FilterExpressionNormalizationVisitor normalizer = new FilterExpressionNormalizationVisitor();
+        FilterExpression normalizedExpression = expression.accept(normalizer);
+
+        return normalizedExpression.accept(new SubqueryFilterSplitter(metaDataStore));
+    }
+
+    @Override
+    public SplitFilter visitPredicate(FilterPredicate filterPredicate) {
+        Type<?> tableType = filterPredicate.getEntityType();
+        String fieldName = filterPredicate.getField();
+
+        SQLTable table = metaDataStore.getTable(tableType);
+
+        List<Reference> references = parser.parse(table, table.getColumnProjection(fieldName));
+        boolean hasJoin = references.stream().anyMatch(ref -> ref.accept(new HasJoinVisitor()));
+        if (hasJoin) {
+            return SplitFilter.builder().outer(filterPredicate).build();
+        }
+        return SplitFilter.builder().inner(filterPredicate).build();
+    }
+
+    @Override
+    public SplitFilter visitAndExpression(AndFilterExpression expression) {
+        SplitFilter lhs = expression.getLeft().accept(this);
+        SplitFilter rhs = expression.getRight().accept(this);
+
+        return SplitFilter.builder()
+                .outer(AndFilterExpression.fromPair(lhs.getOuter(), rhs.getOuter()))
+                .inner(AndFilterExpression.fromPair(lhs.getInner(), rhs.getInner()))
+                .build();
+    }
+
+    @Override
+    public SplitFilter visitOrExpression(OrFilterExpression expression) {
+        SplitFilter lhs = expression.getLeft().accept(this);
+        SplitFilter rhs = expression.getRight().accept(this);
+
+        //If either the left or right side of the expression require an outer query, the entire
+        //expression must be run as an outer query.
+        if (lhs.getOuter() != null || rhs.getOuter() != null) {
+
+            //The only operation that splits a filter into inner & outer is AND.  We can recombine
+            //each side using AND and then OR the results.
+            FilterExpression combined = OrFilterExpression.fromPair(
+                    AndFilterExpression.fromPair(lhs.getOuter(), lhs.getInner()),
+                    AndFilterExpression.fromPair(rhs.getOuter(), rhs.getInner()));
+
+            return SplitFilter.builder()
+                    .outer(combined)
+                    .build();
+        }
+        //Both left and right are inner queries.
+        FilterExpression combined = OrFilterExpression.fromPair(
+                lhs.getInner(),
+                rhs.getInner());
+
+        return SplitFilter.builder()
+                .inner(combined)
+                .build();
+    }
+
+    @Override
+    public SplitFilter visitNotExpression(NotFilterExpression expression) {
+        SplitFilter negated = expression.getNegated().accept(this);
+
+        FilterExpression outerFilter = negated.getOuter() == null
+                ? null
+                : new NotFilterExpression(negated.getOuter());
+
+        FilterExpression innerFilter = negated.getInner() == null
+                ? null
+                : new NotFilterExpression(negated.getInner());
+
+        return SplitFilter.builder()
+                .outer(outerFilter)
+                .inner(innerFilter)
+                .build();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Day.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Day.java
new file mode 100644
index 0000000000..e75f6a085c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Day.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Day.
+ */
+public class Day extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd";
+
+    public Day(Date date) {
+        super(date, true, true, true, false, false, false, getSerializer(TimeGrain.DAY));
+    }
+
+    public Day(LocalDateTime date) {
+        super(date, true, true, true, false, false, false, getSerializer(TimeGrain.DAY));
+    }
+
+    @ElideTypeConverter(type = Day.class, name = "Day")
+    static public class DaySerde implements Serde<Object, Day> {
+        @Override
+        public Day deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Day((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Day(offsetDateTime.toLocalDateTime());
+            }
+            LocalDate localDate = LocalDate.parse(val.toString(), DateTimeFormatter.ISO_LOCAL_DATE);
+            LocalDateTime localDateTime = localDate.atTime(0, 0);
+            return new Day(localDateTime);
+        }
+
+        @Override
+        public String serialize(Day val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Hour.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Hour.java
new file mode 100644
index 0000000000..ef3f846a95
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Hour.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Hour.
+ */
+public class Hour extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd'T'HH";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+            .withZone(ZoneOffset.systemDefault());
+
+    public Hour(Date date) {
+        super(date, true, true, true, true, false, false, getSerializer(TimeGrain.HOUR));
+    }
+
+    public Hour(LocalDateTime date) {
+        super(date, true, true, true, true, false, false, getSerializer(TimeGrain.HOUR));
+    }
+
+    @ElideTypeConverter(type = Hour.class, name = "Hour")
+    static public class HourSerde implements Serde<Object, Hour> {
+        @Override
+        public Hour deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Hour((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Hour(offsetDateTime.toLocalDateTime());
+            }
+            return new Hour(LocalDateTime.parse(val.toString(), FORMATTER));
+        }
+
+        @Override
+        public String serialize(Hour val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/ISOWeek.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/ISOWeek.java
new file mode 100644
index 0000000000..7b12fa434a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/ISOWeek.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for ISOWeek.
+ */
+public class ISOWeek extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd";
+
+    public ISOWeek(LocalDateTime date) {
+        super(date, true, true, true, false, false, false, getSerializer(TimeGrain.ISOWEEK));
+    }
+
+    @ElideTypeConverter(type = ISOWeek.class, name = "ISOWeek")
+    static public class ISOWeekSerde implements Serde<Object, ISOWeek> {
+        @Override
+        public ISOWeek deserialize(Object val) {
+            LocalDateTime date;
+            if (val instanceof Date) {
+                date = LocalDateTime.ofInstant(((Date) val).toInstant(), ZoneOffset.systemDefault());
+            } else {
+                LocalDate localDate;
+                if (val instanceof OffsetDateTime) {
+                    OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                    date = offsetDateTime.toLocalDate().atTime(0, 0);
+                } else {
+                    localDate = LocalDate.parse(val.toString(), DateTimeFormatter.ISO_LOCAL_DATE);
+                    date = localDate.atTime(0, 0);
+                }
+            }
+
+            if (date.getDayOfWeek() != DayOfWeek.MONDAY) {
+                throw new IllegalArgumentException("Date string not a Monday");
+            }
+            return new ISOWeek(date);
+        }
+
+        @Override
+        public String serialize(ISOWeek val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Minute.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Minute.java
new file mode 100644
index 0000000000..ae7e052424
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Minute.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Minute.
+ */
+public class Minute extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd'T'HH:mm";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+            .withZone(ZoneOffset.systemDefault());
+
+    public Minute(Date date) {
+        super(date, true, true, true, true, true, false, getSerializer(TimeGrain.MINUTE));
+    }
+
+    public Minute(LocalDateTime date) {
+        super(date, true, true, true, true, true, false, getSerializer(TimeGrain.MINUTE));
+    }
+
+    @ElideTypeConverter(type = Minute.class, name = "Minute")
+    static public class MinuteSerde implements Serde<Object, Minute> {
+        @Override
+        public Minute deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Minute((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Minute(offsetDateTime.toLocalDateTime());
+            }
+            return new Minute(LocalDateTime.parse(val.toString(), FORMATTER));
+        }
+
+        @Override
+        public String serialize(Minute val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Month.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Month.java
new file mode 100644
index 0000000000..b4d0bbc0b1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Month.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Month.
+ */
+public class Month extends Time {
+
+    public static final String FORMAT = "yyyy-MM";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+            .withZone(ZoneOffset.systemDefault());
+
+    public Month(Date date) {
+        super(date, true, true, false, false, false, false, getSerializer(TimeGrain.MONTH));
+    }
+
+    public Month(LocalDateTime date) {
+        super(date, true, true, false, false, false, false, getSerializer(TimeGrain.MONTH));
+    }
+
+    @ElideTypeConverter(type = Month.class, name = "Month")
+    static public class MonthSerde implements Serde<Object, Month> {
+        @Override
+        public Month deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Month((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Month(offsetDateTime.toLocalDateTime());
+            }
+            YearMonth yearMonth = YearMonth.parse(val.toString(), FORMATTER);
+            LocalDateTime localDateTime = LocalDateTime.of(yearMonth.getYear(), yearMonth.getMonth(), 1, 0, 0);
+            return new Month(localDateTime);
+        }
+
+        @Override
+        public String serialize(Month val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Quarter.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Quarter.java
new file mode 100644
index 0000000000..1b763f7f8c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Quarter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Quarter.
+ */
+public class Quarter extends Time {
+
+    public static final String FORMAT = "yyyy-MM";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+            .withZone(ZoneId.systemDefault());
+
+    public Quarter(LocalDateTime date) {
+        super(date, true, true, false, false, false, false, getSerializer(TimeGrain.QUARTER));
+    }
+
+    @ElideTypeConverter(type = Quarter.class, name = "Quarter")
+    static public class QuarterSerde implements Serde<Object, Quarter> {
+        @Override
+        public Quarter deserialize(Object val) {
+            LocalDateTime date;
+            if (val instanceof Date) {
+                date = LocalDateTime.ofInstant(((Date) val).toInstant(), ZoneOffset.systemDefault());
+            } else {
+                YearMonth yearMonth;
+                if (val instanceof OffsetDateTime) {
+                    OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                    yearMonth = YearMonth.from(offsetDateTime);
+                } else {
+                    yearMonth = YearMonth.parse(val.toString(), FORMATTER);
+                }
+
+                date = LocalDateTime.of(yearMonth.getYear(), yearMonth.getMonth(), 1, 0, 0);
+            }
+
+            int month = date.getMonthValue();
+            if (month != 1 && month != 4 && month != 7 && month != 10) {
+                throw new IllegalArgumentException("Date string not a quarter month");
+            }
+
+            return new Quarter(date);
+        }
+
+        @Override
+        public String serialize(Quarter val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Second.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Second.java
new file mode 100644
index 0000000000..4b01b35c8e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Second.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Second.
+ */
+public class Second extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+               .withZone(ZoneOffset.systemDefault());
+
+    public Second(Date date) {
+        super(date, true, true, true, true, true, true, getSerializer(TimeGrain.SECOND));
+    }
+
+    public Second(LocalDateTime date) {
+        super(date, true, true, true, true, true, true, getSerializer(TimeGrain.SECOND));
+    }
+
+    @ElideTypeConverter(type = Second.class, name = "Second")
+    static public class SecondSerde implements Serde<Object, Second> {
+        @Override
+        public Second deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Second((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Second(offsetDateTime.toLocalDateTime());
+            }
+            return new Second(LocalDateTime.parse(val.toString(), FORMATTER));
+        }
+
+        @Override
+        public String serialize(Second val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Time.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Time.java
new file mode 100644
index 0000000000..c7ed7263c7
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Time.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
+import java.util.Date;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Time date type for all analytic model time dimensions.
+ */
+@RequiredArgsConstructor
+@Getter
+@Setter
+public class Time extends Date {
+
+    public static Type<Time> TIME_TYPE = ClassType.of(Time.class);
+
+    protected final Serializer serializer;
+    protected final boolean supportsYear;
+    protected final boolean supportsMonth;
+    protected final boolean supportsDay;
+    protected final boolean supportsHour;
+    protected final boolean supportsMinute;
+    protected final boolean supportsSecond;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        Time time = (Time) o;
+        return supportsYear == time.supportsYear
+                && supportsMonth == time.supportsMonth
+                && supportsDay == time.supportsDay
+                && supportsHour == time.supportsHour
+                && supportsMinute == time.supportsMinute
+                && supportsSecond == time.supportsSecond
+                && getTime() == time.getTime();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), supportsYear, supportsMonth, supportsDay,
+                supportsHour, supportsMinute, supportsSecond, getTime());
+    }
+
+    @FunctionalInterface
+    public interface Serializer {
+        String format(Time time);
+    }
+
+    @ElideTypeConverter(type = Time.class, name = "Time")
+    static public class TimeSerde implements Serde<Object, Time> {
+
+        private static final String SECOND_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
+        private static final String MINUTE_PATTERN = "yyyy-MM-dd'T'HH:mm";
+        private static final String HOUR_PATTERN = "yyyy-MM-dd'T'HH";
+        private static final String DATE_PATTERN = "yyyy-MM-dd";
+        private static final String MONTH_PATTERN = "yyyy-MM";
+        private static final String YEAR_PATTERN = "yyyy";
+        private static final String ALL_PATTERNS = String.format("[%s][%s][%s][%s][%s][%s]",
+                SECOND_PATTERN,
+                MINUTE_PATTERN,
+                HOUR_PATTERN,
+                DATE_PATTERN,
+                MONTH_PATTERN,
+                YEAR_PATTERN);
+
+        private DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ALL_PATTERNS);
+
+        @Override
+        public Time deserialize(Object val) {
+            try {
+                TemporalAccessor parsed = formatter.parse(val.toString());
+                boolean supportsYear = true;
+                boolean supportsMonth = parsed.isSupported(ChronoField.MONTH_OF_YEAR);
+                boolean supportsDay = parsed.isSupported(ChronoField.DAY_OF_MONTH);
+                boolean supportsHour = parsed.isSupported(ChronoField.HOUR_OF_DAY);
+                boolean supportsMinute = parsed.isSupported(ChronoField.MINUTE_OF_HOUR);
+                boolean supportsSecond = parsed.isSupported(ChronoField.SECOND_OF_MINUTE);
+
+                return new Time(LocalDateTime.of(
+                        parsed.get(ChronoField.YEAR),
+                        supportsMonth ? parsed.get(ChronoField.MONTH_OF_YEAR) : 1,
+                        supportsDay ? parsed.get(ChronoField.DAY_OF_MONTH) : 1,
+                        supportsHour ? parsed.get(ChronoField.HOUR_OF_DAY) : 0,
+                        supportsMinute ? parsed.get(ChronoField.MINUTE_OF_HOUR) : 0,
+                        supportsSecond ? parsed.get(ChronoField.SECOND_OF_MINUTE) : 0),
+                        supportsYear,
+                        supportsMonth,
+                        supportsDay,
+                        supportsHour,
+                        supportsMinute,
+                        supportsSecond,
+                        (time) -> val.toString());
+            } catch (DateTimeParseException e) {
+                throw new IllegalArgumentException("String must be formatted as " + ALL_PATTERNS);
+            }
+        }
+
+        @Override
+        public String serialize(Time val) {
+            return val.serializer.format(val);
+        }
+    }
+
+    public Time(LocalDateTime copy,
+                boolean supportsYear,
+                boolean supportsMonth,
+                boolean supportsDay,
+                boolean supportsHour,
+                boolean supportsMinute,
+                boolean supportsSecond,
+                Serializer formatter) {
+        super(TimeUnit.SECONDS.toMillis(copy.atZone(ZoneOffset.systemDefault()).toEpochSecond()));
+        this.supportsYear = supportsYear;
+        this.supportsMonth = supportsMonth;
+        this.supportsDay = supportsDay;
+        this.supportsHour = supportsHour;
+        this.supportsMinute = supportsMinute;
+        this.supportsSecond = supportsSecond;
+        this.serializer = formatter;
+    }
+
+    public Time(Date copy,
+                boolean supportsYear,
+                boolean supportsMonth,
+                boolean supportsDay,
+                boolean supportsHour,
+                boolean supportsMinute,
+                boolean supportsSecond,
+                Serializer serializer) {
+        super(copy.getTime());
+        this.supportsYear = supportsYear;
+        this.supportsMonth = supportsMonth;
+        this.supportsDay = supportsDay;
+        this.supportsHour = supportsHour;
+        this.supportsMinute = supportsMinute;
+        this.supportsSecond = supportsSecond;
+        this.serializer = serializer;
+    }
+
+    @Override
+    public String toString() {
+        return serializer.format(this);
+    }
+
+    public static Serializer getSerializer(TimeGrain grain) {
+        return (time) -> {
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(time.toInstant(), ZoneOffset.systemDefault());
+            DateTimeFormatter formatter;
+            switch (grain) {
+                case SECOND:
+                    formatter = Second.FORMATTER;
+                    break;
+                case MINUTE:
+                    formatter = Minute.FORMATTER;
+                    break;
+                case HOUR:
+                    formatter = Hour.FORMATTER;
+                    break;
+                case MONTH:
+                case QUARTER:
+                    formatter = Month.FORMATTER;
+                    break;
+                case YEAR:
+                    formatter = Year.FORMATTER;
+                    break;
+                default:
+                    formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+            }
+            return formatter.format(localDateTime);
+        };
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Week.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Week.java
new file mode 100644
index 0000000000..c6bfd3f164
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Week.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Week.
+ */
+public class Week extends Time {
+
+    public static final String FORMAT = "yyyy-MM-dd";
+
+    public Week(LocalDateTime date) {
+        super(date, true, true, true, false, false, false, getSerializer(TimeGrain.WEEK));
+    }
+
+    @ElideTypeConverter(type = Week.class, name = "Week")
+    static public class WeekSerde implements Serde<Object, Week> {
+        @Override
+        public Week deserialize(Object val) {
+            LocalDateTime date;
+            if (val instanceof Date) {
+                date = LocalDateTime.ofInstant(((Date) val).toInstant(), ZoneOffset.systemDefault());
+            } else {
+                LocalDate localDate;
+                if (val instanceof OffsetDateTime) {
+                    OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                    date = offsetDateTime.toLocalDate().atTime(0, 0);
+                } else {
+                    localDate = LocalDate.parse(val.toString(), DateTimeFormatter.ISO_LOCAL_DATE);
+                    date = localDate.atTime(0, 0);
+                }
+            }
+            if (date.getDayOfWeek() != DayOfWeek.SUNDAY) {
+                throw new IllegalArgumentException("Date string not a Sunday");
+            }
+            return new Week(date);
+        }
+
+        @Override
+        public String serialize(Week val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Year.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Year.java
new file mode 100644
index 0000000000..c3e9ddc13b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Year.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains;
+
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * Time Grain class for Year.
+ */
+public class Year extends Time {
+
+    public static final String FORMAT = "yyyy";
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(FORMAT)
+            .withZone(ZoneOffset.systemDefault());
+
+    public Year(Date date) {
+        super(date, true, false, false, false, false, false, getSerializer(TimeGrain.YEAR));
+    }
+
+    public Year(LocalDateTime date) {
+        super(date, true, false, false, false, false, false, getSerializer(TimeGrain.YEAR));
+    }
+
+    @ElideTypeConverter(type = Year.class, name = "Year")
+    static public class YearSerde implements Serde<Object, Year> {
+        @Override
+        public Year deserialize(Object val) {
+            if (val instanceof Date) {
+                return new Year((Date) val);
+            }
+            if (val instanceof OffsetDateTime) {
+                OffsetDateTime offsetDateTime = (OffsetDateTime) val;
+                return new Year(offsetDateTime.toLocalDateTime());
+            }
+
+            java.time.Year year = java.time.Year.parse(val.toString(), FORMATTER);
+            LocalDateTime localDateTime = LocalDateTime.of(year.getValue(), Month.of(1), 1, 0, 0);
+            return new Year(localDateTime);
+        }
+
+        @Override
+        public String serialize(Year val) {
+            return val.serializer.format(val);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidator.java
new file mode 100644
index 0000000000..3b408252ff
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidator.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.validator;
+
+import static com.yahoo.elide.datastores.aggregation.validator.TableArgumentValidator.verifyDefaultValue;
+import static com.yahoo.elide.datastores.aggregation.validator.TableArgumentValidator.verifyValue;
+import static com.yahoo.elide.datastores.aggregation.validator.TableArgumentValidator.verifyValues;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Column;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ColumnArgReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.LogicalReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.Reference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ReferenceExtractor;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Verifies all defined arguments for column.
+ * Ensures all arguments required for column are defined.
+ * For any column:
+ * <ul>
+ *   <li>All the column arguments used (Either in column definition Or in Join expressions for join referenced directly
+ *    in column definition) must be defined in the argument list for this column (with or without default value)</li>
+ *   <li>If the column references another logical column (Either in column definition Or in Join expressions for join
+ *    referenced directly in column definition), If any argument in the argument list for this logical column doesn't
+ *     have default value then that argument must be defined for this column also (with or without default value). The
+ *      only exception is if this logical column is referenced using SQL helper by this column, which defines a fixed
+ *       value for this argument, then there is no need to redefine the argument for this column.</li>
+ * </ul>
+ */
+public class ColumnArgumentValidator {
+
+    private final MetaDataStore metaDataStore;
+    private final SQLTable table;
+    private final Column column;
+    private final String errorMsgPrefix;
+    private final ExpressionParser parser;
+
+    public ColumnArgumentValidator(MetaDataStore metaDataStore, SQLTable table, Column column) {
+        this.metaDataStore = metaDataStore;
+        this.table = table;
+        this.column = column;
+        this.errorMsgPrefix = String.format("Failed to verify column arguments for column: %s in table: %s. ",
+                        column.getName(), table.getName());
+        this.parser = new ExpressionParser(metaDataStore);
+    }
+
+    public void validate() {
+
+        column.getArgumentDefinitions().forEach(arg -> {
+            verifyValues(arg, errorMsgPrefix);
+            verifyDefaultValue(arg, errorMsgPrefix);
+        });
+
+        List<Reference> references = parser.parse(table, column.getExpression());
+
+        ReferenceExtractor<LogicalReference> logicalRefExtractor = new ReferenceExtractor<LogicalReference>(
+                        LogicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_COLUMN);
+        ReferenceExtractor<ColumnArgReference> columnArgRefExtractor = new ReferenceExtractor<ColumnArgReference>(
+                        ColumnArgReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_COLUMN);
+
+        references.stream()
+                        .map(reference -> reference.accept(columnArgRefExtractor))
+                        .flatMap(Set::stream)
+                        .map(ColumnArgReference::getArgName)
+                        .forEach(argName -> {
+                            if (!column.hasArgumentDefinition(argName) && !hasTemplateFilterArgument(argName)) {
+                                throw new IllegalStateException(String.format(errorMsgPrefix
+                                                + "Argument '%s' is not defined but found '{{$$column.args.%s}}'.",
+                                                argName, argName));
+                            }
+                        });
+
+        references.stream()
+                        .map(reference -> reference.accept(logicalRefExtractor))
+                        .flatMap(Set::stream)
+                        .forEach(this::verifyLogicalReference);
+    }
+
+    private void verifyLogicalReference(LogicalReference reference) {
+
+        SQLTable sqlTable = (SQLTable) reference.getSource();
+        ColumnProjection columnProj = reference.getColumn();
+
+        // This will have dependent column's defined arguments merged with pinned arguments used to invoke this column.
+        Map<String, Argument> mergedArguments = columnProj.getArguments();
+
+        Column refColumn = sqlTable.getColumn(Column.class, columnProj.getName());
+
+        verifyPinnedArguments(mergedArguments, refColumn, String.format(errorMsgPrefix
+                        + "Type mismatch of Fixed value provided for Dependent Column: '%s' in table: '%s'. ",
+                        refColumn.getName(), sqlTable.getName()));
+
+        refColumn.getArgumentDefinitions().forEach(argDef -> {
+            String argName = argDef.getName();
+
+            if (column.hasArgumentDefinition(argName)) {
+                if (argDef.getType() != column.getArgumentDefinition(argName).getType()) {
+                    throw new IllegalStateException(String.format(errorMsgPrefix
+                                    + "Argument type mismatch. Dependent Column: '%s' in table: '%s' has same"
+                                    + " Argument: '%s' with type '%s'.",
+                                    refColumn.getName(), sqlTable.getName(), argName, argDef.getType()));
+                }
+            } else if (StringUtils.isBlank(argDef.getDefaultValue().toString())
+                            && StringUtils.isBlank(mergedArguments.get(argName).getValue().toString())) {
+                throw new IllegalStateException(String.format(errorMsgPrefix
+                                + "Argument '%s' with type '%s' is not defined but is required for"
+                                + " Dependent Column: '%s' in table: '%s'.",
+                                argName, argDef.getType(), refColumn.getName(), sqlTable.getName()));
+            }
+        });
+    }
+
+    /**
+     * Verifies pinned value for any argument matches with {@link ArgumentDefinition}.
+     * @param mergedArguments Dependent {@link Column}'s defined arguments merged with pinned arguments used to
+     *         invoke this column.
+     * @param refColumn Original dependent {@link Column}.
+     * @param errorMsgPrefix Custom error message.
+     */
+    private void verifyPinnedArguments(Map<String, Argument> mergedArguments, Column refColumn, String errorMsgPrefix) {
+        mergedArguments.forEach((argName, arg) -> {
+            Object originalValue = refColumn.getArgumentDefinition(argName).getDefaultValue();
+
+            if (! arg.getValue().equals(originalValue)) {
+                verifyValue(refColumn.getArgumentDefinition(argName),
+                            arg.getValue().toString(),
+                            errorMsgPrefix + "Pinned ");
+            }
+        });
+    }
+
+    private boolean hasTemplateFilterArgument(String argName) {
+        return column.getRequiredFilter() != null && column.getRequiredFilter().contains("{{" + argName + "}}");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidator.java
new file mode 100644
index 0000000000..f4dc226cd5
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidator.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.validator;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable.hasSql;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable.resolveTableOrSubselect;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.models.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.ExpressionParser;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.expression.TableArgReference;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Set;
+
+/**
+ * Verifies all defined arguments for table.
+ * Ensures all arguments required for table are defined.
+ * For any table:
+ * <ul>
+ *   <li>All the table arguments used (in the column definition, Join expressions, or table's SQL) must be defined
+ *    in the argument list for this table (with or without default value).</li>
+ *   <li>All the table arguments required for join tables must be defined in the argument list for this table
+ *    (with or without default value).</li>
+ * </ul>
+ */
+public class TableArgumentValidator {
+
+    private final MetaDataStore metaDataStore;
+    private final SQLTable table;
+    private final String errorMsgPrefix;
+    private final ExpressionParser parser;
+    private final EntityDictionary dictionary;
+
+    public TableArgumentValidator(MetaDataStore metaDataStore, SQLTable table) {
+        this.metaDataStore = metaDataStore;
+        this.table = table;
+        this.errorMsgPrefix = String.format("Failed to verify table arguments for table: %s. ", table.getName());
+        this.parser = new ExpressionParser(metaDataStore);
+        this.dictionary = metaDataStore.getMetadataDictionary();
+    }
+
+    public void validate() {
+
+        table.getArgumentDefinitions().forEach(arg -> {
+            verifyValues(arg, errorMsgPrefix);
+            verifyDefaultValue(arg, errorMsgPrefix);
+        });
+
+        verifyTableArgsInTableSql();
+        verifyTableArgsInColumnDefinition();
+        verifyTableArgsInJoinExpressions();
+        verifyRequiredTableArgsForJoinTables();
+    }
+
+    private void verifyTableArgsInTableSql() {
+        Type<?> tableClass = dictionary.getEntityClass(table.getName(), table.getVersion());
+
+        if (hasSql(tableClass)) {
+            String selectSql = resolveTableOrSubselect(dictionary, tableClass);
+            verifyTableArgsExists(selectSql, "in table's sql.");
+        }
+    }
+
+    private void verifyTableArgsInColumnDefinition() {
+        table.getColumnProjections().forEach(column -> verifyTableArgsExists(column.getExpression(),
+                        String.format("in definition of column: '%s'.", column.getName())));
+    }
+
+    private void verifyTableArgsInJoinExpressions() {
+        table.getJoins().forEach((joinName, join) -> verifyTableArgsExists(join.getJoinExpression(),
+                        String.format("in definition of join: '%s'.", joinName)));
+    }
+
+    private void verifyTableArgsExists(String expression, String errorMsgSuffix) {
+        parser.parse(table, expression).stream()
+                        .filter(ref -> ref instanceof TableArgReference)
+                        .map(TableArgReference.class::cast)
+                        .map(TableArgReference::getArgName)
+                        .forEach(argName -> {
+                            if (!table.hasArgumentDefinition(argName) && !hasTemplateFilterArgument(argName)) {
+                                throw new IllegalStateException(String.format(errorMsgPrefix
+                                                + "Argument '%s' is not defined but found '{{$$table.args.%s}}' "
+                                                + errorMsgSuffix, argName, argName));
+                            }
+                        });
+    }
+
+    private boolean hasTemplateFilterArgument(String argName) {
+        return table.getRequiredFilter() != null && table.getRequiredFilter().contains("{{" + argName + "}}");
+    }
+
+    private void verifyRequiredTableArgsForJoinTables() {
+        table.getJoins().forEach((joinName, sqlJoin) -> {
+            SQLTable joinTable = metaDataStore.getTable(sqlJoin.getJoinTableType());
+            joinTable.getArgumentDefinitions().forEach(joinArgDef -> {
+                String joinArgName = joinArgDef.getName();
+
+                if (table.hasArgumentDefinition(joinArgName)) {
+                    if (joinArgDef.getType() != table.getArgumentDefinition(joinArgName).getType()) {
+                        throw new IllegalStateException(String.format(errorMsgPrefix
+                                        + "Argument type mismatch. Join table: '%s' has same Argument: '%s'"
+                                        + " with type '%s'.",
+                                        joinTable.getName(), joinArgName, joinArgDef.getType()));
+                    }
+                } else if (StringUtils.isBlank(joinArgDef.getDefaultValue().toString())) {
+                    throw new IllegalStateException(String.format(errorMsgPrefix
+                                    + "Argument '%s' with type '%s' is not defined but is required by join table: %s.",
+                                    joinArgName, joinArgDef.getType(), joinTable.getName()));
+                }
+            });
+        });
+    }
+
+    public static void verifyValues(ArgumentDefinition argument, String errorMsgPrefix) {
+        Set<String> values = argument.getValues();
+
+        if (CollectionUtils.isEmpty(values)) {
+            return;
+        }
+
+        values.forEach(value -> {
+            if (!argument.getType().matches(value)) {
+                throw new IllegalStateException(String.format(errorMsgPrefix
+                                + "Value: '%s' for Argument '%s' with Type '%s' is invalid.",
+                                value, argument.getName(), argument.getType()));
+            }
+        });
+    }
+
+    public static void verifyDefaultValue(ArgumentDefinition argument, String errorMsgPrefix) {
+        Object value = argument.getDefaultValue();
+
+        /*
+         * Arguments must have default values or else we won't be able to evaluate the correctness of their expressions
+         * at build time.
+         */
+        if (value == null) {
+            throw new IllegalStateException(String.format("Argument '%s' is missing a default value",
+                    argument.getName()));
+        }
+
+        String defaultValue = value.toString();
+        verifyValue(argument, defaultValue, errorMsgPrefix + "Default ");
+    }
+
+    public static void verifyValue(ArgumentDefinition argument, String value, String errorMsgPrefix) {
+
+        Set<String> values = argument.getValues();
+
+        if (StringUtils.isBlank(value)) {
+            return;
+        }
+
+        if (CollectionUtils.isEmpty(values)) {
+            if (!argument.getType().matches(value)) {
+                throw new IllegalStateException(String.format(errorMsgPrefix
+                                + "Value: '%s' for Argument '%s' with Type '%s' is invalid.",
+                                value, argument.getName(), argument.getType()));
+            }
+        } else {
+            if (!values.contains(value)) {
+                throw new IllegalStateException(String.format(errorMsgPrefix
+                                + "Value: '%s' for Argument '%s' with Type '%s' must match one of these values: %s.",
+                                value, argument.getName(), argument.getType(), values));
+            }
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TemplateConfigValidator.java b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TemplateConfigValidator.java
new file mode 100644
index 0000000000..d509d705f5
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/validator/TemplateConfigValidator.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.validator;
+
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.metadata.FormulaValidator;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import com.yahoo.elide.modelconfig.validator.Validator;
+
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * Delegates to DynamicConfigValidator for HJSON syntax and JSON schema validation.  Then builds
+ * table metadata to perform template validation.
+ */
+public class TemplateConfigValidator implements Validator {
+
+    private final ClassScanner scanner;
+    private final String configRoot;
+
+    public TemplateConfigValidator(
+            ClassScanner scanner,
+            String configRoot
+    ) {
+        this.scanner = scanner;
+        this.configRoot = configRoot;
+    }
+
+    //Rebuilds the MetaDataStore for each validation so that we can validate templates.
+    MetaDataStore rebuildMetaDataStore(Map<String, ConfigFile> resourceMap) {
+        DynamicConfigValidator validator = new DynamicConfigValidator(scanner,
+                configRoot);
+
+        validator.validate(resourceMap);
+
+        MetaDataStore metaDataStore = new MetaDataStore(scanner, validator.getTables(),
+                validator.getNamespaceConfigurations(), false);
+
+        //Populates the metadata store with SQL tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> null, new HashSet<>(),
+                new DefaultQueryPlanMerger(metaDataStore),
+                new DefaultQueryValidator(metaDataStore.getMetadataDictionary()));
+
+        return metaDataStore;
+    }
+
+    @Override
+    public void validate(Map<String, ConfigFile> resourceMap) {
+        MetaDataStore metaDataStore = rebuildMetaDataStore(resourceMap);
+
+        metaDataStore.getTables().forEach(table -> {
+            SQLTable sqlTable = (SQLTable) table;
+
+            checkForCycles(sqlTable, metaDataStore);
+
+            TableArgumentValidator tableArgValidator = new TableArgumentValidator(metaDataStore, sqlTable);
+            tableArgValidator.validate();
+
+            sqlTable.getAllColumns().forEach(column -> {
+                ColumnArgumentValidator colArgValidator = new ColumnArgumentValidator(metaDataStore, sqlTable, column);
+                colArgValidator.validate();
+            });
+        });
+    }
+
+    /**
+     * Verify that there is no reference loop for given {@link SQLTable}.
+     * @param sqlTable Queryable to validate.
+     */
+    private void checkForCycles(SQLTable sqlTable, MetaDataStore metaDataStore) {
+        FormulaValidator formulaValidator = new FormulaValidator(metaDataStore);
+        sqlTable.getColumnProjections().forEach(column -> formulaValidator.parse(sqlTable, column));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransactionTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransactionTest.java
new file mode 100644
index 0000000000..2ef5f39150
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/AggregationDataStoreTransactionTest.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.request.Pagination.DEFAULT_PAGE_LIMIT;
+import static com.yahoo.elide.core.request.Pagination.MAX_PAGE_LIMIT;
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT_NAMESPACE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.datastores.aggregation.cache.Cache;
+import com.yahoo.elide.datastores.aggregation.cache.QueryKeyExtractor;
+import com.yahoo.elide.datastores.aggregation.core.QueryLogger;
+import com.yahoo.elide.datastores.aggregation.core.QueryResponse;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.NativeQuery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import com.google.common.collect.Lists;
+import example.PlayerStats;
+import example.PlayerStatsWithRequiredFilter;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+
+@ExtendWith(MockitoExtension.class)
+class AggregationDataStoreTransactionTest extends SQLUnitTest {
+
+    @Mock private SQLQueryEngine queryEngine;
+    @Mock private QueryEngine.Transaction qeTransaction;
+    @Mock private RequestScope scope;
+    @Mock private Cache cache;
+    @Mock private QueryLogger queryLogger;
+
+    private Query query = Query.builder().source(playerStatsTable).build();
+    private final String queryKey = QueryKeyExtractor.extractKey(query);
+    private static final Iterable<Object> DATA = Collections.singletonList("xyzzy");
+
+    // inject our own query instead of using buildQuery impl
+    private class MyAggregationDataStoreTransaction extends AggregationDataStoreTransaction {
+        public MyAggregationDataStoreTransaction(QueryEngine queryEngine, Cache cache, QueryLogger queryLogger) {
+            super(queryEngine, cache, queryLogger);
+        }
+
+        @Override
+        Query buildQuery(EntityProjection entityProjection, RequestScope scope) {
+            return query;
+        }
+    }
+
+    public AggregationDataStoreTransactionTest() {
+        metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), false);
+        CoerceUtil.register(Date.class, new ISO8601DateSerde());
+    }
+
+    @BeforeAll
+    public static void beforeAllTests() {
+        SQLUnitTest.init();
+    }
+
+    @BeforeEach
+    public void setUp() {
+        when(queryEngine.beginTransaction()).thenReturn(qeTransaction);
+    }
+
+    @Test
+    public void testMissingRequiredTableFilter() {
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .build();
+        dictionary.bindEntity(PlayerStatsWithRequiredFilter.class);
+
+        Table table = new SQLTable(new Namespace(DEFAULT_NAMESPACE),
+                ClassType.of(PlayerStatsWithRequiredFilter.class), dictionary);
+
+        AggregationDataStoreTransaction tx = new AggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        assertThrows(BadRequestException.class, () -> tx.addTableFilterArguments(table, query, dictionary));
+    }
+
+    @Test
+    public void testRequiredTableFilterArguments() throws Exception {
+        Type<PlayerStatsWithRequiredFilter> tableType = ClassType.of(PlayerStatsWithRequiredFilter.class);
+
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .build();
+        dictionary.bindEntity(PlayerStatsWithRequiredFilter.class);
+
+        SQLTable table = new SQLTable(new Namespace(DEFAULT_NAMESPACE), tableType, dictionary);
+
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+        FilterExpression where = filterDialect.parse(tableType, new HashSet<>(),
+                "recordedDate>=2019-07-12T00:00Z;recordedDate<2030-07-12T00:00Z", NO_VERSION);
+
+        Query query = Query.builder()
+                .source(table)
+                .whereFilter(where).build();
+
+        AggregationDataStoreTransaction tx = new AggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+
+        Query modifiedQuery = tx.addTableFilterArguments(table, query, dictionary);
+        Map<String, Argument> tableArguments = modifiedQuery.getArguments();
+        assertTrue(tableArguments.containsKey("start"));
+        assertTrue(tableArguments.containsKey("end"));
+        assertEquals(2, tableArguments.size());
+    }
+
+    @Test
+    public void testMissingRequiredColumnFilter() throws Exception {
+        Type<PlayerStatsWithRequiredFilter> tableType = ClassType.of(PlayerStatsWithRequiredFilter.class);
+
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .build();
+        dictionary.bindEntity(PlayerStatsWithRequiredFilter.class);
+
+        SQLTable table = new SQLTable(new Namespace(DEFAULT_NAMESPACE), tableType, dictionary);
+
+        Query query = Query.builder()
+                .column(SQLMetricProjection.builder().name("highScore").build())
+                .source(table)
+                .build();
+
+        AggregationDataStoreTransaction tx = new AggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+
+        assertThrows(BadRequestException.class, () -> tx.addColumnFilterArguments(table, query, dictionary));
+    }
+
+    @Test
+    public void testRequiredColumnFilterArguments() throws Exception {
+        Type<PlayerStatsWithRequiredFilter> tableType = ClassType.of(PlayerStatsWithRequiredFilter.class);
+
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .build();
+        dictionary.bindEntity(PlayerStatsWithRequiredFilter.class);
+
+        SQLTable table = new SQLTable(new Namespace(DEFAULT_NAMESPACE), tableType, dictionary);
+
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+        FilterExpression where = filterDialect.parse(tableType, new HashSet<>(),
+                "recordedDate>2019-07-12T00:00Z", NO_VERSION);
+
+        Query query = Query.builder()
+                .column(SQLMetricProjection.builder().name("highScore").alias("highScore").build())
+                .whereFilter(where)
+                .source(table)
+                .build();
+
+        AggregationDataStoreTransaction tx = new AggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+
+        Query modifiedQuery = tx.addColumnFilterArguments(table, query, dictionary);
+        Map<String, Argument> columnArguments = modifiedQuery.getColumnProjection("highScore").getArguments();
+        assertTrue(columnArguments.containsKey("recordedDate"));
+        assertEquals(1, columnArguments.size());
+    }
+
+    @Test
+    public void loadObjectsPopulatesCache() {
+        Mockito.reset(queryLogger);
+
+        QueryResult queryResult = QueryResult.builder().data(DATA).build();
+        NativeQuery myQuery = NativeQuery.builder()
+                .fromClause(playerStatsTable.getName())
+                .projectionClause(" ").build();
+        when(queryEngine.getTableVersion(playerStatsTable, qeTransaction)).thenReturn("foo");
+        when(queryEngine.executeQuery(query, qeTransaction)).thenReturn(queryResult);
+        when(queryEngine.explain(query)).thenReturn(Arrays.asList(myQuery.toString()));
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        EntityProjection entityProjection = EntityProjection.builder().type(PlayerStats.class).build();
+
+        assertEquals(DATA, Lists.newArrayList(transaction.loadObjects(entityProjection, scope)));
+
+        String cacheKey = "foo;" + queryKey;
+        Mockito.verify(cache).get(cacheKey);
+        Mockito.verify(cache).put(cacheKey, queryResult);
+        Mockito.verifyNoMoreInteractions(cache);
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(false));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void loadObjectsUsesCache() {
+        Mockito.reset(queryLogger);
+
+        String cacheKey = "foo;" + queryKey;
+        QueryResult queryResult = QueryResult.builder().data(DATA).build();
+        NativeQuery myQuery = NativeQuery.builder()
+                .fromClause(playerStatsTable.getName())
+                .projectionClause(" ").build();
+        when(cache.get(cacheKey)).thenReturn(queryResult);
+        when(queryEngine.getTableVersion(playerStatsTable, qeTransaction)).thenReturn("foo");
+        when(queryEngine.explain(query)).thenReturn(Arrays.asList(myQuery.toString()));
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        EntityProjection entityProjection = EntityProjection.builder().type(PlayerStats.class).build();
+
+        assertEquals(DATA, Lists.newArrayList(transaction.loadObjects(entityProjection, scope)));
+
+        Mockito.verify(queryEngine, never()).executeQuery(any(), any());
+        Mockito.verify(cache).get(cacheKey);
+        Mockito.verifyNoMoreInteractions(cache);
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(true));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void loadObjectsPassesPagination() {
+        Mockito.reset(queryLogger);
+
+        QueryResult queryResult = QueryResult.builder().data(DATA).pageTotals(314L).build();
+        NativeQuery myQuery = NativeQuery.builder()
+                .fromClause(playerStatsTable.getName())
+                .projectionClause(" ").build();
+        when(cache.get(anyString())).thenReturn(queryResult);
+        when(queryEngine.getTableVersion(playerStatsTable, qeTransaction)).thenReturn("foo");
+        when(queryEngine.explain(query)).thenReturn(Arrays.asList(myQuery.toString()));
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        Pagination pagination = new PaginationImpl(
+                String.class, null, null, DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT, true, false);
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(PlayerStats.class).pagination(pagination).build();
+
+        assertEquals(DATA, Lists.newArrayList(transaction.loadObjects(entityProjection, scope)));
+        assertEquals(314L, entityProjection.getPagination().getPageTotals());
+
+        String cacheKey = "foo;" + queryKey;
+        Mockito.verify(queryEngine, never()).executeQuery(any(), any());
+        Mockito.verify(cache).get(cacheKey);
+        Mockito.verifyNoMoreInteractions(cache);
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(true));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void loadObjectsNoTableVersion() {
+        Mockito.reset(queryLogger);
+
+        NativeQuery myQuery = NativeQuery.builder()
+                .fromClause(playerStatsTable.getName())
+                .projectionClause(" ").build();
+
+        QueryResult queryResult = QueryResult.builder().data(DATA).build();
+
+        when(queryEngine.executeQuery(query, qeTransaction))
+                .thenReturn(queryResult);
+        when(queryEngine.explain(query)).thenReturn(Arrays.asList(myQuery.toString()));
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        EntityProjection entityProjection = EntityProjection.builder().type(PlayerStats.class).build();
+
+        transaction.loadObjects(entityProjection, scope);
+
+        String cacheKey = ";" + queryKey;
+        Mockito.verify(cache).get(cacheKey);
+        Mockito.verify(cache).put(cacheKey, queryResult);
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(false));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void loadObjectsBypassCache() {
+        Mockito.reset(queryLogger);
+
+        query = Query.builder().source(playerStatsTable).bypassingCache(true).build();
+        NativeQuery myQuery = NativeQuery.builder()
+                .fromClause(playerStatsTable.getName())
+                .projectionClause(" ").build();
+
+        QueryResult queryResult = QueryResult.builder().data(DATA).build();
+        when(queryEngine.executeQuery(query, qeTransaction)).thenReturn(queryResult);
+        when(queryEngine.explain(query)).thenReturn(Arrays.asList(myQuery.toString()));
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        EntityProjection entityProjection = EntityProjection.builder().type(PlayerStats.class).build();
+
+        assertEquals(DATA, Lists.newArrayList(transaction.loadObjects(entityProjection, scope)));
+
+        Mockito.verify(queryEngine, never()).getTableVersion(any(), any());
+        Mockito.verifyNoInteractions(cache);
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(false));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void loadObjectsExceptionThrownTest() throws Exception {
+        Mockito.reset(queryLogger);
+        String nullPointerExceptionMessage = "Cannot dereference an object with value Null";
+        try {
+            query = Query.builder().source(playerStatsTable).bypassingCache(true).build();
+            doThrow(new NullPointerException(nullPointerExceptionMessage))
+                    .when(queryEngine).executeQuery(query, qeTransaction);
+            AggregationDataStoreTransaction transaction =
+                    new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+            EntityProjection entityProjection = EntityProjection.builder().type(PlayerStats.class).build();
+            transaction.loadObjects(entityProjection, scope);
+        } catch (Exception e) {
+                assertEquals(nullPointerExceptionMessage, e.getMessage());
+                Mockito.verify(queryLogger).completeQuery(Mockito.eq(scope.getRequestId()),
+                    argThat((QueryResponse qResponse) -> qResponse.getErrorMessage() == e.getMessage()));
+        }
+
+        Mockito.verify(queryLogger, times(1)).acceptQuery(
+                Mockito.eq(scope.getRequestId()),
+                any(), any(), any(), any(), any());
+        Mockito.verify(queryLogger, times(1)).processQuery(
+                Mockito.eq(scope.getRequestId()), any(), any(), Mockito.eq(false));
+        Mockito.verify(queryLogger, times(1)).completeQuery(
+                Mockito.eq(scope.getRequestId()), any());
+    }
+
+    @Test
+    public void aggregationQueryLoggerCancelQueryTest() {
+        Mockito.reset(queryLogger);
+        AggregationDataStoreTransaction transaction =
+                new MyAggregationDataStoreTransaction(queryEngine, cache, queryLogger);
+        transaction.cancel(scope);
+        Mockito.verify(queryLogger, times(1)).cancelQuery(Mockito.eq(scope.getRequestId()));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidatorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidatorTest.java
new file mode 100644
index 0000000000..80d3ca9c36
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/DefaultQueryValidatorTest.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.FilterConstraints;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.SplitFilterExpressionVisitor;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class DefaultQueryValidatorTest extends SQLUnitTest {
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+    }
+
+    @Test
+    public void testInvalidTableArgument() {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+
+        Map<String, Argument> tableArguments = new HashMap<>();
+        tableArguments.put("rating", Argument.builder().name("rating").value("SELECT * FROM FOO;").build());
+
+        Map<String, Argument> columnArguments = new HashMap<>();
+        columnArguments.put("format", Argument.builder().name("format").value("lower").build());
+
+        Query query = Query.builder()
+                .source(source)
+                .arguments(tableArguments)
+                .metricProjection(source.getMetricProjection("highScore"))
+                .dimensionProjection(source.getDimensionProjection("countryName", columnArguments))
+                .build();
+
+        validateQuery(query, "Invalid operation: Argument 'rating' for table 'playerStatsView' has an invalid value: SELECT * FROM FOO;");
+    }
+
+    @Test
+    public void testValidTableArgument() {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        Map<String, Argument> tableArguments = new HashMap<>();
+        tableArguments.put("rating", Argument.builder().name("rating").value("Terrible").build());
+
+        Map<String, Argument> columnArguments = new HashMap<>();
+        columnArguments.put("format", Argument.builder().name("format").value("lower").build());
+
+        Query query = Query.builder()
+                .source(source)
+                .arguments(tableArguments)
+                .metricProjection(source.getMetricProjection("highScore"))
+                .dimensionProjection(source.getDimensionProjection("countryName", columnArguments))
+                .build();
+
+        validateQueryDoesNotThrow(query);
+    }
+
+    @Test
+    public void testInvalidColumnArgument() {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        Map<String, Argument> argumentMap = new HashMap<>();
+        argumentMap.put("format", Argument.builder().name("format").value(";").build());
+
+        Query query = Query.builder()
+                .source(source)
+                .metricProjection(source.getMetricProjection("highScore"))
+                .dimensionProjection(source.getDimensionProjection("countryName", "countryName", argumentMap))
+                .build();
+
+        validateQuery(query, "Invalid operation: Argument 'format' for column 'countryName' must match one of these values: [lower, upper]");
+    }
+
+    @Test
+    public void testValidColumnArgument() {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        Map<String, Argument> tableArguments = new HashMap<>();
+        tableArguments.put("rating", Argument.builder().name("rating").value("Terrible").build());
+
+        Map<String, Argument> argumentMap = new HashMap<>();
+        argumentMap.put("format", Argument.builder().name("format").value("lower").build());
+
+        Query query = Query.builder()
+                .source(source)
+                .arguments(tableArguments)
+                .metricProjection(source.getMetricProjection("highScore"))
+                .dimensionProjection(source.getDimensionProjection("countryName", "countryName", argumentMap))
+                .build();
+
+        validateQueryDoesNotThrow(query);
+    }
+
+    @Test
+    public void testQueryingByIdAlone() {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("id"))
+                .build();
+
+        validateQuery(query, "Invalid operation: Cannot query a table only by ID");
+    }
+
+    @Test
+    public void testSortingOnId() {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("id", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .metricProjection(playerStatsTable.getMetricProjection("id"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        validateQuery(query, "Invalid operation: Sorting on id field is not permitted");
+    }
+
+    @Test
+    public void testSortingOnNotQueriedDimension() {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryIsoCode", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        validateQuery(query, "Invalid operation: Can not sort on countryIsoCode as it is not present in query");
+    }
+
+    @Test
+    public void testSortingOnNotQueriedMetric() {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        validateQuery(query, "Invalid operation: Can not sort on highScore as it is not present in query");
+    }
+
+    @Test
+    public void testHavingFilterPromotionUngroupedDimension() throws ParseException {
+        FilterExpression originalFilter = filterParser.parseFilterExpression("countryIsoCode==USA,lowScore<45",
+                playerStatsType, false);
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(playerStatsTable);
+        FilterConstraints constraints = originalFilter.accept(visitor);
+        FilterExpression whereFilter = constraints.getWhereExpression();
+        FilterExpression havingFilter = constraints.getHavingExpression();
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .whereFilter(whereFilter)
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQuery(query, "Invalid operation: Post aggregation filtering on 'countryIsoCode' requires the field to be projected in the response");
+    }
+
+    @Test
+    public void testInvalidColumnValueInFilter() throws ParseException {
+        FilterExpression originalFilter = filterParser.parseFilterExpression("countryIsoCode==Invalid,lowScore<45",
+                playerStatsType, false);
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(playerStatsTable);
+        FilterConstraints constraints = originalFilter.accept(visitor);
+        FilterExpression whereFilter = constraints.getWhereExpression();
+        FilterExpression havingFilter = constraints.getHavingExpression();
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryIsoCode"))
+                .whereFilter(whereFilter)
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQuery(query, "Invalid operation: Column 'countryIsoCode' values must match one of these values: [HKG, USA]");
+    }
+
+    @Test
+    public void testValidRegexColumnValueInFilter() throws ParseException {
+        FilterExpression originalFilter = filterParser.parseFilterExpression("countryIsoCode=in=('*H'),lowScore<45",
+                playerStatsType, false);
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(playerStatsTable);
+        FilterConstraints constraints = originalFilter.accept(visitor);
+        FilterExpression whereFilter = constraints.getWhereExpression();
+        FilterExpression havingFilter = constraints.getHavingExpression();
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryIsoCode"))
+                .whereFilter(whereFilter)
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQueryDoesNotThrow(query);
+    }
+
+    @Test
+    public void testHavingFilterOnDimensionTable() throws ParseException {
+        FilterExpression originalFilter = filterParser.parseFilterExpression("country.isoCode==USA,lowScore<45",
+                playerStatsType, false);
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(playerStatsTable);
+        FilterConstraints constraints = originalFilter.accept(visitor);
+        FilterExpression whereFilter = constraints.getWhereExpression();
+        FilterExpression havingFilter = constraints.getHavingExpression();
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .whereFilter(whereFilter)
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQuery(query, "Invalid operation: Relationship traversal not supported for analytic queries.");
+    }
+
+    @Test
+    public void testHavingFilterMismatchedWithProjection() throws ParseException {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        FilterExpression havingFilter = filterParser.parseFilterExpression("countryName[format:upper]==USA",
+                playerStatsViewType, false);
+
+        Query query = Query.builder()
+                .source(source)
+                .dimensionProjection(source.getDimensionProjection("countryName"))
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQuery(query, "Invalid operation: Post aggregation filtering on 'countryName' requires the field to be projected in the response with matching arguments");
+    }
+
+    @Test
+    public void testHavingFilterMatchesProjection() throws ParseException {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        Map<String, Argument> tableArguments = new HashMap<>();
+        tableArguments.put("rating", Argument.builder().name("rating").value("Terrible").build());
+
+        Map<String, Argument> arguments = new HashMap<>();
+        arguments.put("format", Argument.builder().name("format").value("lower").build());
+
+        FilterExpression havingFilter = filterParser.parseFilterExpression("countryName[format:lower]==usa",
+                playerStatsViewType, false);
+
+        Query query = Query.builder()
+                .source(source)
+                .arguments(tableArguments)
+                .dimensionProjection(source.getDimensionProjection("countryName", arguments))
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQueryDoesNotThrow(query);
+    }
+
+    @Test
+    public void testMissingRequiredParameterInProjection() {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        Query query = Query.builder()
+                .source(source)
+                .metricProjection(source.getMetricProjection("highScore"))
+                .dimensionProjection(source.getDimensionProjection("countryName"))
+                .build();
+
+        validateQuery(query, "Invalid operation: Argument 'format' for column 'countryName' is required");
+    }
+
+    @Test
+    public void testMissingRequiredParameterInFilter() throws ParseException {
+        SQLTable source = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+
+        FilterExpression havingFilter = filterParser.parseFilterExpression("countryName==usa",
+                playerStatsViewType, false);
+
+        Query query = Query.builder()
+                .source(source)
+                .dimensionProjection(source.getDimensionProjection("countryName"))
+                .havingFilter(havingFilter)
+                .build();
+
+        validateQuery(query, "Invalid operation: Argument 'format' for column 'countryName' is required");
+    }
+
+    private void validateQuery(Query query, String message) {
+        DefaultQueryValidator validator = new DefaultQueryValidator(dictionary);
+
+        InvalidOperationException exception = assertThrows(InvalidOperationException.class,
+                () -> validator.validate(query));
+        assertEquals(message, exception.getMessage());
+    }
+
+    private void validateQueryDoesNotThrow(Query query) {
+        DefaultQueryValidator validator = new DefaultQueryValidator(dictionary);
+
+        assertDoesNotThrow(() -> validator.validate(query));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslatorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslatorTest.java
new file mode 100644
index 0000000000..97fe529e76
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/EntityProjectionTranslatorTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.FilterConstraints;
+import com.yahoo.elide.datastores.aggregation.filter.visitor.SplitFilterExpressionVisitor;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.TimeDimensionProjection;
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@ExtendWith(MockitoExtension.class)
+public class EntityProjectionTranslatorTest extends SQLUnitTest {
+    private static EntityProjection basicProjection = EntityProjection.builder()
+            .type(PlayerStats.class)
+            .attribute(Attribute.builder()
+                    .type(long.class)
+                    .name("lowScore")
+                    .argument(Argument.builder().name("foo").value("bar").build())
+                    .build())
+            .attribute(Attribute.builder()
+                    .type(String.class)
+                    .name("overallRating")
+                    .build())
+            .argument(Argument.builder().name("foo").value("bar").build())
+            .build();
+
+    @Mock private RequestScope scope;
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+    }
+
+    @Test
+    public void testBasicTranslation() {
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                engine,
+                playerStatsTable,
+                basicProjection,
+                scope,
+                true
+        );
+
+        Query query = translator.getQuery();
+
+        assertEquals(playerStatsTable, query.getSource());
+        assertEquals(1, query.getMetricProjections().size());
+        String actual = query.getMetricProjections().stream()
+                .map(MetricProjection::getAlias)
+                .findFirst()
+                .orElse(null);
+
+        assertEquals("lowScore", actual);
+        assertEquals(1, query.getAllDimensionProjections().size());
+
+        List<ColumnProjection> dimensions = new ArrayList<>(query.getAllDimensionProjections());
+        assertEquals("overallRating", dimensions.get(0).getName());
+    }
+
+    @Test
+    public void testWherePromotion() throws ParseException {
+        FilterExpression originalFilter = filterParser.parseFilterExpression("overallRating==Good,lowScore[foo:bar]<45",
+                playerStatsType, false);
+
+        EntityProjection projection = basicProjection.copyOf()
+                .filterExpression(originalFilter)
+                .build();
+
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                engine,
+                playerStatsTable,
+                projection,
+                scope,
+                true
+        );
+
+        Query query = translator.getQuery();
+
+        SplitFilterExpressionVisitor visitor = new SplitFilterExpressionVisitor(playerStatsTable);
+        FilterConstraints constraints = originalFilter.accept(visitor);
+        FilterExpression whereFilter = constraints.getWhereExpression();
+        FilterExpression havingFilter = constraints.getHavingExpression();
+        assertEquals(whereFilter, query.getWhereFilter());
+        assertEquals(havingFilter, query.getHavingFilter());
+    }
+
+    @Test
+    public void testTimeDimension() {
+        EntityProjection projection = basicProjection.copyOf()
+                .attribute(Attribute.builder()
+                        .type(Date.class)
+                        .name("recordedDate")
+                        .build())
+                .build();
+
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                engine,
+                playerStatsTable,
+                projection,
+                scope,
+                true
+        );
+
+        Query query = translator.getQuery();
+
+        List<TimeDimensionProjection> timeDimensions = new ArrayList<>(query.getTimeDimensionProjections());
+        assertEquals(1, timeDimensions.size());
+        assertEquals("recordedDate", timeDimensions.get(0).getAlias());
+        assertEquals(TimeGrain.DAY, timeDimensions.get(0).getGrain());
+    }
+
+    @Test
+    public void testHavingClauseMetricsMissingFromProjection() throws ParseException {
+        FilterExpression filter = filterParser.parseFilterExpression("lowScore>45",
+                playerStatsType, false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(PlayerStats.class)
+                .filterExpression(filter)
+                .attribute(Attribute.builder()
+                        .type(long.class)
+                        .name("highScore")
+                        .build())
+                .attribute(Attribute.builder()
+                        .type(String.class)
+                        .name("overallRating")
+                        .build())
+                .build();
+
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                engine,
+                playerStatsTable,
+                projection,
+                scope,
+                true
+        );
+
+        Query query = translator.getQuery();
+
+        List<String> metricNames = query.getMetricProjections().stream()
+                .map(MetricProjection::getName)
+                .collect(Collectors.toList());
+
+        assertEquals(metricNames, Arrays.asList("highScore", "lowScore"));
+    }
+
+    @Test
+    public void testQueryArguments() {
+        EntityProjectionTranslator translator = new EntityProjectionTranslator(
+                engine,
+                playerStatsTable,
+                basicProjection,
+                scope,
+                true
+        );
+
+        Query query = translator.getQuery();
+        Argument queryArg = query.getArguments().get("foo");
+        assertEquals("bar", queryArg.getValue());
+
+        Argument lowScoreArg = query.getColumnProjection("lowScore").getArguments().get("foo");
+        assertEquals("bar", lowScoreArg.getValue());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionFormulaTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionFormulaTest.java
new file mode 100644
index 0000000000..00fb0c57e0
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionFormulaTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation.dimensionformula;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.google.common.collect.Sets;
+import com.zaxxer.hikari.HikariDataSource;
+import org.hibernate.annotations.Formula;
+import org.junit.jupiter.api.Test;
+import lombok.Data;
+import lombok.Setter;
+
+import java.util.Arrays;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+
+public class DimensionFormulaTest {
+
+    public static final ConnectionDetails DUMMY_CONNECTION = new ConnectionDetails(new HikariDataSource(),
+                    SQLDialectFactory.getDefaultDialect());
+
+    @Test
+    public void testReferenceLoop() {
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(),
+                getClassType(Sets.newHashSet(DimensionLoop.class)), true);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> new SQLQueryEngine(metaDataStore, (unused) -> DUMMY_CONNECTION));
+        assertTrue(exception.getMessage().startsWith("Formula reference loop found:"));
+    }
+
+    @Test
+    public void testCrossClassReferenceLoop() {
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(),
+                        getClassType(Sets.newLinkedHashSet(Arrays.asList(LoopCountryA.class, LoopCountryB.class))),
+                        true);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> new SQLQueryEngine(metaDataStore, (unused) -> DUMMY_CONNECTION));
+
+        String exception1 = "Formula reference loop found: loopCountryA.inUsa->loopCountryB.inUsa->loopCountryA.inUsa";
+
+        String exception2 = "Formula reference loop found: loopCountryB.inUsa->loopCountryA.inUsa->loopCountryB.inUsa";
+
+        assertTrue(exception1.equals(exception.getMessage()) || exception2.equals(exception.getMessage()));
+    }
+}
+
+@Data
+@Entity
+@Include
+class LoopCountryA {
+    @Setter
+    private String id;
+
+    @Setter
+    private LoopCountryB countryB;
+
+    @Setter
+    private boolean inUsa;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "id")
+    public LoopCountryB getCountryB() {
+        return countryB;
+    }
+
+    @DimensionFormula("CASE WHEN {{countryB.inUsa}} = 'United States' THEN true ELSE false END")
+    @Formula("CASE WHEN name = 'United States' THEN true ELSE false END")
+    public boolean isInUsa() {
+        return inUsa;
+    }
+}
+
+@Data
+@Entity
+@Include
+class LoopCountryB {
+    @Setter
+    private String id;
+
+    @Setter
+    private LoopCountryA countryA;
+
+    @Setter
+    private boolean inUsa;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "id")
+    public LoopCountryA getCountryA() {
+        return countryA;
+    }
+
+    @DimensionFormula("CASE WHEN {{countryA.inUsa}} = 'United States' THEN true ELSE false END")
+    @Formula("CASE WHEN name = 'United States' THEN true ELSE false END")
+    public boolean isInUsa() {
+        return inUsa;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionLoop.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionLoop.java
new file mode 100644
index 0000000000..5a1ae0cdf7
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/dimensionformula/DimensionLoop.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation.dimensionformula;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Id;
+
+@Include
+@EqualsAndHashCode
+@ToString
+public class DimensionLoop {
+    // PK
+    @Setter
+    private String id;
+
+    // degenerated dimension using sql expression
+    @Setter
+    private int playerLevel1;
+
+    @Setter
+    private int playerLevel2;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    @DimensionFormula("CASE WHEN {{playerLevel2}} = 'Good' THEN 1 ELSE 2 END")
+    public int getPlayerLevel1() {
+        return playerLevel1;
+    }
+
+    @DimensionFormula("CASE WHEN {{playerLevel1}} = 'Good' THEN 1 ELSE 2 END")
+    public int getPlayerLevel2() {
+        return playerLevel2;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MeasureLoop.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MeasureLoop.java
new file mode 100644
index 0000000000..ae70b20d06
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MeasureLoop.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation.metricformula;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Id;
+
+@Include
+@EqualsAndHashCode
+@ToString
+public class MeasureLoop {
+    // PK
+    @Setter
+    private String id;
+
+    // A metric
+    @Setter
+    private long highScore;
+
+    @Setter
+    private long lowScore;
+
+    @MetricFormula("{{lowScore}}")
+    public long getHighScore() {
+        return highScore;
+    }
+
+    @MetricFormula("{{highScore}}")
+    public long getLowScore() {
+        return lowScore;
+    }
+
+    @Id
+    public String getId() {
+        return id;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MetricFormulaTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MetricFormulaTest.java
new file mode 100644
index 0000000000..6d384ea323
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/annotation/metricformula/MetricFormulaTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.annotation.metricformula;
+
+import static com.yahoo.elide.datastores.aggregation.annotation.dimensionformula.DimensionFormulaTest.DUMMY_CONNECTION;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.google.common.collect.Sets;
+import org.junit.jupiter.api.Test;
+
+public class MetricFormulaTest {
+    @Test
+    public void testReferenceLoop() {
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(),
+                Sets.newHashSet(ClassType.of(MeasureLoop.class)), true);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> new SQLQueryEngine(metaDataStore, (unused) -> DUMMY_CONNECTION));
+        assertTrue(exception.getMessage().startsWith("Formula reference loop found:"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractorTest.java
new file mode 100644
index 0000000000..b22fa28a96
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/QueryKeyExtractorTest.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT_NAMESPACE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage;
+import com.yahoo.elide.datastores.aggregation.dynamic.TableType;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.query.ImmutablePagination;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.Type;
+
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class QueryKeyExtractorTest {
+
+    private static EntityDictionary dictionary;
+    private static SQLTable playerStatsTable;
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(PlayerStats.class);
+
+        Namespace namespace = new Namespace(DEFAULT_NAMESPACE);
+        playerStatsTable = new SQLTable(namespace, ClassType.of(PlayerStats.class), dictionary);
+    }
+
+    @Test
+    public void testMinimalQuery() {
+        // check for proper handling of unset Query fields
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .build();
+        assertEquals(
+                "example_PlayerStats;{highScore;{}}{}{};;;;",
+                QueryKeyExtractor.extractKey(query));
+    }
+
+    @Test
+    public void testFullQuery() throws Exception {
+        RSQLFilterDialect filterParser = RSQLFilterDialect.builder().dictionary(dictionary).build();
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("playerName", Sorting.SortOrder.asc);
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .whereFilter(filterParser.parseFilterExpression("countryNickName=='Uncle Sam'",
+                        ClassType.of(PlayerStats.class), false))
+                .havingFilter(filterParser.parseFilterExpression("highScore > 300",
+                        ClassType.of(PlayerStats.class), false))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .pagination(new ImmutablePagination(0, 2, false, true))
+                .build();
+        assertEquals("example_PlayerStats;" // table name
+                        + "{highScore;{}}" // columns
+                        + "{overallRating;{}}" // group by
+                        + "{recordedDate;{}}" // time dimensions
+                        + "{P;{{example.PlayerStats;java.lang.String;countryNickName;}}IN;9;Uncle Sam;}" // where
+                        + "{P;{{example.PlayerStats;long;highScore;}}GT;3;300;}" // having
+                        + "{example.PlayerStats;{{example.PlayerStats;java.lang.String;playerName;}}asc;}" // sort
+                        + "{0;2;1;}", // pagination
+                QueryKeyExtractor.extractKey(query));
+    }
+
+    @Test
+    public void testDuplicateFullQuery() throws Exception {
+        // Build 1st Table
+        NamespaceConfig testNamespace = NamespaceConfig.builder()
+                .name("namespace1")
+                .build();
+        NamespacePackage testNamespacePackage = new NamespacePackage(testNamespace);
+
+        Table testTable = Table.builder()
+                .cardinality("medium")
+                .description("A test table")
+                .friendlyName("foo")
+                .table("table1")
+                .name("Table")
+                .schema("db1")
+                .category("category1")
+                .readAccess("Admin")
+                .dbConnectionName("dbConn")
+                .isFact(true)
+                .filterTemplate("a==b")
+                .namespace("namespace1")
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .definition("{{dim1}}")
+                        .type(Type.BOOLEAN)
+                        .values(Collections.EMPTY_SET)
+                        .tags(Collections.EMPTY_SET)
+                        .build())
+                .build();
+        TableType testType = new TableType(testTable, testNamespacePackage);
+        dictionary.bindEntity(testType);
+
+        SQLTable testSqlTable = new SQLTable(new Namespace(testNamespacePackage) , testType, dictionary);
+
+        // Build 2nd Table
+        NamespaceConfig anotherTestNamespace = NamespaceConfig.builder()
+                .name("namespace2")
+                .build();
+        NamespacePackage anotherTestNamespacePackage = new NamespacePackage(anotherTestNamespace);
+
+        Table anotherTestTable = Table.builder() // Exactly same as testTable but different namespace
+                .cardinality("medium")
+                .description("A test table")
+                .friendlyName("foo")
+                .table("table1")
+                .name("Table")
+                .schema("db1")
+                .category("category1")
+                .readAccess("Admin")
+                .dbConnectionName("dbConn")
+                .isFact(true)
+                .filterTemplate("a==b")
+                .namespace("namespace2")
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .definition("{{dim1}}")
+                        .type(Type.BOOLEAN)
+                        .values(Collections.EMPTY_SET)
+                        .tags(Collections.EMPTY_SET)
+                        .build())
+                .build();
+        TableType anotherTestType = new TableType(anotherTestTable, anotherTestNamespacePackage);
+        dictionary.bindEntity(anotherTestType);
+
+        SQLTable anotherTestSqlTable = new SQLTable(new Namespace(anotherTestNamespacePackage) , anotherTestType, dictionary);
+
+        // Build Query and Test
+        Query query = Query.builder()
+                .source(testSqlTable)
+                .dimensionProjection(testSqlTable.getDimensionProjection("dim1"))
+                .pagination(new ImmutablePagination(0, 2, false, true))
+                .build();
+
+        assertEquals("namespace1_Table;" // table name
+                        + "{}" // metrics
+                        + "{dim1;{}}" // Group by
+                        + "{}" // time dimensions
+                        + ";" // where
+                        + ";" // having
+                        + ";" // sort
+                        + "{0;2;1;}", // pagination
+                QueryKeyExtractor.extractKey(query));
+
+        Query anotherQuery = Query.builder()
+                .source(anotherTestSqlTable)
+                .dimensionProjection(anotherTestSqlTable.getDimensionProjection("dim1"))
+                .pagination(new ImmutablePagination(0, 2, false, true))
+                .build();
+
+        assertEquals("namespace2_Table;" // table name
+                        + "{}" // metrics
+                        + "{dim1;{}}" // Group by
+                        + "{}" // time dimensions
+                        + ";" // where
+                        + ";" // having
+                        + ";" // sort
+                        + "{0;2;1;}", // pagination
+                QueryKeyExtractor.extractKey(anotherQuery));
+
+        assertNotEquals(QueryKeyExtractor.extractKey(anotherQuery), QueryKeyExtractor.extractKey(query));
+    }
+
+    @Test
+    public void testColumnsOrdered() {
+        assertNotEquals(
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .build()),
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                        .build()));
+    }
+
+    @Test
+    public void testGroupByDimensionsOrdered() {
+        assertEquals(
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                        .dimensionProjection(playerStatsTable.getDimensionProjection("countryNickName"))
+                        .build()),
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .dimensionProjection(playerStatsTable.getDimensionProjection("countryNickName"))
+                        .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                        .build()));
+    }
+
+    @Test
+    public void testTimeDimensionsOrdered() {
+        assertEquals(
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                        .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("updatedDate"))
+                        .build()),
+                QueryKeyExtractor.extractKey(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                        .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("updatedDate"))
+                        .build()));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/RedisCacheTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/RedisCacheTest.java
new file mode 100644
index 0000000000..6a5ba13a54
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/cache/RedisCacheTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.cache;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import redis.clients.jedis.JedisPooled;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.embedded.RedisServer;
+
+import java.io.IOException;
+import java.util.Collections;
+
+/**
+ * Test cases for RedisCache.
+ */
+public class RedisCacheTest {
+    private static final String HOST = "localhost";
+    private static final int PORT = 6379;
+    private static final int EXPIRATION_MINUTES = 2;
+    private JedisPooled jedisPool;
+    private RedisServer redisServer;
+    RedisCache cache;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        redisServer = new RedisServer(PORT);
+        redisServer.start();
+        jedisPool = new JedisPooled(HOST, PORT);
+        cache = new RedisCache(jedisPool, EXPIRATION_MINUTES);
+    }
+
+    @AfterEach
+    public void destroy() throws IOException {
+        redisServer.stop();
+    }
+
+    @Test
+    public void testGetNonExistent() {
+        String key = "example_NonExist;{highScore;{}}{}{};;;;";
+        assertEquals(null, cache.get(key));
+    }
+
+    @Test
+    public void testPutResults() {
+        String key = "example_PlayerStats;{highScore;{}}{}{};;;;";
+        Iterable<Object> data = Collections.singletonList("xyzzy");
+        QueryResult queryResult = QueryResult.builder().data(data).build();
+
+        cache.put(key, queryResult);
+
+        //retrive results and verify they match original.
+        assertEquals(queryResult, cache.get(key));
+        assertEquals("xyzzy", cache.get(key).getData().iterator().next());
+    }
+
+    // Redis server does not exist.
+    @Test
+    public void testPutResultsFail() throws IOException {
+        destroy();
+        String key = "example_PlayerStats;{highScore;{}}{}{};;;;";
+        Iterable<Object> data = Collections.singletonList("xyzzy");
+        QueryResult queryResult = QueryResult.builder().data(data).build();
+        assertThrows(JedisConnectionException.class, () ->
+                 cache.put(key, queryResult)
+        );
+    }
+
+    @Test
+    public void testGetResultsMulti() {
+        String key = "example_PlayerStats;{highScore;{}}{}{};;;;";
+        Iterable<Object> data = Collections.singletonList("xyzzy");
+        QueryResult queryResult = QueryResult.builder().data(data).build();
+
+        cache.put(key, queryResult);
+
+        //retrive results and verify they match original.
+        assertEquals(queryResult, cache.get(key));
+
+        //retrive results again and verify they match original.
+        assertEquals(queryResult, cache.get(key));
+
+        String key1 = "example_PlayerStats1;{highScore;{}}{}{};;;;";
+        Iterable<Object> data1 = Collections.singletonList("xyzz");
+        QueryResult queryResult1 = QueryResult.builder().data(data).build();
+
+        cache.put(key1, queryResult1);
+
+        //retrive results and verify they match original.
+        assertEquals(queryResult1, cache.get(key1));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/OperatorCheck.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/OperatorCheck.java
new file mode 100644
index 0000000000..b0dbb1536e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/OperatorCheck.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.checks;
+
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.security.checks.prefab.Role.RoleMemberCheck;
+
+@SecurityCheck(OperatorCheck.OPERTOR_CHECK)
+public class OperatorCheck extends RoleMemberCheck {
+
+    public static final String OPERTOR_CHECK = "operator";
+
+    public OperatorCheck() {
+        super("operator");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/VideoGameFilterCheck.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/VideoGameFilterCheck.java
new file mode 100644
index 0000000000..f9867a03e6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/checks/VideoGameFilterCheck.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.checks;
+
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.PostfixPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
+import example.VideoGame;
+
+/**
+ * Filter Expression Check for video game.
+ */
+@SecurityCheck(VideoGameFilterCheck.NAME_FILTER)
+public class VideoGameFilterCheck extends FilterExpressionCheck<VideoGame> {
+    public static final String NAME_FILTER = "player name filter";
+    @Override
+    public FilterExpression getFilterExpression(Type<?> entityClass, RequestScope requestScope) {
+        Path path = super.getFieldPath(entityClass, requestScope, "getPlayerName", "playerName");
+        return new PostfixPredicate(path, "Doe");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/JoinPathTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/JoinPathTest.java
new file mode 100644
index 0000000000..460f68176a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/JoinPathTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.PlayerStatsWithView;
+import example.dimensions.Country;
+import example.dimensions.CountryView;
+import example.dimensions.CountryViewNested;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class JoinPathTest {
+    private static MetaDataStore store;
+
+    @BeforeAll
+    public static void init() {
+
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(PlayerStats.class));
+        models.add(ClassType.of(CountryView.class));
+        models.add(ClassType.of(Country.class));
+        models.add(ClassType.of(SubCountry.class));
+        models.add(ClassType.of(Player.class));
+        models.add(ClassType.of(PlayerRanking.class));
+        models.add(ClassType.of(CountryViewNested.class));
+        models.add(ClassType.of(PlayerStatsWithView.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        store = new MetaDataStore(dictionary.getScanner(), models, true);
+        store.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(store, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+    }
+
+    @Test
+    public void testExtendPath() {
+        JoinPath joinPath = new JoinPath(ClassType.of(PlayerStatsWithView.class), store, "countryView");
+
+        JoinPath extended = new JoinPath(ClassType.of(PlayerStatsWithView.class), store, "countryView.nestedView");
+
+        assertEquals(extended, joinPath.extend("countryView.nestedView"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLoggerTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLoggerTest.java
new file mode 100644
index 0000000000..408fa33b62
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/core/Slf4jQueryLoggerTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.core;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+public class Slf4jQueryLoggerTest {
+
+    @Test
+    void testAccept() {
+        Slf4jQueryLogger.Logger logger = (template, node) -> {
+            assertEquals("QUERY ACCEPTED: {}", template);
+            assertEquals("{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828d\",\"user\":\"Unknown\",\"apiVersion\":\"1.0\",\"path\":\"/sales\",\"headers\":{\"Content-Type\":\"application/vnd.api+json\"}}", node.toString());
+        };
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", "application/vnd.api+json");
+
+        Slf4jQueryLogger slf4jQueryLogger = new Slf4jQueryLogger(logger);
+        slf4jQueryLogger.acceptQuery(
+                UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"),
+                new User(null),
+                headers,
+                "1.0",
+                new MultivaluedHashMap<>(),
+                "/sales");
+    }
+
+    @Test
+    void testProcess() {
+        Slf4jQueryLogger.Logger logger = (template, node) -> {
+            assertEquals("QUERY RUNNING: {}", template);
+            assertEquals("{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828d\",\"queries\":[\"foo\",\"bar\"],\"isCached\":true}", node.toString());
+        };
+
+        Slf4jQueryLogger slf4jQueryLogger = new Slf4jQueryLogger(logger);
+        slf4jQueryLogger.processQuery(
+                UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"),
+                Query.builder()
+                        .source(mock(Queryable.class))
+                        .build(),
+                Arrays.asList("foo", "bar"),
+                true);
+    }
+
+    @Test
+    void testComplete() {
+        Slf4jQueryLogger.Logger logger = (template, node) -> {
+            assertEquals("QUERY COMPLETE: {}", template);
+            assertEquals("{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828d\",\"status\":200,\"error\":\"ok\"}", node.toString());
+        };
+
+        Slf4jQueryLogger slf4jQueryLogger = new Slf4jQueryLogger(logger);
+        slf4jQueryLogger.completeQuery(
+                UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"),
+                new QueryResponse(200, null, "ok"));
+    }
+
+    @Test
+    void testCancel() {
+        Slf4jQueryLogger.Logger logger = (template, node) -> {
+            assertEquals("QUERY CANCELED: {}", template);
+            assertEquals("{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828d\"}", node.toString());
+        };
+
+        Slf4jQueryLogger slf4jQueryLogger = new Slf4jQueryLogger(logger);
+        slf4jQueryLogger.cancelQuery(UUID.fromString("edc4a871-dff2-4054-804e-d80075cf828d"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriod.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriod.java
new file mode 100644
index 0000000000..c2298c29ea
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriod.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.custom;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlan;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLTimeDimensionProjection;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Custom metric projection for daily average score per time period.
+ */
+public class DailyAverageScorePerPeriod extends SQLMetricProjection {
+
+    public DailyAverageScorePerPeriod(Metric metric,
+                                      String alias,
+                                      Map<String, Argument> arguments) {
+        super(metric.getName(), metric.getValueType(), metric.getColumnType(), metric.getExpression(),
+                alias, arguments, true);
+    }
+
+    public DailyAverageScorePerPeriod(SQLMetricProjection projection, String expression) {
+        super(projection.getName(), projection.getValueType(), projection.getColumnType(), expression,
+                        projection.getAlias(), projection.getArguments(), true);
+    }
+
+    @Override
+    public QueryPlan resolve(Query query) {
+        SQLTable table = (SQLTable) query.getSource();
+
+        MetricProjection innerMetric = table.getMetricProjection("highScore");
+        TimeDimension innerTimeGrain = table.getTimeDimension("recordedDate");
+        Map<String, Argument> arguments = new HashMap<>();
+        arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        QueryPlan innerQuery = QueryPlan.builder()
+                .source(query.getSource())
+                .metricProjection(innerMetric)
+                .timeDimensionProjection(new SQLTimeDimensionProjection(
+                        innerTimeGrain,
+                        innerTimeGrain.getTimezone(),
+                        "recordedDate_DAY",
+                        arguments, true
+                )).build();
+
+        QueryPlan outerQuery = QueryPlan.builder()
+                .source(innerQuery)
+                .metricProjection(new DailyAverageScorePerPeriod(this, "AVG({{$highScore}})"))
+                .build();
+
+        return outerQuery;
+    }
+
+    // TODO: Remove this when switching to TableContext
+    // Resolved Reference would be empty if value is not provided in @MetricFormula as value is optional.
+    // Once we change this to use TableContext, then it should be able to resolve expression directly.
+    @Override
+    public boolean canNest(Queryable source, MetaDataStore metaDataStore) {
+        return true;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriodMaker.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriodMaker.java
new file mode 100644
index 0000000000..eabc2dfe06
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/custom/DailyAverageScorePerPeriodMaker.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.custom;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+
+import java.util.Map;
+
+/**
+ * Factory method for custom metric DailyAverageScorePerPeriod.
+ */
+public class DailyAverageScorePerPeriodMaker implements MetricProjectionMaker {
+    @Override
+    public MetricProjection make(Metric metric, String alias, Map<String, Argument> arguments) {
+        return new DailyAverageScorePerPeriod(metric, alias, arguments);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackageTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackageTest.java
new file mode 100644
index 0000000000..0b4a818739
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/NamespacePackageTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import com.yahoo.elide.annotation.ApiVersion;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import org.junit.jupiter.api.Test;
+
+public class NamespacePackageTest {
+
+    @Test
+    void testAnnotations() throws Exception {
+        NamespaceConfig testNamespace = NamespaceConfig.builder()
+                .description("A test Namespace")
+                .name("Test")
+                .build();
+
+        NamespacePackage namespace = new NamespacePackage(testNamespace);
+
+        ReadPermission readPermission = namespace.getDeclaredAnnotation(ReadPermission.class);
+        assertEquals("Prefab.Role.All", readPermission.expression());
+
+        Include meta = namespace.getDeclaredAnnotation(Include.class);
+        assertEquals("A test Namespace", meta.description());
+        assertNull(meta.friendlyName());
+
+        ApiVersion apiVersion = namespace.getDeclaredAnnotation(ApiVersion.class);
+        assertEquals("", apiVersion.version());
+    }
+
+    @Test
+    void testGet() throws Exception {
+        NamespaceConfig testNamespace = NamespaceConfig.builder()
+                .description("A test Namespace")
+                .name("Test")
+                .build();
+
+        NamespacePackage namespace = new NamespacePackage(testNamespace);
+        assertEquals("Test", namespace.getName());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/TableTypeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/TableTypeTest.java
new file mode 100644
index 0000000000..d140177e78
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/TableTypeTest.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.dynamic;
+
+import static com.yahoo.elide.datastores.aggregation.annotation.JoinType.INNER;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.query.DefaultMetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.Grain;
+import com.yahoo.elide.modelconfig.model.Join;
+import com.yahoo.elide.modelconfig.model.Measure;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.TableSource;
+import com.yahoo.elide.modelconfig.model.Type;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+
+public class TableTypeTest {
+
+    @Test
+    void testGetAndSetField() throws Exception {
+        Table testTable = Table.builder()
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .type(Type.BOOLEAN)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+        DynamicModelInstance testTypeInstance = testType.newInstance();
+
+        Field field = testType.getDeclaredField("dim1");
+        field.set(testTypeInstance, true);
+        assertTrue((Boolean) field.get(testTypeInstance));
+        field.set(testTypeInstance, false);
+        assertFalse((Boolean) field.get(testTypeInstance));
+    }
+
+    @Test
+    void testTableAnnotations() throws Exception {
+        Set<String> tags = new HashSet<>(Arrays.asList("tag1", "tag2"));
+        Set<String> hints = new HashSet<>(Arrays.asList("hint1", "hint2"));
+
+        Table testTable = Table.builder()
+                .cardinality("medium")
+                .description("A test table")
+                .friendlyName("foo")
+                .table("table1")
+                .name("Table")
+                .schema("db1")
+                .category("category1")
+                .readAccess("Admin")
+                .dbConnectionName("dbConn")
+                .isFact(true)
+                .filterTemplate("a==b")
+                .tags(tags)
+                .hints(hints)
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Include include = (Include) testType.getAnnotation(Include.class);
+        assertEquals("Table", include.name());
+
+        FromTable fromTable = (FromTable) testType.getAnnotation(FromTable.class);
+        assertEquals("db1.table1", fromTable.name());
+        assertEquals("dbConn", fromTable.dbConnectionName());
+
+        TableMeta tableMeta = (TableMeta) testType.getAnnotation(TableMeta.class);
+        assertEquals("foo", tableMeta.friendlyName());
+        assertEquals(CardinalitySize.MEDIUM, tableMeta.size());
+        assertEquals("A test table", tableMeta.description());
+        assertEquals("category1", tableMeta.category());
+        assertTrue(tableMeta.isFact());
+        assertEquals(tags, new HashSet<>(Arrays.asList(tableMeta.tags())));
+        assertEquals(hints, new HashSet<>(Arrays.asList(tableMeta.hints())));
+        assertEquals("a==b", tableMeta.filterTemplate());
+
+        ReadPermission readPermission = (ReadPermission) testType.getAnnotation(ReadPermission.class);
+        assertEquals("Admin", readPermission.expression());
+    }
+
+    @Test
+    void testHiddenTableAnnotations() throws Exception {
+        Table testTable = Table.builder()
+                .cardinality("medium")
+                .description("A test table")
+                .friendlyName("foo")
+                .table("table1")
+                .name("Table")
+                .hidden(true)
+                .schema("db1")
+                .category("category1")
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Include include = (Include) testType.getAnnotation(Include.class);
+        assertNotNull(include);
+
+        TableMeta tableMeta = (TableMeta) testType.getAnnotation(TableMeta.class);
+        assertNotNull(tableMeta);
+        assertTrue(tableMeta.isHidden());
+    }
+
+    @Test
+    void testTableNameWithoutSchema() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        FromTable fromTable = (FromTable) testType.getAnnotation(FromTable.class);
+        assertEquals("table1", fromTable.name());
+    }
+
+    @Test
+    void testTableSQL() throws Exception {
+        Table testTable = Table.builder()
+                .sql("SELECT * FROM FOO")
+                .name("Table")
+                .dbConnectionName("dbConn")
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        FromSubquery fromSubquery = (FromSubquery) testType.getAnnotation(FromSubquery.class);
+        assertEquals("SELECT * FROM FOO", fromSubquery.sql());
+        assertEquals("dbConn", fromSubquery.dbConnectionName());
+    }
+
+    @Test
+    void testIdField() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        assertTrue(testType.getFields().length == 1);
+        Field field = testType.getDeclaredField("id");
+
+        assertNotNull(field);
+        Id id = field.getAnnotation(Id.class);
+        assertNotNull(id);
+    }
+
+    @Test
+    void testMeasureAnnotations() throws Exception {
+        Set<String> tags = new HashSet<>(Arrays.asList("tag1", "tag2"));
+
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .measure(Measure.builder()
+                        .type(Type.MONEY)
+                        .category("category1")
+                        .definition("SUM{{  price}}")
+                        .hidden(false)
+                        .friendlyName("Price")
+                        .name("price")
+                        .readAccess("Admin")
+                        .description("A measure")
+                        .tags(tags)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("price");
+        assertNotNull(field);
+
+        ReadPermission readPermission = field.getAnnotation(ReadPermission.class);
+        assertEquals("Admin", readPermission.expression());
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertEquals("A measure", columnMeta.description());
+        assertEquals("category1", columnMeta.category());
+        assertEquals("Price", columnMeta.friendlyName());
+        assertEquals(CardinalitySize.UNKNOWN, columnMeta.size());
+        assertEquals(tags, new HashSet<>(Arrays.asList(columnMeta.tags())));
+
+        MetricFormula metricFormula = field.getAnnotation(MetricFormula.class);
+        assertEquals("SUM{{price}}", metricFormula.value());
+        assertEquals(DefaultMetricProjectionMaker.class, metricFormula.maker());
+    }
+
+    @Test
+    void testDimensionAnnotations() throws Exception {
+        Set<String> tags = new HashSet<>(Arrays.asList("tag1", "tag2"));
+
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .type(Type.TEXT)
+                        .category("category1")
+                        .definition("{{region}}")
+                        .hidden(false)
+                        .friendlyName("Region")
+                        .name("region")
+                        .readAccess("Admin")
+                        .description("A dimension")
+                        .tags(tags)
+                        .cardinality("small")
+                        .tableSource(TableSource.builder()
+                                .table("region")
+                                .column("id")
+                                .build())
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("region");
+        assertNotNull(field);
+
+        ReadPermission readPermission = field.getAnnotation(ReadPermission.class);
+        assertEquals("Admin", readPermission.expression());
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertEquals("A dimension", columnMeta.description());
+        assertEquals("category1", columnMeta.category());
+        assertEquals("Region", columnMeta.friendlyName());
+        assertEquals(CardinalitySize.SMALL, columnMeta.size());
+        assertEquals(tags, new HashSet<>(Arrays.asList(columnMeta.tags())));
+
+        DimensionFormula dimensionFormula = field.getAnnotation(DimensionFormula.class);
+        assertEquals("{{region}}", dimensionFormula.value());
+    }
+
+    @Test
+    void testDimensionTableValues() throws Exception {
+        Set<String> values = new HashSet<>(Arrays.asList("DIM1", "DIM2"));
+
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .type(Type.COORDINATE)
+                        .name("location")
+                        .values(values)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("location");
+        assertNotNull(field);
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertEquals(values, new HashSet<>(Arrays.asList(columnMeta.values())));
+    }
+
+    @Test
+    void testTimeDimensionAnnotations() throws Exception {
+        Set<String> tags = new HashSet<>(Arrays.asList("tag1", "tag2"));
+
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .type(Type.TIME)
+                        .category("category1")
+                        .definition("{{createdOn  }}")
+                        .hidden(false)
+                        .friendlyName("Created On")
+                        .name("createdOn")
+                        .readAccess("Admin")
+                        .description("A time dimension")
+                        .tags(tags)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("createdOn");
+        assertNotNull(field);
+
+        ReadPermission readPermission = field.getAnnotation(ReadPermission.class);
+        assertEquals("Admin", readPermission.expression());
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertEquals("A time dimension", columnMeta.description());
+        assertEquals("category1", columnMeta.category());
+        assertEquals("Created On", columnMeta.friendlyName());
+        assertEquals(CardinalitySize.UNKNOWN, columnMeta.size());
+        assertEquals(tags, new HashSet<>(Arrays.asList(columnMeta.tags())));
+
+        DimensionFormula dimensionFormula = field.getAnnotation(DimensionFormula.class);
+        assertEquals("{{createdOn}}", dimensionFormula.value());
+
+        Temporal temporal = field.getAnnotation(Temporal.class);
+        assertEquals("UTC", temporal.timeZone());
+        assertTrue(temporal.grains().length == 0);
+    }
+
+    @Test
+    void testMultipleTimeDimensionGrains() throws Exception {
+
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .type(Type.TIME)
+                        .definition("{{createdOn}}")
+                        .name("createdOn")
+                        .grain(Grain.builder()
+                                .sql("some sql")
+                                .type(Grain.GrainType.DAY)
+                                .build())
+                        .grain(Grain.builder()
+                                .sql("some other sql")
+                                .type(Grain.GrainType.YEAR)
+                                .build())
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("createdOn");
+        assertNotNull(field);
+
+        Temporal temporal = field.getAnnotation(Temporal.class);
+        assertEquals("UTC", temporal.timeZone());
+        assertTrue(temporal.grains().length == 2);
+        assertEquals("some sql", temporal.grains()[0].expression());
+        assertEquals("some other sql", temporal.grains()[1].expression());
+        assertEquals(TimeGrain.DAY, temporal.grains()[0].grain());
+        assertEquals(TimeGrain.YEAR, temporal.grains()[1].grain());
+    }
+
+    @Test
+    void testJoinField() throws Exception {
+        Table testTable1 = Table.builder()
+                .name("table1")
+                .join(Join.builder()
+                        .definition("{{id }} = {{ table2.id}}")
+                        .kind(Join.Kind.TOONE)
+                        .type(Join.Type.INNER)
+                        .name("join1")
+                        .to("table2.dim2")
+                        .build())
+                .build();
+
+        Table testTable2 = Table.builder()
+                .name("table2")
+                .dimension(Dimension.builder()
+                        .name("dim2")
+                        .type(Type.BOOLEAN)
+                        .build())
+                .build();
+
+        TableType testType1 = new TableType(testTable1);
+        TableType testType2 = new TableType(testTable2);
+
+        Map<String, com.yahoo.elide.core.type.Type<?>> tables = new HashMap<>();
+        tables.put("table1", testType1);
+        tables.put("table2", testType2);
+
+        testType1.resolveJoins(tables);
+
+        Field field = testType1.getDeclaredField("join1");
+        assertNotNull(field);
+
+        com.yahoo.elide.datastores.aggregation.annotation.Join join = field.getAnnotation(
+                com.yahoo.elide.datastores.aggregation.annotation.Join.class);
+
+        assertEquals(INNER, join.type());
+        assertEquals("{{id}} = {{table2.id}}", join.value());
+    }
+
+    @Test
+    void testHiddenDimension() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .type(Type.BOOLEAN)
+                        .hidden(true)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("dim1");
+        assertNotNull(field);
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertNotNull(columnMeta);
+        assertTrue(columnMeta.isHidden());
+    }
+
+    @Test
+    void testHiddenMeasure() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .measure(Measure.builder()
+                        .name("measure1")
+                        .type(Type.BOOLEAN)
+                        .hidden(true)
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("measure1");
+        assertNotNull(field);
+
+        ColumnMeta columnMeta = field.getAnnotation(ColumnMeta.class);
+        assertNotNull(columnMeta);
+        assertTrue(columnMeta.isHidden());
+    }
+
+    @Test
+    void testInvalidResolver() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .measure(Measure.builder()
+                        .name("measure1")
+                        .type(Type.BOOLEAN)
+                        .maker("does.not.exist.class")
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+        Field field = testType.getDeclaredField("measure1");
+
+        MetricFormula metricFormula = field.getAnnotation(MetricFormula.class);
+
+        assertThrows(IllegalStateException.class, () -> metricFormula.maker());
+    }
+
+    @Test
+    void testEnumeratedDimension() throws Exception {
+        Table testTable = Table.builder()
+                .table("table1")
+                .name("Table")
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .type("ENUM_ORDINAL")
+                        .values(Set.of("A", "B", "C"))
+                        .build())
+                .build();
+
+        TableType testType = new TableType(testTable);
+
+        Field field = testType.getDeclaredField("dim1");
+        assertNotNull(field);
+
+        Enumerated enumerated = field.getAnnotation(Enumerated.class);
+        assertNotNull(enumerated);
+        assertEquals(EnumType.ORDINAL, enumerated.value());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraintsTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraintsTest.java
new file mode 100644
index 0000000000..473e2e2a1b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/FilterConstraintsTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import example.PlayerStats;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+public class FilterConstraintsTest {
+
+    private static final FilterPredicate WHERE_PREDICATE = new FilterPredicate(
+            new Path.PathElement(PlayerStats.class, String.class, "id"),
+            Operator.IN,
+            Collections.singletonList("foo")
+    );
+    private static final FilterPredicate HAVING_PREDICATE = new FilterPredicate(
+            new Path.PathElement(PlayerStats.class, long.class, "highScore"),
+            Operator.GT,
+            Collections.singletonList(99)
+    );
+
+    @Test
+    public void testPureHaving() {
+        assertTrue(FilterConstraints.pureHaving(HAVING_PREDICATE).isPureHaving());
+        assertFalse(FilterConstraints.pureHaving(HAVING_PREDICATE).isPureWhere());
+        assertEquals(
+                "playerStats.highScore GT [99]",
+                FilterConstraints.pureHaving(HAVING_PREDICATE).getHavingExpression().toString()
+        );
+        assertNull(FilterConstraints.pureHaving(HAVING_PREDICATE).getWhereExpression());
+    }
+
+    @Test
+    public void testPureWhere() {
+        assertTrue(FilterConstraints.pureWhere(WHERE_PREDICATE).isPureWhere());
+        assertFalse(FilterConstraints.pureWhere(WHERE_PREDICATE).isPureHaving());
+        assertEquals(
+                "playerStats.id IN [foo]",
+                FilterConstraints.pureWhere(WHERE_PREDICATE).getWhereExpression().toString()
+        );
+        assertNull(FilterConstraints.pureWhere(WHERE_PREDICATE).getHavingExpression());
+    }
+
+    @Test
+    public void testWithWhereAndHaving() {
+        assertFalse(FilterConstraints.withWhereAndHaving(WHERE_PREDICATE, HAVING_PREDICATE).isPureWhere());
+        assertFalse(FilterConstraints.withWhereAndHaving(WHERE_PREDICATE, HAVING_PREDICATE).isPureHaving());
+        assertEquals(
+                "playerStats.id IN [foo]",
+                FilterConstraints.withWhereAndHaving(WHERE_PREDICATE, HAVING_PREDICATE).getWhereExpression().toString()
+        );
+        assertEquals(
+                "playerStats.highScore GT [99]",
+                FilterConstraints.withWhereAndHaving(WHERE_PREDICATE, HAVING_PREDICATE).getHavingExpression().toString()
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitorTest.java
new file mode 100644
index 0000000000..b39d8da82b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/MatchesTemplateVisitorTest.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import example.Player;
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class MatchesTemplateVisitorTest {
+    private RSQLFilterDialect dialect;
+    private Type<?> playerStatsType = ClassType.of(PlayerStats.class);
+
+    @BeforeEach
+    public void setup() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(PlayerStats.class);
+        dictionary.bindEntity(Player.class);
+
+        dictionary.addArgumentToAttribute(
+                dictionary.getEntityClass("playerStats", EntityDictionary.NO_VERSION),
+                "recordedDate",
+                new ArgumentType("grain", ClassType.STRING_TYPE, TimeGrain.DAY));
+
+        dialect = RSQLFilterDialect.builder().dictionary(dictionary).addDefaultArguments(false).build();
+    }
+
+    @Test
+    public void predicateMatchTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{foo}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("foo")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("foo"), expected);
+    }
+
+    @Test
+    public void predicateWithAliasMatchesTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("highScore==123",
+                playerStatsType, true);
+
+        Attribute attribute = Attribute.builder()
+                .type(ClassType.of(Long.class))
+                .name("highScore")
+                .alias("myScore")
+                .build();
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("myScore=={{foo}}",
+                playerStatsType, false, true, Set.of(attribute));
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("foo")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("foo"), expected);
+    }
+
+    @Test
+    public void predicateMatchWithoutTemplateTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore==123",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void conjunctionContainsTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100;highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("variable")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("variable"), expected);
+    }
+
+    @Test
+    public void conjunctionMatchesTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100;highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("lowScore>100;highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("variable")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("variable"), expected);
+    }
+
+    @Test
+    public void mulipleConjunctionOrderTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100;(highScore>=100;highScore<999)",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore>={{low}};highScore<{{high}}",
+                playerStatsType, false, true);
+
+        Argument expected1 = Argument.builder()
+                .name("low")
+                .value(100L)
+                .build();
+
+        Argument expected2 = Argument.builder()
+                .name("high")
+                .value(999L)
+                .build();
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(2, extractedArgs.size());
+        assertEquals(extractedArgs.get("low"), expected1);
+        assertEquals(extractedArgs.get("high"), expected2);
+    }
+
+    @Test
+    public void conjunctionDoesNotContainTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100;player.name==Bob*",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void parameterizedFilterArgumentsDoNotMatch() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("recordedDate[grain:day]=='2020-01-01'",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("recordedDate[grain:month]=={{day}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void parameterizedFilterArgumentsIgnored() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("recordedDate[grain:day]=='2020-01-01'",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("recordedDate=={{day}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(1, extractedArgs.size());
+    }
+
+    @Test
+    public void parameterizedFilterMatches() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("recordedDate[grain:day]=='2020-01-01'",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("recordedDate[grain:day]=={{day}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(1, extractedArgs.size());
+    }
+
+    @Test
+    public void disjunctionContainsTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100,highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void disjunctionMatchesTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100,highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("lowScore>100,highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("variable")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("variable"), expected);
+    }
+
+    @Test
+    public void disjunctionDoesNotContainTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("lowScore>100,player.name==Bob*",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void predicateMismatchTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("highScore!=123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void predicateMismatchWithoutTemplateTest() throws Exception {
+        FilterExpression clientExpression = dialect.parseFilterExpression("highScore==123",
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore==456",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        assertFalse(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+        assertEquals(0, extractedArgs.size());
+    }
+
+    @Test
+    public void complexExpressionTest() throws Exception {
+        String complexExpression = "(lowScore>100;((player.name==Bob*,lowScore>100);(highScore==123)))";
+        FilterExpression clientExpression = dialect.parseFilterExpression(complexExpression,
+                playerStatsType, true);
+
+        FilterExpression templateExpression = dialect.parseFilterExpression("highScore=={{variable}}",
+                playerStatsType, false, true);
+
+        Map<String, Argument> extractedArgs = new HashMap<>();
+        Argument expected = Argument.builder()
+                .name("variable")
+                .value(123L)
+                .build();
+
+        assertTrue(MatchesTemplateVisitor.isValid(templateExpression, clientExpression, extractedArgs));
+
+        assertEquals(1, extractedArgs.size());
+        assertEquals(extractedArgs.get("variable"), expected);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitorTest.java
new file mode 100644
index 0000000000..b034ecf65d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/filter/visitor/SplitFilterExpressionVisitorTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.filter.visitor;
+
+import static com.yahoo.elide.datastores.aggregation.dynamic.NamespacePackage.DEFAULT_NAMESPACE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.Player;
+import example.PlayerStats;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+public class SplitFilterExpressionVisitorTest {
+
+    private static final FilterPredicate WHERE_PREDICATE = new FilterPredicate(
+            new Path.PathElement(PlayerStats.class, String.class, "overallRating"),
+            Operator.IN,
+            Collections.singletonList("foo")
+    );
+    private static final FilterPredicate HAVING_PREDICATE = new FilterPredicate(
+            new Path.PathElement(PlayerStats.class, long.class, "highScore"),
+            Operator.GT,
+            Collections.singletonList(99)
+    );
+
+    private static FilterExpressionVisitor<FilterConstraints> splitFilterExpressionVisitor;
+
+    @BeforeAll
+    public static void setupEntityDictionary() {
+        EntityDictionary entityDictionary = EntityDictionary.builder().build();
+        entityDictionary.bindEntity(PlayerStats.class);
+        entityDictionary.bindEntity(Country.class);
+        entityDictionary.bindEntity(SubCountry.class);
+        entityDictionary.bindEntity(Player.class);
+
+        Namespace namespace = new Namespace(DEFAULT_NAMESPACE);
+        Table table = new SQLTable(namespace, ClassType.of(PlayerStats.class), entityDictionary);
+        splitFilterExpressionVisitor = new SplitFilterExpressionVisitor(table);
+    }
+
+    @Test
+    public void testVisitPredicate() {
+        // predicate should be a WHERE
+        assertTrue(splitFilterExpressionVisitor.visitPredicate(WHERE_PREDICATE).isPureWhere());
+        assertEquals(
+                "playerStats.overallRating IN [foo]",
+                splitFilterExpressionVisitor.visitPredicate(WHERE_PREDICATE).getWhereExpression().toString()
+        );
+        assertFalse(splitFilterExpressionVisitor.visitPredicate(WHERE_PREDICATE).isPureHaving());
+        assertNull(splitFilterExpressionVisitor.visitPredicate(WHERE_PREDICATE).getHavingExpression());
+
+        // predicate should be a HAVING
+        assertTrue(splitFilterExpressionVisitor.visitPredicate(HAVING_PREDICATE).isPureHaving());
+        assertEquals(
+                "playerStats.highScore GT [99]",
+                splitFilterExpressionVisitor.visitPredicate(HAVING_PREDICATE).getHavingExpression().toString()
+        );
+        assertFalse(splitFilterExpressionVisitor.visitPredicate(HAVING_PREDICATE).isPureWhere());
+        assertNull(splitFilterExpressionVisitor.visitPredicate(HAVING_PREDICATE).getWhereExpression());
+    }
+
+    @Test
+    public void testVisitAndExpression() {
+        // pure-W AND pure-W
+        AndFilterExpression filterExpression = new AndFilterExpression(WHERE_PREDICATE, WHERE_PREDICATE);
+        assertEquals(
+                "(playerStats.overallRating IN [foo] AND playerStats.overallRating IN [foo])",
+                splitFilterExpressionVisitor.visitAndExpression(filterExpression).getWhereExpression().toString()
+        );
+        assertNull(splitFilterExpressionVisitor.visitAndExpression(filterExpression).getHavingExpression());
+
+        // pure-H AND pure-W
+        filterExpression = new AndFilterExpression(HAVING_PREDICATE, WHERE_PREDICATE);
+        assertEquals(
+                "playerStats.overallRating IN [foo]",
+                splitFilterExpressionVisitor.visitAndExpression(filterExpression).getWhereExpression().toString()
+        );
+        assertEquals(
+                "playerStats.highScore GT [99]",
+                splitFilterExpressionVisitor.visitAndExpression(filterExpression).getHavingExpression().toString()
+        );
+
+        // pure-W AND pure-H
+        filterExpression = new AndFilterExpression(WHERE_PREDICATE, HAVING_PREDICATE);
+        assertEquals(
+                "playerStats.overallRating IN [foo]",
+                splitFilterExpressionVisitor.visitAndExpression(filterExpression).getWhereExpression().toString()
+        );
+        assertEquals(
+                "playerStats.highScore GT [99]",
+                splitFilterExpressionVisitor.visitAndExpression(filterExpression).getHavingExpression().toString()
+        );
+
+        // non-pure case - H1 AND W1 AND H2
+        AndFilterExpression and1 = new AndFilterExpression(HAVING_PREDICATE, WHERE_PREDICATE);
+        AndFilterExpression and2 = new AndFilterExpression(and1, HAVING_PREDICATE);
+        assertEquals(
+                "playerStats.overallRating IN [foo]",
+                splitFilterExpressionVisitor.visitAndExpression(and2).getWhereExpression().toString()
+        );
+        assertEquals(
+                "(playerStats.highScore GT [99] AND playerStats.highScore GT [99])",
+                splitFilterExpressionVisitor.visitAndExpression(and2).getHavingExpression().toString()
+        );
+
+        // non-pure case - (H1 OR H2) AND W1
+        OrFilterExpression or = new OrFilterExpression(HAVING_PREDICATE, HAVING_PREDICATE);
+        AndFilterExpression and = new AndFilterExpression(or, WHERE_PREDICATE);
+        assertEquals(
+                "playerStats.overallRating IN [foo]",
+                splitFilterExpressionVisitor.visitAndExpression(and).getWhereExpression().toString()
+        );
+        assertEquals(
+                "(playerStats.highScore GT [99] OR playerStats.highScore GT [99])",
+                splitFilterExpressionVisitor.visitAndExpression(and).getHavingExpression().toString()
+        );
+    }
+
+    @Test
+    public void testVisitOrExpression() {
+        // pure-W OR pure-W
+        OrFilterExpression filterExpression = new OrFilterExpression(WHERE_PREDICATE, WHERE_PREDICATE);
+        assertEquals(
+                "(playerStats.overallRating IN [foo] OR playerStats.overallRating IN [foo])",
+                splitFilterExpressionVisitor.visitOrExpression(filterExpression).getWhereExpression().toString()
+        );
+        assertNull(splitFilterExpressionVisitor.visitOrExpression(filterExpression).getHavingExpression());
+
+        // H1 OR W1
+        OrFilterExpression or = new OrFilterExpression(HAVING_PREDICATE, WHERE_PREDICATE);
+        assertNull(splitFilterExpressionVisitor.visitOrExpression(or).getWhereExpression());
+        assertEquals(
+                "(playerStats.highScore GT [99] OR playerStats.overallRating IN [foo])",
+                splitFilterExpressionVisitor.visitOrExpression(or).getHavingExpression().toString()
+        );
+
+        // (W1 AND H1) OR W2
+        AndFilterExpression and = new AndFilterExpression(WHERE_PREDICATE, HAVING_PREDICATE);
+        or = new OrFilterExpression(and, WHERE_PREDICATE);
+        assertNull(splitFilterExpressionVisitor.visitOrExpression(or).getWhereExpression());
+        assertEquals(
+                "((playerStats.overallRating IN [foo] AND playerStats.highScore GT [99]) OR playerStats.overallRating IN [foo])",
+                splitFilterExpressionVisitor.visitOrExpression(or).getHavingExpression().toString()
+        );
+    }
+
+    @Test
+    public void testVisitNotExpression() {
+        NotFilterExpression notExpression = new NotFilterExpression(
+                new AndFilterExpression(WHERE_PREDICATE, HAVING_PREDICATE)
+        );
+        assertNull(splitFilterExpressionVisitor.visitNotExpression(notExpression).getWhereExpression());
+        assertEquals(
+                "(playerStats.overallRating NOT [foo] OR playerStats.highScore LE [99])",
+                splitFilterExpressionVisitor.visitNotExpression(notExpression).getHavingExpression().toString()
+        );
+
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/AggregationDataStoreTestHarness.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/AggregationDataStoreTestHarness.java
new file mode 100644
index 0000000000..4e5fbb4f1b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/AggregationDataStoreTestHarness.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.framework;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.core.Slf4jQueryLogger;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.AggregateBeforeJoinOptimizer;
+import com.yahoo.elide.datastores.jpa.JpaDataStore;
+import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
+import com.yahoo.elide.datastores.multiplex.MultiplexManager;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import org.hibernate.Session;
+import lombok.AllArgsConstructor;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.function.Consumer;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+@AllArgsConstructor
+public class AggregationDataStoreTestHarness implements DataStoreTestHarness {
+    private EntityManagerFactory entityManagerFactory;
+    private ConnectionDetails defaultConnectionDetails;
+    private Map<String, ConnectionDetails> connectionDetailsMap;
+    private DynamicConfigValidator validator;
+
+    public AggregationDataStoreTestHarness(EntityManagerFactory entityManagerFactory, DataSource defaultDataSource) {
+        this(entityManagerFactory, new ConnectionDetails(defaultDataSource, SQLDialectFactory.getDefaultDialect()));
+    }
+
+    public AggregationDataStoreTestHarness(EntityManagerFactory entityManagerFactory,
+                    ConnectionDetails defaultConnectionDetails) {
+        this(entityManagerFactory, defaultConnectionDetails, Collections.emptyMap(), null);
+    }
+
+    @Override
+    public DataStore getDataStore() {
+
+        AggregationDataStore.AggregationDataStoreBuilder aggregationDataStoreBuilder = AggregationDataStore.builder();
+
+        ClassScanner scanner = DefaultClassScanner.getInstance();
+
+        MetaDataStore metaDataStore;
+        if (validator != null) {
+           metaDataStore = new MetaDataStore(scanner,
+                   validator.getElideTableConfig().getTables(),
+                   validator.getElideNamespaceConfig().getNamespaceconfigs(), true);
+
+           aggregationDataStoreBuilder.dynamicCompiledClasses(metaDataStore.getDynamicTypes());
+        } else {
+            metaDataStore = new MetaDataStore(scanner, true);
+        }
+
+        AggregationDataStore aggregationDataStore = aggregationDataStoreBuilder
+                .queryEngine(new SQLQueryEngine(metaDataStore,
+                        (name) -> connectionDetailsMap.getOrDefault(name, defaultConnectionDetails),
+                        new HashSet<>(Arrays.asList(new AggregateBeforeJoinOptimizer(metaDataStore))),
+                        new DefaultQueryPlanMerger(metaDataStore),
+                        new DefaultQueryValidator(metaDataStore.getMetadataDictionary())))
+                .queryLogger(new Slf4jQueryLogger())
+                .build();
+
+        Consumer<EntityManager> txCancel = em -> em.unwrap(Session.class).cancelQuery();
+
+        DataStore jpaStore = new JpaDataStore(
+                () -> entityManagerFactory.createEntityManager(),
+                em -> new NonJtaTransaction(em, txCancel)
+        );
+
+        return new MultiplexManager(jpaStore, metaDataStore, aggregationDataStore);
+    }
+
+    @Override
+    public void cleanseTestData() {
+
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/SQLUnitTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/SQLUnitTest.java
new file mode 100644
index 0000000000..ac46713375
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/framework/SQLUnitTest.java
@@ -0,0 +1,802 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.framework;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.type.ClassType.STRING_TYPE;
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.DimensionProjection;
+import com.yahoo.elide.datastores.aggregation.query.ImmutablePagination;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Hour;
+import com.yahoo.elide.datastores.aggregation.timegrains.ISOWeek;
+import com.yahoo.elide.datastores.aggregation.timegrains.Minute;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import com.yahoo.elide.datastores.aggregation.timegrains.Quarter;
+import com.yahoo.elide.datastores.aggregation.timegrains.Second;
+import com.yahoo.elide.datastores.aggregation.timegrains.Week;
+import com.yahoo.elide.datastores.aggregation.timegrains.Year;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import example.GameRevenue;
+import example.Player;
+import example.PlayerStats;
+import example.PlayerStatsView;
+import example.PlayerStatsWithView;
+import example.dimensions.Continent;
+import example.dimensions.Country;
+import example.dimensions.CountryView;
+import example.dimensions.CountryViewNested;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.inject.Provider;
+import javax.sql.DataSource;
+
+public abstract class SQLUnitTest {
+
+    protected static SQLTable playerStatsTable;
+    protected static SQLTable playerStatsViewTable;
+    protected static Map<String, Argument> playerStatsViewTableArgs;
+    protected static EntityDictionary dictionary;
+    protected static RSQLFilterDialect filterParser;
+    protected static MetaDataStore metaDataStore;
+
+    private static final DataSource DUMMY_DATASOURCE = new HikariDataSource();
+    private static final String NEWLINE = System.lineSeparator();
+    protected static SQLQueryEngine engine;
+
+    protected QueryEngine.Transaction transaction;
+    private static SQLTable videoGameTable;
+
+    protected static Type<?> playerStatsType = ClassType.of(PlayerStats.class);
+    protected static Type<?> playerStatsViewType = ClassType.of(PlayerStatsView.class);
+
+    // Standard set of test queries used in dialect tests
+    protected enum TestQuery {
+        WHERE_DIMS_ONLY (() ->
+            Query.builder()
+                    .source(playerStatsTable)
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .whereFilter(new FilterPredicate(
+                            new Path(PlayerStats.class, dictionary, "overallRating"),
+                            Operator.NOTNULL,
+                            new ArrayList<>()))
+                    .build()
+        ),
+        WHERE_AND (() -> {
+            FilterPredicate ratingFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "overallRating"),
+                    Operator.NOTNULL, new ArrayList<>());
+            FilterPredicate highScoreFilter = new FilterPredicate(
+                new Path(PlayerStats.class, dictionary, "countryIsoCode"),
+                    Operator.IN,
+                    Arrays.asList("USA"));
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .whereFilter(new AndFilterExpression(ratingFilter, highScoreFilter))
+                    .build();
+        }),
+        WHERE_OR (() -> {
+            FilterPredicate ratingFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "overallRating"),
+                    Operator.NOTNULL, new ArrayList<>());
+            FilterPredicate highScoreFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "countryIsoCode"),
+                    Operator.IN,
+                    Arrays.asList("USA"));
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .whereFilter(new OrFilterExpression(ratingFilter, highScoreFilter))
+                    .build();
+        }),
+        WHERE_WITH_ARGUMENTS (() -> {
+            Set<Argument> dayArgument = new HashSet<>();
+            dayArgument.add(Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+            Map<String, Argument> monthArgument = new HashMap<>();
+            monthArgument.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+            FilterPredicate dayFilter = new FilterPredicate(
+                    new Path(playerStatsType, dictionary, "recordedDate", "recordedDate", dayArgument),
+                    Operator.NOTNULL,
+                    new ArrayList<>());
+
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "recordedDate", monthArgument))
+                    .whereFilter(dayFilter)
+                    .build();
+        }),
+        HAVING_METRICS_ONLY (() ->
+            Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .havingFilter(new FilterPredicate(
+                            new Path(PlayerStats.class, dictionary, "lowScore"),
+                            Operator.GT,
+                            Arrays.asList(9000)))
+                    .build()
+        ),
+        HAVING_DIMS_ONLY (() ->
+            Query.builder()
+                    .source(playerStatsTable)
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .havingFilter(new FilterPredicate(
+                            new Path(PlayerStats.class, dictionary, "overallRating"),
+                            Operator.NOTNULL,
+                            new ArrayList<>()))
+                    .build()
+        ),
+        HAVING_METRICS_AND_DIMS (() -> {
+            FilterPredicate ratingFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "overallRating"),
+                    Operator.NOTNULL, new ArrayList<>());
+            FilterPredicate highScoreFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "highScore"),
+                    Operator.GT,
+                    Arrays.asList(9000));
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .havingFilter(new AndFilterExpression(ratingFilter, highScoreFilter))
+                    .build();
+        }),
+        HAVING_METRICS_OR_DIMS (() -> {
+            FilterPredicate ratingFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "overallRating"),
+                    Operator.NOTNULL, new ArrayList<>());
+            FilterPredicate highScoreFilter = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "highScore"),
+                    Operator.GT,
+                    Arrays.asList(9000));
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .havingFilter(new OrFilterExpression(ratingFilter, highScoreFilter))
+                    .build();
+        }),
+        PAGINATION_TOTAL (() ->
+            Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                    .pagination(new ImmutablePagination(0, 1, false, true))
+                    .build()
+        ),
+        SORT_METRIC_ASC (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("lowScore", Sorting.SortOrder.asc);
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        SORT_METRIC_DESC (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("lowScore", Sorting.SortOrder.desc);
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        SORT_DIM_DESC (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("overallRating", Sorting.SortOrder.desc);
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        SORT_METRIC_AND_DIM_DESC (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("highScore", Sorting.SortOrder.desc);
+            sortMap.put("overallRating", Sorting.SortOrder.desc);
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        SUBQUERY (() -> {
+            return Query.builder()
+                    .source(playerStatsViewTable)
+                    .metricProjection(playerStatsViewTable.getMetricProjection("highScore"))
+                    .arguments(playerStatsViewTableArgs)
+                    .build();
+        }),
+        ORDER_BY_DIMENSION_NOT_IN_SELECT (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("overallRating", Sorting.SortOrder.desc);
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        PAGINATION_METRIC_ONLY (() ->
+            Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .pagination(new ImmutablePagination(10, 5, false, true))
+                    .build()
+        ),
+        COMPLICATED (() -> {
+            // Sorting
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("lowScore", Sorting.SortOrder.desc);
+            // WHERE filter
+            FilterPredicate predicate = new FilterPredicate(
+                    new Path(PlayerStats.class, dictionary, "lowScore"),
+                    Operator.GT,
+                    Arrays.asList(9000));
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                    .pagination(new ImmutablePagination(10, 5, false, true))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .havingFilter(predicate)
+                    // force a join to look up countryIsoCode
+                    .whereFilter(parseFilterExpression("countryIsoCode==USA", playerStatsType, false))
+                    .build();
+        }),
+        NESTED_METRIC_QUERY (() -> {
+            Map<String, Argument> arguments = new HashMap<>();
+            arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            // Sorting
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                    .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                    .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                    .build();
+        }),
+        NESTED_METRIC_WITH_HAVING_QUERY (() -> {
+            Map<String, Argument> arguments = new HashMap<>();
+            arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            // Sorting
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                    .havingFilter(new FilterPredicate(
+                            new Path(PlayerStats.class, dictionary, "dailyAverageScorePerPeriod"),
+                            Operator.GT,
+                            Arrays.asList(100)))
+                    .build();
+        }),
+        NESTED_METRIC_WITH_WHERE_QUERY (() -> {
+            Map<String, Argument> arguments = new HashMap<>();
+            arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            // Sorting
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                    .whereFilter(parseFilterExpression("countryIsoCode==USA", playerStatsType, false))
+                    .build();
+        }),
+        NESTED_METRIC_WITH_PAGINATION_QUERY (() -> {
+            Map<String, Argument> arguments = new HashMap<>();
+            arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            // Sorting
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                    .pagination(new ImmutablePagination(0, 1, false, true))
+                    .build();
+        }),
+        NESTED_METRIC_WITH_SORTING_QUERY (() -> {
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("overallRating", Sorting.SortOrder.desc);
+            sortMap.put("dailyAverageScorePerPeriod", Sorting.SortOrder.desc);
+
+            Map<String, Argument> arguments = new HashMap<>();
+            arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            // Sorting
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                    .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                    .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                    .build();
+        }),
+        NESTED_METRIC_WITH_ALIASES_QUERY (() -> {
+            Set<MetricProjection> metricProjections = new LinkedHashSet<>();
+            metricProjections.add(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod", "average1"));
+            metricProjections.add(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod", "average2"));
+
+            Set<DimensionProjection> dimnesionProjections = new LinkedHashSet<>();
+            dimnesionProjections.add(playerStatsTable.getDimensionProjection("overallRating", "rating"));
+            dimnesionProjections.add(playerStatsTable.getDimensionProjection("playerLevel", "level"));
+
+            Map<String, Argument> monthArgument = new HashMap<>();
+            monthArgument.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+            Set<Argument> dayArgument = new HashSet<>();
+            dayArgument.add(Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+            // where filter with alias
+            FilterPredicate playerLevelFilter = new FilterPredicate(
+                            new Path(playerStatsType, dictionary, "playerLevel", "level", new HashSet<>()),
+                            Operator.IN,
+                            Arrays.asList(1, 2));
+            FilterPredicate dayFilter = new FilterPredicate(
+                            new Path(playerStatsType, dictionary, "recordedDate", "recordedDate", dayArgument),
+                            Operator.NOTNULL,
+                            new ArrayList<>());
+            // forces a join to look up countryIsoCode
+            FilterExpression countryIsoCodeFilter = parseFilterExpression("countryIsoCode==USA", playerStatsType, false);
+            AndFilterExpression andFilterExpression = new AndFilterExpression(playerLevelFilter, countryIsoCodeFilter);
+            FilterExpression wherePredicate = new AndFilterExpression(andFilterExpression, dayFilter);
+
+            // having filter with alias
+            FilterPredicate havingPredicate = new FilterPredicate(
+                            new Path(playerStatsType, dictionary, "dailyAverageScorePerPeriod", "average2", new HashSet<>()),
+                            Operator.GT,
+                            Arrays.asList(10));
+
+            // sorting with alias
+            Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+            sortMap.put("rating", Sorting.SortOrder.desc);
+            Set<Attribute> sortAttributes = new HashSet<>(Arrays.asList(Attribute.builder()
+                            .type(STRING_TYPE)
+                            .name("overallRating")
+                            .alias("rating")
+                            .build()));
+
+            return Query.builder()
+                    .source(playerStatsTable)
+                    .metricProjections(metricProjections)
+                    .dimensionProjections(dimnesionProjections)
+                    .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArgument))
+                    .whereFilter(wherePredicate)
+                    .havingFilter(havingPredicate)
+                    .sorting(new SortingImpl(sortMap, playerStatsType, sortAttributes, dictionary))
+                    .build();
+        }),
+        LEFT_JOIN (() ->
+            Query.builder()
+                    .source(videoGameTable)
+                    .dimensionProjection(videoGameTable.getDimensionProjection("playerName"))
+                    .build()
+        ),
+        INNER_JOIN (() ->
+            Query.builder()
+                    .source(videoGameTable)
+                    .dimensionProjection(videoGameTable.getDimensionProjection("playerNameInnerJoin"))
+                    .build()
+        ),
+        CROSS_JOIN (() ->
+            Query.builder()
+                    .source(videoGameTable)
+                    .dimensionProjection(videoGameTable.getDimensionProjection("playerNameCrossJoin"))
+                    .build()
+        ),
+        METRIC_JOIN(() ->
+            Query.builder()
+                    .source(videoGameTable)
+                    .metricProjection(videoGameTable.getMetricProjection("normalizedHighScore"))
+                    .build()
+        );
+
+        private Provider<Query> queryProvider;
+
+        TestQuery(Provider<Query> p) {
+            queryProvider = p;
+        }
+
+        public Query getQuery() {
+            return queryProvider.get();
+        }
+    }
+
+    protected Pattern repeatedWhitespacePattern = Pattern.compile("\\s\\s*");
+
+    public static void init(SQLDialect sqlDialect, Set<Optimizer> optimizers, MetaDataStore metaDataStore) {
+        Properties properties = new Properties();
+        properties.put("driverClassName", "org.h2.Driver");
+
+        String jdbcUrl = "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"
+                + ";NON_KEYWORDS=VALUE,USER"
+                + ";DATABASE_TO_UPPER=FALSE" + getCompatabilityMode(sqlDialect.getDialectType());
+        properties.put("jdbcUrl", jdbcUrl);
+        HikariConfig config = new HikariConfig(properties);
+        DataSource dataSource = new HikariDataSource(config);
+
+        try (Connection h2Conn = dataSource.getConnection()) {
+            h2Conn.createStatement().execute("RUNSCRIPT FROM 'classpath:prepare_tables.sql'");
+        } catch (SQLException e) {
+            ((HikariDataSource) dataSource).close();
+            throw new IllegalStateException(e);
+        }
+
+        SQLUnitTest.metaDataStore = metaDataStore;
+
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(PlayerStatsWithView.class);
+        dictionary.bindEntity(PlayerStatsView.class);
+        dictionary.bindEntity(PlayerStats.class);
+        dictionary.bindEntity(Country.class);
+        dictionary.bindEntity(SubCountry.class);
+        dictionary.bindEntity(Player.class);
+        dictionary.bindEntity(CountryView.class);
+        dictionary.bindEntity(CountryViewNested.class);
+        dictionary.bindEntity(Continent.class);
+        dictionary.bindEntity(GameRevenue.class);
+        filterParser = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        //Manually register the serdes because we are not running a complete Elide service.
+        CoerceUtil.register(Day.class, new Day.DaySerde());
+        CoerceUtil.register(Hour.class, new Hour.HourSerde());
+        CoerceUtil.register(ISOWeek.class, new ISOWeek.ISOWeekSerde());
+        CoerceUtil.register(Minute.class, new Minute.MinuteSerde());
+        CoerceUtil.register(Month.class, new Month.MonthSerde());
+        CoerceUtil.register(Quarter.class, new Quarter.QuarterSerde());
+        CoerceUtil.register(Second.class, new Second.SecondSerde());
+        CoerceUtil.register(Week.class, new Week.WeekSerde());
+        CoerceUtil.register(Year.class, new Year.YearSerde());
+
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        // Need to provide details for connections used by all available models.
+        Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+        connectionDetailsMap.put("mycon", new ConnectionDetails(dataSource, sqlDialect));
+        connectionDetailsMap.put("SalesDBConnection", new ConnectionDetails(DUMMY_DATASOURCE, sqlDialect));
+
+
+        Function<String, ConnectionDetails> connectionLookup = (name) ->
+                connectionDetailsMap.getOrDefault(name, new ConnectionDetails(dataSource, sqlDialect));
+        engine = new SQLQueryEngine(metaDataStore, connectionLookup,
+                optimizers,
+                new DefaultQueryPlanMerger(metaDataStore),
+                new DefaultQueryValidator(metaDataStore.getMetadataDictionary()));
+        playerStatsTable = (SQLTable) metaDataStore.getTable("playerStats", NO_VERSION);
+        videoGameTable = (SQLTable) metaDataStore.getTable("videoGame", NO_VERSION);
+        playerStatsViewTable = (SQLTable) metaDataStore.getTable("playerStatsView", NO_VERSION);
+        playerStatsViewTableArgs = new HashMap<>();
+        playerStatsViewTableArgs.put("rating", Argument.builder().name("overallRating").value("Great").build());
+        playerStatsViewTableArgs.put("minScore", Argument.builder().name("minScore").value("0").build());
+    }
+
+    private static String getCompatabilityMode(String dialectType) {
+        if (dialectType.equals(SQLDialectFactory.getMySQLDialect().getDialectType())) {
+            return ";MODE=MySQL";
+        }
+        if (dialectType.equals(SQLDialectFactory.getPostgresDialect().getDialectType())) {
+            return ";MODE=PostgreSQL";
+        }
+
+        return "";
+    }
+
+    public static void init(SQLDialect dialect) {
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(),
+                getClassType(DefaultClassScanner.getInstance().getAnnotatedClasses("example",
+                        Include.class)),
+                false);
+        init(dialect, new HashSet<>(), metaDataStore);
+    }
+
+    public static void init() {
+        init(SQLDialectFactory.getDefaultDialect());
+    }
+
+    @BeforeEach
+    public void begin() {
+        transaction = engine.beginTransaction();
+    }
+
+    @AfterEach
+    public void end() {
+        transaction.close();
+    }
+
+    protected static List<Object> toList(Iterable<Object> data) {
+        return StreamSupport.stream(data.spliterator(), false)
+                .collect(Collectors.toList());
+    }
+
+    /*
+     * Automatically convert a single expected string into a List with one element.
+     */
+    protected void compareQueryLists(String expected, List<String> actual) {
+        compareQueryLists(Arrays.asList(expected), actual);
+    }
+
+    /*
+     * Helper for comparing lists of queries.
+     */
+    protected void compareQueryLists(List<String> expected, List<String> actual) {
+        if (expected == actual) {
+            return;
+        }
+        assertNotNull(expected, "Expected a null query List, but actual was non-null");
+        assertNotNull(actual, "Expected a non-null query List, but actual was null");
+        assertEquals(expected.size(), actual.size(), "Query List sizes do not match");
+
+
+        for (int i = 0; i < expected.size(); i++) {
+            String actualMadeStatic = replaceDynamicAliases(actual.get(i).trim());
+            assertEquals(combineWhitespace(expected.get(i).trim()), combineWhitespace(actualMadeStatic));
+        }
+    }
+
+    /*
+     * Helper to remove repeated whitespace chars before comparing queries.
+     */
+    protected String combineWhitespace(String input) {
+        return repeatedWhitespacePattern.matcher(input).replaceAll(" ");
+    }
+
+    /*
+     * Helper that wraps parseFilterExpression and converts ParseException to IllegalStateException.
+     * Because this is for unit testing, the only time a ParseException should occur
+     * is when a test is incorrectly configured.
+     */
+    protected static FilterExpression parseFilterExpression(String expressionText, Type<?> entityType,
+                                                          boolean allowNestedToManyAssociations) {
+        try {
+            return filterParser.parseFilterExpression(expressionText, entityType, allowNestedToManyAssociations);
+        } catch (ParseException pe) {
+            throw new IllegalStateException(pe);
+        }
+    }
+
+    public static String replaceDynamicAliases(String queryText) {
+        //Replaces :dailyAverage_12345_0 with :XXX
+        String replaced = queryText.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+
+        //Replaces Foo_12345.bar with Foo_XXX.bar
+        replaced = replaced.replaceAll("_\\d+\\.", "_XXX\\.");
+
+        //Replaces Foo_12345 with Foo_XXX
+        replaced = replaced.replaceAll("_\\d+\\s+", "_XXX ");
+        return replaced.replaceAll("_\\d+", "_XXX");
+    }
+
+    protected void testQueryExecution(Query query) {
+        try (QueryEngine.Transaction transaction = engine.beginTransaction()) {
+            assertDoesNotThrow(() -> engine.executeQuery(query, transaction));
+        }
+    }
+
+    protected String getExpectedNestedMetricWithSortingQuery(boolean useAliasForOrderByClause) {
+        String expected = "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                + "`example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` ";
+
+        if (useAliasForOrderByClause) {
+            expected = expected + "ORDER BY `dailyAverageScorePerPeriod` DESC,`overallRating` DESC";
+
+        } else {
+            expected = expected
+                    + "ORDER BY AVG(`example_PlayerStats_XXX`.`highScore`) DESC,"
+                    + "`example_PlayerStats_XXX`.`overallRating` DESC";
+        }
+        return expected;
+    }
+
+    protected String getExpectedNestedMetricWithHavingQuery() {
+        return "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                + "`example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "HAVING AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "> :XXX\n";
+    }
+
+    protected String getExpectedNestedMetricWithWhereQuery() {
+        return "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` "
+                + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                + "WHERE `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX) "
+                + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate`\n";
+    }
+
+    protected String getExpectedNestedMetricQuery() {
+        return "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) AS `dailyAverageScorePerPeriod`,"
+                        + "MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) AS `highScore`,"
+                        + "MIN(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) AS `lowScore`,"
+                        + "`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                        + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                        + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "MAX(`example_PlayerStats`.`highScore`) AS `INNER_AGG_XXX`,"
+                        + "MIN(`example_PlayerStats`.`lowScore`) AS `INNER_AGG_XXX`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                        + "`example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS `example_PlayerStats_XXX` GROUP BY "
+                        + "`example_PlayerStats_XXX`.`overallRating`, "
+                        + "`example_PlayerStats_XXX`.`recordedDate`\n";
+
+    }
+
+    protected String getExpectedNestedMetricWithAliasesSQL(boolean useAliasForOrderByClause) {
+
+        String expectedSQL =
+                          "SELECT \n"
+                        + "    AVG(`example_PlayerStats_XXX`.`highScore`) AS `dailyAverageScorePerPeriod_165126357`,\n"
+                        + "    AVG(`example_PlayerStats_XXX`.`highScore`) AS `dailyAverageScorePerPeriod_165126481`,\n"
+                        + "    `example_PlayerStats_XXX`.`overallRating_207658499` AS `overallRating_207658499`,\n"
+                        + "    `example_PlayerStats_XXX`.`playerLevel_96024484` AS `playerLevel_96024484`,\n"
+                        + "    `example_PlayerStats_XXX`.`recordedDate_155839778` AS `recordedDate_155839778` \n"
+                        + "FROM \n"
+                        + "    (\n"
+                        + "        SELECT \n"
+                        + "            MAX(`example_PlayerStats`.`highScore`) AS `highScore`,\n"
+                        + "            `example_PlayerStats`.`overallRating` AS `overallRating_207658499`,\n"
+                        + "            CASE WHEN `example_PlayerStats`.`overallRating` = 'Good' THEN 1 ELSE 2 END AS `playerLevel_96024484`,\n"
+                        + "            PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_55557339`,\n"
+                        + "            PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate_155839778` \n"
+                        + "        FROM \n"
+                        + "            `playerStats` AS `example_PlayerStats` \n"
+                        + "            LEFT OUTER JOIN \n"
+                        + "            `countries` AS `example_PlayerStats_country_XXX` \n"
+                        + "            ON \n"
+                        + "            `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` \n"
+                        + "        WHERE \n"
+                        + "            (\n"
+                        + "                (CASE WHEN `example_PlayerStats`.`overallRating` = 'Good' THEN 1 ELSE 2 END IN (:XXX, :XXX) \n"
+                        + "                AND \n"
+                        + "                `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) \n"
+                        + "                AND \n"
+                        + "                PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IS NOT NULL\n"
+                        + "            ) \n"
+                        + "        GROUP BY \n"
+                        + "            `example_PlayerStats`.`overallRating`, \n"
+                        + "            CASE WHEN `example_PlayerStats`.`overallRating` = 'Good' THEN 1 ELSE 2 END, \n"
+                        + "            PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), \n"
+                        + "            PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') \n"
+                        + "    ) AS `example_PlayerStats_XXX` \n"
+                        + "GROUP BY \n"
+                        + "    `example_PlayerStats_XXX`.`overallRating_207658499`, \n"
+                        + "    `example_PlayerStats_XXX`.`playerLevel_96024484`, \n"
+                        + "    `example_PlayerStats_XXX`.`recordedDate_155839778` \n"
+                        + "HAVING \n"
+                        + "    AVG(`example_PlayerStats_XXX`.`highScore`) > :XXX \n"
+                        + "ORDER BY \n"
+                        + "    `example_PlayerStats_XXX`.`overallRating_207658499` DESC ";
+
+        if (useAliasForOrderByClause) {
+            // Changing last line to have alias only.
+            String[] split = expectedSQL.split(NEWLINE);
+            split[split.length - 1] = "`overallRating_207658499` DESC ";
+            expectedSQL = String.join(NEWLINE, split);
+        }
+        return formatInSingleLine(expectedSQL);
+    }
+
+    protected String getExpectedWhereWithArgumentsSQL() {
+
+        String expectedSQL =
+                          "SELECT \n"
+                        + "    MAX(`example_PlayerStats`.`highScore`) AS `highScore`,\n"
+                        + "    PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` \n"
+                        + "FROM \n"
+                        + "    `playerStats` AS `example_PlayerStats` \n"
+                        + "WHERE \n"
+                        + "     PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IS NOT NULL \n"
+                        + "GROUP BY \n"
+                        + "     PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ";
+
+        return formatInSingleLine(expectedSQL);
+    }
+
+    private String formatInSingleLine(String expectedSQL) {
+        // Remove spaces at the start of each line with in string
+        expectedSQL = expectedSQL.replaceAll("(?m)^\\s*", "");
+        expectedSQL = expectedSQL.replace(NEWLINE, "");
+        return repeatedWhitespacePattern.matcher(expectedSQL).replaceAll(" ");
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java
new file mode 100644
index 0000000000..4ac77ed1c2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java
@@ -0,0 +1,2388 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.integration;
+
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.framework.AggregationDataStoreTestHarness;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.DataSourceConfiguration;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.initialization.GraphQLIntegrationTest;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.yahoo.elide.modelconfig.DBPasswordExtractor;
+import com.yahoo.elide.modelconfig.model.DBConfig;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import com.yahoo.elide.test.graphql.elements.Arguments;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import example.PlayerStats;
+import example.TestCheckMappings;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.inject.Inject;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.sql.DataSource;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.SecurityContext;
+
+/**
+ * Integration tests for {@link AggregationDataStore}.
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AggregationDataStoreIntegrationTest extends GraphQLIntegrationTest {
+
+    @Mock private static SecurityContext securityContextMock;
+
+    public static DynamicConfigValidator VALIDATOR;
+
+    static {
+        VALIDATOR = new DynamicConfigValidator(DefaultClassScanner.getInstance(), "src/test/resources/configs");
+
+        try {
+            VALIDATOR.readAndValidateConfigs();
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static final class SecurityHjsonIntegrationTestResourceConfig extends ResourceConfig {
+
+        @Inject
+        public SecurityHjsonIntegrationTestResourceConfig() {
+            register(new AbstractBinder() {
+                @Override
+                protected void configure() {
+                    Map<String, Class<? extends Check>> map = new HashMap<>(TestCheckMappings.MAPPINGS);
+                    EntityDictionary dictionary = EntityDictionary.builder().checks(map).build();
+
+                    VALIDATOR.getElideSecurityConfig().getRoles().forEach(role ->
+                        dictionary.addRoleCheck(role, new Role.RoleMemberCheck(role))
+                    );
+
+                    Elide elide = new Elide(new ElideSettingsBuilder(getDataStore())
+                                    .withEntityDictionary(dictionary)
+                                    .withAuditLogger(new TestAuditLogger())
+                                    .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                                    .build());
+
+                    elide.doScans();
+                    bind(elide).to(Elide.class).named("elide");
+                }
+            });
+            register((ContainerRequestFilter) requestContext -> requestContext.setSecurityContext(securityContextMock));
+        }
+    }
+
+    public AggregationDataStoreIntegrationTest() {
+        super(SecurityHjsonIntegrationTestResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    @BeforeAll
+    public void beforeAll() {
+        SQLUnitTest.init();
+    }
+
+    @BeforeEach
+    public void setUp() {
+        reset(securityContextMock);
+        when(securityContextMock.isUserInRole("admin.user")).thenReturn(true);
+        when(securityContextMock.isUserInRole("operator")).thenReturn(true);
+        when(securityContextMock.isUserInRole("guest user")).thenReturn(true);
+    }
+
+    @Override
+    protected DataStoreTestHarness createHarness() {
+
+        HikariConfig config = new HikariConfig(File.separator + "jpah2db.properties");
+        DataSource defaultDataSource = new HikariDataSource(config);
+        SQLDialect defaultDialect = SQLDialectFactory.getDefaultDialect();
+        ConnectionDetails defaultConnectionDetails = new ConnectionDetails(defaultDataSource, defaultDialect);
+
+        Properties prop = new Properties();
+        prop.put("javax.persistence.jdbc.driver", config.getDriverClassName());
+        prop.put("javax.persistence.jdbc.url", config.getJdbcUrl());
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("aggregationStore", prop);
+
+        Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+
+        // Add an entry for "mycon" connection which is not from hjson
+        connectionDetailsMap.put("mycon", defaultConnectionDetails);
+        // Add connection details fetched from hjson
+        VALIDATOR.getElideSQLDBConfig().getDbconfigs().forEach(dbConfig ->
+            connectionDetailsMap.put(dbConfig.getName(),
+                            new ConnectionDetails(getDataSource(dbConfig, getDBPasswordExtractor()),
+                                            SQLDialectFactory.getDialect(dbConfig.getDialect())))
+        );
+
+        return new AggregationDataStoreTestHarness(emf, defaultConnectionDetails, connectionDetailsMap, VALIDATOR);
+    }
+
+    static DataSource getDataSource(DBConfig dbConfig, DBPasswordExtractor dbPasswordExtractor) {
+        return new DataSourceConfiguration() {
+        }.getDataSource(dbConfig, dbPasswordExtractor);
+    }
+
+    static DBPasswordExtractor getDBPasswordExtractor() {
+        return new DBPasswordExtractor() {
+            @Override
+            public String getDBPassword(DBConfig config) {
+                String encrypted = (String) config.getPropertyMap().get("encrypted.password");
+                byte[] decrypted = Base64.getDecoder().decode(encrypted.getBytes());
+                try {
+                    return new String(decrypted, "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        };
+    }
+
+    @Test
+    public void testGraphQLSchema() throws IOException {
+        String graphQLRequest = "{"
+                + "__type(name: \"PlayerStatsWithViewEdge\") {"
+                + "   name "
+                + "     fields {"
+                + "         name "
+                + "         type {"
+                + "             name"
+                + "             fields {"
+                + "                 name "
+                + "                 type {"
+                + "                     name "
+                + "                     fields {"
+                + "                         name"
+                + "                     }"
+                + "                 }"
+                + "             }"
+                + "         }"
+                + "     }"
+                + "}"
+                + "}";
+
+        String expected = loadGraphQLResponse("testGraphQLSchema.json");
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLMetdata() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "table",
+                                arguments(
+                                        argument("ids", Arrays.asList("playerStatsView"))
+                                ),
+                                selections(
+                                        field("name"),
+                                        field("arguments",
+                                                selections(
+                                                    field("name"),
+                                                    field("type"),
+                                                    field("defaultValue")
+                                                )
+
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "table",
+                                selections(
+                                        field("name", "playerStatsView"),
+                                        field("arguments",
+                                                selections(
+                                                    field("name", "rating"),
+                                                    field("type", "TEXT"),
+                                                    field("defaultValue", "")
+                                                ),
+                                                selections(
+                                                    field("name", "minScore"),
+                                                    field("type", "INTEGER"),
+                                                    field("defaultValue", "0")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testColumnWhichReferencesHiddenDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("zipCode")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("orderTotal", 78.87),
+                                        field("zipCode", 0)
+                                ),
+                                selections(
+                                        field("orderTotal", 61.43),
+                                        field("zipCode", 10002)
+                                ),
+                                selections(
+                                        field("orderTotal", 285.19),
+                                        field("zipCode", 20166)
+                                ),
+                                selections(
+                                        field("orderTotal", 88.22),
+                                        field("zipCode", 20170)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testHiddenTable() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_performance",
+                                selections(
+                                        field("totalSales")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String errorMessage = "Bad Request Body&#39;Unknown entity {SalesNamespace_performance}.&#39;";
+
+        runQueryWithExpectedError(graphQLRequest, errorMessage);
+    }
+
+    @Test
+    public void testHiddenColumn() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("zipCodeHidden")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String errorMessage = "Validation error of type FieldUndefined: Field &#39;zipCodeHidden&#39; in type &#39;SalesNamespace_orderDetails&#39; is undefined @ &#39;SalesNamespace_orderDetails/edges/node/zipCodeHidden&#39;";
+
+        runQueryWithExpectedError(graphQLRequest, errorMessage);
+    }
+
+    @Test
+    public void parameterizedJsonApiColumnTest() throws Exception {
+        when()
+            .get("/SalesNamespace_orderDetails?filter=deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'&fields[SalesNamespace_orderDetails]=orderRatio")
+            .then()
+            .body(equalTo(
+                data(
+                    resource(
+                        type("SalesNamespace_orderDetails"),
+                        id("0"),
+                        attributes(
+                            attr("orderRatio", 1)
+                        )
+                    )
+                ).toJSON())
+            )
+            .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void parameterizedGraphQLFilterNoAliasTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"orderRatio[numerator:orderMax][denominator:orderMax]>=.5;deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderRatio", "ratio1", arguments(
+                                                argument("numerator", "\"orderMax\""),
+                                                argument("denominator", "\"orderMax\"")
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("ratio1", 1.0)
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void parameterizedGraphQLFilterWithAliasTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"ratio1>=.5;deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderRatio", "ratio1", arguments(
+                                                argument("numerator", "\"orderMax\""),
+                                                argument("denominator", "\"orderMax\"")
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("ratio1", 1.0)
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void parameterizedGraphQLSortWithAliasTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\""),
+                                        argument("sort", "\"ratio1\"")
+                                ),
+                                selections(
+                                        field("orderRatio", "ratio1", arguments(
+                                                argument("numerator", "\"orderMax\""),
+                                                argument("denominator", "\"orderMax\"")
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("ratio1", 1.0)
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void parameterizedGraphQLColumnTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderRatio", "ratio1", arguments(
+                                                argument("numerator", "\"orderMax\""),
+                                                argument("denominator", "\"orderMax\"")
+                                        )),
+                                        field("orderRatio", "ratio2", arguments(
+                                                argument("numerator", "\"orderMax\""),
+                                                argument("denominator", "\"orderTotal\"")
+                                        )),
+                                        field("orderRatio", "ratio3", arguments())
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("ratio1", 1.0),
+                                        field("ratio2", 0.20190379786260731),
+                                        field("ratio3", 1.0)
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void basicAggregationTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"highScore\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("overallRating"),
+                                        field("countryIsoCode"),
+                                        field("playerRank")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 1000),
+                                        field("overallRating", "Good"),
+                                        field("countryIsoCode", "HKG"),
+                                        field("playerRank", 3)
+                                ),
+                                selections(
+                                        field("highScore", 1234),
+                                        field("overallRating", "Good"),
+                                        field("countryIsoCode", "USA"),
+                                        field("playerRank", 1)
+                                ),
+                                selections(
+                                        field("highScore", 2412),
+                                        field("overallRating", "Great"),
+                                        field("countryIsoCode", "USA"),
+                                        field("playerRank", 2)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void metricFormulaTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "videoGame",
+                                arguments(
+                                        argument("sort", "\"timeSpentPerSession\"")
+                                ),
+                                selections(
+                                        field("timeSpent"),
+                                        field("sessions"),
+                                        field("timeSpentPerSession"),
+                                        field("playerName")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "videoGame",
+                                selections(
+                                        field("timeSpent", 720),
+                                        field("sessions", 60),
+                                        field("timeSpentPerSession", 12.0),
+                                        field("playerName", "Jon Doe")
+                                ),
+                                selections(
+                                        field("timeSpent", 350),
+                                        field("sessions", 25),
+                                        field("timeSpentPerSession", 14.0),
+                                        field("playerName", "Jane Doe")
+                                ),
+                                selections(
+                                        field("timeSpent", 300),
+                                        field("sessions", 10),
+                                        field("timeSpentPerSession", 30.0),
+                                        field("playerName", "Han")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+
+        //When admin = false
+
+        when(securityContextMock.isUserInRole("admin.user")).thenReturn(false);
+
+        expected = document(
+                selections(
+                        field(
+                                "videoGame",
+                                selections(
+                                        field("timeSpent", 720),
+                                        field("sessions", 60),
+                                        field("timeSpentPerSession", 12.0),
+                                        field("playerName", "Jon Doe")
+                                ),
+                                selections(
+                                        field("timeSpent", 350),
+                                        field("sessions", 25),
+                                        field("timeSpentPerSession", 14.0),
+                                        field("playerName", "Jane Doe")
+                                )
+                        )
+                )
+        ).toResponse();
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Test sql expression in where, sorting, group by and projection.
+     * @throws Exception exception
+     */
+    @Test
+    public void dimensionFormulaTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"playerLevel\""),
+                                        argument("filter", "\"playerLevel>\\\"0\\\"\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("playerLevel")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 1234),
+                                        field("playerLevel", 1)
+                                ),
+                                selections(
+                                        field("highScore", 2412),
+                                        field("playerLevel", 2)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void noMetricQueryTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStatsWithView",
+                                arguments(
+                                        argument("sort", "\"countryViewViewIsoCode\"")
+                                ),
+                                selections(
+                                        field("countryViewViewIsoCode")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStatsWithView",
+                                selections(
+                                        field("countryViewViewIsoCode", "HKG")
+                                ),
+                                selections(
+                                        field("countryViewViewIsoCode", "USA")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void whereFilterTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"overallRating==\\\"Good\\\"\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("overallRating")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 1234),
+                                        field("overallRating", "Good")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void havingFilterTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"lowScore<\\\"45\\\"\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("overallRating"),
+                                        field("playerName")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 35),
+                                        field("overallRating", "Good"),
+                                        field("playerName", "Jon Doe")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Test the case that a where clause is promoted into having clause.
+     * @throws Exception exception
+     */
+    @Test
+    public void wherePromotionTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"overallRating==\\\"Good\\\",lowScore<\\\"45\\\"\""),
+                                        argument("sort", "\"lowScore\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("overallRating"),
+                                        field("playerName")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 35),
+                                        field("overallRating", "Good"),
+                                        field("playerName", "Jon Doe")
+                                ),
+                                selections(
+                                        field("lowScore", 72),
+                                        field("overallRating", "Good"),
+                                        field("playerName", "Han")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Test the case that a where clause, which requires dimension join, is promoted into having clause.
+     * @throws Exception exception
+     */
+    @Test
+    public void havingClauseJoinTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"countryIsoCode==\\\"USA\\\",lowScore<\\\"45\\\"\""),
+                                        argument("sort", "\"lowScore\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("countryIsoCode"),
+                                        field("playerName")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 35),
+                                        field("countryIsoCode", "USA"),
+                                        field("playerName", "Jon Doe")
+                                ),
+                                selections(
+                                        field("lowScore", 241),
+                                        field("countryIsoCode", "USA"),
+                                        field("playerName", "Jane Doe")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Test invalid where promotion on a dimension field that is not grouped.
+     * @throws Exception exception
+     */
+    @Test
+    public void ungroupedHavingDimensionTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"countryIsoCode==\\\"USA\\\",lowScore<\\\"45\\\"\"")
+                                ),
+                                selections(
+                                        field("lowScore")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String errorMessage = "Exception while fetching data (/playerStats) : Invalid operation: "
+                + "Post aggregation filtering on &#39;countryIsoCode&#39; requires the field to be projected in the response";
+
+        runQueryWithExpectedError(graphQLRequest, errorMessage);
+    }
+
+    /**
+     * Test invalid having clause on a metric field that is not aggregated.
+     * @throws Exception exception
+     */
+    @Test
+    public void nonAggregatedHavingMetricTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"highScore>\\\"0\\\"\"")
+                                ),
+                                selections(
+                                        field("lowScore")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 35)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Test invalid where promotion on a different class than the queried class.
+     * @throws Exception exception
+     */
+    @Test
+    public void invalidHavingClauseClassTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"country.isoCode==\\\"USA\\\",lowScore<\\\"45\\\"\"")
+                                ),
+                                selections(
+                                        field("lowScore")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String errorMessage = "Exception while fetching data (/playerStats) : Invalid operation: "
+                + "Relationship traversal not supported for analytic queries.";
+
+        runQueryWithExpectedError(graphQLRequest, errorMessage);
+    }
+
+    @Test
+    public void dimensionSortingTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"overallRating\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("overallRating")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 35),
+                                        field("overallRating", "Good")
+                                ),
+                                selections(
+                                        field("lowScore", 241),
+                                        field("overallRating", "Great")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void metricSortingTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"-highScore\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("countryIsoCode")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 2412),
+                                        field("countryIsoCode", "USA")
+                                ),
+                                selections(
+                                        field("highScore", 1000),
+                                        field("countryIsoCode", "HKG")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void multipleColumnsSortingTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"overallRating,playerName\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("overallRating"),
+                                        field("playerName")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("lowScore", 72),
+                                        field("overallRating", "Good"),
+                                        field("playerName", "Han")
+                                ),
+                                selections(
+                                        field("lowScore", 35),
+                                        field("overallRating", "Good"),
+                                        field("playerName", "Jon Doe")
+                                ),
+                                selections(
+                                        field("lowScore", 241),
+                                        field("overallRating", "Great"),
+                                        field("playerName", "Jane Doe")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void idSortingTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"id\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("id")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Sorting on id field is not permitted";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void nestedDimensionNotInQuerySortingTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"-countryIsoCode,lowScore\"")
+                                ),
+                                selections(
+                                        field("lowScore")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Can not sort on countryIsoCode as it is not present in query";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void sortingOnMetricNotInQueryTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"highScore\"")
+                                ),
+                                selections(
+                                        field("lowScore"),
+                                        field("countryIsoCode")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Can not sort on highScore as it is not present in query";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void basicViewAggregationTest() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStatsWithView",
+                                arguments(
+                                        argument("sort", "\"highScore\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("countryViewIsoCode")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStatsWithView",
+                                selections(
+                                        field("highScore", 1000),
+                                        field("countryViewIsoCode", "HKG")
+                                ),
+                                selections(
+                                        field("highScore", 2412),
+                                        field("countryViewIsoCode", "USA")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void multiTimeDimensionTest() throws IOException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("recordedDate"),
+                                        field("updatedDate")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("recordedDate", "2019-07-11"),
+                                        field("updatedDate", "2020-07-12")
+                                ),
+                                selections(
+                                        field("recordedDate", "2019-07-12"),
+                                        field("updatedDate", "2019-10-12")
+                                ),
+                                selections(
+                                        field("recordedDate", "2019-07-13"),
+                                        field("updatedDate", "2020-01-12")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphqlQueryDynamicModelById() throws IOException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("orderTotal")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("id", "0"),
+                                        field("orderTotal", 513.71)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void jsonApiAggregationTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/playerStats")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", hasItems("0", "1", "2"))
+                .body("data.attributes.highScore", hasItems(1000, 1234, 2412))
+                .body("data.attributes.countryIsoCode", hasItems("USA", "HKG"));
+    }
+
+    /**
+     * Below tests demonstrate using the aggregation store from dynamic configuration.
+     */
+    @Test
+    public void testDynamicAggregationModel() {
+        String getPath = "/SalesNamespace_orderDetails?sort=customerRegion,orderTime&page[totals]&"
+                        + "fields[SalesNamespace_orderDetails]=orderTotal,customerRegion,orderTime&filter=deliveryTime>=2020-01-01;deliveryTime<2020-12-31;orderTime>=2020-08";
+        given()
+            .when()
+            .get(getPath)
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data", hasSize(4))
+            .body("data.id", hasItems("0", "1", "2", "3"))
+            .body("data.attributes", hasItems(
+                    allOf(hasEntry("customerRegion", "NewYork"), hasEntry("orderTime", "2020-08")),
+                    allOf(hasEntry("customerRegion", "Virginia"), hasEntry("orderTime", "2020-08")),
+                    allOf(hasEntry("customerRegion", "Virginia"), hasEntry("orderTime", "2020-08")),
+                    allOf(hasEntry("customerRegion", null), hasEntry("orderTime", "2020-09"))))
+            .body("data.attributes.orderTotal", hasItems(78.87F, 61.43F, 113.07F, 260.34F))
+            .body("meta.page.number", equalTo(1))
+            .body("meta.page.totalRecords", equalTo(4))
+            .body("meta.page.totalPages", equalTo(1))
+            .body("meta.page.limit", equalTo(500));
+    }
+
+    @Test
+    public void testInvalidSparseFields() {
+        String expectedError = "Invalid value: SalesNamespace_orderDetails does not contain the fields: [orderValue, customerState]";
+        String getPath = "/SalesNamespace_orderDetails?fields[SalesNamespace_orderDetails]=orderValue,customerState,orderTime";
+        given()
+            .when()
+            .get(getPath)
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body("errors.detail", hasItems(expectedError));
+    }
+
+    @Test
+    public void missingClientFilterTest() {
+        String expectedError = "Querying SalesNamespace_orderDetails requires a mandatory filter:"
+                + " deliveryTime&gt;={{start}};deliveryTime&lt;{{end}}";
+        when()
+        .get("/SalesNamespace_orderDetails/")
+        .then()
+        .body("errors.detail", hasItems(expectedError))
+        .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void incompleteClientFilterTest() {
+        String expectedError = "Querying SalesNamespace_orderDetails requires a mandatory filter:"
+                + " deliveryTime&gt;={{start}};deliveryTime&lt;{{end}}";
+        when()
+        .get("/SalesNamespace_orderDetails?filter=deliveryTime>=2020-08")
+        .then()
+        .body("errors.detail", hasItems(expectedError))
+        .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void completeClientFilterTest() {
+        when()
+        .get("/SalesNamespace_deliveryDetails?filter=month>=2020-08;month<2020-09")
+        .then()
+        .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testGraphQLDynamicAggregationModel() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';orderTime=='2020-08'\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("customerRegionRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("orderTotal", 61.43F),
+                                        field("customerRegion", "NewYork"),
+                                        field("customerRegionRegion", "NewYork"),
+                                        field("orderTime", "2020-08")
+                                ),
+                                selections(
+                                        field("orderTotal", 113.07F),
+                                        field("customerRegion", "Virginia"),
+                                        field("customerRegionRegion", "Virginia"),
+                                        field("orderTime", "2020-08")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Tests for below type of column references.
+     *
+     * a) Physical Column Reference in same table.
+     * b) Logical Column Reference in same table, which references Physical column in same table.
+     * c) Logical Column Reference in same table, which references another Logical column in same table, which
+     *  references Physical column in same table.
+     * d) Physical Column Reference in referred table.
+     * e) Logical Column Reference in referred table, which references Physical column in referred table.
+     * f) Logical Column Reference in referred table, which references another Logical column in referred table, which
+     *  references another Logical column in referred table, which references Physical column in referred table.
+     * g) Logical Column Reference in same table, which references Physical column in referred table.
+     * h) Logical Column Reference in same table, which references another Logical Column in referred table, which
+     *  references another Logical column in referred table, which references another Logical column in referred table,
+     *  which references Physical column in referred table
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testGraphQLDynamicAggregationModelAllFields() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"courierName,deliveryDate,orderTotal,customerRegion\""),
+                                        argument("filter", "\"deliveryYear=='2020';(deliveryTime>='2020-08-01';deliveryTime<'2020-12-31');(deliveryDate>='2020-09-01',orderTotal>50)\"")
+                                ),
+                                selections(
+                                        field("courierName"),
+                                        field("deliveryTime"),
+                                        field("deliveryHour"),
+                                        field("deliveryDate"),
+                                        field("deliveryMonth"),
+                                        field("deliveryYear"),
+                                        field("deliveryDefault"),
+                                        field("orderTime", "bySecond", arguments(
+                                                argument("grain", TimeGrain.SECOND)
+                                        )),
+                                        field("orderTime", "byDay", arguments(
+                                                argument("grain", TimeGrain.DAY)
+                                        )),
+                                        field("orderTime", "byMonth", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        )),
+                                        field("customerRegion"),
+                                        field("customerRegionRegion"),
+                                        field("orderTotal"),
+                                        field("zipCode"),
+                                        field("orderId")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("courierName", "FEDEX"),
+                                        field("deliveryTime", "2020-09-11T16:30:11"),
+                                        field("deliveryHour", "2020-09-11T16"),
+                                        field("deliveryDate", "2020-09-11"),
+                                        field("deliveryMonth", "2020-09"),
+                                        field("deliveryYear", "2020"),
+                                        field("bySecond", "2020-09-08T16:30:11"),
+                                        field("deliveryDefault", "2020-09-11"),
+                                        field("byDay", "2020-09-08"),
+                                        field("byMonth", "2020-09"),
+                                        field("customerRegion", "Virginia"),
+                                        field("customerRegionRegion", "Virginia"),
+                                        field("orderTotal", 84.11F),
+                                        field("zipCode", 20166),
+                                        field("orderId", "order-1b")
+                                ),
+                                selections(
+                                        field("courierName", "FEDEX"),
+                                        field("deliveryTime", "2020-09-11T16:30:11"),
+                                        field("deliveryHour", "2020-09-11T16"),
+                                        field("deliveryDate", "2020-09-11"),
+                                        field("deliveryMonth", "2020-09"),
+                                        field("deliveryYear", "2020"),
+                                        field("bySecond", "2020-09-08T16:30:11"),
+                                        field("deliveryDefault", "2020-09-11"),
+                                        field("byDay", "2020-09-08"),
+                                        field("byMonth", "2020-09"),
+                                        field("customerRegion", "Virginia"),
+                                        field("customerRegionRegion", "Virginia"),
+                                        field("orderTotal", 97.36F),
+                                        field("zipCode", 20166),
+                                        field("orderId", "order-1c")
+                                ),
+                                selections(
+                                        field("courierName", "UPS"),
+                                        field("deliveryTime", "2020-09-05T16:30:11"),
+                                        field("deliveryHour", "2020-09-05T16"),
+                                        field("deliveryDate", "2020-09-05"),
+                                        field("deliveryMonth", "2020-09"),
+                                        field("deliveryYear", "2020"),
+                                        field("bySecond", "2020-08-30T16:30:11"),
+                                        field("deliveryDefault", "2020-09-05"),
+                                        field("byDay", "2020-08-30"),
+                                        field("byMonth", "2020-08"),
+                                        field("customerRegion", "Virginia"),
+                                        field("customerRegionRegion", "Virginia"),
+                                        field("orderTotal", 103.72F),
+                                        field("zipCode", 20166),
+                                        field("orderId", "order-1a")
+                                ),
+                                selections(
+                                        field("courierName", "UPS"),
+                                        field("deliveryTime", "2020-09-13T16:30:11"),
+                                        field("deliveryHour", "2020-09-13T16"),
+                                        field("deliveryDate", "2020-09-13"),
+                                        field("deliveryMonth", "2020-09"),
+                                        field("deliveryYear", "2020"),
+                                        field("bySecond", "2020-09-09T16:30:11"),
+                                        field("deliveryDefault", "2020-09-13"),
+                                        field("byDay", "2020-09-09"),
+                                        field("byMonth", "2020-09"),
+                                        field("customerRegion", (String) null, false),
+                                        field("customerRegionRegion", (String) null, false),
+                                        field("orderTotal", 78.87F),
+                                        field("zipCode", 0),
+                                        field("orderId", "order-null-enum")
+                                ),
+                                selections(
+                                        field("courierName", "UPS"),
+                                        field("deliveryTime", "2020-09-13T16:30:11"),
+                                        field("deliveryHour", "2020-09-13T16"),
+                                        field("deliveryDate", "2020-09-13"),
+                                        field("deliveryMonth", "2020-09"),
+                                        field("deliveryYear", "2020"),
+                                        field("bySecond", "2020-09-09T16:30:11"),
+                                        field("deliveryDefault", "2020-09-13"),
+                                        field("byDay", "2020-09-09"),
+                                        field("byMonth", "2020-09"),
+                                        field("customerRegion", "Virginia"),
+                                        field("customerRegionRegion", "Virginia"),
+                                        field("orderTotal", 78.87F),
+                                        field("zipCode", 20170),
+                                        field("orderId", "order-3b")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLDynamicAggregationModelDateTime() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"bySecond=='2020-09-08T16:30:11';(deliveryTime>='2020-01-01';deliveryTime<'2020-12-31')\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("orderTime", "byMonth", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        )),
+                                        field("orderTime", "bySecond", arguments(
+                                                argument("grain", TimeGrain.SECOND)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("orderTotal", 181.47F),
+                                        field("customerRegion", "Virginia"),
+                                        field("byMonth", "2020-09"),
+                                        field("bySecond", "2020-09-08T16:30:11")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testTimeDimMismatchArgs() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"orderTime[grain:DAY]=='2020-08',orderTotal>50\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.MONTH) // Does not match grain argument in filter
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/SalesNamespace_orderDetails) : Invalid operation: Post aggregation filtering on &#39;orderTime&#39; requires the field to be projected in the response with matching arguments";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testTimeDimMismatchArgsWithDefaultSelect() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"orderTime[grain:DAY]=='2020-08',orderTotal>50\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("orderTime") //Default Grain for OrderTime is Month.
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/SalesNamespace_orderDetails) : Invalid operation: Post aggregation filtering on &#39;orderTime&#39; requires the field to be projected in the response with matching arguments";
+
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testTimeDimMismatchArgsWithDefaultFilter() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"orderTime,customerRegion\""),
+                                        argument("filter", "\"(orderTime=='2020-08-01',orderTotal>50);(deliveryTime>='2020-01-01';deliveryTime<'2020-12-31')\"") //No Grain Arg passed, so works based on Alias's argument in Selection.
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.DAY)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("orderTotal", 103.72F),
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTime", "2020-08-30")
+                                ),
+                                selections(
+                                        field("orderTotal", 181.47F),
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTime", "2020-09-08")
+                                ),
+                                selections(
+                                        field("orderTotal", 78.87F),
+                                        field("customerRegion", (String) null, false),
+                                        field("orderTime", "2020-09-09")
+                                ),
+                                selections(
+                                        field("orderTotal", 78.87F),
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTime", "2020-09-09")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testAdminRole() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';orderTime=='2020-08'\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("customerRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("orderTotal", 61.43F),
+                                        field("customerRegion", "NewYork"),
+                                        field("orderTime", "2020-08")
+                                ),
+                                selections(
+                                        field("orderTotal", 113.07F),
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTime", "2020-08")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testOperatorRole() throws Exception {
+
+        when(securityContextMock.isUserInRole("admin")).thenReturn(false);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';orderTime=='2020-08'\"")
+                                ),
+                                selections(
+                                        field("customerRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("customerRegion", "NewYork"),
+                                        field("orderTime", "2020-08")
+                                ),
+                                selections(
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTime", "2020-08")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGuestUserRole() throws Exception {
+
+        when(securityContextMock.isUserInRole("admin")).thenReturn(false);
+        when(securityContextMock.isUserInRole("operator")).thenReturn(false);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';orderTime=='2020-08'\"")
+                                ),
+                                selections(
+                                        field("customerRegion"),
+                                        field("orderTime", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/SalesNamespace_orderDetails/edges[0]/node/customerRegion) : ReadPermission Denied";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testTimeDimensionAliases() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"byDay>='2019-07-12'\""),
+                                        argument("sort", "\"byDay\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("recordedDate", "byDay", arguments(
+                                                argument("grain", TimeGrain.DAY)
+                                        )),
+                                        field("recordedDate", "byMonth", arguments(
+                                                argument("grain", TimeGrain.MONTH)
+                                        )),
+                                        field("recordedDate", "byQuarter", arguments(
+                                                argument("grain", TimeGrain.QUARTER)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 1234),
+                                        field("byDay", "2019-07-12"),
+                                        field("byMonth", "2019-07"),
+                                        field("byQuarter", "2019-07")
+                                ),
+                                selections(
+                                        field("highScore", 1000),
+                                        field("byDay", "2019-07-13"),
+                                        field("byMonth", "2019-07"),
+                                        field("byQuarter", "2019-07")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Check if AggregationBeforeJoinOptimizer works with alias
+     * @throws Exception
+     */
+    @Test
+    public void testJoinBeforeAggregationWithAlias() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"highScore\"")
+                                ),
+                                selections(
+                                        field("highScore"),
+                                        field("countryIsoCode", "countryAlias", Arguments.emptyArgument())
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", 1000),
+                                        field("countryAlias", "HKG")
+                                ),
+                                selections(
+                                        field("highScore", 2412),
+                                        field("countryAlias", "USA")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    /**
+     * Check working of alias on simple metrics, 2-pass agg metrics, simple dimensions, join dimension, and date dimension.
+     *
+     * Note that Optimizer is not invoked because of 2 pass aggregation metrics.
+     * @throws Exception
+     */
+    @Test
+    public void testMetricsAndDimensionsWithAlias() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScore", "highScoreAlias", Arguments.emptyArgument()),
+                                        field("dailyAverageScorePerPeriod", "avgScoreAlias", Arguments.emptyArgument()),
+                                        field("overallRating", "ratingAlias", Arguments.emptyArgument()),
+                                        field("countryIsoCode", "countryAlias", Arguments.emptyArgument()),
+                                        field("recordedDate", "byDay", arguments(
+                                                argument("grain", TimeGrain.DAY)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("highScoreAlias", 1000),
+                                        field("avgScoreAlias", 1000.0),
+                                        field("ratingAlias", "Good"),
+                                        field("countryAlias", "HKG"),
+                                        field("byDay", "2019-07-13")
+                                ),
+                                selections(
+                                        field("highScoreAlias", 1234),
+                                        field("avgScoreAlias", 1234),
+                                        field("ratingAlias", "Good"),
+                                        field("countryAlias", "USA"),
+                                        field("byDay", "2019-07-12")
+                                ),
+                                selections(
+                                        field("highScoreAlias", 2412),
+                                        field("avgScoreAlias", 2412),
+                                        field("ratingAlias", "Great"),
+                                        field("countryAlias", "USA"),
+                                        field("byDay", "2019-07-11")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testTimeDimensionArgumentsInFilter() throws Exception {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("sort", "\"customerRegion\""),
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';orderTime[grain:day]=='2020-09-08'\"")
+                                ),
+                                selections(
+                                        field("customerRegion"),
+                                        field("orderTotal"),
+                                        field("orderTime", arguments(
+                                                   argument("grain", TimeGrain.MONTH)
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("customerRegion", "Virginia"),
+                                        field("orderTotal", 181.47F),
+                                        field("orderTime", "2020-09")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testSchemaIntrospection() throws Exception {
+        String graphQLRequest = "{"
+                + "__schema {"
+                + "   mutationType {"
+                + "     name "
+                + "     fields {"
+                + "       name "
+                + "       args {"
+                + "          name"
+                + "          defaultValue"
+                + "       }"
+                + "     }"
+                + "   }"
+                + "}"
+                + "}";
+
+        String query = toJsonQuery(graphQLRequest, new HashMap<>());
+
+        given()
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON)
+            .body(query)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            // Verify that the SalesNamespace_orderDetails Model has an argument "denominator".
+            .body("data.__schema.mutationType.fields.find { it.name == 'SalesNamespace_orderDetails' }.args.name[7] ", equalTo("denominator"));
+
+        graphQLRequest = "{"
+                + "__type(name: \"SalesNamespace_orderDetails\") {"
+                + "   name"
+                + "   fields {"
+                + "     name "
+                + "     args {"
+                + "        name"
+                + "        defaultValue"
+                + "     }"
+                + "   }"
+                + "}"
+                + "}";
+
+        query = toJsonQuery(graphQLRequest, new HashMap<>());
+
+        given()
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON)
+            .body(query)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            // Verify that the orderTotal attribute has an argument "precision".
+            .body("data.__type.fields.find { it.name == 'orderTotal' }.args.name[0]", equalTo("precision"));
+    }
+
+    @Test
+    public void testDelete() throws IOException {
+        String graphQLRequest = mutation(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("op", "DELETE"),
+                                        argument("ids", Arrays.asList("0"))
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("overallRating")
+                                )
+                        )
+                )
+        ).toGraphQLSpec();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Filtering by ID is not supported on playerStats";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testUpdate() throws IOException {
+
+        PlayerStats playerStats = new PlayerStats();
+        playerStats.setId("1");
+        playerStats.setHighScore(100);
+
+        String graphQLRequest = mutation(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("op", "UPDATE"),
+                                        argument("data", playerStats)
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("overallRating")
+                                )
+                        )
+                )
+        ).toGraphQLSpec();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Filtering by ID is not supported on playerStats";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testUpsertWithStaticModel() throws IOException {
+
+        PlayerStats playerStats = new PlayerStats();
+        playerStats.setId("1");
+        playerStats.setHighScore(100);
+
+        String graphQLRequest = mutation(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("op", "UPSERT"),
+                                        argument("data", playerStats)
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("overallRating")
+                                )
+                        )
+                )
+        ).toGraphQLSpec();
+
+        String expected = "Exception while fetching data (/playerStats) : Invalid operation: Filtering by ID is not supported on playerStats";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testUpsertWithDynamicModel() throws IOException {
+
+        Map<String, Object> order = new HashMap<>();
+        order.put("orderId", "1");
+        order.put("courierName", "foo");
+
+        String graphQLRequest = mutation(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("op", "UPSERT"),
+                                        argument("data", order)
+                                ),
+                                selections(
+                                        field("orderId")
+                                )
+                        )
+                )
+        ).toGraphQLSpec();
+
+        String expected = "Invalid operation: SalesNamespace_orderDetails is read only.";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+    }
+
+    /**
+     * Test missing required column filter on deliveryYear.
+     * @throws Exception exception
+     */
+    @Test
+    public void missingRequiredColumnFilter() throws Exception {
+        String graphQLRequest = document(
+                selection(
+
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("orderTotal"),
+                                        field("deliveryYear")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String errorMessage = "Exception while fetching data (/SalesNamespace_orderDetails) : "
+                + "Querying deliveryYear requires a mandatory filter: deliveryYear=={{deliveryYear}}";
+
+        runQueryWithExpectedError(graphQLRequest, errorMessage);
+    }
+
+    //Security
+    @Test
+    public void testPermissionFilters() throws IOException {
+        when(securityContextMock.isUserInRole("admin.user")).thenReturn(false);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "videoGame",
+                                arguments(
+                                        argument("sort", "\"timeSpentPerSession\"")
+                                ),
+                                selections(
+                                        field("timeSpent"),
+                                        field("sessions"),
+                                        field("timeSpentPerSession")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        //Records for Jon Doe and Jane Doe will only be aggregated.
+        String expected = document(
+                selections(
+                        field(
+                                "videoGame",
+                                selections(
+                                        field("timeSpent", 1070),
+                                        field("sessions", 85),
+                                        field("timeSpentPerSession", 12.588235)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+
+    }
+
+    @Test
+    public void testFieldPermissions() throws IOException {
+        when(securityContextMock.isUserInRole("operator")).thenReturn(false);
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "videoGame",
+                                selections(
+                                        field("timeSpent"),
+                                        field("sessions"),
+                                        field("timeSpentPerSession"),
+                                        field("timeSpentPerGame")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "Exception while fetching data (/videoGame/edges[0]/node/timeSpentPerGame) : ReadPermission Denied";
+
+        runQueryWithExpectedError(graphQLRequest, expected);
+
+    }
+
+    @Test
+    public void testEnumDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\"")
+                                ),
+                                selections(
+                                        field("customerRegionType1"),
+                                        field("customerRegionType2")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("customerRegionType1", (String) null, false),
+                                        field("customerRegionType2", (String) null, false)
+                                ),
+                                selections(
+                                        field("customerRegionType1", "STATE"),
+                                        field("customerRegionType2", "STATE")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testHjsonFilterByEnumDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31';customerRegionType1==STATE;customerRegionType2==STATE\"")
+                                ),
+                                selections(
+                                        field("customerRegionType1"),
+                                        field("customerRegionType2")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("customerRegionType1", "STATE"),
+                                        field("customerRegionType2", "STATE")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testJavaFilterByEnumDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("filter", "\"placeType1==STATE;placeType2==STATE\"")
+                                ),
+                                selections(
+                                        field("placeType1"),
+                                        field("placeType2")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("placeType1", "STATE"),
+                                        field("placeType2", "STATE")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testJavaSortByEnumDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "playerStats",
+                                arguments(
+                                        argument("sort", "\"placeType1,placeType2\"")
+                                ),
+                                selections(
+                                        field("placeType1"),
+                                        field("placeType2")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "playerStats",
+                                selections(
+                                        field("placeType1", "STATE"),
+                                        field("placeType2", "STATE")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testHjsonSortByEnumDimension() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                arguments(
+                                        argument("filter", "\"deliveryTime>='2020-01-01';deliveryTime<'2020-12-31'\""),
+                                        argument("sort", "\"customerRegionType1,customerRegionType2\"")
+                                ),
+                                selections(
+                                        field("customerRegionType1"),
+                                        field("customerRegionType2")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "SalesNamespace_orderDetails",
+                                selections(
+                                        field("customerRegionType1", (String) null, false),
+                                        field("customerRegionType2", (String) null, false)
+                                ),
+                                selections(
+                                        field("customerRegionType1", "STATE"),
+                                        field("customerRegionType2", "STATE")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/MetaDataStoreIntegrationTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/MetaDataStoreIntegrationTest.java
new file mode 100644
index 0000000000..2676db0470
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/MetaDataStoreIntegrationTest.java
@@ -0,0 +1,603 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.integration;
+
+import static com.yahoo.elide.datastores.aggregation.integration.AggregationDataStoreIntegrationTest.VALIDATOR;
+import static com.yahoo.elide.datastores.aggregation.integration.AggregationDataStoreIntegrationTest.getDBPasswordExtractor;
+import static com.yahoo.elide.datastores.aggregation.integration.AggregationDataStoreIntegrationTest.getDataSource;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.not;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.datastores.aggregation.checks.OperatorCheck;
+import com.yahoo.elide.datastores.aggregation.checks.VideoGameFilterCheck;
+import com.yahoo.elide.datastores.aggregation.framework.AggregationDataStoreTestHarness;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import example.TestCheckMappings;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.inject.Inject;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.sql.DataSource;
+
+public class MetaDataStoreIntegrationTest extends IntegrationTest {
+
+    private static final class SecurityHjsonIntegrationTestResourceConfig extends ResourceConfig {
+
+        @Inject
+        public SecurityHjsonIntegrationTestResourceConfig() {
+            register(new AbstractBinder() {
+                @Override
+                protected void configure() {
+                    Map<String, Class<? extends Check>> map = new HashMap<>(TestCheckMappings.MAPPINGS);
+                    map.put(OperatorCheck.OPERTOR_CHECK, OperatorCheck.class);
+                    map.put(VideoGameFilterCheck.NAME_FILTER, VideoGameFilterCheck.class);
+                    EntityDictionary dictionary = EntityDictionary.builder().checks(map).build();
+
+                    VALIDATOR.getElideSecurityConfig().getRoles().forEach(role ->
+                            dictionary.addRoleCheck(role, new Role.RoleMemberCheck(role))
+                    );
+
+                    DefaultFilterDialect defaultFilterStrategy = new DefaultFilterDialect(dictionary);
+                    RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+                    MultipleFilterDialect multipleFilterStrategy = new MultipleFilterDialect(
+                            Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy),
+                            Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy)
+                    );
+
+                    Elide elide = new Elide(new ElideSettingsBuilder(IntegrationTest.getDataStore())
+                            .withJoinFilterDialect(multipleFilterStrategy)
+                            .withSubqueryFilterDialect(multipleFilterStrategy)
+                            .withEntityDictionary(dictionary)
+                            .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                            .build());
+
+                    elide.doScans();
+                    bind(elide).to(Elide.class).named("elide");
+                }
+            });
+        }
+    }
+
+    public MetaDataStoreIntegrationTest() {
+        super(SecurityHjsonIntegrationTestResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    @Override
+    protected DataStoreTestHarness createHarness() {
+
+        HikariConfig config = new HikariConfig(File.separator + "jpah2db.properties");
+        DataSource defaultDataSource = new HikariDataSource(config);
+        SQLDialect defaultDialect = SQLDialectFactory.getDefaultDialect();
+        ConnectionDetails defaultConnectionDetails = new ConnectionDetails(defaultDataSource, defaultDialect);
+
+        Properties prop = new Properties();
+        prop.put("javax.persistence.jdbc.driver", config.getDriverClassName());
+        prop.put("javax.persistence.jdbc.url", config.getJdbcUrl());
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("aggregationStore", prop);
+
+        Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+
+        // Add an entry for "mycon" connection which is not from hjson
+        connectionDetailsMap.put("mycon", defaultConnectionDetails);
+        // Add connection details fetched from hjson
+        VALIDATOR.getElideSQLDBConfig().getDbconfigs().forEach(dbConfig ->
+            connectionDetailsMap.put(dbConfig.getName(),
+                            new ConnectionDetails(getDataSource(dbConfig, getDBPasswordExtractor()),
+                                            SQLDialectFactory.getDialect(dbConfig.getDialect())))
+        );
+
+        return new AggregationDataStoreTestHarness(emf, defaultConnectionDetails, connectionDetailsMap, VALIDATOR);
+    }
+
+    @Test
+    public void tableWithRequiredFilter() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStatsFiltered")
+                .then()
+                .body("data.attributes.requiredFilter", equalTo("recordedDate>={{start}};recordedDate<{{end}}"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testStaticTableRelationshipsAreExcluded() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/book/dimensions")
+                .then()
+                .body("data.id", containsInAnyOrder("book.language", "book.id", "book.awards", "book.price",
+                        "book.chapterCount", "book.publishDate", "book.editorName", "book.title", "book.genre"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testStaticComplexAttributesAreExcluded() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/embedded/dimensions")
+                .then()
+                .body("data.id", containsInAnyOrder("embedded.id", "embedded.segmentIds"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void namespaceTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/namespace/SalesNamespace")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("SalesNamespace"))
+                .body("data.attributes.friendlyName", equalTo("Sales"))
+                .body("data.relationships.tables.data.id", contains(
+                        "SalesNamespace_orderDetails",
+                        "SalesNamespace_deliveryDetails"));
+        given()
+                .accept("application/vnd.api+json")
+                .get("/namespace/default")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("default"))
+                .body("data.attributes.friendlyName", equalTo("DEFAULT")) // Overridden value
+                .body("data.attributes.description", equalTo("Default Namespace")) // Overridden value
+                .body("data.relationships.tables.data.id", hasItems("playerStats", "country", "planet"));
+        given()
+                .accept("application/vnd.api+json")
+                .get("/namespace/NoDescriptionNamespace") //"default" namespace added by Agg Store
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("NoDescriptionNamespace"))
+                .body("data.attributes.friendlyName", equalTo("NoDescriptionNamespace")) // No FriendlyName provided, defaulted to name
+                .body("data.attributes.description", equalTo("NoDescriptionNamespace")) // No description provided, defaulted to name
+                .body("data.relationships.tables.data.id", empty());
+    }
+
+    @Test
+    public void tableSourceTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.countryNickName/tableSource")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.relationships.suggestionColumns.data.id", containsInAnyOrder("subCountry.id", "subCountry.isoCode"))
+                .body("data.relationships.valueSource.data.id", equalTo("subCountry.name"));
+    }
+
+    @Test
+    public void tableTest() {
+        given()
+               .accept("application/vnd.api+json")
+               .get("/table/planet")
+               .then()
+               .statusCode(HttpStatus.SC_OK)
+               .body("data.attributes.isFact", equalTo(false)) //FromTable, TableMeta Present, isFact false
+               .body("data.attributes.friendlyName", equalTo("planet"))
+               .body("data.relationships.columns.data.id", containsInAnyOrder("planet.id", "planet.name"));
+        given()
+               .accept("application/vnd.api+json")
+               .get("/table/continent")
+               .then()
+               .statusCode(HttpStatus.SC_OK)
+               .body("data.attributes.isFact", equalTo(false)) //TableMeta Present, isFact false
+               .body("data.attributes.friendlyName", equalTo("continent"))
+               .body("data.relationships.columns.data.id", containsInAnyOrder("continent.id", "continent.name"));
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerRanking") //Entity Annotated
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.cardinality", equalTo("MEDIUM"));
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/country")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.isFact", equalTo(true)) //TableMeta Present, isFact default true
+                .body("data.attributes.cardinality", equalTo("UNKNOWN"))
+                .body("data.relationships.columns.data.id", containsInAnyOrder("country.id", "country.name",
+                        "country.inUsa", "country.unSeats", "country.nickName", "country.isoCode"));
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStatsView")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.isFact", equalTo(true)); //FromSubquery
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.isFact", equalTo(true)) //FromTable
+                .body("data.attributes.cardinality", equalTo("LARGE"))
+                .body("data.attributes.category", equalTo("Sports Category"))
+                .body("data.attributes.tags", containsInAnyOrder("Statistics", "Game"))
+                .body(
+                        "data.relationships.dimensions.data.id",
+                        containsInAnyOrder(
+                                "playerStats.playerName",
+                                "playerStats.playerRank",
+                                "playerStats.playerLevel",
+                                "playerStats.countryIsInUsa",
+                                "playerStats.countryUnSeats",
+                                "playerStats.countryNickName",
+                                "playerStats.player2Name",
+                                "playerStats.countryIsoCode",
+                                "playerStats.subCountryIsoCode",
+                                "playerStats.overallRating",
+                                "playerStats.placeType1",
+                                "playerStats.placeType2"))
+                .body("data.relationships.metrics.data.id", containsInAnyOrder("playerStats.id", "playerStats.lowScore",
+                        "playerStats.highScore", "playerStats.dailyAverageScorePerPeriod"))
+                .body("data.relationships.timeDimensions.data.id", containsInAnyOrder("playerStats.recordedDate",
+                        "playerStats.updatedDate"));
+        // Verify Table Arguments
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails?include=arguments")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.relationships.arguments.data.id",
+                        containsInAnyOrder("SalesNamespace_orderDetails.denominator"));
+    }
+
+    @Test
+    public void hiddenDimensionTest() {
+
+        //Non Hidden
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.zipCode")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        //Hidden
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.zipCodeHidden")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+
+        //Hidden
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/columns")
+                .then()
+                .body("data.id", not(contains("SalesNamespace_orderDetails.zipCodeHidden")))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void hiddenTableTest() {
+
+        //Non Hidden
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        //Hidden
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_performance")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void dimensionMetaDataTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.playerName")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("playerName"))
+                .body("data.attributes.friendlyName", equalTo("playerName"))
+                .body("data.attributes.valueType",  equalTo("TEXT"))
+                .body("data.attributes.columnType",  equalTo("FORMULA"))
+                .body("data.attributes.valueSourceType",  equalTo("NONE"))
+                .body("data.attributes.expression",  equalTo("{{player.name}}"))
+                .body("data.attributes.tableSource",  nullValue())
+                .body("data.relationships.table.data.id", equalTo("playerStats"))
+                .body("data.relationships.arguments.data", empty()); // No Arguments were set.
+    }
+
+    @Test
+    public void dimensionValuesOnReferenceTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.countryIsoCode")
+                .then()
+                .body("data.attributes.values", containsInAnyOrder("USA", "HKG"))
+                .body("data.attributes.valueSourceType", equalTo("ENUM"))
+                .body("data.attributes.tableSource", nullValue())
+                .body("data.attributes.columnType", equalTo("FORMULA"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void dimensionValuesOnFieldTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.overallRating")
+                .then()
+                .body("data.attributes.values", containsInAnyOrder("Good", "OK", "Great", "Terrible"))
+                .body("data.attributes.valueSourceType", equalTo("ENUM"))
+                .body("data.attributes.tableSource", nullValue())
+                .body("data.attributes.columnType", equalTo("FIELD"))
+                .body("data.attributes.cardinality", equalTo("MEDIUM"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void dimensionTagsTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.overallRating")
+                .then()
+                .body("data.attributes.tags", containsInAnyOrder("PUBLIC"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void dimensionIdTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/book/dimensions/book.id")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void metricIdTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/planet/metrics/planet.id")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void dimensionTableSourceOverrideTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.countryNickName")
+                .then()
+                .body("data.attributes.valueSourceType", equalTo("TABLE"))
+                .body("data.attributes.columnType", equalTo("FORMULA"))
+                .body("data.attributes.expression",  equalTo("{{country.nickName}}"))
+                .body("data.attributes.values", equalTo(Collections.emptyList()))
+                .body("data.attributes.cardinality", equalTo("UNKNOWN"))
+                .body("data.relationships.tableSource.data.id",  equalTo("subCountry.name"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void timeDimensionMetaDataTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/timeDimensions/playerStats.recordedDate?include=supportedGrains")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("recordedDate"))
+                .body("data.attributes.friendlyName", equalTo("recordedDate"))
+                .body("data.attributes.valueType",  equalTo("TIME"))
+                .body("data.attributes.columnType",  equalTo("FORMULA"))
+                .body("data.attributes.expression",  equalTo("{{$recordedDate}}"))
+                .body("data.relationships.arguments.data", empty()) // No Arguments were set.
+                .body("data.relationships.table.data.id", equalTo("playerStats"))
+                .body("data.relationships.supportedGrains.data.id", containsInAnyOrder("playerStats.recordedDate.day", "playerStats.recordedDate.month", "playerStats.recordedDate.quarter"))
+                .body("included.id", containsInAnyOrder("playerStats.recordedDate.day", "playerStats.recordedDate.month", "playerStats.recordedDate.quarter"))
+                .body("included.attributes.grain", containsInAnyOrder("DAY", "MONTH", "QUARTER"))
+                .body("included.attributes.expression",
+                        containsInAnyOrder(
+                                "PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')",
+                                "PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')",
+                                "PARSEDATETIME(CONCAT(FORMATDATETIME({{$$column.expr}}, 'yyyy-'), LPAD(3 * QUARTER({{$$column.expr}}) - 2, 2, '0'), '-01'), 'yyyy-MM-dd')"
+                        ));
+    }
+
+    @Test
+    public void metricMetaDataTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/metrics/playerStats.lowScore")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("lowScore"))
+                .body("data.attributes.friendlyName", equalTo("lowScore"))
+                .body("data.attributes.valueType",  equalTo("INTEGER"))
+                .body("data.attributes.columnType",  equalTo("FORMULA"))
+                .body("data.attributes.expression",  equalTo("MIN({{$lowScore}})"))
+                .body("data.attributes.category",  equalTo("Score Category"))
+                .body("data.attributes.description",  equalTo("very low score"))
+                .body("data.attributes.tags",  containsInAnyOrder("PRIVATE"))
+                .body("data.relationships.arguments.data", empty()) // No Arguments were set.
+                .body("data.relationships.table.data.id", equalTo("playerStats"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/videoGame/metrics/videoGame.timeSpentPerSession")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("timeSpentPerSession"))
+                .body("data.attributes.valueType",  equalTo("DECIMAL"))
+                .body("data.attributes.columnType",  equalTo("FORMULA"))
+                .body("data.attributes.expression",  equalTo("({{timeSpent}} / (CASE WHEN SUM({{$game_rounds}}) = 0 THEN 1 ELSE {{sessions}} END))"))
+                .body("data.relationships.arguments.data", empty()) // No Arguments were set.
+                .body("data.relationships.table.data.id", equalTo("videoGame"));
+
+        // Verify Metric Arguments
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/metrics/SalesNamespace_orderDetails.orderTotal?include=arguments")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("orderTotal"))
+                .body("data.attributes.friendlyName", equalTo("orderTotal"))
+                .body("data.relationships.arguments.data.id", containsInAnyOrder("SalesNamespace_orderDetails.orderTotal.precision"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/metrics/SalesNamespace_orderDetails.id")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("id"))
+                .body("data.attributes.friendlyName", equalTo("Row Number"))
+                .body("data.attributes.valueType",  equalTo("ID"))
+                .body("data.attributes.valueSourceType",  equalTo("NONE"))
+                .body("data.attributes.columnType",  equalTo("FIELD"))
+                .body("data.attributes.description",  equalTo("Row number for each record returned by a query."))
+                .body("data.attributes.expression",  equalTo("{{$id}}"))
+                .body("data.attributes.category",  nullValue())
+                .body("data.attributes.tags",  empty())
+                .body("data.attributes.values",  empty())
+                .body("data.relationships.arguments.data", empty()) // No Arguments were set.
+                .body("data.relationships.table.data.id", equalTo("SalesNamespace_orderDetails"));
+    }
+
+    @Test
+    public void versioningTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data", hasSize(greaterThan(30)));
+
+        given()
+                .header("ApiVersion", "")
+                .accept("application/vnd.api+json")
+                .get("/table")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data", hasSize(greaterThan(30)));
+
+        given()
+                .header("ApiVersion", "1.0")
+                .accept("application/vnd.api+json")
+                .get("/table")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data", hasSize(1))
+                .body("data.attributes.name", containsInAnyOrder("book"));
+
+        given()
+                .header("ApiVersion", "2.0")
+                .accept("application/vnd.api+json")
+                .get("/table")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors.detail", containsInAnyOrder("API version 2.0 not found"));
+    }
+
+    @Test
+    public void dynamicConfigMetaDataTest() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.customerRegion")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("customerRegion"))
+                .body("data.attributes.cardinality", equalTo("SMALL"))
+                .body("data.attributes.expression", equalTo("{{customer.customerRegion}}"))
+                .body("data.attributes.tableSource", nullValue())
+                .body("data.attributes.valueSourceType", equalTo("NONE"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.customerRegionRegion")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("customerRegionRegion"))
+                .body("data.attributes.cardinality", equalTo("UNKNOWN"))
+                .body("data.attributes.expression", equalTo("{{customer.region.region}}"))
+                .body("data.attributes.valueSourceType", equalTo("TABLE"))
+                .body("data.relationships.tableSource.data.id", equalTo("regionDetails.region"));
+    }
+
+    @Test
+    public void testEnumDimensionTypes() {
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.customerRegionType1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("customerRegionType1"))
+                .body("data.attributes.valueType", equalTo("TEXT"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/SalesNamespace_orderDetails/dimensions/SalesNamespace_orderDetails.customerRegionType2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("customerRegionType2"))
+                .body("data.attributes.valueType", equalTo("TEXT"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.placeType1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("placeType1"))
+                .body("data.attributes.valueType", equalTo("TEXT"));
+
+        given()
+                .accept("application/vnd.api+json")
+                .get("/table/playerStats/dimensions/playerStats.placeType2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("placeType2"))
+                .body("data.attributes.valueType", equalTo("TEXT"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContextTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContextTest.java
new file mode 100644
index 0000000000..473f4866c2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/ColumnContextTest.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.query.QueryPlanTranslator.addHiddenProjections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import org.junit.jupiter.api.Test;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.sql.DataSource;
+
+public class ColumnContextTest {
+
+    private SQLTable revenueFactTable;
+    private MetaDataStore metaDataStore;
+    private Map<String, Argument> queryArgs = new HashMap<>();
+
+    public ColumnContextTest() {
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(RevenueFact.class));
+        models.add(ClassType.of(CurrencyRate.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        // The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) ->
+                new ConnectionDetails(mockDataSource, SQLDialectFactory.getDefaultDialect()));
+
+        revenueFactTable = metaDataStore.getTable(ClassType.of(RevenueFact.class));
+
+        queryArgs.put("format", Argument.builder().name("format").value("999999D000000").build());
+        queryArgs.put("testPercentage", Argument.builder().name("testPercentage").value("0.1").build());
+    }
+
+    @Test
+    public void testLogicalReference() {
+
+        Map<String, Argument> impressionsArg = new HashMap<>();
+        impressionsArg.put("aggregation", Argument.builder().name("aggregation").value("SUM").build());
+        SQLMetricProjection impressions = (SQLMetricProjection) revenueFactTable.getMetricProjection("impressions",
+                        "impressions", impressionsArg);
+
+        Map<String, Argument> testImpressionsArg = new HashMap<>();
+        testImpressionsArg.put("aggregation", Argument.builder().name("aggregation").value("MIN").build());
+        SQLMetricProjection testImpressions = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("testImpressions", "testImpressions", testImpressionsArg);
+
+        SQLMetricProjection testRevenue = (SQLMetricProjection) revenueFactTable.getMetricProjection("testRevenue");
+        SQLMetricProjection testRevenueLogicalRef = (SQLMetricProjection) revenueFactTable.getMetricProjection("testRevenueLogicalRef");
+
+        Map<String, Argument> revenueArg = new HashMap<>();
+        revenueArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection revenueWithArg = (SQLMetricProjection) revenueFactTable.getMetricProjection("revenue",
+                        "revenueWithArg", revenueArg);
+
+        SQLDimensionProjection conversionRate = (SQLDimensionProjection) revenueFactTable.getDimensionProjection("conversionRate");
+        SQLDimensionProjection rateProvider = (SQLDimensionProjection) revenueFactTable.getDimensionProjection("rateProvider");
+
+        Query query = Query.builder()
+                        .source(revenueFactTable)
+                        .metricProjection(impressions)
+                        .metricProjection(testImpressions)
+                        .metricProjection(testRevenue)
+                        .metricProjection(testRevenueLogicalRef)
+                        .metricProjection(revenueWithArg)
+                        .dimensionProjection(conversionRate)
+                        .dimensionProjection(rateProvider)
+                        .arguments(queryArgs)
+                        .build();
+
+        Query.QueryBuilder builder = Query.builder()
+                        .source(query.getSource())
+                        .metricProjections(query.getMetricProjections())
+                        .dimensionProjections(query.getDimensionProjections())
+                        .arguments(query.getArguments());
+
+        Query expandedQuery = addHiddenProjections(metaDataStore, builder, query).build();
+
+        // definition: {{$$column.args.aggregation}}({{$impressions}})
+        // -> value of 'aggregation' argument is passed in the query for "impressions" column and same is used while
+        // resolving this column.
+        assertEquals("SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`impressions`)",
+                        impressions.toSQL(expandedQuery, metaDataStore));
+
+        // definition: {{impressions}}) * {{$$table.args.testPercentage}}
+        // -> default value of table argument 'testPercentage' is used.
+        // -> value of 'aggregation' argument is passed in the query for "testImpressions" column and same is used while
+        // resolving referenced column "impressions".
+        assertEquals("MIN(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`impressions`)) * 0.1",
+                        testImpressions.toSQL(expandedQuery, metaDataStore));
+
+        // definition: {{revenue}}
+        // revenue definition: TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}})
+        // -> default value of 'format' argument in "revenue" column is used while resolving this column.
+        // -> default value of 'format' argument in "revenue" column is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 99D00), 99D00)",
+                        testRevenue.toSQL(expandedQuery, metaDataStore));
+
+        // definition: {{revenueUsingLogicalRef}}
+        // revenueUsingLogicalRef's definition: TO_CHAR(SUM({{$revenue}}) * {{conversionRate}}, {{$$column.args.format}})
+        // -> default value of 'format' argument in "revenueUsingLogicalRef" column is used while resolving this column.
+        // -> This column references "conversionRate" which references "rate.conversionRate". Since conversionRate doesn't have
+        // 'format' argument defined, default value of 'format' argument in joined table's "conversionRate" column is used.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 9D0), 99D00)",
+                        testRevenueLogicalRef.toSQL(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}})
+        // -> value of 'format' argument is passed in the query for "revenue" column and same is used for resolving
+        // referenced column "rate.conversionRate" and this column.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 11D00), 11D00)",
+                        revenueWithArg.toSQL(expandedQuery, metaDataStore));
+
+        // definition: {{rate.conversionRate}}
+        // -> logical column 'conversionRate' doesn't support arguments.
+        // -> default value of 'format' argument in "conversionRate" column of joined table is used while resolving this.
+        assertEquals("TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 9D0)",
+                        conversionRate.toSQL(expandedQuery, metaDataStore));
+
+        // definition: {{rate.$provider}}
+        assertEquals("`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`provider`",
+                        rateProvider.toSQL(expandedQuery, metaDataStore));
+    }
+
+    @Test
+    public void testSqlHelper() {
+
+        Map<String, Argument> revenueArg = new HashMap<>();
+        revenueArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection revenueUsingSqlHelper = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("revenueUsingSqlHelper", "revenueUsingSqlHelper", revenueArg);
+
+        SQLMetricProjection impressionsPerUSD = (SQLMetricProjection) revenueFactTable.getMetricProjection("impressionsPerUSD");
+
+        Map<String, Argument> impressionsPerUSDArg = new HashMap<>();
+        impressionsPerUSDArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection impressionsPerUSDWithArg = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("impressionsPerUSD", "impressionsPerUSDWithArg", impressionsPerUSDArg);
+        // impressionsPerUSD2 invokes 'revenueUsingSqlHelper' instead of 'revenue'.
+        SQLMetricProjection impressionsPerUSD2 = (SQLMetricProjection) revenueFactTable.getMetricProjection("impressionsPerUSD2");
+
+        Query query = Query.builder()
+                        .source(revenueFactTable)
+                        .metricProjection(revenueUsingSqlHelper)
+                        .metricProjection(impressionsPerUSD)
+                        .metricProjection(impressionsPerUSDWithArg)
+                        .metricProjection(impressionsPerUSD2)
+                        .arguments(queryArgs)
+                        .build();
+
+        Query.QueryBuilder builder = Query.builder()
+                        .source(query.getSource())
+                        .metricProjections(query.getMetricProjections())
+                        .arguments(query.getArguments());
+
+        Query expandedQuery = addHiddenProjections(metaDataStore, builder, query).build();
+
+        // definition: TO_CHAR(SUM({{$revenue}}) * {{sql from='rate' column='conversionRate[format:9999D0000]'}}, {{$$column.args.format}})
+        // -> value of 'format' argument is passed in the query for "revenueUsingSqlHelper" column and same is used for
+        // resolving this column.
+        // -> pinned value (9999D0000) of 'format' argument in SQL helper is used while resolving referenced column "rate.conversionRate".
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 9999D0000), 11D00)",
+                        revenueUsingSqlHelper.toSQL(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenue[format:99999D00000]'}}, {{$$table.args.format}})
+        // -> {{$$table.args.format}} is resolved using query argument 'format' (999999D000000).
+        // -> pinned value (SUM) of 'aggregation' argument in SQL helper is used while resolving invoked column "impressions".
+        // -> pinned value (99999D00000) of 'format' argument in SQL helper is used while resolving invoked column "revenue".
+        // -> revenue definition is : TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}}),
+        // Available value of 'format' argument in "revenue" column is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`impressions`)"
+                        + " / TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 99999D00000), 99999D00000), 999999D000000)",
+                        impressionsPerUSD.toSQL(expandedQuery, metaDataStore));
+
+        // -> Even 'format' is passed in query column args, pinned value (9999D0000) of 'format' argument in SQL helper is used while
+        // resolving "revenue" column and same is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`impressions`)"
+                        + " / TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 99999D00000), 99999D00000), 999999D000000)",
+                        impressionsPerUSDWithArg.toSQL(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenueUsingSqlHelper[format:99999D00000]'}}, {{$$table.args.format}})
+        // -> As "rate.conversionRate" is invoked using SQL helper from "revenue" column, this uses the fixed value(9999D0000) of
+        // 'format' argument provided in definition of "revenueUsingSqlHelper" column.
+        assertEquals("TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`impressions`)"
+                        + " / TO_CHAR(SUM(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact`.`revenue`)"
+                        + " * TO_CHAR(`com_yahoo_elide_datastores_aggregation_metadata_RevenueFact_rate_221749474`.`conversion_rate`, 9999D0000), 99999D00000), 999999D000000)",
+                        impressionsPerUSD2.toSQL(expandedQuery, metaDataStore));
+    }
+}
+
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "revenue_fact")
+@TableMeta(arguments = {
+                @ArgumentDefinition(name = "testPercentage", type = ValueType.DECIMAL, defaultValue = "0.1"),
+                @ArgumentDefinition(name = "format", type = ValueType.TEXT)})
+@Include(name = "revenueFact")
+class RevenueFact {
+
+    @Id
+    private String id;
+
+    @MetricFormula(value = "{{$$column.args.aggregation}}({{$impressions}})",
+                    arguments = {@ArgumentDefinition(name = "aggregation", type = ValueType.TEXT,
+                                    defaultValue = "MAX")})
+    private Integer impressions;
+
+    @MetricFormula(value = "{{impressions}}) * {{$$table.args.testPercentage}}",
+                    arguments = {@ArgumentDefinition(name = "aggregation", type = ValueType.TEXT,
+                                    defaultValue = "MIN")})
+    private Integer testImpressions;
+
+    @MetricFormula("{{revenue}}")
+    private BigDecimal testRevenue;
+
+    @MetricFormula("{{revenueUsingLogicalRef}}")
+    private BigDecimal testRevenueLogicalRef;
+
+    @MetricFormula(value = "TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}})",
+                    arguments = {@ArgumentDefinition(name = "format", type = ValueType.TEXT,
+                                    defaultValue = "99D00")})
+    private BigDecimal revenue;
+
+    @MetricFormula(value = "TO_CHAR(SUM({{$revenue}}) * {{conversionRate}}, {{$$column.args.format}})",
+                    arguments = {@ArgumentDefinition(name = "format", type = ValueType.TEXT,
+                                    defaultValue = "99D00")})
+    private BigDecimal revenueUsingLogicalRef;
+
+    @MetricFormula(value = "TO_CHAR(SUM({{$revenue}}) * {{sql from='rate' column='conversionRate[format:9999D0000]'}}, {{$$column.args.format}})",
+                    arguments = {@ArgumentDefinition(name = "format", type = ValueType.TEXT,
+                                    defaultValue = "999D000")})
+    private BigDecimal revenueUsingSqlHelper;
+
+    @MetricFormula(value = "TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenue[format:99999D00000]'}}, {{$$table.args.format}})")
+    private Double impressionsPerUSD;
+
+    @MetricFormula(value = "TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenueUsingSqlHelper[format:99999D00000]'}}, {{$$table.args.format}})")
+    private Double impressionsPerUSD2;
+
+    @DimensionFormula("{{rate.conversionRate}}")
+    private String conversionRate;
+
+    @DimensionFormula("{{rate.$provider}}")
+    private String rateProvider;
+
+    @Join("{{rate.$id}} = {{$rateId}}")
+    private CurrencyRate rate;
+}
+
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "currency_rate")
+@Include(name = "currencyRate")
+class CurrencyRate {
+
+    @Id
+    private String id;
+
+    @DimensionFormula(value = "TO_CHAR({{$conversion_rate}}, {{$$column.args.format}})",
+                    arguments = {@ArgumentDefinition(name = "format", type = ValueType.TEXT,
+                                    defaultValue = "9D0")})
+    private String conversionRate;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTest.java
new file mode 100644
index 0000000000..397d6de98e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/MetaDataStoreTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Dimension;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Namespace;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Table;
+import com.yahoo.elide.datastores.aggregation.metadata.models.TimeDimension;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.PlayerStatsView;
+import example.PlayerStatsWithView;
+import example.dimensions.Country;
+import example.dimensions.CountryView;
+import example.dimensions.CountryViewNested;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+public class MetaDataStoreTest {
+    private ClassScanner scanner = DefaultClassScanner.getInstance();
+    private MetaDataStore dataStore;
+    public MetaDataStoreTest() {
+        Set<Type<?>> types = getClassType(Set.of(
+            PlayerStatsWithView.class,
+            PlayerStatsView.class,
+            PlayerStats.class,
+            PlayerRanking.class,
+            Country.class,
+            SubCountry.class,
+            Player.class,
+            CountryView.class,
+            CountryViewNested.class
+        ));
+
+        dataStore = new MetaDataStore(scanner, types, true);
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        for (Type<?> type: types) {
+            dictionary.bindEntity(type);
+        }
+
+        dataStore.populateEntityDictionary(dictionary);
+
+        ConnectionDetails connectionDetails = mock(ConnectionDetails.class);
+        QueryEngine engine = new SQLQueryEngine(dataStore, (unused) -> connectionDetails);
+    }
+
+    @Test
+    public void testSetup() {
+        assertNotNull(dataStore);
+    }
+
+    @Test
+    public void testHiddenFields() {
+        Table playerStats = dataStore.getTable(ClassType.of(PlayerStats.class));
+        Dimension country = playerStats.getDimension("country");
+        Dimension playerRank = playerStats.getDimension("playerRank");
+        Metric highScore = playerStats.getMetric("highScore");
+        Metric hiddenHighScore = playerStats.getMetric("hiddenHighScore");
+        TimeDimension recordedDate = playerStats.getTimeDimension("recordedDate");
+        TimeDimension hiddenRecordedDate = playerStats.getTimeDimension("hiddenRecordedDate");
+
+        assertTrue(country.isHidden());
+        assertFalse(playerRank.isHidden());
+        assertTrue(hiddenHighScore.isHidden());
+        assertFalse(highScore.isHidden());
+        assertTrue(hiddenRecordedDate.isHidden());
+        assertFalse(recordedDate.isHidden());
+
+        assertTrue(playerStats.getColumns().contains(highScore));
+        assertTrue(playerStats.getColumns().contains(recordedDate));
+        assertTrue(playerStats.getColumns().contains(playerRank));
+        assertFalse(playerStats.getColumns().contains(country));
+        assertFalse(playerStats.getColumns().contains(hiddenHighScore));
+        assertFalse(playerStats.getColumns().contains(hiddenRecordedDate));
+
+        assertTrue(playerStats.getAllColumns().contains(highScore));
+        assertTrue(playerStats.getAllColumns().contains(recordedDate));
+        assertTrue(playerStats.getAllColumns().contains(playerRank));
+        assertTrue(playerStats.getAllColumns().contains(country));
+        assertTrue(playerStats.getAllColumns().contains(hiddenHighScore));
+        assertTrue(playerStats.getAllColumns().contains(hiddenRecordedDate));
+
+        assertFalse(playerStats.getDimensions().contains(country));
+        assertFalse(playerStats.getMetrics().contains(hiddenHighScore));
+        assertFalse(playerStats.getTimeDimensions().contains(hiddenRecordedDate));
+        assertTrue(playerStats.getMetrics().contains(highScore));
+        assertTrue(playerStats.getDimensions().contains(playerRank));
+        assertTrue(playerStats.getTimeDimensions().contains(recordedDate));
+
+        assertTrue(playerStats.getAllDimensions().contains(country));
+        assertTrue(playerStats.getAllMetrics().contains(hiddenHighScore));
+        assertTrue(playerStats.getAllTimeDimensions().contains(hiddenRecordedDate));
+        assertTrue(playerStats.getAllMetrics().contains(highScore));
+        assertTrue(playerStats.getAllDimensions().contains(playerRank));
+        assertTrue(playerStats.getAllTimeDimensions().contains(recordedDate));
+    }
+
+    @Test
+    public void testHiddenTable() {
+        Table player = dataStore.getTable(ClassType.of(Player.class));
+        Table playerStats = dataStore.getTable(ClassType.of(PlayerStats.class));
+        assertTrue(player.isHidden());
+        assertFalse(playerStats.isHidden());
+
+        Namespace namespace = dataStore.getNamespace(ClassType.of(Player.class));
+        assertTrue(namespace.getTables().contains(playerStats));
+        assertFalse(namespace.getTables().contains(player));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContextTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContextTest.java
new file mode 100644
index 0000000000..c0bc1806b4
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/PhysicalRefColumnContextTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.query.QueryPlanTranslator.addHiddenProjections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLDimensionProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class PhysicalRefColumnContextTest {
+
+    private SQLTable revenueFactTable;
+    private MetaDataStore metaDataStore;
+    private Map<String, Argument> queryArgs = new HashMap<>();
+
+    public PhysicalRefColumnContextTest() {
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(RevenueFact.class));
+        models.add(ClassType.of(CurrencyRate.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        // The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) ->
+                new ConnectionDetails(mockDataSource, SQLDialectFactory.getDefaultDialect()));
+
+        revenueFactTable = metaDataStore.getTable(ClassType.of(RevenueFact.class));
+
+        queryArgs.put("format", Argument.builder().name("format").value("999999D000000").build());
+        queryArgs.put("testPercentage", Argument.builder().name("testPercentage").value("0.1").build());
+    }
+
+    @Test
+    public void testLogicalReference() {
+
+        Map<String, Argument> impressionsArg = new HashMap<>();
+        impressionsArg.put("aggregation", Argument.builder().name("aggregation").value("SUM").build());
+        SQLMetricProjection impressions = (SQLMetricProjection) revenueFactTable.getMetricProjection("impressions",
+                        "impressions", impressionsArg);
+
+        Map<String, Argument> testImpressionsArg = new HashMap<>();
+        testImpressionsArg.put("aggregation", Argument.builder().name("aggregation").value("MIN").build());
+        SQLMetricProjection testImpressions = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("testImpressions", "testImpressions", testImpressionsArg);
+
+        SQLMetricProjection testRevenue = (SQLMetricProjection) revenueFactTable.getMetricProjection("testRevenue");
+        SQLMetricProjection testRevenueLogicalRef = (SQLMetricProjection) revenueFactTable.getMetricProjection("testRevenueLogicalRef");
+
+        Map<String, Argument> revenueArg = new HashMap<>();
+        revenueArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection revenueWithArg = (SQLMetricProjection) revenueFactTable.getMetricProjection("revenue",
+                        "revenueWithArg", revenueArg);
+
+        SQLDimensionProjection conversionRate = (SQLDimensionProjection) revenueFactTable.getDimensionProjection("conversionRate");
+        SQLDimensionProjection rateProvider = (SQLDimensionProjection) revenueFactTable.getDimensionProjection("rateProvider");
+
+        Query query = Query.builder()
+                        .source(revenueFactTable)
+                        .metricProjection(impressions)
+                        .metricProjection(testImpressions)
+                        .metricProjection(testRevenue)
+                        .metricProjection(testRevenueLogicalRef)
+                        .metricProjection(revenueWithArg)
+                        .dimensionProjection(conversionRate)
+                        .dimensionProjection(rateProvider)
+                        .arguments(queryArgs)
+                        .build();
+
+        Query.QueryBuilder builder = Query.builder()
+                        .source(query.getSource())
+                        .metricProjections(query.getMetricProjections())
+                        .dimensionProjections(query.getDimensionProjections())
+                        .arguments(query.getArguments());
+
+        Query expandedQuery = addHiddenProjections(metaDataStore, builder, query).build();
+
+        // definition: {{$$column.args.aggregation}}({{$impressions}})
+        // -> value of 'aggregation' argument is passed in the query for "impressions" column and same is used while
+        // resolving this column.
+        assertEquals("SUM({{$impressions}})", impressions.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: {{impressions}}) * {{$$table.args.testPercentage}}
+        // -> default value of table argument 'testPercentage' is used.
+        // -> value of 'aggregation' argument is passed in the query for "testImpressions" column and same is used while
+        // resolving referenced column "impressions".
+        assertEquals("MIN({{$impressions}})) * 0.1", testImpressions.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: {{revenue}}
+        // revenue definition: TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}})
+        // -> default value of 'format' argument in "revenue" column is used while resolving this column.
+        // -> default value of 'format' argument in "revenue" column is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 99D00), 99D00)",
+                        testRevenue.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: {{revenueUsingLogicalRef}}
+        // revenueUsingLogicalRef's definition: TO_CHAR(SUM({{$revenue}}) * {{conversionRate}}, {{$$column.args.format}})
+        // -> default value of 'format' argument in "revenueUsingLogicalRef" column is used while resolving this column.
+        // -> This column references "conversionRate" which references "rate.conversionRate". Since conversionRate doesn't have
+        // 'format' argument defined, default value of 'format' argument in joined table's "conversionRate" column is used.
+        assertEquals("TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 9D0), 99D00)",
+                        testRevenueLogicalRef.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}})
+        // -> value of 'format' argument is passed in the query for "revenue" column and same is used for resolving
+        // referenced column "rate.conversionRate" and this column.
+        assertEquals("TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 11D00), 11D00)",
+                        revenueWithArg.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: {{rate.conversionRate}}
+        // -> logical column 'conversionRate' doesn't support arguments.
+        // -> default value of 'format' argument in "conversionRate" column of joined table is used while resolving this.
+        assertEquals("TO_CHAR({{rate.$conversion_rate}}, 9D0)", conversionRate.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: {{rate.$provider}}
+        assertEquals("{{rate.$provider}}", rateProvider.toPhysicalReferences(expandedQuery, metaDataStore));
+    }
+
+    @Test
+    public void testSqlHelper() {
+
+        Map<String, Argument> revenueArg = new HashMap<>();
+        revenueArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection revenueUsingSqlHelper = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("revenueUsingSqlHelper", "revenueUsingSqlHelper", revenueArg);
+
+        SQLMetricProjection impressionsPerUSD = (SQLMetricProjection) revenueFactTable.getMetricProjection("impressionsPerUSD");
+
+        Map<String, Argument> impressionsPerUSDArg = new HashMap<>();
+        impressionsPerUSDArg.put("format", Argument.builder().name("format").value("11D00").build());
+        SQLMetricProjection impressionsPerUSDWithArg = (SQLMetricProjection) revenueFactTable
+                        .getMetricProjection("impressionsPerUSD", "impressionsPerUSDWithArg", impressionsPerUSDArg);
+        // impressionsPerUSD2 invokes 'revenueUsingSqlHelper' instead of 'revenue'.
+        SQLMetricProjection impressionsPerUSD2 =  (SQLMetricProjection) revenueFactTable.getMetricProjection("impressionsPerUSD2");
+
+        Query query = Query.builder()
+                        .source(revenueFactTable)
+                        .metricProjection(revenueUsingSqlHelper)
+                        .metricProjection(impressionsPerUSD)
+                        .metricProjection(impressionsPerUSD2)
+                        .arguments(queryArgs)
+                        .build();
+
+        Query.QueryBuilder builder = Query.builder()
+                        .source(query.getSource())
+                        .metricProjections(query.getMetricProjections())
+                        .arguments(query.getArguments());
+
+        Query expandedQuery = addHiddenProjections(metaDataStore, builder, query).build();
+
+        // definition: TO_CHAR(SUM({{$revenue}}) * {{sql from='rate' column='conversionRate[format:9999D0000]'}}, {{$$column.args.format}})
+        // -> value of 'format' argument is passed in the query for "revenueUsingSqlHelper" column and same is used for
+        // resolving this column.
+        // -> pinned value (9999D0000) of 'format' argument in SQL helper is used while resolving referenced column "rate.conversionRate".
+        assertEquals("TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 9999D0000), 11D00)",
+                        revenueUsingSqlHelper.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenue[format:99999D00000]'}}, {{$$table.args.format}})
+        // -> {{$$table.args.format}} is resolved using query argument 'format' (999999D000000).
+        // -> pinned value (SUM) of 'aggregation' argument in SQL helper is used while resolving invoked column "impressions".
+        // -> pinned value (99999D00000) of 'format' argument in SQL helper is used while resolving invoked column "revenue".
+        // -> revenue definition is : TO_CHAR(SUM({{$revenue}}) * {{rate.conversionRate}}, {{$$column.args.format}}),
+        // Available value of 'format' argument in "revenue" column is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM({{$impressions}}) / TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 99999D00000), 99999D00000), 999999D000000)",
+                        impressionsPerUSD.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // -> Even 'format' is passed in query column args, pinned value (9999D0000) of 'format' argument in SQL helper is used while
+        // resolving "revenue" column and same is passed to joined table's "conversionRate" column.
+        assertEquals("TO_CHAR(SUM({{$impressions}}) / TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 99999D00000), 99999D00000), 999999D000000)",
+                        impressionsPerUSDWithArg.toPhysicalReferences(expandedQuery, metaDataStore));
+
+        // definition: TO_CHAR({{sql column='impressions[aggregation:SUM]'}} / {{sql column='revenueUsingSqlHelper[format:99999D00000]'}}, {{$$table.args.format}})
+        // -> As "rate.conversionRate" is invoked using SQL helper from "revenue" column, this uses the fixed value(9999D0000) of
+        // 'format' argument provided in definition of "revenueUsingSqlHelper" column.
+        assertEquals("TO_CHAR(SUM({{$impressions}}) / TO_CHAR(SUM({{$revenue}}) * TO_CHAR({{rate.$conversion_rate}}, 9999D0000), 99999D00000), 999999D000000)",
+                        impressionsPerUSD2.toPhysicalReferences(expandedQuery, metaDataStore));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueTypeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueTypeTest.java
new file mode 100644
index 0000000000..90d8a4df05
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/metadata/enums/ValueTypeTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class ValueTypeTest {
+
+    @BeforeAll
+    public static void init() {
+        CoerceUtil.register(Time.class, new Time.TimeSerde());
+    }
+
+    @Test
+    public void testValidTimeValues() {
+        assertTrue(ValueType.TIME.matches("2017"));
+        assertTrue(ValueType.TIME.matches("2017-01"));
+        assertTrue(ValueType.TIME.matches("2017-01-01"));
+        assertTrue(ValueType.TIME.matches("2017-01-01T01"));
+        assertTrue(ValueType.TIME.matches("2017-01-01T01:00"));
+        assertTrue(ValueType.TIME.matches("2017-01-01T01:00:00"));
+    }
+
+    @Test
+    public void testInvalidTimeValues() {
+        assertFalse(ValueType.TIME.matches("foo"));
+        assertFalse(ValueType.TIME.matches("2017;"));
+    }
+
+    @Test
+    public void testValidDecimalValues() {
+        assertTrue(ValueType.DECIMAL.matches("1"));
+        assertTrue(ValueType.DECIMAL.matches("01"));
+        assertTrue(ValueType.DECIMAL.matches("1.1"));
+        assertTrue(ValueType.DECIMAL.matches("0.1"));
+        assertTrue(ValueType.DECIMAL.matches(".1"));
+        assertTrue(ValueType.DECIMAL.matches("100.100"));
+        assertTrue(ValueType.DECIMAL.matches("-1"));
+        assertTrue(ValueType.DECIMAL.matches("-01"));
+        assertTrue(ValueType.DECIMAL.matches("-1.1"));
+        assertTrue(ValueType.DECIMAL.matches("-0.1"));
+        assertTrue(ValueType.DECIMAL.matches("-.1"));
+        assertTrue(ValueType.DECIMAL.matches("-100.100"));
+        assertTrue(ValueType.DECIMAL.matches("+1"));
+        assertTrue(ValueType.DECIMAL.matches("+01"));
+        assertTrue(ValueType.DECIMAL.matches("+1.1"));
+        assertTrue(ValueType.DECIMAL.matches("+0.1"));
+        assertTrue(ValueType.DECIMAL.matches("+.1"));
+        assertTrue(ValueType.DECIMAL.matches("+100.100"));
+    }
+
+    @Test
+    public void testInvalidDecimalValues() {
+        assertFalse(ValueType.DECIMAL.matches("foo"));
+        assertFalse(ValueType.DECIMAL.matches("01.00.00"));
+        assertFalse(ValueType.DECIMAL.matches("1;"));
+    }
+
+    @Test
+    public void testValidCoordinateValues() {
+        assertTrue(ValueType.COORDINATE.matches("1"));
+        assertTrue(ValueType.COORDINATE.matches("01"));
+        assertTrue(ValueType.COORDINATE.matches("1.1"));
+        assertTrue(ValueType.COORDINATE.matches("0.1"));
+        assertTrue(ValueType.COORDINATE.matches("100.100"));
+        assertTrue(ValueType.COORDINATE.matches("-1"));
+        assertTrue(ValueType.COORDINATE.matches("-01"));
+        assertTrue(ValueType.COORDINATE.matches("-1.1"));
+        assertTrue(ValueType.COORDINATE.matches("-0.1"));
+        assertTrue(ValueType.COORDINATE.matches("-100.100"));
+
+        assertTrue(ValueType.COORDINATE.matches("1,1"));
+        assertTrue(ValueType.COORDINATE.matches("01, 01"));
+        assertTrue(ValueType.COORDINATE.matches("1.1,   1.1"));
+        assertTrue(ValueType.COORDINATE.matches("-1.0, 1.0"));
+    }
+
+    @Test
+    public void testInvalidCoordinateValues() {
+        assertFalse(ValueType.COORDINATE.matches("1;"));
+        assertFalse(ValueType.COORDINATE.matches(".101"));
+        assertFalse(ValueType.COORDINATE.matches("+1.1"));
+        assertFalse(ValueType.COORDINATE.matches("1.1, 1.1, 1.1"));
+        assertFalse(ValueType.COORDINATE.matches("FOO"));
+    }
+
+    @Test
+    public void testInvalidMoneyValues() {
+        assertFalse(ValueType.MONEY.matches("foo"));
+        assertFalse(ValueType.MONEY.matches("01.00.00"));
+        assertFalse(ValueType.MONEY.matches("1;"));
+    }
+
+    @Test
+    public void testValidMoneyValues() {
+        assertTrue(ValueType.MONEY.matches("1"));
+        assertTrue(ValueType.MONEY.matches("01"));
+        assertTrue(ValueType.MONEY.matches("1.1"));
+        assertTrue(ValueType.MONEY.matches("0.1"));
+        assertTrue(ValueType.MONEY.matches(".1"));
+        assertTrue(ValueType.MONEY.matches("100.100"));
+        assertTrue(ValueType.MONEY.matches("-1"));
+        assertTrue(ValueType.MONEY.matches("-01"));
+        assertTrue(ValueType.MONEY.matches("-1.1"));
+        assertTrue(ValueType.MONEY.matches("-0.1"));
+        assertTrue(ValueType.MONEY.matches("-.1"));
+        assertTrue(ValueType.MONEY.matches("-100.100"));
+        assertTrue(ValueType.MONEY.matches("+1"));
+        assertTrue(ValueType.MONEY.matches("+01"));
+        assertTrue(ValueType.MONEY.matches("+1.1"));
+        assertTrue(ValueType.MONEY.matches("+0.1"));
+        assertTrue(ValueType.MONEY.matches("+.1"));
+        assertTrue(ValueType.MONEY.matches("+100.100"));
+    }
+
+    @Test
+    public void testValidNumberValues() {
+        assertTrue(ValueType.INTEGER.matches("1"));
+        assertTrue(ValueType.INTEGER.matches("01"));
+        assertTrue(ValueType.INTEGER.matches("-1"));
+        assertTrue(ValueType.INTEGER.matches("-01"));
+        assertTrue(ValueType.INTEGER.matches("+1"));
+        assertTrue(ValueType.INTEGER.matches("+01"));
+    }
+
+    @Test
+    public void testInvalidNumberValues() {
+        assertFalse(ValueType.INTEGER.matches("foo"));
+        assertFalse(ValueType.INTEGER.matches("01.00"));
+        assertFalse(ValueType.INTEGER.matches(".00"));
+        assertFalse(ValueType.INTEGER.matches("1."));
+        assertFalse(ValueType.INTEGER.matches("1;"));
+    }
+
+    @Test
+    public void testValidBooleanValues() {
+        assertTrue(ValueType.BOOLEAN.matches("1"));
+        assertTrue(ValueType.BOOLEAN.matches("0"));
+        assertTrue(ValueType.BOOLEAN.matches("true"));
+        assertTrue(ValueType.BOOLEAN.matches("false"));
+        assertTrue(ValueType.BOOLEAN.matches("tRuE"));
+        assertTrue(ValueType.BOOLEAN.matches("fAlSe"));
+    }
+
+    @Test
+    public void testInvalidBooleanValues() {
+        assertFalse(ValueType.BOOLEAN.matches("foo"));
+        assertFalse(ValueType.BOOLEAN.matches("01.00"));
+        assertFalse(ValueType.BOOLEAN.matches(".00"));
+        assertFalse(ValueType.BOOLEAN.matches("1."));
+        assertFalse(ValueType.BOOLEAN.matches("1;"));
+    }
+
+    @Test
+    public void testValidTextValues() {
+        assertTrue(ValueType.TEXT.matches("1"));
+        assertTrue(ValueType.TEXT.matches("01"));
+        assertTrue(ValueType.TEXT.matches("abc"));
+        assertTrue(ValueType.TEXT.matches("XYZ"));
+        assertTrue(ValueType.TEXT.matches("123abc"));
+        assertTrue(ValueType.TEXT.matches("___XYZ123abcABC"));
+        assertTrue(ValueType.TEXT.matches("r2-d2"));
+    }
+
+    @Test
+    public void testInvalidTextValues() {
+        assertFalse(ValueType.TEXT.matches("foo&"));
+        assertFalse(ValueType.TEXT.matches("01.00"));
+        assertFalse(ValueType.TEXT.matches(".00"));
+        assertFalse(ValueType.TEXT.matches("1."));
+        assertFalse(ValueType.TEXT.matches("DROP TABLE"));
+        assertFalse(ValueType.TEXT.matches("1;"));
+    }
+
+    @Test
+    public void testValidIdValues() {
+        assertTrue(ValueType.ID.matches("1"));
+        assertTrue(ValueType.ID.matches("01"));
+        assertTrue(ValueType.ID.matches("abc"));
+        assertTrue(ValueType.ID.matches("XYZ"));
+        assertTrue(ValueType.ID.matches("123abc"));
+        assertTrue(ValueType.ID.matches("___XYZ123abcABC"));
+    }
+
+    @Test
+    public void testInvalidIdValues() {
+        assertFalse(ValueType.ID.matches("foo&"));
+        assertFalse(ValueType.ID.matches("01.00"));
+        assertFalse(ValueType.ID.matches(".00"));
+        assertFalse(ValueType.ID.matches("1."));
+        assertFalse(ValueType.ID.matches("DROP TABLE"));
+        assertFalse(ValueType.ID.matches("1;"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMergerTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMergerTest.java
new file mode 100644
index 0000000000..62bc9cc00f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/query/DefaultQueryPlanMergerTest.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.query;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DefaultQueryPlanMergerTest {
+
+    @Test
+    public void testCannotMergeNoNesting() {
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+
+        when(a.canNest(any())).thenReturn(false);
+        when(b.canNest(any())).thenReturn(true);
+        when(a.nestDepth()).thenReturn(1);
+        when(b.nestDepth()).thenReturn(2);
+
+        assertFalse(merger.canMerge(a, b));
+        assertFalse(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testCannotMergeMismatchedUnnestedWhere() {
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+
+        when(a.canNest(any())).thenReturn(false);
+        when(b.canNest(any())).thenReturn(false);
+        when(a.nestDepth()).thenReturn(1);
+        when(b.nestDepth()).thenReturn(1);
+
+        FilterExpression expression = mock(FilterExpression.class);
+
+        when(a.getWhereFilter()).thenReturn(expression);
+        when(b.getWhereFilter()).thenReturn(null);
+
+        assertFalse(merger.canMerge(a, b));
+        assertFalse(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testCannotMergeMismatchedNestedWhere() {
+        Queryable source = mock(Queryable.class);
+
+        //A root source.
+        when(source.getSource()).thenReturn(source);
+
+        MetricProjection m1 = mock(MetricProjection.class);
+        MetricProjection m2 = mock(MetricProjection.class);
+        when(m1.getName()).thenReturn("m1");
+        when(m2.getName()).thenReturn("m2");
+        when(m1.canNest(any(), any())).thenReturn(true);
+        when(m1.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(m1, Set.of(m1)));
+        when(m2.canNest(any(), any())).thenReturn(true);
+        when(m2.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(m2, Set.of(m2)));
+
+        FilterExpression filterA = mock(FilterExpression.class);
+        FilterExpression filterB = mock(FilterExpression.class);
+
+        QueryPlan a = QueryPlan
+                .builder()
+                .source(source)
+                .whereFilter(filterA)
+                .metricProjection(m1)
+                .build();
+
+        QueryPlan nested = QueryPlan
+                .builder()
+                .source(source)
+                .whereFilter(filterB)
+                .metricProjection(m2)
+                .build();
+
+        QueryPlan b = QueryPlan
+                .builder()
+                .source(nested)
+                .metricProjection(m2)
+                .build();
+
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+
+        assertFalse(merger.canMerge(a, b));
+        assertFalse(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testCannotMergeMismatchedDimension() {
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+
+        when(a.canNest(any())).thenReturn(false);
+        when(b.canNest(any())).thenReturn(false);
+        when(a.nestDepth()).thenReturn(1);
+        when(b.nestDepth()).thenReturn(1);
+
+        DimensionProjection p1 = mock(DimensionProjection.class);
+        Map<String, Argument> args1 = new HashMap<>();
+        when(p1.getName()).thenReturn("name");
+        when(p1.getArguments()).thenReturn(args1);
+
+        DimensionProjection p2 = mock(DimensionProjection.class);
+        Map<String, Argument> args2 = new HashMap<>();
+        args2.put("foo", Argument.builder().name("a").value(100).build());
+        when(p2.getName()).thenReturn("name");
+        when(p2.getArguments()).thenReturn(args2);
+
+        when(a.getDimensionProjections()).thenReturn(List.of(p1));
+        when(b.getDimensionProjections()).thenReturn(List.of(p2));
+        when(b.getDimensionProjection(eq("name"))).thenReturn(p2);
+        when(a.getDimensionProjection(eq("name"))).thenReturn(p1);
+
+        assertFalse(merger.canMerge(a, b));
+        assertFalse(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testCannotMergeMismatchedTimeDimension() {
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+
+        when(a.canNest(any())).thenReturn(false);
+        when(b.canNest(any())).thenReturn(false);
+        when(a.nestDepth()).thenReturn(1);
+        when(b.nestDepth()).thenReturn(1);
+
+        TimeDimensionProjection p1 = mock(TimeDimensionProjection.class);
+        Map<String, Argument> args1 = new HashMap<>();
+        when(p1.getName()).thenReturn("name");
+        when(p1.getArguments()).thenReturn(args1);
+
+        TimeDimensionProjection p2 = mock(TimeDimensionProjection.class);
+        Map<String, Argument> args2 = new HashMap<>();
+        args2.put("foo", Argument.builder().name("a").value(100).build());
+        when(p2.getName()).thenReturn("name");
+        when(p2.getArguments()).thenReturn(args2);
+
+        when(a.getTimeDimensionProjections()).thenReturn(List.of(p1));
+        when(b.getTimeDimensionProjections()).thenReturn(List.of(p2));
+        when(b.getTimeDimensionProjection(eq("name"))).thenReturn(p2);
+        when(a.getTimeDimensionProjection(eq("name"))).thenReturn(p1);
+
+        assertFalse(merger.canMerge(a, b));
+        assertFalse(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testCanMerge() {
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+
+        when(a.canNest(any())).thenReturn(false);
+        when(b.canNest(any())).thenReturn(false);
+        when(a.nestDepth()).thenReturn(1);
+        when(b.nestDepth()).thenReturn(1);
+
+        FilterExpression expression = mock(FilterExpression.class);
+        when(a.getWhereFilter()).thenReturn(expression);
+        when(b.getWhereFilter()).thenReturn(expression);
+
+        TimeDimensionProjection p1 = mock(TimeDimensionProjection.class);
+        Map<String, Argument> args1 = new HashMap<>();
+        args1.put("foo", Argument.builder().name("a").value(100).build());
+        when(p1.getName()).thenReturn("name");
+        when(p1.getArguments()).thenReturn(args1);
+
+        TimeDimensionProjection p2 = mock(TimeDimensionProjection.class);
+        Map<String, Argument> args2 = new HashMap<>();
+        args2.put("foo", Argument.builder().name("a").value(100).build());
+        when(p2.getName()).thenReturn("name");
+        when(p2.getArguments()).thenReturn(args2);
+
+        when(a.getTimeDimensionProjections()).thenReturn(List.of(p1));
+        when(b.getTimeDimensionProjections()).thenReturn(List.of(p2));
+        when(b.getTimeDimensionProjection(eq("name"))).thenReturn(p2);
+        when(a.getTimeDimensionProjection(eq("name"))).thenReturn(p1);
+
+        assertTrue(merger.canMerge(a, b));
+        assertTrue(merger.canMerge(b, a));
+    }
+
+    @Test
+    public void testSimpleMerge() {
+        Queryable source = mock(Queryable.class);
+
+        //A root source.
+        when(source.getSource()).thenReturn(source);
+
+        MetricProjection m1 = mock(MetricProjection.class);
+        MetricProjection m2 = mock(MetricProjection.class);
+        when(m1.getName()).thenReturn("m1");
+        when(m2.getName()).thenReturn("m2");
+
+        DimensionProjection d1 = mock(DimensionProjection.class);
+        DimensionProjection d2 = mock(DimensionProjection.class);
+        when(d1.getName()).thenReturn("d1");
+        when(d2.getName()).thenReturn("d2");
+
+        TimeDimensionProjection t1 = mock(TimeDimensionProjection.class);
+        TimeDimensionProjection t2 = mock(TimeDimensionProjection.class);
+        when(t1.getName()).thenReturn("t1");
+        when(t2.getName()).thenReturn("t2");
+
+        QueryPlan a = QueryPlan
+                .builder()
+                .source(source)
+                .metricProjection(m1)
+                .dimensionProjection(d1)
+                .timeDimensionProjection(t1)
+                .build();
+
+        QueryPlan b = QueryPlan
+                .builder()
+                .source(source)
+                .metricProjection(m2)
+                .dimensionProjection(d2)
+                .timeDimensionProjection(t2)
+                .build();
+
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+
+        QueryPlan c = merger.merge(a, b);
+        assertEquals(List.of(m2, m1), c.getMetricProjections());
+        assertEquals(List.of(d2, d1), c.getDimensionProjections());
+        assertEquals(List.of(t2, t1), c.getTimeDimensionProjections());
+    }
+
+    @Test
+    public void testNestedMerge() {
+        Queryable source = mock(Queryable.class);
+
+        //A root source.
+        when(source.getSource()).thenReturn(source);
+
+        MetricProjection m1 = mock(MetricProjection.class);
+        MetricProjection m2 = mock(MetricProjection.class);
+        when(m1.getName()).thenReturn("m1");
+        when(m2.getName()).thenReturn("m2");
+        when(m1.canNest(any(), any())).thenReturn(true);
+        when(m1.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(m1, Set.of(m1)));
+        when(m2.canNest(any(), any())).thenReturn(true);
+        when(m2.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(m2, Set.of(m2)));
+
+        DimensionProjection d1 = mock(DimensionProjection.class);
+        DimensionProjection d2 = mock(DimensionProjection.class);
+        when(d1.getName()).thenReturn("d1");
+        when(d2.getName()).thenReturn("d2");
+        when(d1.canNest(any(), any())).thenReturn(true);
+        when(d1.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(d1, Set.of(d1)));
+        when(d2.canNest(any(), any())).thenReturn(true);
+        when(d2.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(d2, Set.of(d2)));
+
+        TimeDimensionProjection t1 = mock(TimeDimensionProjection.class);
+        TimeDimensionProjection t2 = mock(TimeDimensionProjection.class);
+        when(t1.getName()).thenReturn("t1");
+        when(t2.getName()).thenReturn("t2");
+        when(t1.canNest(any(), any())).thenReturn(true);
+        when(t1.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(t1, Set.of(t1)));
+        when(t2.canNest(any(), any())).thenReturn(true);
+        when(t2.nest(any(), any(), anyBoolean())).thenReturn(Pair.of(t2, Set.of(t2)));
+
+        FilterExpression filterExpression = mock(FilterExpression.class);
+
+        QueryPlan a = QueryPlan
+                .builder()
+                .source(source)
+                .whereFilter(filterExpression)
+                .metricProjection(m1)
+                .dimensionProjection(d1)
+                .timeDimensionProjection(t1)
+                .build();
+
+        QueryPlan nested = QueryPlan
+                .builder()
+                .source(source)
+                .metricProjection(m2)
+                .dimensionProjection(d2)
+                .timeDimensionProjection(t2)
+                .build();
+
+        QueryPlan b = QueryPlan
+                .builder()
+                .source(nested)
+                .metricProjection(m2)
+                .dimensionProjection(d2)
+                .timeDimensionProjection(t2)
+                .build();
+
+        MetaDataStore metaDataStore = mock(MetaDataStore.class);
+        DefaultQueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+
+        QueryPlan c = merger.merge(a, b);
+        assertNull(c.getWhereFilter());
+        assertEquals(List.of(m2, m1), c.getMetricProjections());
+        assertEquals(List.of(d2, d1), c.getDimensionProjections());
+        assertEquals(List.of(t2, t1), c.getTimeDimensionProjections());
+
+        QueryPlan d = (QueryPlan) c.getSource();
+        assertEquals(List.of(m2, m1), d.getMetricProjections());
+        assertEquals(List.of(d2, d1), d.getDimensionProjections());
+        assertEquals(List.of(t2, t1), d.getTimeDimensionProjections());
+        assertEquals(filterExpression, d.getWhereFilter());
+    }
+
+    @Test
+    public void testMultipleMergeSuccess() {
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+        QueryPlan c = mock(QueryPlan.class);
+
+        QueryPlanMerger merger = new QueryPlanMerger() {
+            @Override
+            public boolean canMerge(QueryPlan a, QueryPlan b) {
+                return true;
+            }
+
+            @Override
+            public QueryPlan merge(QueryPlan a, QueryPlan b) {
+                return mock(QueryPlan.class);
+            }
+        };
+
+        List<QueryPlan> results = merger.merge(List.of(a, b, c));
+
+        assertEquals(1, results.size());
+    }
+
+    @Test
+    public void testMultipleMergeFailure() {
+        QueryPlan a = mock(QueryPlan.class);
+        QueryPlan b = mock(QueryPlan.class);
+        QueryPlan c = mock(QueryPlan.class);
+
+        QueryPlanMerger merger = new QueryPlanMerger() {
+            @Override
+            public boolean canMerge(QueryPlan a, QueryPlan b) {
+                return false;
+            }
+
+            @Override
+            public QueryPlan merge(QueryPlan a, QueryPlan b) {
+                return mock(QueryPlan.class);
+            }
+        };
+
+        List<QueryPlan> results = merger.merge(List.of(a, b, c));
+
+        assertEquals(3, results.size());
+        assertEquals(List.of(a, b, c), results);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DruidExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DruidExplainQueryTest.java
new file mode 100644
index 0000000000..b5f7592cf4
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/DruidExplainQueryTest.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.BACKTICK;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.DOUBLE_QUOTE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class DruidExplainQueryTest  extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getDruidDialect());
+    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "WHERE \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+
+        testQueryExecution(TestQuery.WHERE_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL AND \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_AND.getQuery());
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL OR \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_OR.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_ONLY.getQuery());
+    }
+
+    /*
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+
+        //Druid does not allow HAVING on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.HAVING_DIMS_ONLY.getQuery());
+    }
+    */
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "AND MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_AND_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "OR MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_OR_DIMS.getQuery());
+    }
+
+    /*
+     * This test validates that generateCountDistinctClause() is called in the DruidDialect (same as default/H2).
+     */
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS \"pagination_subquery\"";
+        String expectedQueryStr2 =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS "
+                        + "\"lowScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\",PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" FROM \"playerStats\" AS "
+                        + "\"example_PlayerStats\"   "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 1 OFFSET 0";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+
+        testQueryExecution(TestQuery.PAGINATION_TOTAL.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_ASC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_DESC.getQuery());
+    }
+
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "ORDER BY \"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") "
+                        + "AS \"highScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "ORDER BY \"highScore\" DESC,\"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery());
+    }
+
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStatsView\".\"highScore\") AS "
+                        + "\"highScore\" FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "\"example_PlayerStatsView\"";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+
+        testQueryExecution(TestQuery.SUBQUERY.getQuery());
+    }
+
+    /* TODO: Druid doesn't support this. To make this work, we'd need to push the ORDER BY field into the SELECT
+    then drop it before returning the data.
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "ORDER BY \"example_PlayerStats\".\"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+
+        testQueryExecution(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery());
+    }
+    */
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX ) AS \"pagination_subquery\"";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX "
+                        + "ORDER BY MIN(\"example_PlayerStats\".\"lowScore\") DESC LIMIT 5 OFFSET 10";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.COMPLICATED.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithHavingQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithWhereQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" "
+                + "GROUP BY \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" ) AS \"pagination_subquery\"\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                + "\"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "LIMIT 1 OFFSET 0\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithSortingQuery(true).replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(true).replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        String expectedStr = getExpectedWhereWithArgumentsSQL().replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_VideoGame_player_XXX\".\"name\" AS \"playerName\" FROM \"videoGames\" AS \"example_VideoGame\""
+                        + " LEFT OUTER JOIN \"players\" AS \"example_VideoGame_player_XXX\" ON \"example_VideoGame\".\"player_id\""
+                        + " = \"example_VideoGame_player_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_VideoGame_playerInnerJoin_XXX\".\"name\" AS \"playerNameInnerJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                        + " INNER JOIN \"players\" AS \"example_VideoGame_playerInnerJoin_XXX\" ON \"example_VideoGame\".\"player_id\""
+                        + " = \"example_VideoGame_playerInnerJoin_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_VideoGame_playerCrossJoin_XXX\".\"name\" AS \"playerNameCrossJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                        + " CROSS JOIN \"players\" AS \"example_VideoGame_playerCrossJoin_XXX\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(\"example_VideoGame_playerStats_XXX\".\"highScore\") / SUM(\"example_VideoGame\".\"timeSpent\") AS \"normalizedHighScore\" "
+                + "FROM \"videoGames\" AS \"example_VideoGame\" "
+                + "LEFT OUTER JOIN \"playerStats\" AS \"example_VideoGame_playerStats_XXX\" "
+                + "ON \"example_VideoGame\".\"player_id\" = \"example_VideoGame_playerStats_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LIMIT 5 OFFSET 10\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydratorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydratorTest.java
new file mode 100644
index 0000000000..e434607369
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydratorTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.query.ColumnProjection.createSafeAlias;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+public class EntityHydratorTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+    }
+
+    @Test
+    void testEmptyResponse() throws Exception {
+        ResultSet resultSet = mock(ResultSet.class);
+        when(resultSet.next()).thenReturn(false);
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Query query = Query.builder()
+                .source(playerStatsTable) .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .build();
+
+        EntityHydrator hydrator = new EntityHydrator(resultSet, query, dictionary);
+        Iterator<Object> iterator = hydrator.iterator();
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, () -> hydrator.iterator().next());
+    }
+
+    @Test
+    void testTimeDimensionHydration() throws Exception {
+        ResultSet resultSet = mock(ResultSet.class);
+        ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
+        when(resultSet.next()).thenReturn(true, false);
+        when(resultSet.getObject("highScore")).thenReturn(1234);
+        when(resultSet.getObject(createSafeAlias("recordedDate", "byDay"))).thenReturn(new Date(1612390856));
+        when(resultSet.getObject(createSafeAlias("recordedDate", "byMonth"))).thenReturn(new Date(1612390856));
+        when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
+        when(resultSetMetaData.getColumnCount()).thenReturn(3);
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Query query = Query.builder()
+                .source(playerStatsTable) .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .build();
+
+        EntityHydrator hydrator = new EntityHydrator(resultSet, query, dictionary);
+
+        Iterator<Object> iterator = hydrator.iterator();
+        assertTrue(iterator.hasNext());
+        PlayerStats stats = (PlayerStats) iterator.next();
+
+        assertEquals(Month.class, stats.fetch("byMonth", null).getClass());
+        assertEquals(Day.class, stats.fetch("byDay", null).getClass());
+
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, () -> hydrator.iterator().next());
+    }
+
+    @Test
+    void testNullEnumHydration() throws Exception {
+        ResultSet resultSet = mock(ResultSet.class);
+        ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
+        when(resultSet.next()).thenReturn(true, false);
+        when(resultSet.getObject("overallRating")).thenReturn(null);
+        when(resultSetMetaData.getColumnCount()).thenReturn(1);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .build();
+
+        EntityHydrator hydrator = new EntityHydrator(resultSet, query, dictionary);
+
+        Iterator<Object> iterator = hydrator.iterator();
+        assertTrue(iterator.hasNext());
+        PlayerStats stats = (PlayerStats) iterator.next();
+
+        assertNull(stats.getOverallRating());
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, () -> hydrator.iterator().next());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/H2ExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/H2ExplainQueryTest.java
new file mode 100644
index 0000000000..adb5a11a59
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/H2ExplainQueryTest.java
@@ -0,0 +1,484 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This class tests SQLQueryEngine.explain() with the H2 dialect.
+ */
+public class H2ExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getH2Dialect());
+    }
+
+//    TODO - Should this generate an error from the engine level?
+//    @Test
+//    public void testExplainNoMetricsOrDimensions() {
+//        Query query = Query.builder()
+//                .table(playerStatsTable)
+//                .build();
+//        String expectedQueryStr = "SELECT DISTINCT  " +
+//                "FROM playerStats AS example_PlayerStats";
+//
+//        compareQueryLists(expectedQueryStr, engine.explain(query));
+//    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "WHERE `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+
+        testQueryExecution(TestQuery.WHERE_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL AND `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_AND.getQuery());
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL OR `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_OR.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "HAVING `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+
+        //H2 does not allow HAVING on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.HAVING_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "AND MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_AND_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "OR MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_OR_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS "
+                        + "`lowScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating`,PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` FROM `playerStats` AS "
+                        + "`example_PlayerStats`   "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 1 OFFSET 0";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+
+        testQueryExecution(TestQuery.PAGINATION_TOTAL.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_ASC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating` FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) "
+                        + "AS `highScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating` FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "ORDER BY MAX(`example_PlayerStats`.`highScore`) DESC,"
+                        + "`example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStatsView`.`highScore`) AS "
+                        + "`highScore` FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "`example_PlayerStatsView`";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+
+        testQueryExecution(TestQuery.SUBQUERY.getQuery());
+    }
+
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+
+        //H2 does not allow ORDER BY on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery());
+    }
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX ) AS `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC LIMIT 5 OFFSET 10";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.COMPLICATED.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithHavingQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithWhereQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` "
+                + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` "
+                + "GROUP BY `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` ) AS `pagination_subquery`\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                + "`example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "LIMIT 1 OFFSET 0\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithSortingQuery(false);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(false);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        assertEquals(getExpectedWhereWithArgumentsSQL(), queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_player_XXX`.`name` AS `playerName` FROM `videoGames` AS `example_VideoGame`"
+                                        + " LEFT OUTER JOIN `players` AS `example_VideoGame_player_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_player_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerInnerJoin_XXX`.`name` AS `playerNameInnerJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " INNER JOIN `players` AS `example_VideoGame_playerInnerJoin_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_playerInnerJoin_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerCrossJoin_XXX`.`name` AS `playerNameCrossJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " CROSS JOIN `players` AS `example_VideoGame_playerCrossJoin_XXX`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(`example_VideoGame_playerStats_XXX`.`highScore`) / SUM(`example_VideoGame`.`timeSpent`) AS `normalizedHighScore` "
+                + "FROM `videoGames` AS `example_VideoGame` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_VideoGame_playerStats_XXX` "
+                + "ON `example_VideoGame`.`player_id` = `example_VideoGame_playerStats_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LIMIT 5 OFFSET 10\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/HiveExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/HiveExplainQueryTest.java
new file mode 100644
index 0000000000..242e84efbe
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/HiveExplainQueryTest.java
@@ -0,0 +1,462 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This class tests SQLQueryEngine.explain() with the Hive dialect.
+ *
+ * *** KEY ASSUMPTIONS ***
+ *      * `from_unixtime(unix_timestamp())` shall be used instead of `PARSEDATETIME(FORMATDATETIME())`
+ *           when defining a datastore a real Hive environment.
+ *        - PlayerStats.DAY_FORMAT provides an example of where this logic would have to be updated
+ *        - com/yahoo/elide/datastores/aggregation/example/PlayerStats.java
+ *
+ *      * UDAFs (User-defined Aggregation Functions) such as MIN and MAX will be supported in the Hive environment
+ * *** * * * * * * * * ***
+ *
+ */
+public class HiveExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getHiveDialect());
+    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "WHERE `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL AND `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL OR `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    /* // TODO Group By is needed before a having clause in Hive
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        List<FilterPredicate.FilterParameter> params = ((FilterPredicate) query.getHavingFilter()).getParameters();
+        String expectedQueryStr =
+                "SELECT highScore AS `highScore`NoAgg, "
+                        + "MIN(`example_PlayerStats`.`lowScore`) AS lowScore "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY highscore HAVING highScore > 0"
+                        + params.get(0).getPlaceholder();
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }*/
+
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "HAVING `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+    }
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "AND MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "OR MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    /**
+     * This test validates that generateCountDistinctClause() is called in the HiveDialect. The difference between this
+     * and the default dialect is an omitted parentheses on the inner DISTINCT clause. (expectedQueryStr1)
+     */
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') FROM "
+                        + "`playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS "
+                        + "`lowScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating`,PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` FROM `playerStats` AS "
+                        + "`example_PlayerStats`   "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 0,1";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+    }
+
+    /* TODO - Query generation needs to support aliases in ORDER BY to make these pass
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT highScore AS `highScore`NoAgg "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY highScoreNoAgg ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT highScore AS `highScore`NoAgg "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY highScoreNoAgg DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+    }
+    */
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT "
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+    }
+
+    /* TODO: This test won't work because:
+     * 1) dims can only be added in aggregations, which means metrics must be aggregated
+     * 2) metrics aggregations are expanded in ORDER BY.
+     * Using aliases in ORDER BY will fix this.
+     *
+     * Sample string that would resolve this
+     * String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "MIN(`example_PlayerStats`.`lowScore`) AS lowScore "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "ORDER BY lowScore DESC";
+     *
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) "
+                        + "AS `highScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "overallRating FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+    }*/
+
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStatsView`.`highScore`) AS "
+                        + "`highScore` FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "`example_PlayerStatsView`";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+    }
+
+    /* TODO: Hive doesn't support this. To make this work, we'd need to push the ORDER BY field into the SELECT
+             then drop it before returning the data.
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+    }
+    */
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX ) AS `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC LIMIT 10,5";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithHavingQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithWhereQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` "
+                + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` "
+                + "GROUP BY `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` ) AS `pagination_subquery`\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                + "`example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "LIMIT 0,1\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithSortingQuery(false);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(false);
+        assertEquals(expectedStr, queryStr);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        assertEquals(getExpectedWhereWithArgumentsSQL(), queryStr);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_player_XXX`.`name` AS `playerName` FROM `videoGames` AS `example_VideoGame`"
+                                        + " LEFT OUTER JOIN `players` AS `example_VideoGame_player_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_player_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerInnerJoin_XXX`.`name` AS `playerNameInnerJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " INNER JOIN `players` AS `example_VideoGame_playerInnerJoin_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_playerInnerJoin_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerCrossJoin_XXX`.`name` AS `playerNameCrossJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " CROSS JOIN `players` AS `example_VideoGame_playerCrossJoin_XXX`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(`example_VideoGame_playerStats_XXX`.`highScore`) / SUM(`example_VideoGame`.`timeSpent`) AS `normalizedHighScore` "
+                + "FROM `videoGames` AS `example_VideoGame` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_VideoGame_playerStats_XXX` "
+                + "ON `example_VideoGame`.`player_id` = `example_VideoGame_playerStats_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LIMIT 10,5\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/MySQLExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/MySQLExplainQueryTest.java
new file mode 100644
index 0000000000..cb5d475e3d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/MySQLExplainQueryTest.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This class tests SQLQueryEngine.explain() with the MySQL dialect.
+ */
+public class MySQLExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getMySQLDialect());
+    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "WHERE `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+
+        testQueryExecution(TestQuery.WHERE_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL AND `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_AND.getQuery());
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = `example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE (`example_PlayerStats`.`overallRating` IS NOT NULL OR `example_PlayerStats_country_XXX`.`iso_code` IN (:XXX)) "
+                        + " GROUP BY `example_PlayerStats`.`overallRating`\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_OR.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "HAVING `example_PlayerStats`.`overallRating` IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+
+        //H2 does not allow HAVING on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.HAVING_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "AND MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_AND_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "HAVING (`example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "OR MAX(`example_PlayerStats`.`highScore`) > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_OR_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS `pagination_subquery`";
+        String expectedQueryStr2 =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS "
+                        + "`lowScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating`,PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` FROM `playerStats` AS "
+                        + "`example_PlayerStats`   "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 0,1";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+
+        testQueryExecution(TestQuery.PAGINATION_TOTAL.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_ASC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats`   "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT `example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating` FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) "
+                        + "AS `highScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating` FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating` "
+                        + "ORDER BY MAX(`example_PlayerStats`.`highScore`) DESC,"
+                        + "`example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStatsView`.`highScore`) AS "
+                        + "`highScore` FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "`example_PlayerStatsView`";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+
+        testQueryExecution(TestQuery.SUBQUERY.getQuery());
+    }
+
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "ORDER BY `example_PlayerStats`.`overallRating` DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+
+        //H2 does not allow ORDER BY on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery());
+    }
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX ) AS `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_country_XXX` "
+                        + "ON `example_PlayerStats`.`country_id` = "
+                        + "`example_PlayerStats_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_country_XXX`.`iso_code` "
+                        + "IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(`example_PlayerStats`.`lowScore`) > :XXX "
+                        + "ORDER BY MIN(`example_PlayerStats`.`lowScore`) DESC LIMIT 10,5";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        // H2 Postgress mode is not working when subquery has having clause.
+        // testQueryExecution(TestQuery.COMPLICATED.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithHavingQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithWhereQuery();
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` "
+                + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` "
+                + "GROUP BY `example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` ) AS `pagination_subquery`\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(`example_PlayerStats_XXX`.`highScore`) "
+                + "AS `dailyAverageScorePerPeriod`,`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `highScore`,"
+                + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate_XXX`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `recordedDate` "
+                + "FROM `playerStats` AS `example_PlayerStats` GROUP BY "
+                + "`example_PlayerStats`.`overallRating`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_PlayerStats_XXX` GROUP BY "
+                + "`example_PlayerStats_XXX`.`overallRating`, "
+                + "`example_PlayerStats_XXX`.`recordedDate` "
+                + "LIMIT 0,1\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithSortingQuery(false);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(false);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        assertEquals(getExpectedWhereWithArgumentsSQL(), queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_player_XXX`.`name` AS `playerName` FROM `videoGames` AS `example_VideoGame`"
+                                        + " LEFT OUTER JOIN `players` AS `example_VideoGame_player_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_player_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerInnerJoin_XXX`.`name` AS `playerNameInnerJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " INNER JOIN `players` AS `example_VideoGame_playerInnerJoin_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_playerInnerJoin_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerCrossJoin_XXX`.`name` AS `playerNameCrossJoin` FROM `videoGames` AS `example_VideoGame`"
+                                        + " CROSS JOIN `players` AS `example_VideoGame_playerCrossJoin_XXX`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(`example_VideoGame_playerStats_XXX`.`highScore`) / SUM(`example_VideoGame`.`timeSpent`) AS `normalizedHighScore` "
+                + "FROM `videoGames` AS `example_VideoGame` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_VideoGame_playerStats_XXX` "
+                + "ON `example_VideoGame`.`player_id` = `example_VideoGame_playerStats_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS `lowScore` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "LIMIT 10,5\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PostgresExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PostgresExplainQueryTest.java
new file mode 100644
index 0000000000..cc21bdc31e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PostgresExplainQueryTest.java
@@ -0,0 +1,546 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.BACKTICK;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.DOUBLE_QUOTE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This class tests a PostgreSQL generation of the engine.
+ * This class only covers known differences/ use cases and will continue to grow as relavent differences are discovered.
+ *
+ */
+public class PostgresExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getPostgresDialect());
+    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "WHERE \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+
+        testQueryExecution(TestQuery.WHERE_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL AND \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_AND.getQuery());
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL OR \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_OR.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+
+        //Postgres does not allow HAVING on a column not in the GROUP BY list.
+        //testQueryExecution(TestQuery.HAVING_DIMS_ONLY.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "AND MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_AND_DIMS.getQuery());
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "OR MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.HAVING_METRICS_OR_DIMS.getQuery());
+    }
+
+    /*
+     * This test validates that generateCountDistinctClause() is called in the PostgresDialect (same as default/H2).
+     */
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS \"pagination_subquery\"";
+
+        String expectedQueryStr2 =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS "
+                        + "\"lowScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\",PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" FROM \"playerStats\" AS "
+                        + "\"example_PlayerStats\"   "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 1 OFFSET 0";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+
+        testQueryExecution(TestQuery.PAGINATION_TOTAL.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_ASC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_DESC.getQuery());
+    }
+
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "ORDER BY \"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") "
+                        + "AS \"highScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "ORDER BY \"highScore\" DESC,\"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+
+        testQueryExecution(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery());
+    }
+
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStatsView\".\"highScore\") AS "
+                        + "\"highScore\" FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "\"example_PlayerStatsView\"";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+
+        testQueryExecution(TestQuery.SUBQUERY.getQuery());
+    }
+
+    /* TODO: Postgres doesn't support this. To make this work, we'd need to push the ORDER BY field into the SELECT
+    then drop it before returning the data.
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "ORDER BY \"example_PlayerStats\".\"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+
+        testQueryExecution(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery());
+    }
+    */
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX ) AS \"pagination_subquery\"";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX "
+                        + "ORDER BY MIN(\"example_PlayerStats\".\"lowScore\") DESC LIMIT 5 OFFSET 10";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+        // H2 Postgress mode is not working when subquery has having clause.
+        // testQueryExecution(TestQuery.COMPLICATED.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr =
+                "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") AS \"dailyAverageScorePerPeriod\","
+                        + "MAX(\"example_PlayerStats_XXX\".\"inner_agg_XXX\") AS \"highScore\","
+                        + "MIN(\"example_PlayerStats_XXX\".\"inner_agg_XXX\") AS \"lowScore\","
+                        + "\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                        + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "MAX(\"example_PlayerStats\".\"highScore\") AS \"inner_agg_XXX\","
+                        + "MIN(\"example_PlayerStats\".\"lowScore\") AS \"inner_agg_XXX\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                        + "\"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                        + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\"\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr =
+                "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                        + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                        + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                        + "\"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                        + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                        + "HAVING AVG(\"example_PlayerStats_XXX\".\"highScore\") > :XXX\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.SORT_DIM_DESC.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr =
+                "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                        + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                        + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                        + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\"\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" "
+                + "GROUP BY \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" ) AS \"pagination_subquery\"\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                + "\"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "LIMIT 1 OFFSET 0\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr =
+                "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                        + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                        + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                        + "\"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                        + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                        + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                        + "ORDER BY \"dailyAverageScorePerPeriod\" DESC,\"overallRating\" DESC";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(true).replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        String expectedStr = getExpectedWhereWithArgumentsSQL().replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_player_XXX\".\"name\" AS \"playerName\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " LEFT OUTER JOIN \"players\" AS \"example_VideoGame_player_XXX\" ON \"example_VideoGame\".\"player_id\""
+                                        + " = \"example_VideoGame_player_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_playerInnerJoin_XXX\".\"name\" AS \"playerNameInnerJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " INNER JOIN \"players\" AS \"example_VideoGame_playerInnerJoin_XXX\" ON \"example_VideoGame\".\"player_id\""
+                                        + " = \"example_VideoGame_playerInnerJoin_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_playerCrossJoin_XXX\".\"name\" AS \"playerNameCrossJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " CROSS JOIN \"players\" AS \"example_VideoGame_playerCrossJoin_XXX\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(\"example_VideoGame_playerStats_XXX\".\"highScore\") / SUM(\"example_VideoGame\".\"timeSpent\") AS \"normalizedHighScore\" "
+                + "FROM \"videoGames\" AS \"example_VideoGame\" "
+                + "LEFT OUTER JOIN \"playerStats\" AS \"example_VideoGame_playerStats_XXX\" "
+                + "ON \"example_VideoGame\".\"player_id\" = \"example_VideoGame_playerStats_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LIMIT 5 OFFSET 10\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PrestoDBExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PrestoDBExplainQueryTest.java
new file mode 100644
index 0000000000..7b98af1ae1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/PrestoDBExplainQueryTest.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.BACKTICK;
+import static com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect.DOUBLE_QUOTE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This class tests a Presto SQL generation of the engine.
+ * This class only covers known differences/ use cases and will continue to grow as relavent differences are discovered.
+ *
+ * *** KEY ASSUMPTIONS ***
+ *      * `parse_datetime(format_datetime())` shall be used instead of `parse_datetime(format_datetime())`
+ *           when defining a datastore a real Presto environment.
+ *        - PlayerStats.DAY_FORMAT provides an example of where this logic would have to be updated
+ *        - com/yahoo/elide/datastores/aggregation/example/PlayerStats.java
+ *
+ *      * UDAFs (User-defined Aggregation Functions) such as MIN and MAX will be supported in the Hive environment
+ *      * WHERE clause cannot contain aggregations, window functions or grouping operations in Presto
+ * *** * * * * * * * * ***
+ *
+ */
+public class PrestoDBExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(SQLDialectFactory.getPrestoDBDialect());
+    }
+
+    @Test
+    public void testExplainWhereDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "WHERE \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.WHERE_DIMS_ONLY.getQuery()));
+    }
+
+    @Test
+    public void testExplainWhereAnd() throws Exception {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL AND \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void textExplainWhereOr() throws Exception {
+        Query query = TestQuery.WHERE_OR.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = \"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE (\"example_PlayerStats\".\"overallRating\" IS NOT NULL OR \"example_PlayerStats_country_XXX\".\"iso_code\" IN (:XXX)) "
+                        + " GROUP BY \"example_PlayerStats\".\"overallRating\"\n";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testExplainHavingMetricsOnly() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testExplainHavingDimsOnly() throws Exception {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "HAVING \"example_PlayerStats\".\"overallRating\" IS NOT NULL";
+        compareQueryLists(expectedQueryStr, engine.explain(TestQuery.HAVING_DIMS_ONLY.getQuery()));
+    }
+
+    @Test
+    public void testExplainHavingMetricsAndDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_AND_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "AND MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testExplainHavingMetricsOrDims() throws Exception {
+        Query query = TestQuery.HAVING_METRICS_OR_DIMS.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "HAVING (\"example_PlayerStats\".\"overallRating\" IS NOT NULL "
+                        + "OR MAX(\"example_PlayerStats\".\"highScore\") > :XXX)";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    /*
+     * This test validates that generateCountDistinctClause() is called in the PrestoDialect (same as default/H2).
+     */
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') FROM "
+                        + "\"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') ) AS \"pagination_subquery\"";
+        String expectedQueryStr2 =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS "
+                        + "\"lowScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\",PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" FROM \"playerStats\" AS "
+                        + "\"example_PlayerStats\"   "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') LIMIT 1";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+    }
+
+    @Test
+    public void testExplainSortingAscending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" ASC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_ASC.getQuery()));
+    }
+
+    @Test
+    public void testExplainSortingDecending() {
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\"   "
+                        + "ORDER BY \"lowScore\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_DESC.getQuery()));
+    }
+
+
+    @Test
+    public void testExplainSortingByDimensionDesc() {
+        String expectedQueryStr =
+                "SELECT DISTINCT \"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "ORDER BY \"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_DIM_DESC.getQuery()));
+    }
+
+    @Test
+    public void testExplainSortingByMetricAndDimension() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") "
+                        + "AS \"highScore\",\"example_PlayerStats\".\"overallRating\" AS "
+                        + "\"overallRating\" FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\" "
+                        + "ORDER BY \"highScore\" DESC,\"overallRating\" DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SORT_METRIC_AND_DIM_DESC.getQuery()));
+    }
+
+
+    @Test
+    public void testExplainSelectFromSubquery() {
+        String expectedQueryStr =
+                "SELECT MAX(\"example_PlayerStatsView\".\"highScore\") AS "
+                        + "\"highScore\" FROM (SELECT stats.highScore, stats.player_id, c.name as countryName FROM "
+                        + "playerStats AS stats LEFT JOIN countries AS c ON stats.country_id = c.id "
+                        + "WHERE stats.overallRating = 'Great' AND stats.highScore >= 0) AS "
+                        + "\"example_PlayerStatsView\"";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.SUBQUERY.getQuery()));
+    }
+
+    /* TODO: Presto doesn't support this. To make this work, we'd need to push the ORDER BY field into the SELECT
+             then drop it before returning the data.
+    @Test
+    public void testExplainOrderByNotInSelect() {
+        String expectedQueryStr =
+                "SELECT MAX(example_PlayerStats.highScore) AS highScore "
+                        + "FROM playerStats AS example_PlayerStats "
+                        + "ORDER BY example_PlayerStats.overallRating DESC";
+        List<String> expectedQueryList = Arrays.asList(expectedQueryStr);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.ORDER_BY_DIMENSION_NOT_IN_SELECT.getQuery()));
+    }
+    */
+
+    @Test
+    public void testExplainComplicated() {
+        Query query = TestQuery.COMPLICATED.getQuery();
+
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX ) AS \"pagination_subquery\"";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                        + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS \"recordedDate\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LEFT OUTER JOIN \"countries\" AS \"example_PlayerStats_country_XXX\" "
+                        + "ON \"example_PlayerStats\".\"country_id\" = "
+                        + "\"example_PlayerStats_country_XXX\".\"id\" "
+                        + "WHERE \"example_PlayerStats_country_XXX\".\"iso_code\" "
+                        + "IN (:XXX) "
+                        + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING MIN(\"example_PlayerStats\".\"lowScore\") > :XXX "
+                        + "ORDER BY MIN(\"example_PlayerStats\".\"lowScore\") DESC LIMIT 5";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricQuery() {
+        Query query = TestQuery.NESTED_METRIC_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(TestQuery.NESTED_METRIC_QUERY.getQuery());
+    }
+
+    @Test
+    public void testNestedMetricWithHavingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_HAVING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithHavingQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithWhereQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_WHERE_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithWhereQuery().replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithPaginationQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_PAGINATION_QUERY.getQuery();
+        String exptectedQueryStr1 = "SELECT COUNT(*) FROM "
+                + "(SELECT \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                + "GROUP BY \"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" "
+                + "GROUP BY \"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" ) AS \"pagination_subquery\"\n";
+
+        String exptectedQueryStr2 = "SELECT AVG(\"example_PlayerStats_XXX\".\"highScore\") "
+                + "AS \"dailyAverageScorePerPeriod\",\"example_PlayerStats_XXX\".\"overallRating\" AS \"overallRating\","
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" AS \"recordedDate\" "
+                + "FROM (SELECT MAX(\"example_PlayerStats\".\"highScore\") AS \"highScore\","
+                + "\"example_PlayerStats\".\"overallRating\" AS \"overallRating\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd') AS \"recordedDate_XXX\","
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') AS \"recordedDate\" "
+                + "FROM \"playerStats\" AS \"example_PlayerStats\" GROUP BY "
+                + "\"example_PlayerStats\".\"overallRating\", "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-dd'), 'yyyy-MM-dd'), "
+                + "PARSEDATETIME(FORMATDATETIME(\"example_PlayerStats\".\"recordedDate\", 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS \"example_PlayerStats_XXX\" GROUP BY "
+                + "\"example_PlayerStats_XXX\".\"overallRating\", "
+                + "\"example_PlayerStats_XXX\".\"recordedDate\" "
+                + "LIMIT 1\n";
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr1);
+        expectedQueryList.add(exptectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithSortingQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_SORTING_QUERY.getQuery();
+
+        String exptectedQueryStr = getExpectedNestedMetricWithSortingQuery(true).replace(BACKTICK, DOUBLE_QUOTE);
+
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(exptectedQueryStr);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+    }
+
+    @Test
+    public void testNestedMetricWithAliasesQuery() {
+        Query query = TestQuery.NESTED_METRIC_WITH_ALIASES_QUERY.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+        queryStr = queryStr.replaceAll(":[a-zA-Z0-9_]+", ":XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_\\d+", "PlayerStats_XXX");
+        queryStr = queryStr.replaceAll("PlayerStats_country_\\d+", "PlayerStats_country_XXX");
+
+        String expectedStr = getExpectedNestedMetricWithAliasesSQL(true).replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+    }
+
+    @Test
+    public void testWhereWithArguments() {
+        Query query = TestQuery.WHERE_WITH_ARGUMENTS.getQuery();
+
+        String queryStr = engine.explain(query).get(0);
+        queryStr = repeatedWhitespacePattern.matcher(queryStr).replaceAll(" ");
+
+        String expectedStr = getExpectedWhereWithArgumentsSQL().replace(BACKTICK, DOUBLE_QUOTE);
+        assertEquals(expectedStr, queryStr);
+    }
+
+    @Test
+    public void testLeftJoin() throws Exception {
+        Query query = TestQuery.LEFT_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_player_XXX\".\"name\" AS \"playerName\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " LEFT OUTER JOIN \"players\" AS \"example_VideoGame_player_XXX\" ON \"example_VideoGame\".\"player_id\""
+                                        + " = \"example_VideoGame_player_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_playerInnerJoin_XXX\".\"name\" AS \"playerNameInnerJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " INNER JOIN \"players\" AS \"example_VideoGame_playerInnerJoin_XXX\" ON \"example_VideoGame\".\"player_id\""
+                                        + " = \"example_VideoGame_playerInnerJoin_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testCrossJoin() throws Exception {
+        Query query = TestQuery.CROSS_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT \"example_VideoGame_playerCrossJoin_XXX\".\"name\" AS \"playerNameCrossJoin\" FROM \"videoGames\" AS \"example_VideoGame\""
+                                        + " CROSS JOIN \"players\" AS \"example_VideoGame_playerCrossJoin_XXX\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+
+    @Test
+    public void testJoinWithMetrics() throws Exception {
+        Query query = TestQuery.METRIC_JOIN.getQuery();
+
+        String expectedQueryStr = "SELECT "
+                + "MAX(\"example_VideoGame_playerStats_XXX\".\"highScore\") / SUM(\"example_VideoGame\".\"timeSpent\") AS \"normalizedHighScore\" "
+                + "FROM \"videoGames\" AS \"example_VideoGame\" "
+                + "LEFT OUTER JOIN \"playerStats\" AS \"example_VideoGame_playerStats_XXX\" "
+                + "ON \"example_VideoGame\".\"player_id\" = \"example_VideoGame_playerStats_XXX\".\"id\"";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testPaginationMetricsOnly() throws Exception {
+        // pagination query should be empty since there is no dimension projection
+        Query query = TestQuery.PAGINATION_METRIC_ONLY.getQuery();
+        String expectedQueryStr =
+                "SELECT MIN(\"example_PlayerStats\".\"lowScore\") AS \"lowScore\" "
+                        + "FROM \"playerStats\" AS \"example_PlayerStats\" "
+                        + "LIMIT 5\n";
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.PAGINATION_METRIC_ONLY.getQuery());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/QueryEngineTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/QueryEngineTest.java
new file mode 100644
index 0000000000..e2a3d0c1a8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/QueryEngineTest.java
@@ -0,0 +1,847 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.datastores.aggregation.timegrains.Time.TIME_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.exceptions.InvalidParameterizedAttributeException;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.query.ImmutablePagination;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.query.QueryResult;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import example.PlayerStats;
+import example.PlayerStatsView;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Date;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class QueryEngineTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+    }
+
+    /**
+     * Test loading all three records from the table.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testFullTableLoad() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setLowScore(241);
+        stats0.setHighScore(2412);
+        stats0.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setLowScore(35);
+        stats1.setHighScore(1234);
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-12")));
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("2");
+        stats2.setLowScore(72);
+        stats2.setHighScore(1000);
+        stats2.setRecordedDate(new Day(Date.valueOf("2019-07-13")));
+
+        assertEquals(ImmutableList.of(stats0, stats1, stats2), results);
+    }
+
+    /**
+     * Test loading records using {@link FromSubquery}.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testFromSubQuery() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsViewTable.toQueryable())
+                .metricProjection(playerStatsViewTable.getMetricProjection("highScore"))
+                .arguments(playerStatsViewTableArgs)
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsView stats2 = new PlayerStatsView();
+        stats2.setId("0");
+        stats2.setHighScore(2412);
+
+        assertEquals(ImmutableList.of(stats2), results);
+    }
+
+    /**
+     * Test group by, having, dimension, metric at the same time.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testAllArgumentQuery() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryName", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsViewTable)
+                .metricProjection(playerStatsViewTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsViewTable.getDimensionProjection("countryName"))
+                .whereFilter(filterParser.parseFilterExpression("countryName=='United States'", playerStatsViewType, false))
+                .havingFilter(filterParser.parseFilterExpression("highScore > 300", playerStatsViewType, false))
+                .sorting(new SortingImpl(sortMap, PlayerStatsView.class, dictionary))
+                .arguments(playerStatsViewTableArgs)
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsView stats2 = new PlayerStatsView();
+        stats2.setId("0");
+        stats2.setHighScore(2412);
+        stats2.setCountryName("United States");
+
+        assertEquals(ImmutableList.of(stats2), results);
+    }
+
+    /**
+     * Test group by a degenerate dimension with a filter applied.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testDegenerateDimensionFilter() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .whereFilter(filterParser.parseFilterExpression("overallRating==Great", playerStatsType, false))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setLowScore(241);
+        stats1.setOverallRating("Great");
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        assertEquals(ImmutableList.of(stats1), results);
+    }
+
+    /**
+     * Test filtering on an attribute that's not present in the query.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testNotProjectedFilter() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsViewTable)
+                .metricProjection(playerStatsViewTable.getMetricProjection("highScore"))
+                .whereFilter(filterParser.parseFilterExpression("countryName=='United States'",
+                        playerStatsViewType, false))
+                .arguments(playerStatsViewTableArgs)
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsView stats2 = new PlayerStatsView();
+        stats2.setId("0");
+        stats2.setHighScore(2412);
+
+        assertEquals(ImmutableList.of(stats2), results);
+    }
+
+    @Test
+    public void testSortAggregatedMetric() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("lowScore", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setLowScore(241);
+        stats0.setOverallRating("Great");
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setLowScore(35);
+        stats1.setOverallRating("Good");
+
+        assertEquals(ImmutableList.of(stats0, stats1), results);
+    }
+
+    /**
+     * Test sorting by dimension attribute which is not present in the query.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testSortJoin() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("playerName", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setLowScore(72);
+        stats0.setOverallRating("Good");
+        stats0.setRecordedDate(new Day(Date.valueOf("2019-07-13")));
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setLowScore(241);
+        stats1.setOverallRating("Great");
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("2");
+        stats2.setLowScore(35);
+        stats2.setOverallRating("Good");
+        stats2.setRecordedDate(new Day(Date.valueOf("2019-07-12")));
+
+        assertEquals(ImmutableList.of(stats0, stats1, stats2), results);
+    }
+
+    /**
+     * Test pagination.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testPagination() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .pagination(new ImmutablePagination(0, 1, false, true))
+                .build();
+
+        QueryResult result = engine.executeQuery(query, transaction);
+        List<Object> data = toList(result.getData());
+
+        //Jon Doe,1234,72,Good,840,2019-07-12 00:00:00
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setLowScore(35);
+        stats1.setOverallRating("Good");
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-12")));
+
+        assertEquals(ImmutableList.of(stats1), data, "Returned record does not match");
+        assertEquals(3, result.getPageTotals(), "Page totals does not match");
+    }
+
+    /**
+     * Nested Queries with filter - Pagination
+     * @throws Exception
+     */
+    @Test
+    public void testPaginationWithFilter() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .whereFilter(filterParser.parseFilterExpression("overallRating==Great", playerStatsType, false))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .pagination(new ImmutablePagination(0, 1, false, true))
+                .build();
+
+        QueryResult result = engine.executeQuery(query, transaction);
+        List<Object> data = toList(result.getData());
+
+        //Jon Doe,1234,72,Good,840,2019-07-12 00:00:00
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setDailyAverageScorePerPeriod(2412.0f);
+        stats1.setOverallRating("Great");
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        assertEquals(ImmutableList.of(stats1), data, "Returned record does not match");
+        assertEquals(1, result.getPageTotals(), "Page totals does not match");
+    }
+
+    /**
+     * Test having clause integrates with group by clause.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testHavingClause() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .havingFilter(filterParser.parseFilterExpression("highScore < 2400", playerStatsType, false))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        // Only "Good" rating would have total high score less than 2400
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setHighScore(1234);
+
+        assertEquals(ImmutableList.of(stats1), results);
+    }
+
+    /**
+     * Test having clause integrates with group by clause and join.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testHavingClauseJoin() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryIsoCode"))
+                .havingFilter(filterParser.parseFilterExpression("countryIsoCode==USA", playerStatsType, false))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("1");
+        stats0.setOverallRating("Great");
+        stats0.setCountryIsoCode("USA");
+        stats0.setHighScore(2412);
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setCountryIsoCode("USA");
+        stats1.setHighScore(1234);
+
+        assertEquals(ImmutableList.of(stats1, stats0), results);
+    }
+
+    /**
+     * Test sorting by two different columns-one metric and one dimension.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testSortByMultipleColumns() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("lowScore", Sorting.SortOrder.desc);
+        sortMap.put("playerName", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setLowScore(241);
+        stats0.setOverallRating("Great");
+        stats0.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setLowScore(72);
+        stats1.setOverallRating("Good");
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-13")));
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("2");
+        stats2.setLowScore(35);
+        stats2.setOverallRating("Good");
+        stats2.setRecordedDate(new Day(Date.valueOf("2019-07-12")));
+
+        assertEquals(ImmutableList.of(stats0, stats1, stats2), results);
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToGroupBy() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryIsoCode"))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setHighScore(2412);
+        stats1.setCountryIsoCode("USA");
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("0");
+        stats2.setHighScore(1000);
+        stats2.setCountryIsoCode("HKG");
+
+        assertEquals(ImmutableList.of(stats2, stats1), results);
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToFilter() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .whereFilter(filterParser.parseFilterExpression("countryIsoCode==USA", playerStatsType, false))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setHighScore(1234);
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("1");
+        stats2.setOverallRating("Great");
+        stats2.setHighScore(2412);
+
+        assertEquals(ImmutableList.of(stats1, stats2), results);
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToSort() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryIsoCode", Sorting.SortOrder.asc);
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setCountryIsoCode("HKG");
+        stats1.setHighScore(1000);
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("1");
+        stats2.setOverallRating("Good");
+        stats2.setCountryIsoCode("USA");
+        stats2.setHighScore(1234);
+
+        PlayerStats stats3 = new PlayerStats();
+        stats3.setId("2");
+        stats3.setOverallRating("Great");
+        stats3.setCountryIsoCode("USA");
+        stats3.setHighScore(2412);
+
+        assertEquals(ImmutableList.of(stats1, stats2, stats3), results);
+    }
+
+    /**
+     * Test month grain query.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testTotalScoreByMonth() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .build();
+
+        //Change for monthly column
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setHighScore(2412);
+        stats0.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setHighScore(1234);
+        stats1.setRecordedDate(new Day(Date.valueOf("2019-07-12")));
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("2");
+        stats2.setHighScore(1000);
+        stats2.setRecordedDate(new Day(Date.valueOf("2019-07-13")));
+
+        assertEquals(ImmutableList.of(stats0, stats1, stats2), results);
+
+    }
+
+    /**
+     * Test filter by time dimension.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testFilterByTemporalDimension() throws Exception {
+        FilterPredicate predicate = new FilterPredicate(
+                new Path(PlayerStats.class, dictionary, "recordedDate"),
+                Operator.IN,
+                Lists.newArrayList(new Day(Date.valueOf("2019-07-11"))));
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .whereFilter(predicate)
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setHighScore(2412);
+        stats0.setRecordedDate(new Day(Date.valueOf("2019-07-11")));
+
+        assertEquals(ImmutableList.of(stats0), results);
+    }
+
+    @Test
+    public void testAmbiguousFields() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("lowScore", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .dimensionProjection(playerStatsTable.getDimensionProjection("playerName"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("player2Name"))
+                .metricProjection(playerStatsTable.getMetricProjection("lowScore"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setLowScore(35);
+        stats0.setPlayerName("Jon Doe");
+        stats0.setPlayer2Name("Jane Doe");
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setLowScore(72);
+        stats1.setPlayerName("Han");
+        stats1.setPlayer2Name("Jon Doe");
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("2");
+        stats2.setLowScore(241);
+        stats2.setPlayerName("Jane Doe");
+        stats2.setPlayer2Name("Han");
+
+        assertEquals(ImmutableList.of(stats0, stats1, stats2), results);
+    }
+
+    @Test
+    public void testNullJoinToStringValue() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryNickName"))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setHighScore(2412);
+        stats1.setCountryNickName("Uncle Sam");
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("0");
+        stats2.setHighScore(1000);
+        stats2.setCountryNickName(null);
+
+        assertEquals(ImmutableList.of(stats2, stats1), results);
+    }
+
+    @Test
+    public void testNullJoinToIntValue() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("countryUnSeats"))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setHighScore(2412);
+        stats1.setCountryUnSeats(1);
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("0");
+        stats2.setHighScore(1000);
+        stats2.setCountryUnSeats(0);
+
+        assertEquals(ImmutableList.of(stats2, stats1), results);
+    }
+
+    @Test
+    public void testMultipleTimeGrains() throws Exception {
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<PlayerStats> results = toList(engine.executeQuery(query, transaction).getData());
+        assertEquals(3, results.size());
+        assertEquals(1000, results.get(0).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-13")), results.get(0).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(0).fetch("byMonth", null));
+        assertEquals(1234, results.get(1).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-12")), results.get(1).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(1).fetch("byMonth", null));
+        assertEquals(2412, results.get(2).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-11")), results.get(2).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(2).fetch("byMonth", null));
+    }
+
+    @Test
+    public void testMultipleTimeGrainsFilteredByDayAlias() throws Exception {
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        FilterPredicate predicate = new FilterPredicate(
+                new Path(ClassType.of(PlayerStats.class), dictionary, "recordedDate", "byDay",
+                        new HashSet<>(dayArguments.values())),
+                Operator.IN,
+                Lists.newArrayList(new Day(Date.valueOf("2019-07-11"))));
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .whereFilter(predicate)
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<PlayerStats> results = toList(engine.executeQuery(query, transaction).getData());
+        assertEquals(1, results.size());
+        assertEquals(2412, results.get(0).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-11")), results.get(0).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(0).fetch("byMonth", null));
+    }
+
+    @Test
+    public void testMultipleTimeGrainsFilteredByMonthAlias() throws Exception {
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        FilterPredicate predicate = new FilterPredicate(
+                new Path(ClassType.of(PlayerStats.class), dictionary, "recordedDate", "byMonth",
+                        new HashSet<>(monthArguments.values())),
+                Operator.IN,
+                Lists.newArrayList(new Day(Date.valueOf("2019-07-01"))));
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .whereFilter(predicate)
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<PlayerStats> results = toList(engine.executeQuery(query, transaction).getData());
+        assertEquals(3, results.size());
+        assertEquals(1000, results.get(0).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-13")), results.get(0).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(0).fetch("byMonth", null));
+
+        assertEquals(1234, results.get(1).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-12")), results.get(1).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(1).fetch("byMonth", null));
+
+        assertEquals(2412, results.get(2).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-11")), results.get(2).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(2).fetch("byMonth", null));
+    }
+
+    @Test
+    public void testMultipleTimeGrainsSortedByDayAlias() throws Exception {
+        Map<String, Argument> dayArguments = new HashMap<>();
+        dayArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.DAY).build());
+
+        Map<String, Argument> monthArguments = new HashMap<>();
+        monthArguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("byDay", Sorting.SortOrder.asc);
+
+        Set<Attribute> sortAttributes = new HashSet<>(Arrays.asList(Attribute.builder()
+                .type(TIME_TYPE)
+                .name("recordedDate")
+                .alias("byDay")
+                .arguments(dayArguments.values())
+                .build()));
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byDay", dayArguments))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", "byMonth", monthArguments))
+                .sorting(new SortingImpl(sortMap, ClassType.of(PlayerStats.class), sortAttributes, dictionary))
+                .build();
+
+        List<PlayerStats> results = toList(engine.executeQuery(query, transaction).getData());
+        assertEquals(3, results.size());
+        assertEquals(2412, results.get(0).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-11")), results.get(0).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(0).fetch("byMonth", null));
+
+        assertEquals(1234, results.get(1).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-12")), results.get(1).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(1).fetch("byMonth", null));
+
+        assertEquals(1000, results.get(2).getHighScore());
+        assertEquals(new Day(Date.valueOf("2019-07-13")), results.get(2).fetch("byDay", null));
+        assertEquals(new Month(Date.valueOf("2019-07-01")), results.get(2).fetch("byMonth", null));
+    }
+
+    @Test
+    public void testMetricFormulaWithQueryPlan() throws Exception {
+
+        Map<String, Argument> arguments = new HashMap<>();
+        arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.MONTH).build());
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("dailyAverageScorePerPeriod"))
+                .timeDimensionProjection(
+                        playerStatsTable.getTimeDimensionProjection("recordedDate", arguments))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats0 = new PlayerStats();
+        stats0.setId("0");
+        stats0.setDailyAverageScorePerPeriod((float) 1548.6666);
+        stats0.setRecordedDate(new Month(Date.valueOf("2019-07-01")));
+
+        assertEquals(ImmutableList.of(stats0), results);
+    }
+
+    @Test
+    public void testInvalidTimeGrain() {
+        Map<String, Argument> arguments = new HashMap<>();
+        arguments.put("grain", Argument.builder().name("grain").value(TimeGrain.YEAR).build());
+
+
+        assertThrows(InvalidParameterizedAttributeException.class,
+                () -> playerStatsTable.getTimeDimensionProjection("recordedDate", arguments));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SubselectTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SubselectTest.java
new file mode 100644
index 0000000000..cb66bf5ff5
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/SubselectTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.google.common.collect.ImmutableList;
+import example.PlayerStats;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class SubselectTest extends SQLUnitTest {
+    private static final SubCountry SUB_HONG_KONG = new SubCountry();
+    private static final SubCountry SUB_USA = new SubCountry();
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+
+        SUB_HONG_KONG.setIsoCode("HKG");
+        SUB_HONG_KONG.setName("Hong Kong");
+        SUB_HONG_KONG.setId("344");
+
+        SUB_USA.setIsoCode("USA");
+        SUB_USA.setName("United States");
+        SUB_USA.setId("840");
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToGroupBy() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("subCountryIsoCode"))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("1");
+        stats1.setHighScore(2412);
+        stats1.setSubCountryIsoCode("USA");
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("0");
+        stats2.setHighScore(1000);
+        stats2.setSubCountryIsoCode("HKG");
+
+        assertEquals(ImmutableList.of(stats2, stats1), results);
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToFilter() throws Exception {
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .whereFilter(filterParser.parseFilterExpression("subCountryIsoCode==USA", playerStatsType, false))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setHighScore(1234);
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("1");
+        stats2.setOverallRating("Great");
+        stats2.setHighScore(2412);
+
+        assertEquals(2, results.size());
+        assertEquals(stats1, results.get(0));
+        assertEquals(stats2, results.get(1));
+    }
+
+    /**
+     * Test grouping by a dimension with a JoinTo annotation.
+     *
+     * @throws Exception exception
+     */
+    @Test
+    public void testJoinToSort() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("subCountryIsoCode", Sorting.SortOrder.asc);
+        sortMap.put("highScore", Sorting.SortOrder.asc);
+
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("subCountryIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStats stats1 = new PlayerStats();
+        stats1.setId("0");
+        stats1.setOverallRating("Good");
+        stats1.setSubCountryIsoCode("HKG");
+        stats1.setHighScore(1000);
+
+        PlayerStats stats2 = new PlayerStats();
+        stats2.setId("1");
+        stats2.setOverallRating("Good");
+        stats2.setSubCountryIsoCode("USA");
+        stats2.setHighScore(1234);
+
+        PlayerStats stats3 = new PlayerStats();
+        stats3.setId("2");
+        stats3.setOverallRating("Great");
+        stats3.setSubCountryIsoCode("USA");
+        stats3.setHighScore(2412);
+
+        assertEquals(3, results.size());
+        assertEquals(stats1, results.get(0));
+        assertEquals(stats2, results.get(1));
+        assertEquals(stats3, results.get(2));
+    }
+
+    //TODO - Add Invalid Request Tests
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/UseASBeforeTableAliasExplainQueryTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/UseASBeforeTableAliasExplainQueryTest.java
new file mode 100644
index 0000000000..28b3c3937a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/UseASBeforeTableAliasExplainQueryTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.AbstractSqlDialect;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UseASBeforeTableAliasExplainQueryTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init(new AbstractSqlDialect() {
+
+            @Override
+            public String getDialectType() {
+                return "test";
+            }
+
+            @Override
+            public boolean useASBeforeTableAlias() {
+                return false;
+            }
+        });
+    }
+
+    @Test
+    public void testExplainPagination() {
+        String expectedQueryStr1 = "SELECT COUNT(*) FROM "
+                        + "(SELECT `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "FROM `playerStats` `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) `pagination_subquery`";
+
+        String expectedQueryStr2 =
+                "SELECT MIN(`example_PlayerStats`.`lowScore`) AS "
+                        + "`lowScore`,`example_PlayerStats`.`overallRating` AS "
+                        + "`overallRating`,PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') AS `recordedDate` FROM `playerStats` "
+                        + "`example_PlayerStats`   "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "PARSEDATETIME(FORMATDATETIME("
+                        + "`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), "
+                        + "'yyyy-MM-dd') OFFSET 0 LIMIT 1";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+        compareQueryLists(expectedQueryList, engine.explain(TestQuery.PAGINATION_TOTAL.getQuery()));
+    }
+
+    @Test
+    public void testInnerJoin() throws Exception {
+        Query query = TestQuery.INNER_JOIN.getQuery();
+
+        String expectedQueryStr =
+                        "SELECT DISTINCT `example_VideoGame_playerInnerJoin_XXX`.`name` AS `playerNameInnerJoin` FROM `videoGames` `example_VideoGame`"
+                                        + " INNER JOIN `players` `example_VideoGame_playerInnerJoin_XXX` ON `example_VideoGame`.`player_id`"
+                                        + " = `example_VideoGame_playerInnerJoin_XXX`.`id`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ViewTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ViewTest.java
new file mode 100644
index 0000000000..8da2da1e6f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/ViewTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.PlayerStatsWithView;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class ViewTest extends SQLUnitTest {
+    protected static SQLTable playerStatsWithViewSchema;
+
+    @BeforeAll
+    public static void init() {
+        SQLUnitTest.init();
+        playerStatsWithViewSchema =
+                (SQLTable) engine.getMetaDataStore().getTable("playerStatsWithView", NO_VERSION);
+    }
+
+    @Test
+    public void testViewAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsWithViewSchema.getDimensionProjection("countryViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+
+    @Test
+    public void testNestedViewAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(playerStatsWithViewSchema.getDimensionProjection("countryViewViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+
+    @Test
+    public void testNestedRelationshipAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(
+                        playerStatsWithViewSchema.getDimensionProjection("countryViewViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+
+    @Test
+    public void testSortingViewAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(
+                        playerStatsWithViewSchema.getDimensionProjection("countryViewViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+
+    @Test
+    public void testSortingNestedViewAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(
+                        playerStatsWithViewSchema.getDimensionProjection("countryViewViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+
+    @Test
+    public void testSortingNestedRelationshipAttribute() throws Exception {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryViewViewIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(playerStatsWithViewSchema)
+                .metricProjection(playerStatsWithViewSchema.getMetricProjection("lowScore"))
+                .dimensionProjection(
+                        playerStatsWithViewSchema.getDimensionProjection("countryViewViewIsoCode"))
+                .sorting(new SortingImpl(sortMap, PlayerStatsWithView.class, dictionary))
+                .build();
+
+        List<Object> results = toList(engine.executeQuery(query, transaction).getData());
+
+        PlayerStatsWithView usa0 = new PlayerStatsWithView();
+        usa0.setId("0");
+        usa0.setLowScore(35);
+        usa0.setCountryViewViewIsoCode("USA");
+
+        PlayerStatsWithView hk1 = new PlayerStatsWithView();
+        hk1.setId("1");
+        hk1.setLowScore(72);
+        hk1.setCountryViewViewIsoCode("HKG");
+
+        assertEquals(2, results.size());
+        assertEquals(usa0, results.get(0));
+        assertEquals(hk1, results.get(1));
+
+        // the join would not happen for a view join
+        PlayerStatsWithView actualStats1 = (PlayerStatsWithView) results.get(0);
+        assertNull(actualStats1.getCountry());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractorTest.java
new file mode 100644
index 0000000000..f27c579505
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteInnerAggregationExtractorTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+public class CalciteInnerAggregationExtractorTest {
+
+    private SQLDialect dialect = new H2Dialect();
+
+    @Test
+    public void testExpressionParsing() throws Exception {
+        String sql = "        SUM (CASE\n"
+                + "                WHEN 'number_of_lectures' > 20 then 1\n"
+                + "                ELSE 0\n"
+                + "        END) / SUM(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+        CalciteInnerAggregationExtractor extractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> aggregations = node.accept(extractor);
+
+        assertEquals(2, aggregations.size());
+        assertEquals(1, aggregations.get(0).size());
+        assertEquals(1, aggregations.get(1).size());
+        assertEquals("SUM(CASE WHEN 'number_of_lectures' > 20 THEN 1 ELSE 0 END)", aggregations.get(0).get(0));
+        assertEquals("SUM(`blah`)", aggregations.get(1).get(0));
+    }
+
+    @Test
+    public void testCaseStmtParsing() throws Exception {
+        String sql = "        CASE\n"
+                + "                WHEN SUM(blah) = 0 THEN 1\n"
+                + "                ELSE SUM('number_of_lectures') / SUM(blah)\n"
+                + "        END";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+        CalciteInnerAggregationExtractor extractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> aggregations = node.accept(extractor);
+
+        assertEquals(3, aggregations.size());
+        assertEquals(1, aggregations.get(0).size());
+        assertEquals(1, aggregations.get(1).size());
+        assertEquals(1, aggregations.get(2).size());
+        assertEquals("SUM(`blah`)", aggregations.get(0).get(0));
+        assertEquals("SUM('number_of_lectures')", aggregations.get(1).get(0));
+        assertEquals("SUM(`blah`)", aggregations.get(2).get(0));
+    }
+
+    @Test
+    public void testInvalidAggregationFunction() throws Exception {
+        String sql = "CUSTOM_SUM(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+        CalciteInnerAggregationExtractor extractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> aggregations = node.accept(extractor);
+
+        assertTrue(aggregations.isEmpty());
+    }
+
+    @Test
+    public void testAverageFunction() throws Exception {
+        String sql = "AVG(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+        CalciteInnerAggregationExtractor extractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> aggregations = node.accept(extractor);
+
+        assertEquals(1, aggregations.size());
+        assertEquals(2, aggregations.get(0).size());
+        assertEquals("SUM(`blah`)", aggregations.get(0).get(0));
+        assertEquals("COUNT(`blah`)", aggregations.get(0).get(1));
+    }
+
+    @Test
+    public void testVarPopFunction() throws Exception {
+        String sql = "VAR_POP(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+        CalciteInnerAggregationExtractor extractor = new CalciteInnerAggregationExtractor(dialect);
+        List<List<String>> aggregations = node.accept(extractor);
+
+        assertEquals(1, aggregations.size());
+        assertEquals(3, aggregations.get(0).size());
+        assertEquals("SUM(`blah` * `blah`)", aggregations.get(0).get(0));
+        assertEquals("SUM(`blah`)", aggregations.get(0).get(1));
+        assertEquals("COUNT(`blah`)", aggregations.get(0).get(2));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractorTest.java
new file mode 100644
index 0000000000..683da1ce70
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/CalciteOuterAggregationExtractorTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CalciteOuterAggregationExtractorTest {
+
+    private SQLDialect dialect = new H2Dialect();
+
+    @Test
+    public void testExpressionParsing() throws Exception {
+        String sql = "        SUM (CASE\n"
+                + "                WHEN 'number_of_lectures' > 20 then 1\n"
+                + "                ELSE 0\n"
+                + "        END) / SUM(blah)";
+
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+
+        List<List<String>> substitutions = Arrays.asList(Arrays.asList("SUB1"), Arrays.asList("SUB2"));
+        CalciteOuterAggregationExtractor extractor = new CalciteOuterAggregationExtractor(dialect, substitutions);
+        String actual = node.accept(extractor).toSqlString(dialect.getCalciteDialect()).getSql();
+        String expected = "SUM(`SUB1`) / SUM(`SUB2`)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testCaseStmtParsing() throws Exception {
+        String sql = "        CASE\n"
+                + "                WHEN SUM(blah) = 0 THEN 1\n"
+                + "                ELSE SUM('number_of_lectures') / SUM(blah)\n"
+                + "        END";
+
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+
+        List<List<String>> substitutions = Arrays.asList(Arrays.asList("SUB1"), Arrays.asList("SUB2"), Arrays.asList("SUB1"));
+        CalciteOuterAggregationExtractor extractor = new CalciteOuterAggregationExtractor(dialect, substitutions);
+        String actual = node.accept(extractor).toSqlString(dialect.getCalciteDialect()).getSql();
+        String expected = "CASE WHEN SUM(`SUB1`) = 0 THEN 1 ELSE SUM(`SUB2`) / SUM(`SUB1`) END";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testCustomAggregationFunction() throws Exception {
+        String sql = "CUSTOM_SUM(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+
+        List<List<String>> substitutions = Arrays.asList(Arrays.asList("SUB1"));
+        CalciteOuterAggregationExtractor extractor = new CalciteOuterAggregationExtractor(dialect, substitutions);
+        String actual = node.accept(extractor).toSqlString(dialect.getCalciteDialect()).getSql();
+        String expected = "`CUSTOM_SUM`(`blah`)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testAverageFunction() throws Exception {
+        String sql = "AVG(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+
+        List<List<String>> substitutions = Arrays.asList(Arrays.asList("SUB1"));
+        CalciteOuterAggregationExtractor extractor = new CalciteOuterAggregationExtractor(dialect, substitutions);
+        String actual = node.accept(extractor).toSqlString(dialect.getCalciteDialect()).getSql();
+        String expected = "SUM(`SUB1`) / COUNT(`SUB1`)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testVarPopFunction() throws Exception {
+        String sql = "VAR_POP(blah)";
+        SqlParser sqlParser = SqlParser.create(sql, CalciteUtils.constructParserConfig(dialect));
+        SqlNode node = sqlParser.parseExpression();
+
+        List<List<String>> substitutions = Arrays.asList(Arrays.asList("SUB1", "SUB2", "SUB3"));
+
+        CalciteOuterAggregationExtractor extractor = new CalciteOuterAggregationExtractor(dialect, substitutions);
+        String actual = node.accept(extractor).toSqlString(dialect.getCalciteDialect()).getSql();
+        String expected = "(SUM(`SUB1`) - SUM(`SUB2`) * SUM(`SUB2`) / COUNT(`SUB3`)) / COUNT(`SUB3`)";
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifierTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifierTest.java
new file mode 100644
index 0000000000..d3dc2910ef
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/calcite/SyntaxVerifierTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.calcite;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.MySQLDialect;
+import org.junit.jupiter.api.Test;
+
+public class SyntaxVerifierTest {
+
+    @Test
+    public void testValidVerification() {
+        SyntaxVerifier verifier = new SyntaxVerifier(new MySQLDialect());
+
+        assertTrue(verifier.verify("CAST(`2017-08-29` AS DATE)"));
+    }
+
+    @Test
+    public void testInvalidOperator() {
+        SyntaxVerifier verifier = new SyntaxVerifier(new MySQLDialect());
+
+        assertFalse(verifier.verify("CAST(`2017-08-29` AS DATE) + FOOBAR(123)"));
+        assertEquals("Unknown operator: FOOBAR", verifier.getLastError());
+    }
+
+    @Test
+    public void testInvalidSyntax() {
+        SyntaxVerifier verifier = new SyntaxVerifier(new MySQLDialect());
+
+        assertFalse(verifier.verify("A /+/ B"));
+        assertTrue(verifier.getLastError().startsWith("Encountered"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParserTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParserTest.java
new file mode 100644
index 0000000000..ad0f16bff0
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/ExpressionParserTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class ExpressionParserTest {
+
+    private ExpressionParser parser;
+    private SQLTable playerStats;
+    private SQLTable country;
+    private MetaDataStore metaDataStore;
+    private JoinReference countryInUSAJoinReference;
+
+    public ExpressionParserTest() {
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(PlayerStats.class));
+        models.add(ClassType.of(Country.class));
+        models.add(ClassType.of(SubCountry.class));
+        models.add(ClassType.of(Player.class));
+        models.add(ClassType.of(PlayerRanking.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+
+        parser = new ExpressionParser(metaDataStore);
+        playerStats = (SQLTable) metaDataStore.getTable(ClassType.of(PlayerStats.class));
+        country = (SQLTable) metaDataStore.getTable(ClassType.of(Country.class));
+
+        countryInUSAJoinReference = JoinReference
+                .builder()
+                .source(playerStats)
+                .path(new JoinPath(ClassType.of(PlayerStats.class), metaDataStore, "country.inUsa"))
+                .reference(LogicalReference
+                        .builder()
+                        .source(country)
+                        .column(country.getColumnProjection("inUsa"))
+                        .reference(LogicalReference
+                                .builder()
+                                .source(country)
+                                .column(country.getColumnProjection("name"))
+                                .reference(PhysicalReference
+                                        .builder()
+                                        .source(country)
+                                        .name("name")
+                                        .build()
+                                )
+                                .build()
+                        )
+                        .build())
+                .build();
+    }
+
+    @Test
+    public void testPhysicalExpression() {
+        ColumnProjection recordedDate = playerStats.getColumnProjection("recordedDate");
+
+        List<Reference> references = parser.parse(playerStats, recordedDate.getExpression());
+
+        assertTrue(references.size() == 1);
+        assertEquals(PhysicalReference.builder()
+                .name("recordedDate")
+                .source(playerStats)
+                .build(), references.get(0));
+    }
+
+    @Test
+    public void testLogicalExpression() {
+        ColumnProjection playerLevel = playerStats.getColumnProjection("playerLevel");
+
+        List<Reference> references = parser.parse(playerStats, playerLevel.getExpression());
+
+        assertTrue(references.size() == 1);
+        assertEquals(LogicalReference
+                .builder()
+                .source(playerStats)
+                .column(playerStats.getColumnProjection("overallRating"))
+                .reference(PhysicalReference
+                        .builder()
+                        .source(playerStats)
+                        .name("overallRating")
+                        .build())
+                .build(), references.get(0));
+    }
+
+    @Test
+    public void testJoinExpression() {
+        ColumnProjection countryInUsa = playerStats.getColumnProjection("countryIsInUsa");
+
+        List<Reference> references = parser.parse(playerStats, countryInUsa.getExpression());
+
+        assertTrue(references.size() == 1);
+        assertEquals(countryInUSAJoinReference, references.get(0));
+    }
+
+    @Test
+    public void testMultipleReferences() {
+        List<Reference> references = parser.parse(playerStats, "{{$country_id}} = {{country.$id}}");
+
+        assertTrue(references.size() == 2);
+
+        assertEquals(PhysicalReference.builder()
+                .name("country_id")
+                .source(playerStats)
+                .build(), references.get(0));
+
+        assertEquals(JoinReference
+                .builder()
+                .source(playerStats)
+                .path(new JoinPath(ClassType.of(PlayerStats.class), metaDataStore, "country.$id"))
+                .reference(PhysicalReference
+                        .builder()
+                        .source(country)
+                        .name("id")
+                        .build())
+                .build(), references.get(1));
+    }
+
+    @Test
+    public void testMultipleReferencesWithHelper() {
+        List<Reference> references = parser.parse(playerStats, "{{$country_id}} = {{country.$id}} AND {{sql from='country' column='inUsa'}} = true");
+
+        assertTrue(references.size() == 3);
+
+        assertEquals(PhysicalReference.builder()
+                .name("country_id")
+                .source(playerStats)
+                .build(), references.get(0));
+
+        assertEquals(JoinReference
+                .builder()
+                .source(playerStats)
+                .path(new JoinPath(ClassType.of(PlayerStats.class), metaDataStore, "country.$id"))
+                .reference(PhysicalReference
+                        .builder()
+                        .source(country)
+                        .name("id")
+                        .build())
+                .build(), references.get(1));
+
+        assertEquals(countryInUSAJoinReference, references.get(2));
+
+    }
+
+    @Test
+    public void testArgReferences() {
+        List<Reference> references = parser.parse(playerStats, "{{$country_id}} with {{$$column.expr}} = {{$$column.args.foo}} OR {{$$table.args.bar}}");
+
+        assertTrue(references.size() == 3);
+
+        assertEquals(PhysicalReference.builder()
+                .name("country_id")
+                .source(playerStats)
+                .build(), references.get(0));
+
+        assertEquals(ColumnArgReference.builder()
+                .argName("foo")
+                .build(), references.get(1));
+
+        assertEquals(TableArgReference.builder()
+                .argName("bar")
+                .build(), references.get(2));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasColumnArgsVisitorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasColumnArgsVisitorTest.java
new file mode 100644
index 0000000000..17c681505c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasColumnArgsVisitorTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.persistence.Id;
+import javax.sql.DataSource;
+
+public class HasColumnArgsVisitorTest {
+
+    private MetaDataStore metaDataStore;
+
+    @Include
+    class TableA {
+        @Id
+        long id;
+
+        @Join(value = "{{$$column.args.foo}} = '123' AND {{$id}} == {{joinWithColumnArgs.$id}}")
+        TableB joinWithColumnArgs;
+
+        @DimensionFormula(value = "{{joinWithColumnArgs.physical}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String joinWithColumnArgsToPhysical;
+
+        @DimensionFormula(value = "{{physical}}")
+        String logical;
+
+        @DimensionFormula(value = "{{$physical}}")
+        String physical;
+    }
+
+    @Include
+    class TableB {
+        @Id
+        long id;
+
+        @DimensionFormula(value = "{{$physical}}")
+        String physical;
+    }
+
+    @Include
+    class TableC {
+        @Id
+        long id;
+
+        @Join(value = "{{$id}} == {{simpleJoin.$id}}")
+        TableA simpleJoin;
+
+        @Join(value = "{{$id}} == {{simpleJoin.$id}} AND {{physical}} = '123'")
+        TableB joinWithPhysical;
+
+        @Join(value = "{{$id}} == {{simpleJoin.$id}} AND {{columnArgs}} = '123'")
+        TableB joinWithLogicalWithColumnArgs;
+
+        @DimensionFormula(value = "{{simpleJoin.joinWithColumnArgs.physical}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String nestedJoinWithColumnArgs;
+
+        @DimensionFormula(value = "{{simpleJoin.logical}}")
+        String simpleJoinToLogical;
+
+        @DimensionFormula(value = "{{$physical}}")
+        String physical;
+
+        @DimensionFormula(value = "{{$$column.args.foo}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String columnArgs;
+
+        @DimensionFormula(value = "{{joinWithLogicalWithColumnArgs.physical}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String joinWithLogicalWithColumnArgsToPhysical;
+
+        @DimensionFormula(value = "{{joinWithPhysical.physical}}")
+        String joinWithPhysicalToPhysical;
+    }
+
+    public HasColumnArgsVisitorTest() {
+
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(TableA.class));
+        models.add(ClassType.of(TableB.class));
+        models.add(ClassType.of(TableC.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+    }
+
+
+    @Test
+    public void testJoinWithColumnArgs() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableA.class));
+        ColumnProjection projection = table.getColumnProjection("joinWithColumnArgsToPhysical");
+        assertTrue(matches(table, projection));
+    }
+
+    @Test
+    public void testPhysicalColumn() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableB.class));
+        ColumnProjection projection = table.getColumnProjection("physical");
+        assertFalse(matches(table, projection));
+    }
+
+    @Test
+    public void testNestedJoinWithColumnArgs() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableC.class));
+        ColumnProjection projection = table.getColumnProjection("nestedJoinWithColumnArgs");
+        assertTrue(matches(table, projection));
+    }
+
+    @Test
+    public void testSimpleJoinToLogicalColumn() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableC.class));
+        ColumnProjection projection = table.getColumnProjection("simpleJoinToLogical");
+        assertFalse(matches(table, projection));
+    }
+
+    @Test
+    public void testColumnArgs() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableC.class));
+        ColumnProjection projection = table.getColumnProjection("columnArgs");
+        assertTrue(matches(table, projection));
+    }
+
+    @Test
+    public void testJoinWithLogicalReferenceThatReferencesColumnArgs() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableC.class));
+        ColumnProjection projection = table.getColumnProjection("joinWithLogicalWithColumnArgsToPhysical");
+        assertTrue(matches(table, projection));
+    }
+
+    @Test
+    public void testJoinWithLogicalReferenceThatReferencesPhysical() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableC.class));
+        ColumnProjection projection = table.getColumnProjection("joinWithPhysicalToPhysical");
+        assertFalse(matches(table, projection));
+    }
+
+    private boolean matches(SQLTable source, ColumnProjection projection) {
+        List<Reference> references = new ExpressionParser(metaDataStore).parse(source, projection);
+
+        return ! references.stream()
+                .map(reference -> reference.accept(new ReferenceExtractor<ColumnArgReference>(
+                        ColumnArgReference.class, metaDataStore)))
+                .flatMap(Set::stream)
+                .collect(Collectors.toSet())
+                .isEmpty();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitorTest.java
new file mode 100644
index 0000000000..986ab56eeb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/HasJoinVisitorTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.datastores.aggregation.core.JoinPath;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.query.Queryable;
+import org.junit.jupiter.api.Test;
+
+public class HasJoinVisitorTest {
+
+    @Test
+    void testHasJoin() {
+        Queryable source = mock(Queryable.class);
+        JoinPath path = mock(JoinPath.class);
+        ColumnProjection column = mock(ColumnProjection.class);
+        Reference reference = LogicalReference.builder()
+                .source(source)
+                .column(column)
+                .reference(PhysicalReference.builder()
+                        .name("foo")
+                        .source(source)
+                        .build())
+                .reference(JoinReference
+                        .builder()
+                        .source(source)
+                        .path(path)
+                        .reference(PhysicalReference.builder()
+                                .name("bar")
+                                .source(source)
+                                .build())
+                        .build())
+                .build();
+
+        assertTrue(reference.accept(new HasJoinVisitor()));
+    }
+
+    @Test
+    void testLogicalColumnNoJoin() {
+        Queryable source = mock(Queryable.class);
+        ColumnProjection column = mock(ColumnProjection.class);
+        Reference reference = LogicalReference.builder()
+                .source(source)
+                .column(column)
+                .reference(PhysicalReference.builder()
+                        .name("foo")
+                        .source(source)
+                        .build())
+
+                .build();
+
+        assertFalse(reference.accept(new HasJoinVisitor()));
+    }
+
+    @Test
+    void testPhysicalColumnNoJoin() {
+        Queryable source = mock(Queryable.class);
+        Reference reference = PhysicalReference.builder()
+                .name("foo")
+                .source(source)
+                .build();
+
+        assertFalse(reference.accept(new HasJoinVisitor()));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractorTest.java
new file mode 100644
index 0000000000..7f8a98895d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/JoinExpressionExtractorTest.java
@@ -0,0 +1,585 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static java.util.Collections.emptyMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLDimensionProjection;
+import org.junit.jupiter.api.Test;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import javax.persistence.Id;
+import javax.sql.DataSource;
+
+public class JoinExpressionExtractorTest {
+
+    private static final String ALIAS_PREFIX = "com_yahoo_elide_datastores_aggregation_queryengines_sql_expression_";
+    private static final Pattern REPEATEDSPACE_PATTERN = Pattern.compile("\\s\\s*");
+    private static final String NL = System.lineSeparator();
+
+    private SQLTable table;
+    private MetaDataStore metaDataStore;
+    private SQLQueryEngine engine;
+    private Map<String, Argument> queryArgs;
+
+    public JoinExpressionExtractorTest() {
+
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(MainTable.class));
+        models.add(ClassType.of(JoinTable.class));
+        models.add(ClassType.of(JoinJoinTable.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        // The query engine populates the metadata store with actual tables.
+        engine = new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource, new H2Dialect()));
+        table = metaDataStore.getTable(ClassType.of(MainTable.class));
+        queryArgs = new HashMap<>();
+        queryArgs.put("tableArg", Argument.builder().name("tableArg").value("tableArgValue").build());
+    }
+
+    // Case:
+    // dim1 -> {{join.dim1}}
+    // {{join.dim1}} -> Physical
+    @Test
+    void test2TableJoin() {
+
+        SQLDimensionProjection dim1 = (SQLDimensionProjection) table.getDimensionProjection("dim1");
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim1)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join_258525107`.`dim1` AS `dim1` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join_258525107` " + NL
+                        + "ON " + NL
+                        + "  `MainTable`.`id` = `MainTable_join_258525107`.`id` ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Case:
+    // dim -> {{join.dim2}}
+    // {{join.dim2}} -> {{join.dim3}}
+    // {{join.dim3}} -> {{joinjoin.dim3}}
+    // {{joinjoin.dim3}} -> Physical
+    @Test
+    void test3TableJoinWithLogicalColumn() {
+
+        SQLDimensionProjection dim2 = (SQLDimensionProjection) table.getDimensionProjection("dim2");
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim2)
+                        .arguments(queryArgs)
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join_258525107_joinjoin_88940112`.`dim3` - 'tableArgValue' AS `dim2` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join_258525107` " + NL
+                        + "ON " + NL
+                        + "  `MainTable`.`id` = `MainTable_join_258525107`.`id` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `joinjoin_table` AS `MainTable_join_258525107_joinjoin_88940112` " + NL
+                        + "ON " + NL
+                        + "  `MainTable_join_258525107`.`id` = `MainTable_join_258525107_joinjoin_88940112`.`id` ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Case:
+    // dim3 -> {{join.joinjoin.dim2}}
+    // {{join.joinjoin.dim2}} -> {{join.joinjoin.dim3}}
+    // {{join.joinjoin.dim3}} -> Physical
+    @Test
+    void test3TableJoinWithoutLogicalColumn() {
+
+        SQLDimensionProjection dim3 = (SQLDimensionProjection) table.getDimensionProjection("dim3");
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim3)
+                        .arguments(queryArgs)
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join_258525107_joinjoin_88940112`.`dim3` - 'tableArgValue' AS `dim3` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join_258525107` " + NL
+                        + "ON " + NL
+                        + "  `MainTable`.`id` = `MainTable_join_258525107`.`id` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `joinjoin_table` AS `MainTable_join_258525107_joinjoin_88940112` " + NL
+                        + "ON " + NL
+                        + "  `MainTable_join_258525107`.`id` = `MainTable_join_258525107_joinjoin_88940112`.`id` ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Both dim4 and dim5 passes same value for join expression's argument 'exprArg'
+    // Single Join expression is generated.
+    @Test
+    void testArgumentsInJoinExprCase1() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        SQLDimensionProjection dim4 = (SQLDimensionProjection) table.getDimensionProjection("dim4", "dim4", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        SQLDimensionProjection dim5 = (SQLDimensionProjection) table.getDimensionProjection("dim5", "dim5", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4)
+                        .dimensionProjection(dim5)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2_201179280`.`dim1` AS `dim4`," + NL
+                        + "           `MainTable_join2_201179280`.`dim1` AS `dim5` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_201179280` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_201179280`.`dim4` - 'foo' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // dim4 and dim5 passes different value for join expression's argument 'exprArg'
+    // 2 Join expressions are generated.
+    @Test
+    void testArgumentsInJoinExprCase2a() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("value4").build());
+        SQLDimensionProjection dim4 = (SQLDimensionProjection) table.getDimensionProjection("dim4", "dim4", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("value5").build());
+        SQLDimensionProjection dim5 = (SQLDimensionProjection) table.getDimensionProjection("dim5", "dim5", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4)
+                        .dimensionProjection(dim5)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2_63993339`.`dim1` AS `dim4`," + NL
+                        + "           `MainTable_join2_86115708`.`dim1` AS `dim5` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_63993339` " + NL
+                        + "ON " + NL
+                        + "  value = 'value4' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_63993339`.`dim4` - 'foo' "
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_86115708` " + NL
+                        + "ON " + NL
+                        + "  value = 'value5' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_86115708`.`dim4` - 'foo' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // dim4x and dim5x passes different value for join expression's argument 'exprArg'
+    // 1 Join expression is generated as they invoke dim4 and dim5 using sql helper with same value
+    @Test
+    void testArgumentsInJoinExprCase2b() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("value4").build());
+        SQLDimensionProjection dim4x = (SQLDimensionProjection) table.getDimensionProjection("dim4x", "dim4x", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("value5").build());
+        SQLDimensionProjection dim5x = (SQLDimensionProjection) table.getDimensionProjection("dim5x", "dim5x", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4x)
+                        .dimensionProjection(dim5x)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2_156385021`.`dim1` - 'value4' AS `dim4x`," + NL
+                        + "           `MainTable_join2_156385021`.`dim1` - 'value5' AS `dim5x` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_156385021` " + NL
+                        + "ON " + NL
+                        + "  value = 'fixedExpr' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_156385021`.`dim4` - 'fixedArg' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Both dim4 and dim5 passes same value for join expression's argument 'exprArg'
+    // dim4 and dim5 passes different value for join table's column argument 'joinArg'
+    // 2 Join expressions are generated.
+    @Test
+    void testArgumentsInJoinExprCase3() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim4Arg.put("joinArg", Argument.builder().name("joinArg").value("foo4").build());
+        SQLDimensionProjection dim4 = (SQLDimensionProjection) table.getDimensionProjection("dim4", "dim4", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim5Arg.put("joinArg", Argument.builder().name("joinArg").value("foo5").build());
+        SQLDimensionProjection dim5 = (SQLDimensionProjection) table.getDimensionProjection("dim5", "dim5", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4)
+                        .dimensionProjection(dim5)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2_201179732`.`dim1` AS `dim4`," + NL
+                        + "           `MainTable_join2_201179856`.`dim1` AS `dim5` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_201179732` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_201179732`.`dim4` - 'foo4' "
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_201179856` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2_201179856`.`dim4` - 'foo5' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Both dim4 and dim5 passes same value for join expression's argument 'exprArg'
+    // dim4 and dim5 passes different value for column argument 'arg6'
+    // 2 Join expressions are generated.
+    @Test
+    void testArgumentsInJoinExprCase4() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim4Arg.put("arg6", Argument.builder().name("arg6").value("bar4").build());
+        SQLDimensionProjection dim4 = (SQLDimensionProjection) table.getDimensionProjection("dim4", "dim4", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim5Arg.put("arg6", Argument.builder().name("arg6").value("bar5").build());
+        SQLDimensionProjection dim5 = (SQLDimensionProjection) table.getDimensionProjection("dim5", "dim5", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4)
+                        .dimensionProjection(dim5)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2_148518185`.`dim1` AS `dim4`," + NL
+                        + "           `MainTable_join2_209848490`.`dim1` AS `dim5` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_148518185` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar4' = `MainTable_join2_148518185`.`dim4` - 'foo' "
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2_209848490` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar5' = `MainTable_join2_209848490`.`dim4` - 'foo' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // Both dim4a and dim5a passes same value for join expression's argument 'exprArg'
+    // dim4a and dim5a passes different value for join table's column argument 'joinArg'
+    // 1 Join expressions is generated as fixed value of joinArg is used while calling join table's column.
+    @Test
+    void testArgumentsInJoinExprCase5a() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim4Arg.put("joinArg", Argument.builder().name("joinArg").value("foo4").build());
+        SQLDimensionProjection dim4a = (SQLDimensionProjection) table.getDimensionProjection("dim4a", "dim4a", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("same").build());
+        dim5Arg.put("joinArg", Argument.builder().name("joinArg").value("foo5").build());
+        SQLDimensionProjection dim5a = (SQLDimensionProjection) table.getDimensionProjection("dim5a", "dim5a", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4a)
+                        .dimensionProjection(dim5a)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2a_157775546`.`dim1` AS `dim4a`," + NL
+                        + "           `MainTable_join2a_157775546`.`dim1` AS `dim5a` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2a_157775546` " + NL
+                        + "ON " + NL
+                        + "  value = 'same' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2a_157775546`.`dim4` - 'fixedFoo' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    // dim4a and dim5a passes different value for join expression's argument 'exprArg'
+    // dim4a and dim5a passes different value for join table's column argument 'joinArg'
+    // 2 Join expressions are generated as 'exprArg' is different but fixed value of 'joinArg' is used.
+    @Test
+    void testArgumentsInJoinExprCase5b() {
+
+        Map<String, Argument> dim4Arg = new HashMap<>();
+        dim4Arg.put("exprArg", Argument.builder().name("exprArg").value("value4").build());
+        dim4Arg.put("joinArg", Argument.builder().name("joinArg").value("foo4").build());
+        SQLDimensionProjection dim4a = (SQLDimensionProjection) table.getDimensionProjection("dim4a", "dim4a", dim4Arg);
+
+        Map<String, Argument> dim5Arg = new HashMap<>();
+        dim5Arg.put("exprArg", Argument.builder().name("exprArg").value("value5").build());
+        dim5Arg.put("joinArg", Argument.builder().name("joinArg").value("foo5").build());
+        SQLDimensionProjection dim5a = (SQLDimensionProjection) table.getDimensionProjection("dim5a", "dim5a", dim5Arg);
+
+        Query query = Query.builder()
+                        .source(table)
+                        .dimensionProjection(dim4a)
+                        .dimensionProjection(dim5a)
+                        .arguments(emptyMap())
+                        .build();
+
+        String generatedSql = engine.explain(query).get(0);
+
+        String expectedSQL =
+                          "SELECT " + NL
+                        + "  DISTINCT `MainTable_join2a_16142728`.`dim1` AS `dim4a`," + NL
+                        + "           `MainTable_join2a_29675529`.`dim1` AS `dim5a` " + NL
+                        + "FROM " + NL
+                        + "  `main_table` AS `MainTable` " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2a_16142728` " + NL
+                        + "ON " + NL
+                        + "  value = 'value4' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2a_16142728`.`dim4` - 'fixedFoo' " + NL
+                        + "LEFT OUTER JOIN " + NL
+                        + "  `join_table` AS `MainTable_join2a_29675529` " + NL
+                        + "ON " + NL
+                        + "  value = 'value5' AND `MainTable`.`dim6` - 'bar' = `MainTable_join2a_29675529`.`dim4` - 'fixedFoo' ";
+
+        assertEquals(formatExpected(expectedSQL), formatGenerated(generatedSql));
+    }
+
+    private String formatExpected(String expectedSQL) {
+        // Remove spaces at the start of each line with in string
+        expectedSQL = expectedSQL.replaceAll("(?m)^\\s*", "");
+        expectedSQL = expectedSQL.replace(NL, "");
+        return REPEATEDSPACE_PATTERN.matcher(expectedSQL).replaceAll(" ");
+    }
+
+    private String formatGenerated(String generatedSql) {
+        generatedSql = generatedSql.replace(ALIAS_PREFIX, "");
+        return REPEATEDSPACE_PATTERN.matcher(generatedSql).replaceAll(" ");
+    }
+}
+
+
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "main_table")
+@Include(name = "mainTable")
+@TableMeta(arguments = {@ArgumentDefinition(name = "tableArg", type = ValueType.TEXT)})
+class MainTable {
+
+    @Id
+    private String id;
+
+    @DimensionFormula("{{join.dim1}}")
+    private String dim1;
+
+    @DimensionFormula("{{join.dim2}}")
+    private String dim2;
+
+    @DimensionFormula("{{join.joinjoin.dim2}}")
+    private String dim3;
+
+    @Join("{{$id}} = {{join.$id}}")
+    private JoinTable join;
+
+    @DimensionFormula(value = "{{join2.dim1}}",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim4;
+
+    @DimensionFormula(value = "{{join2.dim1}}",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim5;
+
+    @DimensionFormula(value = "{{join2a.dim1}}",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim4a;
+
+    @DimensionFormula(value = "{{join2a.dim1}}",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim5a;
+
+    @DimensionFormula(value = "{{sql column='dim4[exprArg:fixedExpr][joinArg:fixedArg]'}} - '{{$$column.args.exprArg}}'",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim4x;
+
+    @DimensionFormula(value = "{{sql column='dim5[exprArg:fixedExpr][joinArg:fixedArg]'}} - '{{$$column.args.exprArg}}'",
+                      arguments = { @ArgumentDefinition(name = "exprArg", type = ValueType.TEXT),
+                                    @ArgumentDefinition(name = "joinArg", type = ValueType.TEXT)})
+    private String dim5x;
+
+    @Join("value = '{{$$column.args.exprArg}}' AND {{dim6}} = {{join2.dim4}}")
+    private JoinTable join2;
+
+    @Join("value = '{{$$column.args.exprArg}}' AND {{dim6}} = {{join2a.dim4a}}")
+    private JoinTable join2a;
+
+    @DimensionFormula(value = "{{$dim6}} - '{{$$column.args.arg6}}'",
+                      arguments = {@ArgumentDefinition(name = "arg6", type = ValueType.TEXT, defaultValue = "bar")})
+    private String dim6;
+}
+
+
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "join_table")
+@Include(name = "joinTable")
+@TableMeta(arguments = {@ArgumentDefinition(name = "tableArg", type = ValueType.TEXT)})
+class JoinTable {
+
+    @Id
+    private String id;
+
+    @DimensionFormula("{{$dim1}}")
+    private String dim1;
+
+    @DimensionFormula("{{dim3}}")
+    private String dim2;
+
+    @DimensionFormula("{{joinjoin.dim3}}")
+    private String dim3;
+
+    @DimensionFormula(value = "{{$dim4}} - '{{$$column.args.joinArg}}'",
+                      arguments = {@ArgumentDefinition(name = "joinArg", type = ValueType.TEXT, defaultValue = "foo")})
+    private String dim4;
+
+    @DimensionFormula(value = "{{sql column='dim4[joinArg:fixedFoo]'}}",
+                      arguments = {@ArgumentDefinition(name = "joinArg", type = ValueType.TEXT, defaultValue = "foo")})
+    private String dim4a;
+
+    @Join("{{$id}} = {{joinjoin.$id}}")
+    private JoinJoinTable joinjoin;
+}
+
+
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "joinjoin_table")
+@Include(name = "joinjoinTable")
+@TableMeta(arguments = {@ArgumentDefinition(name = "tableArg", type = ValueType.TEXT)})
+class JoinJoinTable {
+
+    @Id
+    private String id;
+
+    @DimensionFormula("{{dim2}}")
+    private String dim1;
+
+    @DimensionFormula("{{dim3}}")
+    private String dim2;
+
+    @DimensionFormula("{{$dim3}} - '{{$$table.args.tableArg}}'")
+    private String dim3;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReferenceExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReferenceExtractorTest.java
new file mode 100644
index 0000000000..0417a70f16
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/LogicalReferenceExtractorTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class LogicalReferenceExtractorTest {
+
+    private ExpressionParser parser;
+    private SQLTable playerStats;
+    private MetaDataStore metaDataStore;
+
+    public LogicalReferenceExtractorTest() {
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(PlayerStats.class));
+        models.add(ClassType.of(Country.class));
+        models.add(ClassType.of(SubCountry.class));
+        models.add(ClassType.of(Player.class));
+        models.add(ClassType.of(PlayerRanking.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+
+        parser = new ExpressionParser(metaDataStore);
+        playerStats = (SQLTable) metaDataStore.getTable(ClassType.of(PlayerStats.class));
+    }
+
+    @Test
+    public void testPhysicalReference() {
+        ColumnProjection recordedDate = playerStats.getColumnProjection("recordedDate");
+
+        List<Reference> references = parser.parse(playerStats, recordedDate.getExpression());
+
+        assertTrue(references.size() == 1);
+        ReferenceExtractor<LogicalReference> extractor =
+                new ReferenceExtractor(LogicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+        Set<LogicalReference> logicalReferences = references.get(0).accept(extractor);
+
+        assertTrue(logicalReferences.size() == 0);
+    }
+
+    @Test
+    public void testJoinReference() {
+        ColumnProjection countryIsInUsa = playerStats.getColumnProjection("countryIsInUsa");
+
+        List<Reference> references = parser.parse(playerStats, countryIsInUsa.getExpression());
+
+        assertTrue(references.size() == 1);
+
+        ReferenceExtractor<LogicalReference> extractor =
+                new ReferenceExtractor(LogicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+
+        Set<LogicalReference> logicalReferences = references.get(0).accept(extractor);
+
+        assertEquals(0, logicalReferences.size());
+    }
+
+    @Test
+    public void testLogicalReference() {
+        ColumnProjection playerLevel = playerStats.getColumnProjection("playerLevel");
+
+        List<Reference> references = parser.parse(playerStats, playerLevel.getExpression());
+
+        assertTrue(references.size() == 1);
+        ReferenceExtractor<LogicalReference> extractor =
+                new ReferenceExtractor(LogicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+        Set<LogicalReference> logicalReferences = references.get(0).accept(extractor);
+
+        assertEquals(1, logicalReferences.size());
+        assertTrue(logicalReferences.contains(LogicalReference
+                .builder()
+                .source(playerStats)
+                .column(playerStats.getColumnProjection("overallRating"))
+                .reference(PhysicalReference.builder().source(playerStats).name("overallRating").build())
+                .build()));
+
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReferenceExtractorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReferenceExtractorTest.java
new file mode 100644
index 0000000000..84c300c521
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/expression/PhysicalReferenceExtractorTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.expression;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class PhysicalReferenceExtractorTest {
+
+    private ExpressionParser parser;
+    private SQLTable playerStats;
+    private MetaDataStore metaDataStore;
+
+    public PhysicalReferenceExtractorTest() {
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(PlayerStats.class));
+        models.add(ClassType.of(Country.class));
+        models.add(ClassType.of(SubCountry.class));
+        models.add(ClassType.of(Player.class));
+        models.add(ClassType.of(PlayerRanking.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+
+        parser = new ExpressionParser(metaDataStore);
+        playerStats = (SQLTable) metaDataStore.getTable(ClassType.of(PlayerStats.class));
+    }
+
+    @Test
+    public void testPhysicalReference() {
+        ColumnProjection recordedDate = playerStats.getColumnProjection("recordedDate");
+
+        List<Reference> references = parser.parse(playerStats, recordedDate.getExpression());
+
+        assertTrue(references.size() == 1);
+
+        ReferenceExtractor<PhysicalReference> extractor =
+                new ReferenceExtractor(PhysicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+
+        Set<PhysicalReference> physicalReferences = references.get(0).accept(extractor);
+
+        assertTrue(physicalReferences.size() == 1);
+        assertTrue(physicalReferences.contains(PhysicalReference
+                .builder()
+                .source(playerStats)
+                .name("recordedDate")
+                .build()));
+
+    }
+
+    @Test
+    public void testJoinReference() {
+        ColumnProjection countryIsInUsa = playerStats.getColumnProjection("countryIsInUsa");
+
+        List<Reference> references = parser.parse(playerStats, countryIsInUsa.getExpression());
+
+        assertTrue(references.size() == 1);
+
+        ReferenceExtractor<PhysicalReference> extractor =
+                new ReferenceExtractor(PhysicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+
+        Set<PhysicalReference> physicalReferences = references.get(0).accept(extractor);
+
+        assertEquals(1, physicalReferences.size());
+        assertTrue(physicalReferences.contains(PhysicalReference
+                .builder()
+                .source(playerStats)
+                .name("country_id")
+                .build()));
+
+    }
+
+    @Test
+    public void testLogicalReference() {
+        ColumnProjection playerLevel = playerStats.getColumnProjection("playerLevel");
+
+        List<Reference> references = parser.parse(playerStats, playerLevel.getExpression());
+
+        assertTrue(references.size() == 1);
+
+        ReferenceExtractor<PhysicalReference> extractor =
+                new ReferenceExtractor(PhysicalReference.class, metaDataStore, ReferenceExtractor.Mode.SAME_QUERY);
+        Set<PhysicalReference> physicalReferences = references.get(0).accept(extractor);
+
+        assertEquals(1, physicalReferences.size());
+        assertTrue(physicalReferences.contains(PhysicalReference
+                .builder()
+                .source(playerStats)
+                .name("overallRating")
+                .build()));
+
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizerTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizerTest.java
new file mode 100644
index 0000000000..ee4e49b18e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/AggregateBeforeJoinOptimizerTest.java
@@ -0,0 +1,1579 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.ImmutablePagination;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import example.GameRevenue;
+import example.PlayerStats;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class AggregateBeforeJoinOptimizerTest extends SQLUnitTest {
+
+    @BeforeAll
+    public static void init() {
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(),
+                getClassType(dictionary.getScanner().getAnnotatedClasses("example",
+                        Include.class)),
+                false);
+        Set<Optimizer> optimizers = new HashSet<>(Arrays.asList(new AggregateBeforeJoinOptimizer(metaDataStore)));
+        init(new H2Dialect(), optimizers, metaDataStore);
+    }
+
+    @Test
+    public void testWhereAnd() {
+        Query query = TestQuery.WHERE_AND.getQuery();
+        String expectedQueryStr =
+                "SELECT MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) AS `highScore`,"
+                        + "`example_PlayerStats_XXX`.`overallRating` AS `overallRating` "
+                        + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `INNER_AGG_XXX`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "`example_PlayerStats`.`country_id` AS `country_id` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "WHERE `example_PlayerStats`.`overallRating` IS NOT NULL "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "`example_PlayerStats`.`country_id` ) AS `example_PlayerStats_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_XXX_country_XXX` "
+                        + "ON `example_PlayerStats_XXX`.`country_id` = `example_PlayerStats_XXX_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats_XXX`.`overallRating`";
+
+        compareQueryLists(expectedQueryStr, engine.explain(query));
+
+        testQueryExecution(TestQuery.WHERE_AND.getQuery());
+    }
+
+    @Test
+    public void testSortAndPaginate() {
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("highScore", Sorting.SortOrder.desc);
+        // WHERE filter
+        FilterPredicate predicate = new FilterPredicate(
+                new Path(PlayerStats.class, dictionary, "highScore"),
+                Operator.GT,
+                Arrays.asList(9000));
+        Query query = Query.builder()
+                .source(playerStatsTable)
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .dimensionProjection(playerStatsTable.getDimensionProjection("overallRating"))
+                .timeDimensionProjection(playerStatsTable.getTimeDimensionProjection("recordedDate"))
+                .pagination(new ImmutablePagination(10, 5, false, true))
+                .sorting(new SortingImpl(sortMap, PlayerStats.class, dictionary))
+                .havingFilter(predicate)
+                // force a join to look up countryIsoCode
+                .whereFilter(parseFilterExpression("countryIsoCode==USA", playerStatsType, false))
+                .build();
+
+        String expectedQueryStr1 =
+                "SELECT COUNT(*) FROM "
+                + "(SELECT `example_PlayerStats_XXX`.`overallRating`, "
+                        + "`example_PlayerStats_XXX`.`recordedDate` "
+                        + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `INNER_AGG_XXX`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "`example_PlayerStats`.`country_id` AS `country_id`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "`example_PlayerStats`.`country_id`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                        + "AS `example_PlayerStats_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_XXX_country_XXX` "
+                        + "ON `example_PlayerStats_XXX`.`country_id` = `example_PlayerStats_XXX_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats_XXX`.`overallRating`, "
+                        + "`example_PlayerStats_XXX`.`recordedDate` "
+                        + "HAVING MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) > :XXX ) AS `pagination_subquery`\n";
+
+        String expectedQueryStr2 =
+                "SELECT MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) AS `highScore`,"
+                        + "`example_PlayerStats_XXX`.`overallRating` AS `overallRating`,"
+                        + "`example_PlayerStats_XXX`.`recordedDate` AS `recordedDate` "
+                        + "FROM (SELECT MAX(`example_PlayerStats`.`highScore`) AS `INNER_AGG_XXX`,"
+                        + "`example_PlayerStats`.`overallRating` AS `overallRating`,"
+                        + "`example_PlayerStats`.`country_id` AS `country_id`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `recordedDate` "
+                        + "FROM `playerStats` AS `example_PlayerStats` "
+                        + "GROUP BY `example_PlayerStats`.`overallRating`, "
+                        + "`example_PlayerStats`.`country_id`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_PlayerStats`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                        + "AS `example_PlayerStats_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_PlayerStats_XXX_country_XXX` "
+                        + "ON `example_PlayerStats_XXX`.`country_id` = `example_PlayerStats_XXX_country_XXX`.`id` "
+                        + "WHERE `example_PlayerStats_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                        + "GROUP BY `example_PlayerStats_XXX`.`overallRating`, "
+                        + "`example_PlayerStats_XXX`.`recordedDate` "
+                        + "HAVING MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "ORDER BY MAX(`example_PlayerStats_XXX`.`INNER_AGG_XXX`) "
+                        + "DESC LIMIT 5 OFFSET 10\n";
+        List<String> expectedQueryList = new ArrayList<>();
+        expectedQueryList.add(expectedQueryStr1);
+        expectedQueryList.add(expectedQueryStr2);
+
+        compareQueryLists(expectedQueryList, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testNoOptimizationNoJoins() {
+        Query query = TestQuery.WHERE_DIMS_ONLY.getQuery();
+
+        AggregateBeforeJoinOptimizer optimizer = new AggregateBeforeJoinOptimizer(metaDataStore);
+
+        assertFalse(optimizer.canOptimize(query));
+    }
+
+    @Test
+    public void testNoOptimizationNestedQuery() {
+        Query query = Query.builder()
+                .source(Query.builder()
+                        .source(playerStatsTable)
+                        .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                        .build())
+                .metricProjection(playerStatsTable.getMetricProjection("highScore"))
+                .build();
+
+        AggregateBeforeJoinOptimizer optimizer = new AggregateBeforeJoinOptimizer(metaDataStore);
+
+        assertFalse(optimizer.canOptimize(query));
+    }
+
+    @Test
+    public void testSortingOnMetricInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("revenue", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id` FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id` ) AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code` "
+                        + "ORDER BY MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) DESC\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnMetricInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterPredicate predicate = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "revenue"),
+                Operator.GT,
+                Arrays.asList(9000));
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .havingFilter(predicate)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id` FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id` ) AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code` "
+                        + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "category"),
+                        Operator.IN,
+                        Arrays.asList("foo")
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("category"))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                        + "`example_GameRevenue_XXX`.`category` AS `category` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                        + "`example_GameRevenue`.`category` AS `category` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id`, "
+                        + "`example_GameRevenue`.`category` ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                        + "`example_GameRevenue_XXX`.`category` "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR `example_GameRevenue_XXX`.`category` IN (:XXX))\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code` "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX))\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression having = new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000));
+
+        FilterExpression where = new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "category"),
+                        Operator.IN,
+                        Arrays.asList("foo"));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("category"))
+                .havingFilter(having)
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`category` AS `category` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE `example_GameRevenue`.`category` IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`category` "
+                + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnDimensionNotInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+            new FilterPredicate(
+                    new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                    Operator.IN,
+                    Arrays.asList("foo")),
+            new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "category"),
+                Operator.IN,
+                Arrays.asList("foo")));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE `example_GameRevenue`.`category` IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnDimensionNotInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo"));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo"));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testSortOnDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryIsoCode", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code` "
+                + "ORDER BY `example_GameRevenue_XXX_country_XXX`.`iso_code` DESC\n";
+
+                compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testSortOnDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("category", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("category"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`category` AS `category` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`category` "
+                + "ORDER BY `example_GameRevenue_XXX`.`category` DESC\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+    @Test
+    public void testSortOnTimeDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("sessionDate", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `sessionDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ORDER BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') DESC\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testSortOnTimeDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("saleDate", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`saleDate` "
+                + "ORDER BY `example_GameRevenue_XXX`.`saleDate` DESC\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnTimeDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "saleDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate"))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                        + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `saleDate` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                        + "`example_GameRevenue_XXX`.`saleDate` "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR `example_GameRevenue_XXX`.`saleDate` IN (:XXX))\n",
+
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnTimeDimensionInProjectionNotRequiringJoinWithArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "saleDate", "saleDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate", arguments))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                        + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `saleDate` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`country_id`, "
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                        + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                        + "`example_GameRevenue_XXX`.`saleDate` "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR `example_GameRevenue_XXX`.`saleDate` IN (:XXX))\n",
+
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnTimeDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate"))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `sessionDate` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`player_stats_id` ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                        + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX))\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnTimeDimensionInProjectionRequiringJoinWithArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+        FilterExpression expression = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(9000)
+                ),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate", "sessionDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                )
+        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate", arguments))
+                .havingFilter(expression)
+                .build();
+
+        compareQueryLists("SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                        + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `sessionDate` "
+                        + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                        + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                        + "FROM `gameRevenue` AS `example_GameRevenue` "
+                        + "GROUP BY `example_GameRevenue`.`player_stats_id` ) "
+                        + "AS `example_GameRevenue_XXX` "
+                        + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                        + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                        + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') "
+                        + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                        + "OR PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX))\n",
+                engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression having = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "revenue"),
+                Operator.GT,
+                Arrays.asList(9000));
+
+        FilterExpression where = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "saleDate"),
+                Operator.IN,
+                Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate"))
+                .havingFilter(having)
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`saleDate` "
+                + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionNotRequiringJoinWithMatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression having = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "revenue"),
+                Operator.GT,
+                Arrays.asList(9000));
+
+        FilterExpression where = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "saleDate", "saleDate", arguments),
+                Operator.IN,
+                Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate", arguments))
+                .havingFilter(having)
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`saleDate` "
+                + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionNotRequiringJoinWithDefaultMatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("DAY")
+                .build());
+
+        FilterExpression having = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "revenue"),
+                Operator.GT,
+                Arrays.asList(9000));
+
+        FilterExpression where = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "saleDate", "saleDate", arguments),
+                Operator.IN,
+                Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate"))
+                .havingFilter(having)
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`saleDate` "
+                + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionNotRequiringJoinWithMismatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression having = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "revenue"),
+                Operator.GT,
+                Arrays.asList(9000));
+
+        FilterExpression where = new FilterPredicate(
+                new Path(GameRevenue.class, dictionary, "saleDate", "saleDate", arguments),
+                Operator.IN,
+                Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryIsoCode"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("saleDate"))
+                .havingFilter(having)
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "`example_GameRevenue_XXX_country_XXX`.`iso_code` AS `countryIsoCode`,"
+                + "`example_GameRevenue_XXX`.`saleDate` AS `saleDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY `example_GameRevenue_XXX_country_XXX`.`iso_code`, "
+                + "`example_GameRevenue_XXX`.`saleDate` "
+                + "HAVING MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionNotInProjectionNotRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "saleDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionNotInProjectionNotRequiringJoinWithArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression where = new AndFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "saleDate", "saleDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue`.`saleDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY `example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE `example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionNotInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                        );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionNotInProjectionRequiringJoinWithArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate", "sessionDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))
+                );
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX)\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionRequiringJoin() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `sessionDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd')\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionRequiringJoinWithMismatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        //Grain in filter does not match grain in projected dimension.
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate", "sessionDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `sessionDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd')\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionRequiringJoinWithMatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        //Grain in filter matches grain in projected dimension.
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("MONTH")
+                .build());
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate", "sessionDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate", arguments))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') AS `sessionDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-01'), 'yyyy-MM-dd')\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnTimeDimensionInProjectionRequiringJoinWithDefaultMatchingArguments() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        //Grain in filter matches default grain in projected dimension.
+        Set<Argument> arguments = new HashSet<>();
+        arguments.add(Argument.builder()
+                .name("grain")
+                .value("DAY")
+                .build());
+
+        FilterExpression where =
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "sessionDate", "sessionDate", arguments),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date())));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("sessionDate"))
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `sessionDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "WHERE PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX) "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(`example_GameRevenue_XXX_playerStats_XXX`.`recordedDate`, 'yyyy-MM-dd'), 'yyyy-MM-dd')\n";
+
+        compareQueryLists(expected, engine.explain(query));
+
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnMultiReferenceTimeDimensionNotInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+            new FilterPredicate(
+                    new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                    Operator.IN,
+                    Arrays.asList("foo")),
+            new FilterPredicate(
+                    new Path(GameRevenue.class, dictionary, "lastDate"),
+                    Operator.IN,
+                    Arrays.asList(new Day(new Date()))));
+
+            Query query = Query.builder()
+            .source(gameRevenueTable)
+            .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+            .whereFilter(where)
+            .build();
+
+            String expected = "SELECT "
+                    + "MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                    + "FROM (SELECT "
+                    + "MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                    + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id`,"
+                    + "`example_GameRevenue`.`saleDate` AS `saleDate`,"
+                    + "`example_GameRevenue`.`country_id` AS `country_id` "
+                    + "FROM `gameRevenue` AS `example_GameRevenue` "
+                    + "GROUP BY "
+                    + "`example_GameRevenue`.`player_stats_id`, "
+                    + "`example_GameRevenue`.`saleDate`, "
+                    + "`example_GameRevenue`.`country_id` ) "
+                    + "AS `example_GameRevenue_XXX` "
+                    + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                    + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                    + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                    + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                    + "WHERE (`example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                    + "AND PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX))";
+
+            compareQueryLists(expected, engine.explain(query));
+            testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnMultiReferenceTimeDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "lastDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("lastDate"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `lastDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id`,"
+                + "`example_GameRevenue`.`saleDate` AS `saleDate`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id`, "
+                + "`example_GameRevenue`.`saleDate`, "
+                + "`example_GameRevenue`.`country_id` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE (`example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                + "AND PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX)) "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd')";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testSortOnMultiReferenceTimeDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("lastDate", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("lastDate"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `lastDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id`,"
+                + "`example_GameRevenue`.`saleDate` AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id`, "
+                + "`example_GameRevenue`.`saleDate` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                + "ORDER BY PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') DESC\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnMultiReferenceTimeDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression having = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(100)),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "lastDate"),
+                        Operator.IN,
+                        Arrays.asList(new Day(new Date()))));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .timeDimensionProjection(gameRevenueTable.getTimeDimensionProjection("lastDate"))
+                .havingFilter(having)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') AS `lastDate` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`player_stats_id` AS `player_stats_id`,"
+                + "`example_GameRevenue`.`saleDate` AS `saleDate` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`player_stats_id`, "
+                + "`example_GameRevenue`.`saleDate` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `playerStats` AS `example_GameRevenue_XXX_playerStats_XXX` "
+                + "ON `example_GameRevenue_XXX`.`player_stats_id` = `example_GameRevenue_XXX_playerStats_XXX`.`id` "
+                + "GROUP BY PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') "
+                + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX "
+                + "OR PARSEDATETIME(FORMATDATETIME(CASE WHEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` > `example_GameRevenue_XXX`.`saleDate` THEN `example_GameRevenue_XXX_playerStats_XXX`.`recordedDate` ELSE `example_GameRevenue_XXX`.`saleDate` END, 'yyyy-MM-dd'), 'yyyy-MM-dd') IN (:XXX))\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnMultiReferenceDimensionNotInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryCategory"),
+                        Operator.IN,
+                        Arrays.asList("US")));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE (`example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                + "AND CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END IN (:XXX))\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testWhereOnMultiReferenceDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression where = new AndFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryIsoCode"),
+                        Operator.IN,
+                        Arrays.asList("foo")),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryCategory"),
+                        Operator.IN,
+                        Arrays.asList("US")));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryCategory"))
+                .whereFilter(where)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END AS `countryCategory` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) "
+                + "AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "WHERE (`example_GameRevenue_XXX_country_XXX`.`iso_code` IN (:XXX) "
+                + "AND CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END IN (:XXX)) "
+                + "GROUP BY CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testSortOnMultiReferenceDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        Map<String, Sorting.SortOrder> sortMap = new TreeMap<>();
+        sortMap.put("countryCategory", Sorting.SortOrder.desc);
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryCategory"))
+                .sorting(new SortingImpl(sortMap, GameRevenue.class, dictionary))
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END AS `countryCategory` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) AS `example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END "
+                + "ORDER BY CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END DESC\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+
+    @Test
+    public void testHavingOnMultiReferenceDimensionInProjection() {
+        SQLTable gameRevenueTable = (SQLTable) metaDataStore.getTable("gameRevenue", NO_VERSION);
+
+        FilterExpression having = new OrFilterExpression(
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "revenue"),
+                        Operator.GT,
+                        Arrays.asList(100)),
+                new FilterPredicate(
+                        new Path(GameRevenue.class, dictionary, "countryCategory"),
+                        Operator.IN,
+                        Arrays.asList("foo")));
+
+        Query query = Query.builder()
+                .source(gameRevenueTable)
+                .metricProjection(gameRevenueTable.getMetricProjection("revenue"))
+                .dimensionProjection(gameRevenueTable.getDimensionProjection("countryCategory"))
+                .havingFilter(having)
+                .build();
+
+        String expected = "SELECT MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) AS `revenue`,"
+                + "CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END AS `countryCategory` "
+                + "FROM (SELECT MAX(`example_GameRevenue`.`revenue`) AS `INNER_AGG_XXX`,"
+                + "`example_GameRevenue`.`country_id` AS `country_id`,"
+                + "`example_GameRevenue`.`category` AS `category` "
+                + "FROM `gameRevenue` AS `example_GameRevenue` "
+                + "GROUP BY `example_GameRevenue`.`country_id`, "
+                + "`example_GameRevenue`.`category` ) AS "
+                + "`example_GameRevenue_XXX` "
+                + "LEFT OUTER JOIN `countries` AS `example_GameRevenue_XXX_country_XXX` "
+                + "ON `example_GameRevenue_XXX`.`country_id` = `example_GameRevenue_XXX_country_XXX`.`id` "
+                + "GROUP BY CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END "
+                + "HAVING (MAX(`example_GameRevenue_XXX`.`INNER_AGG_XXX`) > :XXX OR CASE WHEN `example_GameRevenue_XXX_country_XXX`.`iso_code` = 'US' THEN `example_GameRevenue_XXX`.`category` ELSE 'UNKNONWN' END IN (:XXX))\n";
+
+        compareQueryLists(expected, engine.explain(query));
+        testQueryExecution(query);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjectionTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjectionTest.java
new file mode 100644
index 0000000000..c3a605794e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SQLColumnProjectionTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.query.ColumnProjection;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.metadata.SQLTable;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Id;
+import javax.sql.DataSource;
+
+public class SQLColumnProjectionTest {
+
+    private MetaDataStore metaDataStore;
+
+    @Include
+    class TableA {
+        @Id
+        long id;
+
+        @Join(value = "{{$$column.args.foo}} = '123' AND {{$id}} == {{tableB.$id}}")
+        TableB tableB;
+
+        @DimensionFormula(value = "{{tableB.dim1}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String dim1;
+
+        @DimensionFormula(value = "{{$$column.args.foo}}",
+                          arguments = {@ArgumentDefinition(name = "foo", type = ValueType.TEXT)})
+        String dim2;
+    }
+
+    @Include
+    class TableB {
+        @Id
+        long id;
+
+        @DimensionFormula(value = "{{$foo}}")
+        String dim1;
+    }
+
+    public SQLColumnProjectionTest() {
+
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(TableA.class));
+        models.add(ClassType.of(TableB.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+    }
+
+
+    @Test
+    public void testColumnThatCannotNest() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableA.class));
+
+        ColumnProjection projection = table.getColumnProjection("dim1");
+
+        assertFalse(projection.canNest(table, metaDataStore));
+    }
+
+    @Test
+    public void testPhysicalColumnThatCanNest() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableB.class));
+
+        ColumnProjection projection = table.getColumnProjection("dim1");
+
+        assertTrue(projection.canNest(table, metaDataStore));
+    }
+
+    @Test
+    public void testColumnArgsColumnThatCanNest() throws Exception {
+        SQLTable table = metaDataStore.getTable(ClassType.of(TableA.class));
+
+        Map<String, Argument> args = new HashMap<>();
+        args.put("foo", Argument.builder().name("foo").value("bar").build());
+
+        ColumnProjection projection = table.getColumnProjection("dim2", args);
+
+        assertTrue(projection.canNest(table, metaDataStore));
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SkipOptimizerTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SkipOptimizerTest.java
new file mode 100644
index 0000000000..e8920ab576
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SkipOptimizerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getClassType;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.framework.SQLUnitTest;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.Query;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class SkipOptimizerTest extends SQLUnitTest {
+
+    private static Optimizer optimizer = mock(Optimizer.class);
+
+    @BeforeAll
+    public static void init() {
+        MetaDataStore metaDataStore = new MetaDataStore(
+                DefaultClassScanner.getInstance(),
+                getClassType(DefaultClassScanner.getInstance().getAnnotatedClasses("example",
+                        Include.class)),
+                false);
+
+        Set<Optimizer> optimizers = new HashSet<>(Arrays.asList(optimizer));
+        init(new H2Dialect(), optimizers, metaDataStore);
+    }
+
+    @BeforeEach
+    public void beforeEach() {
+        reset(optimizer);
+    }
+
+    @Test
+    public void testSkippingOptimizer() {
+        when(optimizer.hint()).thenReturn("Skip");
+        Query query = TestQuery.WHERE_AND.getQuery();
+        engine.explain(query);
+
+        verify(optimizer, never()).optimize(any());
+    }
+
+    @Test
+    public void testNegatingOptimizer() {
+        when(optimizer.hint()).thenReturn("JoinBeforeAggregate");
+        when(optimizer.negateHint()).thenReturn("NoJoinBeforeAggregate");
+        Query query = TestQuery.WHERE_AND.getQuery();
+        engine.explain(query);
+
+        verify(optimizer, never()).optimize(any());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitterTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitterTest.java
new file mode 100644
index 0000000000..507bbd6eb2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/query/SubqueryFilterSplitterTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.queryengines.sql.query;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import example.Player;
+import example.PlayerRanking;
+import example.PlayerStats;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.sql.DataSource;
+
+public class SubqueryFilterSplitterTest {
+
+    private MetaDataStore metaDataStore;
+    private RSQLFilterDialect dialect;
+    private static final Type<PlayerStats> PLAYER_STATS_TYPE = ClassType.of(PlayerStats.class);
+
+    public SubqueryFilterSplitterTest() {
+
+        Set<Type<?>> models = new HashSet<>();
+        models.add(ClassType.of(PlayerStats.class));
+        models.add(ClassType.of(Country.class));
+        models.add(ClassType.of(SubCountry.class));
+        models.add(ClassType.of(Player.class));
+        models.add(ClassType.of(PlayerRanking.class));
+
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        models.stream().forEach(dictionary::bindEntity);
+
+        metaDataStore = new MetaDataStore(dictionary.getScanner(), models, true);
+        metaDataStore.populateEntityDictionary(dictionary);
+
+        DataSource mockDataSource = mock(DataSource.class);
+        //The query engine populates the metadata store with actual tables.
+        new SQLQueryEngine(metaDataStore, (unused) -> new ConnectionDetails(mockDataSource,
+                SQLDialectFactory.getDefaultDialect()));
+
+        dialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+    }
+
+
+    @Test
+    public void testSinglePredicateNoJoin() throws Exception {
+        FilterExpression expression = parse("overallRating=='Foo'");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertNull(splitExpressions.getOuter());
+        assertEquals(expression, splitExpressions.getInner());
+    }
+
+    @Test
+    public void testSinglePredicateWithJoin() throws Exception {
+        FilterExpression expression = parse("countryUnSeats>3");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertNull(splitExpressions.getInner());
+        assertEquals(expression, splitExpressions.getOuter());
+    }
+
+    @Test
+    public void testSplitByAnd() throws Exception {
+        FilterExpression expression = parse("countryUnSeats>3;overallRating=='Foo'");
+        FilterExpression expectedOuter = parse("countryUnSeats>3");
+        FilterExpression expectedInner = parse("overallRating=='Foo'");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertEquals(expectedOuter, splitExpressions.getOuter());
+        assertEquals(expectedInner, splitExpressions.getInner());
+    }
+
+    @Test
+    public void testSplitByOr() throws Exception {
+        FilterExpression expression = parse("countryUnSeats>3,overallRating=='Foo'");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertEquals(expression, splitExpressions.getOuter());
+        assertNull(splitExpressions.getInner());
+    }
+
+    @Test
+    public void testCompoundSplitByAnd() throws Exception {
+        FilterExpression expression = parse(
+                "(countryUnSeats>3,overallRating=='Foo');(overallRating=='Bar',overallRating=='Blah')");
+
+        FilterExpression expectedOuter = parse("countryUnSeats>3,overallRating=='Foo'");
+        FilterExpression expectedInner = parse("overallRating=='Bar',overallRating=='Blah'");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertEquals(expectedOuter, splitExpressions.getOuter());
+        assertEquals(expectedInner, splitExpressions.getInner());
+    }
+
+    @Test
+    public void testCompoundSplitByOr() throws Exception {
+        FilterExpression expression = parse(
+                "(countryUnSeats>3;overallRating=='Foo'),(overallRating=='Bar';overallRating=='Blah')");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertEquals(expression, splitExpressions.getOuter());
+        assertNull(splitExpressions.getInner());
+    }
+
+    @Test
+    public void testAllOrsWithNoJoins() throws Exception {
+        FilterExpression expression = parse(
+                "(overallRating=='Foobar',overallRating=='Foo'),(overallRating=='Bar',overallRating=='Blah')");
+
+        SubqueryFilterSplitter.SplitFilter splitExpressions =
+                SubqueryFilterSplitter.splitFilter(metaDataStore, expression);
+
+        assertEquals(expression, splitExpressions.getInner());
+        assertNull(splitExpressions.getOuter());
+    }
+
+    private FilterExpression parse(String filter) throws ParseException {
+        return dialect.parse(PLAYER_STATS_TYPE, new HashSet<>(), filter, NO_VERSION);
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/DaySerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/DaySerdeTest.java
new file mode 100644
index 0000000000..52ab2a813d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/DaySerdeTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class DaySerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+
+    @Test
+    public void testDateSerialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+
+        Day expectedDate = new Day(localDate);
+        Serde serde = new Day.DaySerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020-01-01", actual);
+    }
+
+    @Test
+    public void testDateDeserialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Day expectedDate = new Day(localDate);
+        Serde serde = new Day.DaySerde();
+        Object actualDate = serde.deserialize("2020-01-01");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+
+        Day expectedDate = new Day(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Day.DaySerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Day expectedDate = new Day(localDate);
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 01, 01, 00, 00, 00, 00, ZoneOffset.UTC);
+
+        Serde serde = new Day.DaySerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "January-01-2020";
+        Serde serde = new Day.DaySerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/HourSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/HourSerdeTest.java
new file mode 100644
index 0000000000..ba6e50acff
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/HourSerdeTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Hour;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class HourSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH");
+
+    @Test
+    public void testDateSerialize() {
+
+        String expected = "2020-01-01T01";
+        Hour expectedDate = new Hour(LocalDateTime.from(formatter.parse(expected)));
+        Serde serde = new Hour.HourSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDateDeserializeString() {
+
+        String dateInString = "2020-01-01T01";
+        Hour expectedDate = new Hour(LocalDateTime.from(formatter.parse(dateInString)));
+        Serde serde = new Hour.HourSerde();
+        Object actualDate = serde.deserialize(dateInString);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+
+        String dateInString = "2020-01-01T01";
+        Hour expectedDate = new Hour(LocalDateTime.from(formatter.parse(dateInString)));
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Hour.HourSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 01, 00, 00);
+        Hour expectedDate = new Hour(localDate);
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 01, 01, 01, 00, 00, 00, ZoneOffset.UTC);
+
+        Serde serde = new Hour.HourSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "00 2020-01-01";
+        Serde serde = new Hour.HourSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/ISOWeekSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/ISOWeekSerdeTest.java
new file mode 100644
index 0000000000..89557ae75f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/ISOWeekSerdeTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.ISOWeek;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class ISOWeekSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+
+    @Test
+    public void testDateSerialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 06, 00, 00, 00);
+
+        ISOWeek expectedDate = new ISOWeek(localDate);
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020-01-06", actual);
+    }
+
+    @Test
+    public void testDateDeserializeString() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 06, 00, 00, 00);
+
+        ISOWeek expectedDate = new ISOWeek(localDate);
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        Object actualDate = serde.deserialize("2020-01-06");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestampNotMonday() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        ISOWeek timestamp = new ISOWeek(localDate);
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+            serde.deserialize(timestamp)
+        );
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 06, 00, 00, 00);
+        ISOWeek expectedDate = new ISOWeek(localDate);
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 01, 06, 00, 00, 00, 00, ZoneOffset.UTC);
+
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTimeNotMonday() {
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 01, 01, 00, 00, 00, 00, ZoneOffset.UTC);
+
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+                serde.deserialize(dateTime)
+        );
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 06, 00, 00, 00);
+        ISOWeek expectedDate = new ISOWeek(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "January-2020-01";
+        Serde serde = new ISOWeek.ISOWeekSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MinuteSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MinuteSerdeTest.java
new file mode 100644
index 0000000000..6742987abc
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MinuteSerdeTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Minute;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class MinuteSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm");
+
+    @Test
+    public void testDateSerialize() {
+
+        String expected = "2020-01-01T01:18";
+        Minute expectedDate = new Minute(LocalDateTime.from(formatter.parse(expected)));
+        Serde serde = new Minute.MinuteSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDateDeserializeString() {
+
+        String dateInString = "2020-01-01T01:18";
+        Minute expectedDate = new Minute(LocalDateTime.from(formatter.parse(dateInString)));
+        String actual = "2020-01-01T01:18";
+        Serde serde = new Minute.MinuteSerde();
+        Object actualDate = serde.deserialize(actual);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+
+        String dateInString = "2020-01-01T01:18";
+        Minute expectedDate = new Minute(LocalDateTime.from(formatter.parse(dateInString)));
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Minute.MinuteSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        String dateInString = "2020-01-01T01:18";
+        Minute expectedDate = new Minute(LocalDateTime.from(formatter.parse(dateInString)));
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 01, 01, 01, 18, 0, 0, ZoneOffset.UTC);
+        Serde serde = new Minute.MinuteSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "00:18 2020-01-01";
+        Serde serde = new Minute.MinuteSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MonthSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MonthSerdeTest.java
new file mode 100644
index 0000000000..addad39896
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/MonthSerdeTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Month;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class MonthSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+
+    @Test
+    public void testDateSerialize() {
+
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Month expectedDate = new Month(localDate);
+        Serde serde = new Month.MonthSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020-01", actual);
+    }
+
+    @Test
+    public void testDateDeserialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Month expectedDate = new Month(localDate);
+        Serde serde = new Month.MonthSerde();
+        Object actualDate = serde.deserialize("2020-01");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Month expectedDate = new Month(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Month.MonthSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Month expectedDate = new Month(localDate);
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        Serde serde = new Month.MonthSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+        String dateInString = "January-2020";
+        Serde serde = new Month.MonthSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/QuarterSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/QuarterSerdeTest.java
new file mode 100644
index 0000000000..b2c8528146
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/QuarterSerdeTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Quarter;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class QuarterSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+
+    @Test
+    public void testDateSerialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Quarter expectedDate = new Quarter(localDate);
+        Serde serde = new Quarter.QuarterSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020-01", actual);
+    }
+
+    @Test
+    public void testDateDeserialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Quarter expectedDate = new Quarter(localDate);
+        Serde serde = new Quarter.QuarterSerde();
+        Object actualDate = serde.deserialize("2020-01");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestampNotQuarterMonth() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(02), 01, 00, 00, 00);
+        Quarter quarter = new Quarter(localDate);
+        Serde serde = new Quarter.QuarterSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+            serde.deserialize(quarter)
+        );
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Quarter expectedDate = new Quarter(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Quarter.QuarterSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTimeNotQuarterMonth() {
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 2, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+
+        Serde serde = new Quarter.QuarterSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+                serde.deserialize(dateTime)
+        );
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Quarter expectedDate = new Quarter(localDate);
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        Serde serde = new Quarter.QuarterSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "January-2020";
+        Serde serde = new Quarter.QuarterSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/SecondSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/SecondSerdeTest.java
new file mode 100644
index 0000000000..b57571d7d2
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/SecondSerdeTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Second;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class SecondSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+
+    @Test
+    public void testDateSerialize() {
+
+        String expected = "2020-01-01T01:18:19";
+        Second expectedDate = new Second(LocalDateTime.from(formatter.parse(expected)));
+        Serde serde = new Second.SecondSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDateDeserializeString() {
+
+        String dateInString = "2020-01-01T01:18:19";
+        Second expectedDate = new Second(LocalDateTime.from(formatter.parse(dateInString)));
+        String actual = "2020-01-01T01:18:19";
+        Serde serde = new Second.SecondSerde();
+        Object actualDate = serde.deserialize(actual);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+
+        String dateInString = "2020-01-01T01:18:19";
+        Second expectedDate = new Second(LocalDateTime.from(formatter.parse(dateInString)));
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Second.SecondSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        String dateInString = "2020-01-01T01:18:19";
+        Second expectedDate = new Second(LocalDateTime.from(formatter.parse(dateInString)));
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 1, 1, 18, 19, 0, ZoneOffset.UTC);
+        Serde serde = new Second.SecondSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "00:18:19 2020-01-01";
+        Serde serde = new Second.SecondSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/TimeSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/TimeSerdeTest.java
new file mode 100644
index 0000000000..af9424a1f1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/TimeSerdeTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+public class TimeSerdeTest {
+
+    private static final String YEAR = "2020";
+    private static final String MONTH = "2020-01";
+    private static final String DATE = "2020-01-01";
+    private static final String HOUR = "2020-01-01T00";
+    private static final String MINUTE = "2020-01-01T00:00";
+    private static final String SECOND = "2020-01-01T00:00:00";
+
+    @Test
+    public void testTimeDeserializeYear() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, false, false, false, false, false, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(YEAR);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(YEAR, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testTimeDeserializeMonth() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, true, false, false, false, false, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(MONTH);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(MONTH, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testTimeDeserializeDate() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, true, true, false, false, false, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(DATE);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(DATE, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testTimeDeserializeHour() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, true, true, true, true, true, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(HOUR);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(HOUR, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testTimeDeserializeMinute() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, true, true, true, true, true, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(MINUTE);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(MINUTE, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testTimeDeserializeSecond() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Time expectedDate = new Time(localDate, true, true, true, true, true, true, (unused) -> "");
+        Serde serde = new Time.TimeSerde();
+        Object actualDate = serde.deserialize(SECOND);
+        assertEquals(expectedDate, actualDate);
+        assertEquals(SECOND, serde.serialize(actualDate));
+    }
+
+    @Test
+    public void testInvalidDeserialization() {
+        Serde serde = new Time.TimeSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+            serde.deserialize("2020R1")
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/WeekSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/WeekSerdeTest.java
new file mode 100644
index 0000000000..e99bfdf52e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/WeekSerdeTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Week;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class WeekSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+
+    @Test
+    public void testDateSerialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 05, 00, 00, 00);
+
+        Week expectedDate = new Week(localDate);
+        Serde serde = new Week.WeekSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020-01-05", actual);
+    }
+
+    @Test
+    public void testDateDeserializeString() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 05, 00, 00, 00);
+        Week expectedDate = new Week(localDate);
+        Serde serde = new Week.WeekSerde();
+        Object actualDate = serde.deserialize("2020-01-05");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestampNotSunday() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 06, 00, 00, 00);
+
+        Week expectedDate = new Week(localDate);
+        Serde serde = new Week.WeekSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+            serde.deserialize(expectedDate)
+        );
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 05, 00, 00, 00);
+
+        Week expectedDate = new Week(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Week.WeekSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTimeNotSunday() {
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 6, 0, 0, 0, 0, ZoneOffset.UTC);
+
+        Serde serde = new Week.WeekSerde();
+        assertThrows(IllegalArgumentException.class, () ->
+                serde.deserialize(dateTime)
+        );
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 05, 00, 00, 00);
+
+        Week expectedDate = new Week(localDate);
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 5, 0, 0, 0, 0, ZoneOffset.UTC);
+        Serde serde = new Week.WeekSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "January-2020-01";
+        Serde serde = new Week.WeekSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/YearSerdeTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/YearSerdeTest.java
new file mode 100644
index 0000000000..3b82b7b46e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/timegrains/serde/YearSerdeTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.timegrains.serde;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.datastores.aggregation.timegrains.Year;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class YearSerdeTest {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
+
+    @Test
+    public void testDateSerialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+
+        Year expectedDate = new Year(localDate);
+        Serde serde = new Year.YearSerde();
+        Object actual = serde.serialize(expectedDate);
+        assertEquals("2020", actual);
+    }
+
+    @Test
+    public void testDateDeserialize() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+
+        Year expectedDate = new Year(localDate);
+        Serde serde = new Year.YearSerde();
+        Object actualDate = serde.deserialize("2020");
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeTimestamp() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+
+        Year expectedDate = new Year(localDate);
+        Timestamp timestamp = new Timestamp(expectedDate.getTime());
+        Serde serde = new Year.YearSerde();
+        Object actualDate = serde.deserialize(timestamp);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeOffsetDateTime() {
+        LocalDateTime localDate = LocalDateTime.of(2020, java.time.Month.of(01), 01, 00, 00, 00);
+        Year expectedDate = new Year(localDate);
+
+        OffsetDateTime dateTime = OffsetDateTime.of(2020, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        Serde serde = new Year.YearSerde();
+        Object actualDate = serde.deserialize(dateTime);
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testDeserializeDateInvalidFormat() {
+
+        String dateInString = "January";
+        Serde serde = new Year.YearSerde();
+        assertThrows(DateTimeParseException.class, () ->
+            serde.deserialize(dateInString)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidatorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidatorTest.java
new file mode 100644
index 0000000000..b665ebefe9
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/ColumnArgumentValidatorTest.java
@@ -0,0 +1,388 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.validator;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryValidator;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.modelconfig.model.Argument;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.Join;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.Type;
+import com.zaxxer.hikari.HikariDataSource;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+class ColumnArgumentValidatorTest {
+
+    private final Set<Optimizer> optimizers = new HashSet<>();
+    private final QueryValidator queryValidator = new DefaultQueryValidator(EntityDictionary.builder().build());
+
+    private Table.TableBuilder mainTableBuilder, joinTableBuilder;
+    private final Argument mainArg1;
+    private final Collection<NamespaceConfig> namespaceConfigs;
+    private final Function<String, ConnectionDetails> connectionLookup;
+
+    public ColumnArgumentValidatorTest() {
+        ConnectionDetails connection = new ConnectionDetails(new HikariDataSource(), SQLDialectFactory.getDefaultDialect());
+        Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+        connectionDetailsMap.put("mycon", connection);
+        connectionDetailsMap.put("SalesDBConnection", connection);
+
+        this.namespaceConfigs = Collections.singleton(NamespaceConfig.builder().name("namespace").build());
+
+        this.mainTableBuilder = Table.builder()
+                        .name("MainTable")
+                        .namespace("namespace");
+        this.joinTableBuilder = Table.builder()
+                        .name("JoinTable")
+                        .namespace("namespace");
+
+        this.mainArg1 = Argument.builder()
+                        .name("mainArg1")
+                        .type(Type.INTEGER)
+                        .values(Collections.emptySet())
+                        .defaultValue("")
+                        .build();
+
+        connectionLookup = (name) -> connectionDetailsMap.getOrDefault(name, connection);
+    }
+
+    @Test
+    public void testUndefinedColumnArgsInColumnDefinition() {
+        Table mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{$$column.args.mainArg2}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument 'mainArg2' is not defined but found '{{$$column.args.mainArg2}}'.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testUndefinedColumnArgsInJoinExpression() {
+        Table mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$column.args.mainArg2}} blah")
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{join.$joinCol}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(joinTableBuilder.build());
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument 'mainArg2' is not defined but found '{{$$column.args.mainArg2}}'.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testColumnArgsTypeMismatchForDepenedentColumn() {
+        Table mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{dim2}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim2")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("{{$dim2}} blah {{$$column.args.mainArg1}} end")
+                                        .argument(Argument.builder()
+                                                        .name("mainArg1")
+                                                        .type(Type.TEXT)
+                                                        .values(Collections.emptySet())
+                                                        .defaultValue("")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument type mismatch. Dependent Column: 'dim2' in table: 'namespace_MainTable'"
+                        + " has same Argument: 'mainArg1' with type 'TEXT'.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testMissingRequiredColumnArgs() {
+        Table mainTable = mainTableBuilder
+               .dimension(Dimension.builder()
+                        .name("dim1")
+                        .type(Type.BOOLEAN)
+                        .values(Collections.emptySet())
+                        .tags(Collections.emptySet())
+                        .definition("start {{$$column.args.mainArg1}} end")
+                        .build())
+                .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument 'mainArg1' is not defined but found '{{$$column.args.mainArg1}}'.",
+                e.getMessage());
+    }
+
+    @Test
+    public void testRequiredColumnArgsInFilterTemplate() {
+        Table mainTable = mainTableBuilder
+                .dimension(Dimension.builder()
+                        .name("dim1")
+                        .type(Type.BOOLEAN)
+                        .values(Collections.emptySet())
+                        .tags(Collections.emptySet())
+                        .definition("start {{$$column.args.mainArg1}} end")
+                        .filterTemplate("dim1=={{mainArg1}}")
+                        .build())
+                .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        assertDoesNotThrow(() -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+    }
+
+    @Test
+    public void testMissingRequiredColumnArgsForDepenedentColumnCase1() {
+        Table mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{dim2}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim2")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("{{$dim2}} blah {{$$column.args.dependentArg1}} end")
+                                        .argument(Argument.builder()
+                                                        .name("dependentArg1")
+                                                        .type(Type.INTEGER)
+                                                        .values(Collections.emptySet())
+                                                        .defaultValue("")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument 'dependentArg1' with type 'INTEGER' is not defined but is"
+                        + " required for Dependent Column: 'dim2' in table: 'namespace_MainTable'.",
+                        e.getMessage());
+
+        // If 'dim2' is invoked using SQL helper, must not complain.
+        mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{sql column='dim2[dependentArg1:123]'}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim2")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("{{$dim2}} blah {{$$column.args.dependentArg1}} end")
+                                        .argument(Argument.builder()
+                                                        .name("dependentArg1")
+                                                        .type(Type.INTEGER)
+                                                        .values(Collections.emptySet())
+                                                        .defaultValue("")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        tables = new HashSet<>();
+        tables.add(mainTable);
+
+        MetaDataStore metaDataStore1 = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        assertDoesNotThrow(() -> new SQLQueryEngine(metaDataStore1, connectionLookup, optimizers, merger, queryValidator));
+    }
+
+    @Test
+    public void testMissingRequiredColumnArgsForDepenedentColumnCase2() {
+        Table mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$column.args.mainArg1}} blah {{join.$joinCol}} end")
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{join.joinCol}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .build();
+
+        Table joinTable = joinTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("joinCol")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("{{$joinCol}} blah {{$$column.args.joinArg1}} end")
+                                        .argument(Argument.builder()
+                                                        .name("joinArg1")
+                                                        .type(Type.INTEGER)
+                                                        .values(Collections.emptySet())
+                                                        .defaultValue("")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(joinTable);
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Argument 'joinArg1' with type 'INTEGER' is not defined but is"
+                        + " required for Dependent Column: 'joinCol' in table: 'namespace_JoinTable'.",
+                        e.getMessage());
+
+        // If 'join.joinCol' is invoked using SQL helper, must not complain.
+        mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$column.args.mainArg1}} blah {{join.$joinCol}} end")
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{sql from='join' column='joinCol[joinArg1:123]'}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .build();
+
+        tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(joinTable);
+
+        MetaDataStore metaDataStore1 = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        assertDoesNotThrow(() -> new SQLQueryEngine(metaDataStore1, connectionLookup, optimizers, merger, queryValidator));
+    }
+
+    @Test
+    public void testInvalidPinnedArgForDepenedentColumn() {
+        // 'dim2' is invoked using SQL helper, pinned value is Invalid
+        Table mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$column.args.mainArg1}} blah {{sql column='dim2[dependentArg1:foo]'}} end")
+                                        .argument(mainArg1)
+                                        .build())
+                        .dimension(Dimension.builder()
+                                        .name("dim2")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("{{$dim2}} blah {{$$column.args.dependentArg1}} end")
+                                        .argument(Argument.builder()
+                                                        .name("dependentArg1")
+                                                        .type(Type.INTEGER)
+                                                        .values(Collections.emptySet())
+                                                        .defaultValue("")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify column arguments for column: dim1 in table: namespace_MainTable. Type mismatch of Fixed value provided for Dependent Column: 'dim2'"
+                        + " in table: 'namespace_MainTable'. Pinned Value: 'foo' for Argument 'dependentArg1' with Type 'INTEGER' is invalid.",
+                        e.getMessage());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidatorTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidatorTest.java
new file mode 100644
index 0000000000..f2cd9fd885
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/validator/TableArgumentValidatorTest.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.aggregation.validator;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryValidator;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.query.Optimizer;
+import com.yahoo.elide.datastores.aggregation.query.QueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.modelconfig.model.Argument;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.Join;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.Type;
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.commons.compress.utils.Sets;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class TableArgumentValidatorTest {
+
+    private final Set<Optimizer> optimizers = new HashSet<>();
+    private final QueryValidator queryValidator = new DefaultQueryValidator(EntityDictionary.builder().build());
+
+    private Table.TableBuilder mainTableBuilder;
+    private final Collection<NamespaceConfig> namespaceConfigs;
+    private final Function<String, ConnectionDetails> connectionLookup;
+
+    public TableArgumentValidatorTest() {
+        ConnectionDetails connection = new ConnectionDetails(new HikariDataSource(), SQLDialectFactory.getDefaultDialect());
+        Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+        connectionDetailsMap.put("mycon", connection);
+        connectionDetailsMap.put("SalesDBConnection", connection);
+
+        this.namespaceConfigs = Collections.singleton(NamespaceConfig.builder().name("namespace").build());
+
+        this.mainTableBuilder = Table.builder()
+                        .name("MainTable")
+                        .namespace("namespace")
+                        .argument(Argument.builder()
+                                        .name("mainArg1")
+                                        .type(Type.INTEGER)
+                                        .values(Collections.emptySet())
+                                        .defaultValue("")
+                                        .build())
+                        ;
+
+        connectionLookup = (name) -> connectionDetailsMap.getOrDefault(name, connection);
+    }
+
+    @Test
+    public void testArgumentValues() {
+
+        Table mainTable = mainTableBuilder
+                        .argument(Argument.builder()
+                                        .name("testArg")
+                                        .type(Type.INTEGER)
+                                        .values(Sets.newHashSet("1", "2.5"))
+                                        .defaultValue("")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Value: '2.5' for Argument 'testArg' with Type 'INTEGER' is invalid.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testDefaultValueIsInValues() {
+
+        Table mainTable = mainTableBuilder
+                        .argument(Argument.builder()
+                                        .name("testArg")
+                                        .type(Type.INTEGER)
+                                        .values(Sets.newHashSet("1", "2"))
+                                        .defaultValue("5")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Default Value: '5' for Argument 'testArg' with Type 'INTEGER' must match one of these values: [1, 2].",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testDefaultValueMatchesType() {
+
+        Table mainTable = mainTableBuilder
+                        .argument(Argument.builder()
+                                        .name("testArg")
+                                        .type(Type.INTEGER)
+                                        .values(Collections.emptySet())
+                                        .defaultValue("2.5")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Default Value: '2.5' for Argument 'testArg' with Type 'INTEGER' is invalid.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testUndefinedTableArgsInTableSql() {
+
+        Table mainTable = mainTableBuilder
+                        .sql("SELECT something {{$$table.args.mainArg1}} blah {{$$table.args.mainArg2}} FROM")
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Argument 'mainArg2' is not defined but found '{{$$table.args.mainArg2}}' in table's sql.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testUndefinedTableArgsInColumnDefinition() {
+        Table mainTable = mainTableBuilder
+                        .dimension(Dimension.builder()
+                                        .name("dim1")
+                                        .type(Type.BOOLEAN)
+                                        .values(Collections.emptySet())
+                                        .tags(Collections.emptySet())
+                                        .definition("start {{$$table.args.mainArg1}} blah {{$$table.args.mainArg2}} end")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Argument 'mainArg2' is not defined but found '{{$$table.args.mainArg2}}' in definition of column: 'dim1'.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testUndefinedTableArgsInJoinExpressions() {
+        Table mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$table.args.mainArg1}} blah {{$$table.args.mainArg2}} end")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(Table.builder()
+                        .name("JoinTable")
+                        .namespace("namespace")
+                        .build());
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Argument 'mainArg2' is not defined but found '{{$$table.args.mainArg2}}' in definition of join: 'join'.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testMissingRequiredTableArgsForJoinTable() {
+        Table mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$table.args.mainArg1}} end")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(Table.builder()
+                        .name("JoinTable")
+                        .namespace("namespace")
+                        .argument(Argument.builder()
+                                        .name("joinArg1")
+                                        .type(Type.INTEGER)
+                                        .values(Collections.emptySet())
+                                        .defaultValue("")
+                                        .build())
+                        .build());
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Argument 'joinArg1' with type 'INTEGER' is not defined but is required by join table: namespace_JoinTable.",
+                        e.getMessage());
+    }
+
+    @Test
+    public void testRequiredTableArgsForJoinTableInFilterTemplate() {
+        Table mainTable = Table.builder()
+                .name("MainTable")
+                .namespace("namespace")
+                .filterTemplate("foo>{{filterArg1}}")
+                .join(Join.builder()
+                        .name("join")
+                        .namespace("namespace")
+                        .to("JoinTable")
+                        .definition("start {{$$table.args.filterArg1}} end")
+                        .build())
+                .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(Table.builder()
+                .name("JoinTable")
+                .namespace("namespace")
+                .build());
+
+        assertDoesNotThrow(() -> {
+            new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        });
+    }
+
+    @Test
+    public void testTableArgsTypeMismatchForJoinTable() {
+        Table mainTable = mainTableBuilder
+                        .join(Join.builder()
+                                        .name("join")
+                                        .namespace("namespace")
+                                        .to("JoinTable")
+                                        .definition("start {{$$table.args.mainArg1}} end")
+                                        .build())
+                        .build();
+
+        Set<Table> tables = new HashSet<>();
+        tables.add(mainTable);
+        tables.add(Table.builder()
+                        .name("JoinTable")
+                        .namespace("namespace")
+                        .argument(Argument.builder()
+                                        .name("mainArg1")
+                                        .type(Type.TEXT)
+                                        .values(Collections.emptySet())
+                                        .defaultValue("")
+                                        .build())
+                        .build());
+
+        MetaDataStore metaDataStore = new MetaDataStore(DefaultClassScanner.getInstance(), tables, this.namespaceConfigs, true);
+        QueryPlanMerger merger = new DefaultQueryPlanMerger(metaDataStore);
+        Exception e = assertThrows(IllegalStateException.class, () -> new SQLQueryEngine(metaDataStore, connectionLookup, optimizers, merger, queryValidator));
+
+        assertEquals("Failed to verify table arguments for table: namespace_MainTable. Argument type mismatch. Join table: 'namespace_JoinTable' has same Argument: 'mainArg1' with type 'TEXT'.",
+                        e.getMessage());
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/GameRevenue.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/GameRevenue.java
new file mode 100644
index 0000000000..db23ad58e6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/GameRevenue.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import static example.TimeGrainDefinitions.DATE_FORMAT;
+import static example.TimeGrainDefinitions.MONTH_FORMAT;
+import static example.TimeGrainDefinitions.QUARTER_FORMAT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.VersionQuery;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import example.dimensions.Country;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import javax.persistence.Id;
+
+@Include
+@VersionQuery(sql = "SELECT COUNT(*) from playerStats")
+@EqualsAndHashCode(callSuper = false)
+@ToString
+@FromTable(name = "gameRevenue")
+@TableMeta(
+        description = "Game REvenue",
+        hints = {"AggregateBeforeJoin"},
+        size = CardinalitySize.LARGE
+)
+public class GameRevenue {
+    @Id
+    private int rowNumber;
+    @Join("{{$country_id}} = {{country.$id}}")
+    private Country country;
+
+    @Join("{{$player_stats_id}} = {{playerStats.$id}}")
+    private PlayerStats playerStats;
+
+    @MetricFormula("MAX({{$revenue}})")
+    private BigDecimal revenue;
+
+    @DimensionFormula("{{country.isoCode}}")
+    @ColumnMeta(values = {"HK", "US"})
+    private String countryIsoCode;
+
+    @DimensionFormula("{{$category}}")
+    private String category;
+
+    @Temporal(grains = {
+            @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.MONTH, expression = MONTH_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.QUARTER, expression = QUARTER_FORMAT)
+    }, timeZone = "UTC")
+    @DimensionFormula("{{$saleDate}}")
+    private Day saleDate;
+
+    @Temporal(grains = {
+            @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.MONTH, expression = MONTH_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.QUARTER, expression = QUARTER_FORMAT)
+    }, timeZone = "UTC")
+    @DimensionFormula("{{playerStats.recordedDate}}")
+    private Day sessionDate;
+
+    @Temporal(grains = {
+            @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.MONTH, expression = MONTH_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.QUARTER, expression = QUARTER_FORMAT)
+     }, timeZone = "UTC")
+    @DimensionFormula("CASE WHEN {{sessionDate}} > {{saleDate}} THEN {{sessionDate}} ELSE {{saleDate}} END")
+    private Day lastDate;
+
+    @DimensionFormula("CASE WHEN {{countryIsoCode}} = 'US' THEN {{category}} ELSE 'UNKNONWN' END")
+    private String countryCategory;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/Player.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/Player.java
new file mode 100644
index 0000000000..05bfad7e22
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/Player.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Entity
+@Include
+@Table(name = "players")
+@TableMeta(
+        isHidden = true
+)
+@Data
+public class Player {
+
+    @Id
+    private long id;
+
+    @FriendlyName
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerRanking.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerRanking.java
new file mode 100644
index 0000000000..8774aa9fc8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerRanking.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Entity
+@Include
+@Data
+@TableMeta(size = CardinalitySize.MEDIUM)
+@Table(name = "playerRanking")
+public class PlayerRanking {
+
+    @Id
+    private long id;
+
+    private Integer ranking;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStats.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStats.java
new file mode 100644
index 0000000000..3f052ef2b4
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStats.java
@@ -0,0 +1,392 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static example.TimeGrainDefinitions.DATE_FORMAT;
+import static example.TimeGrainDefinitions.MONTH_FORMAT;
+import static example.TimeGrainDefinitions.QUARTER_FORMAT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.type.ParameterizedModel;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.TableSource;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.custom.DailyAverageScorePerPeriodMaker;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.VersionQuery;
+import com.yahoo.elide.datastores.aggregation.timegrains.Day;
+import com.yahoo.elide.datastores.aggregation.timegrains.Time;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import example.dimensions.Country;
+import example.dimensions.PlaceType;
+import example.dimensions.SubCountry;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Include
+@VersionQuery(sql = "SELECT COUNT(*) from playerStats")
+@EqualsAndHashCode(callSuper = false)
+@ToString
+@FromTable(name = "playerStats")
+@TableMeta(
+        description = "Player Statistics",
+        category = "Sports Category",
+        tags = {"Game", "Statistics"},
+        hints = {"AggregateBeforeJoin", "NoJoinBeforeAggregate"},
+        size = CardinalitySize.LARGE
+)
+public class PlayerStats extends ParameterizedModel {
+
+    /**
+     * PK.
+     */
+    private String id;
+
+    /**
+     * A metric.
+     */
+    private long highScore;
+
+    /**
+     * A metric.
+     */
+    private long lowScore;
+
+    /**
+     * A metric.
+     */
+    private float dailyAverageScorePerPeriod;
+
+    /**
+     * A degenerate dimension.
+     */
+    private String overallRating;
+
+    /**
+     * A table dimension.
+     */
+    private Country country;
+
+    private String countryNickName;
+
+    private int countryUnSeats;
+
+    /**
+     * A subselect dimension.
+     */
+    private SubCountry subCountry;
+
+    @Setter
+    private String countryViewIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String countryIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String subCountryIsoCode;
+
+    /**
+     * A table dimension.
+     */
+    private Player player;
+
+    /**
+     * A table dimension.
+     */
+    private Player player2;
+
+    /**
+     * A table dimension.
+     */
+    private PlayerRanking playerRanking;
+
+    private Integer playerRank;
+
+    private String playerName;
+
+    private String player2Name;
+
+    private Time recordedDate;
+
+    private Day updatedDate;
+
+    @Setter
+    private int playerLevel;
+
+    @Setter
+    private String countryIsInUsa;
+
+    private PlaceType placeType1;
+    private PlaceType placeType2;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @MetricFormula("MAX({{$highScore}})")
+    @ColumnMeta(description = "very awesome score", category = "Score Category")
+    public long getHighScore() {
+        return fetch("highScore", highScore);
+    }
+
+    public void setHighScore(final long highScore) {
+        this.highScore = highScore;
+    }
+
+    @JsonIgnore
+    @MetricFormula("MAX({{$highScore}})")
+    @ColumnMeta(isHidden = true, description = "hidden metric", category = "Score Category")
+    public long getHiddenHighScore() {
+        return fetch("hiddenHighScore", highScore);
+    }
+
+    @MetricFormula("MIN({{$lowScore}})")
+    @ColumnMeta(description = "very low score", category = "Score Category", tags = {"PRIVATE"})
+    public long getLowScore() {
+        return fetch("lowScore", lowScore);
+    }
+
+    public void setLowScore(final long lowScore) {
+        this.lowScore = lowScore;
+    }
+
+    @MetricFormula(maker = DailyAverageScorePerPeriodMaker.class)
+    public float getDailyAverageScorePerPeriod() {
+        return fetch("dailyAverageScorePerPeriod", dailyAverageScorePerPeriod);
+    }
+
+    public void setDailyAverageScorePerPeriod(final float dailyAverageScorePerPeriod) {
+        this.dailyAverageScorePerPeriod = dailyAverageScorePerPeriod;
+    }
+
+    @FriendlyName
+    @ColumnMeta(values = {"Good", "OK", "Great", "Terrible"}, tags = {"PUBLIC"}, size = CardinalitySize.MEDIUM)
+    public String getOverallRating() {
+        return fetch("overallRating", overallRating);
+    }
+
+    public void setOverallRating(final String overallRating) {
+        this.overallRating = overallRating;
+    }
+
+    @Join("{{$country_id}} = {{country.$id}}")
+    public Country getCountry() {
+        return fetch("country", country);
+    }
+
+    public void setCountry(final Country country) {
+        this.country = country;
+    }
+
+    @DimensionFormula("{{country.nickName}}")
+    @ColumnMeta(
+            description = "SubCountry NickName",
+            tableSource = @TableSource(table = "subCountry", column = "name", suggestionColumns = { "id", "isoCode" })
+    )
+    public String getCountryNickName() {
+        return fetch("countryNickName", countryNickName);
+    }
+
+    public void setCountryNickName(String nickName) {
+        this.countryNickName = nickName;
+    }
+
+    @DimensionFormula("{{country.unSeats}}")
+    public int getCountryUnSeats() {
+        return fetch ("countryUnSeats", countryUnSeats);
+    }
+
+    public void setCountryUnSeats(int seats) {
+        this.countryUnSeats = seats;
+    }
+
+    @DimensionFormula("{{country.isoCode}}")
+    @ColumnMeta(values = {"HKG", "USA"})
+    public String getCountryIsoCode() {
+        return fetch("countryIsoCode", countryIsoCode);
+    }
+
+    public void setCountryIsoCode(String isoCode) {
+        this.countryIsoCode = isoCode;
+    }
+
+    @Join("{{$sub_country_id}} = {{subCountry.$id}}")
+    public SubCountry getSubCountry() {
+        return fetch("subCountry", subCountry);
+    }
+
+    public void setSubCountry(final SubCountry subCountry) {
+        this.subCountry = subCountry;
+    }
+
+    @DimensionFormula("{{subCountry.isoCode}}")
+    @Column(updatable = false, insertable = false) // subselect field should be read-only
+    public String getSubCountryIsoCode() {
+        return fetch("subCountryIsoCode", subCountryIsoCode);
+    }
+
+    public void setSubCountryIsoCode(String isoCode) {
+        this.subCountryIsoCode = isoCode;
+    }
+
+    @Join("{{$player_id}} = {{playerRanking.$id}}")
+    public PlayerRanking getPlayerRanking() {
+        return fetch("playerRanking", playerRanking);
+    }
+
+    public void setPlayerRanking(final PlayerRanking playerRanking) {
+        this.playerRanking = playerRanking;
+    }
+
+    @Join("{{$player_id}} = {{player.$id}}")
+    public Player getPlayer() {
+        return player;
+    }
+
+    public void setPlayer(final Player player) {
+        this.player = player;
+    }
+
+    @Join("{{$player2_id}} = {{player2.$id}}")
+    public Player getPlayer2() {
+        return player2;
+    }
+
+    public void setPlayer2(Player player2) {
+        this.player2 = player2;
+    }
+
+    @DimensionFormula("{{playerRanking.ranking}}")
+    public Integer getPlayerRank() {
+        return fetch("playerRank", playerRank);
+    }
+
+    public void setPlayerRank(Integer playerRank) {
+        this.playerRank = playerRank;
+    }
+
+    @DimensionFormula("{{player.name}}")
+    public String getPlayerName() {
+        return fetch("playerName", playerName);
+    }
+
+    public void setPlayerName(String playerName) {
+        this.playerName = playerName;
+    }
+
+    @DimensionFormula("{{player2.name}}")
+    public String getPlayer2Name() {
+        return fetch("player2Name", player2Name);
+    }
+
+    public void setPlayer2Name(String player2Name) {
+        this.player2Name = player2Name;
+    }
+
+    @DimensionFormula("CASE WHEN {{overallRating}} = 'Good' THEN 1 ELSE 2 END")
+    public int getPlayerLevel() {
+        return fetch("playerLevel", playerLevel);
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>. See
+     *
+     * @return the date of the player session.
+     */
+    @Temporal(grains = {
+            @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.MONTH, expression = MONTH_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.QUARTER, expression = QUARTER_FORMAT)
+    }, timeZone = "UTC")
+    @DimensionFormula("{{$recordedDate}}")
+    public Time getRecordedDate() {
+        return fetch("recordedDate", recordedDate);
+    }
+
+    public void setRecordedDate(final Time recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>. See
+     *
+     * @return the date of the player session.
+     */
+    @JsonIgnore
+    @Temporal(grains = {
+            @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.MONTH, expression = MONTH_FORMAT),
+            @TimeGrainDefinition(grain = TimeGrain.QUARTER, expression = QUARTER_FORMAT)
+    }, timeZone = "UTC")
+    @ColumnMeta(isHidden = true)
+    @DimensionFormula("{{$recordedDate}}")
+    public Time getHiddenRecordedDate() {
+        return fetch("hiddenRecordedDate", recordedDate);
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>. See
+     *
+     * @return the date of the player session.
+     */
+    @Temporal(grains = { @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT) }, timeZone = "UTC")
+    public Day getUpdatedDate() {
+        return fetch("updatedDate", updatedDate);
+    }
+
+    public void setUpdatedDate(final Day updatedDate) {
+        this.updatedDate = updatedDate;
+    }
+
+    @DimensionFormula("CASE WHEN {{country.inUsa}} THEN 'true' ELSE 'false' END")
+    public String getCountryIsInUsa() {
+        return fetch("countryIsInUsa", countryIsInUsa);
+    }
+
+    @DimensionFormula("{{$place_type_ordinal}}")
+    @Enumerated(EnumType.ORDINAL)
+    public PlaceType getPlaceType1() {
+        return placeType1;
+    }
+
+    public void setPlaceType1(PlaceType placeType) {
+        this.placeType1 = placeType;
+    }
+
+    @DimensionFormula("{{$place_type_text}}")
+    @Enumerated(EnumType.STRING)
+    public PlaceType getPlaceType2() {
+        return placeType2;
+    }
+
+    public void setPlaceType2(PlaceType placeType) {
+        this.placeType2 = placeType;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsView.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsView.java
new file mode 100644
index 0000000000..9b21e7c70b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsView.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.ArgumentDefinition;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromSubquery;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Include
+@Data
+@FromSubquery(sql = "SELECT stats.highScore, stats.player_id, c.name as countryName FROM playerStats AS stats "
+                + "LEFT JOIN countries AS c ON stats.country_id = c.id "
+                + "WHERE stats.overallRating = '{{$$table.args.rating}}' AND stats.highScore >= {{$$table.args.minScore}}")
+@TableMeta(arguments = {
+                @ArgumentDefinition(name = "rating", type = ValueType.TEXT),
+                @ArgumentDefinition(name = "minScore", type = ValueType.INTEGER, defaultValue = "0")})
+public class PlayerStatsView {
+
+    /**
+     * PK.
+     */
+    @Id
+    private String id;
+
+    /**
+     * A metric.
+     */
+    @MetricFormula("MAX({{$highScore}})")
+    private long highScore;
+
+    /**
+     * A degenerate dimension.
+     */
+    //TODO - @DimensionFormula(value = "$$column.args.format({{$countryName}})", arguments = {
+    @DimensionFormula(value = "{{$countryName}}", arguments = {
+            @ArgumentDefinition(name = "format", values = {"lower", "upper"})
+    })
+    private String countryName;
+
+    @Join("{{$player_id}} = {{player.$id}}")
+    private Player player;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithRequiredFilter.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithRequiredFilter.java
new file mode 100644
index 0000000000..35703015db
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithRequiredFilter.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static example.TimeGrainDefinitions.DATE_FORMAT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.VersionQuery;
+import example.dimensions.Country;
+import example.dimensions.SubCountry;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Include(name = "playerStatsFiltered")
+@VersionQuery(sql = "SELECT COUNT(*) from playerStats")
+@EqualsAndHashCode
+@ToString
+@FromTable(name = "playerStats")
+@TableMeta(
+        description = "Player Statistics",
+        category = "Sports Category",
+        filterTemplate = PlayerStatsWithRequiredFilter.FILTER_TEMPLATE,
+        size = CardinalitySize.LARGE
+)
+public class PlayerStatsWithRequiredFilter {
+    public static final String FILTER_TEMPLATE = "recordedDate>={{start}};recordedDate<{{end}}";
+
+    /**
+     * PK.
+     */
+    private String id;
+
+    /**
+     * A metric.
+     */
+    private long highScore;
+
+    /**
+     * A metric.
+     */
+    private long lowScore;
+
+    /**
+     * A degenerate dimension.
+     */
+    private String overallRating;
+
+    /**
+     * A table dimension.
+     */
+    private Country country;
+
+    private String countryNickName;
+
+    private int countryUnSeats;
+
+    /**
+     * A subselect dimension.
+     */
+    private SubCountry subCountry;
+
+    @Setter
+    private String countryViewIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String countryIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String subCountryIsoCode;
+
+    /**
+     * A table dimension.
+     */
+    private Player player;
+
+    /**
+     * A table dimension.
+     */
+    private Player player2;
+
+    private String playerName;
+
+    private String player2Name;
+
+    private Date recordedDate;
+
+    private Date updatedDate;
+
+    @Setter
+    private int playerLevel;
+
+    @Setter
+    private String countryIsInUsa;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @MetricFormula("MAX(highScore)")
+    @ColumnMeta(description = "very awesome score", category = "Score Category", filterTemplate = "recordedDate>{{recordedDate}}")
+    public long getHighScore() {
+        return highScore;
+    }
+
+    public void setHighScore(final long highScore) {
+        this.highScore = highScore;
+    }
+
+    @MetricFormula(value = "{{$highScore}}")
+    @ColumnMeta(description = "highScore with no aggregation")
+    public long getHighScoreNoAgg() {
+        return highScore;
+    }
+    public void setHighScoreNoAgg(final long highScore) {
+        this.highScore = highScore;
+    }
+
+    @MetricFormula("MIN({{$lowScore}})")
+    @ColumnMeta(description = "very low score", category = "Score Category")
+    public long getLowScore() {
+        return lowScore;
+    }
+
+    public void setLowScore(final long lowScore) {
+        this.lowScore = lowScore;
+    }
+
+    @FriendlyName
+    @ColumnMeta(size = CardinalitySize.MEDIUM)
+    public String getOverallRating() {
+        return overallRating;
+    }
+
+    public void setOverallRating(final String overallRating) {
+        this.overallRating = overallRating;
+    }
+
+    @Join("{{$country_id}} = {{country.$id}}")
+    public Country getCountry() {
+        return country;
+    }
+
+    public void setCountry(final Country country) {
+        this.country = country;
+    }
+
+    @DimensionFormula("{{country.nickName}}")
+    public String getCountryNickName() {
+        return countryNickName;
+    }
+
+    public void setCountryNickName(String nickName) {
+        this.countryNickName = nickName;
+    }
+
+    @DimensionFormula("{{country.unSeats}}")
+    public int getCountryUnSeats() {
+        return countryUnSeats;
+    }
+
+    public void setCountryUnSeats(int seats) {
+        this.countryUnSeats = seats;
+    }
+
+    @DimensionFormula("{{country.isoCode}}")
+    public String getCountryIsoCode() {
+        return countryIsoCode;
+    }
+
+    public void setCountryIsoCode(String isoCode) {
+        this.countryIsoCode = isoCode;
+    }
+
+    @Join("{{$sub_country_id}} = {{subCountry.$id}}")
+    public SubCountry getSubCountry() {
+        return subCountry;
+    }
+
+    public void setSubCountry(final SubCountry subCountry) {
+        this.subCountry = subCountry;
+    }
+
+    @DimensionFormula("{{subCountry.isoCode}}")
+    @Column(updatable = false, insertable = false) // subselect field should be read-only
+    public String getSubCountryIsoCode() {
+        return subCountryIsoCode;
+    }
+
+    public void setSubCountryIsoCode(String isoCode) {
+        this.subCountryIsoCode = isoCode;
+    }
+
+    @Join("{{$player_id}} = {{player.$id}}")
+    public Player getPlayer() {
+        return player;
+    }
+
+    public void setPlayer(final Player player) {
+        this.player = player;
+    }
+
+    @Join("{{$player2_id}} = {{player2.$id}}")
+    public Player getPlayer2() {
+        return player2;
+    }
+
+    public void setPlayer2(Player player2) {
+        this.player2 = player2;
+    }
+
+    @DimensionFormula("{{player.name}}")
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public void setPlayerName(String playerName) {
+        this.playerName = playerName;
+    }
+
+    @DimensionFormula("{{player2.name}}")
+    public String getPlayer2Name() {
+        return player2Name;
+    }
+
+    public void setPlayer2Name(String player2Name) {
+        this.player2Name = player2Name;
+    }
+
+    @DimensionFormula("CASE WHEN {{overallRating}} = 'Good' THEN 1 ELSE 2 END")
+    public int getPlayerLevel() {
+        return playerLevel;
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>. See
+     *
+     * @return the date of the player session.
+     */
+    @Temporal(grains = { @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT)}, timeZone = "UTC")
+    public Date getRecordedDate() {
+        return recordedDate;
+    }
+
+    public void setRecordedDate(final Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>. See
+     *
+     * @return the date of the player session.
+     */
+    @Temporal(grains = { @TimeGrainDefinition(grain = TimeGrain.DAY, expression = DATE_FORMAT)}, timeZone = "UTC")
+    public Date getUpdatedDate() {
+        return updatedDate;
+    }
+
+    public void setUpdatedDate(final Date updatedDate) {
+        this.updatedDate = updatedDate;
+    }
+
+    @DimensionFormula("CASE WHEN {{country.inUsa}} THEN 'true' ELSE 'false' END")
+    public String getCountryIsInUsa() {
+        return countryIsInUsa;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithView.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithView.java
new file mode 100644
index 0000000000..c9d82d5034
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/PlayerStatsWithView.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Temporal;
+import com.yahoo.elide.datastores.aggregation.annotation.TimeGrainDefinition;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.TimeGrain;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import example.dimensions.Country;
+import example.dimensions.CountryView;
+import example.dimensions.SubCountry;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Include
+@EqualsAndHashCode
+@ToString
+@FromTable(name = "playerStats")
+public class PlayerStatsWithView {
+
+    /**
+     * PK.
+     */
+    private String id;
+
+    /**
+     * A metric.
+     */
+    private long highScore;
+
+    /**
+     * A metric.
+     */
+    private long lowScore;
+
+    /**
+     * A degenerate dimension.
+     */
+    private String overallRating;
+
+    /**
+     * A table dimension.
+     */
+    private Country country;
+
+    /**
+     * A subselect dimension.
+     */
+    private SubCountry subCountry;
+
+    private CountryView countryView;
+
+    @Setter
+    private String countryViewIsoCode;
+
+    @Setter
+    private String countryViewViewIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String countryIsoCode;
+
+    /**
+     * A dimension field joined to this table.
+     */
+    private String subCountryIsoCode;
+
+    /**
+     * A table dimension.
+     */
+    private Player player;
+
+    private Date recordedDate;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @MetricFormula("MAX({{$highScore}})")
+    @ColumnMeta(description = "very awesome score")
+    public long getHighScore() {
+        return highScore;
+    }
+
+    public void setHighScore(final long highScore) {
+        this.highScore = highScore;
+    }
+
+    @MetricFormula("MIN({{$lowScore}})")
+    public long getLowScore() {
+        return lowScore;
+    }
+
+    public void setLowScore(final long lowScore) {
+        this.lowScore = lowScore;
+    }
+
+    @FriendlyName
+    @ColumnMeta(size = CardinalitySize.MEDIUM)
+    public String getOverallRating() {
+        return overallRating;
+    }
+
+    public void setOverallRating(final String overallRating) {
+        this.overallRating = overallRating;
+    }
+
+    @Join("{{$country_id}} = {{country.$id}}")
+    public Country getCountry() {
+        return country;
+    }
+
+    public void setCountry(final Country country) {
+        this.country = country;
+    }
+
+    @Join("{{$sub_country_id}} = {{subCountry.$id}}")
+    public SubCountry getSubCountry() {
+        return subCountry;
+    }
+
+    public void setSubCountry(final SubCountry subCountry) {
+        this.subCountry = subCountry;
+    }
+
+    @Join("{{$player_id}} = {{player.$id}}")
+    public Player getPlayer() {
+        return player;
+    }
+
+    public void setPlayer(final Player player) {
+        this.player = player;
+    }
+
+    /**
+     * <b>DO NOT put {@link Cardinality} annotation on this field</b>.
+     *
+     * @return the date of the player session.
+     */
+    @Temporal(grains = { @TimeGrainDefinition(grain = TimeGrain.DAY, expression = "")}, timeZone = "UTC")
+    public Date getRecordedDate() {
+        return recordedDate;
+    }
+
+    public void setRecordedDate(final Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+    @DimensionFormula("{{country.isoCode}}")
+    public String getCountryIsoCode() {
+        return countryIsoCode;
+    }
+
+    public void setCountryIsoCode(String isoCode) {
+        this.countryIsoCode = isoCode;
+    }
+
+
+    @DimensionFormula("{{subCountry.isoCode}}")
+    @Column(updatable = false, insertable = false) // subselect field should be read-only
+    public String getSubCountryIsoCode() {
+        return subCountryIsoCode;
+    }
+
+    public void setSubCountryIsoCode(String isoCode) {
+        this.subCountryIsoCode = isoCode;
+    }
+
+    @Join("{{$country_id}} = {{countryView.$id}}")
+    public CountryView getCountryView() {
+        return countryView;
+    }
+
+    @DimensionFormula("{{countryView.$iso_code}}")
+    public String getCountryViewIsoCode() {
+        return countryViewIsoCode;
+    }
+
+    @DimensionFormula("{{countryView.nestedView.isoCode}}")
+    public String getCountryViewViewIsoCode() {
+        return countryViewViewIsoCode;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/TimeGrainDefinitions.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/TimeGrainDefinitions.java
new file mode 100644
index 0000000000..f39bacce78
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/TimeGrainDefinitions.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+public class TimeGrainDefinitions {
+    public static final String DATE_FORMAT = "PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')";
+    public static final String MONTH_FORMAT = "PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')";
+    public static final String QUARTER_FORMAT =
+            "PARSEDATETIME(CONCAT(FORMATDATETIME({{$$column.expr}}, 'yyyy-'), LPAD(3 * QUARTER({{$$column.expr}}) - 2, 2, '0'), '-01'), 'yyyy-MM-dd')";
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/VideoGame.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/VideoGame.java
new file mode 100644
index 0000000000..2c6549977b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/VideoGame.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.annotation.JoinType;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Include
+@FromTable(name = "videoGames", dbConnectionName = "mycon")
+@ReadPermission(expression = "admin.user or player name filter")
+public class VideoGame {
+    @Setter
+    private Long id;
+
+    @Setter
+    private Long sessions;
+
+    @Setter
+    private Long timeSpent;
+
+    @Setter
+    private Float timeSpentPerSession;
+
+    @Setter
+    private Float timeSpentPerGame;
+
+    @Setter
+    private Float normalizedHighScore;
+
+    @Setter
+    private Player player;
+
+    @Setter
+    private PlayerStats playerStats;
+
+    @Setter
+    private Player playerInnerJoin;
+
+    @Setter
+    private Player playerCrossJoin;
+
+    @Setter
+    private String playerName;
+
+    @Setter
+    private String playerNameInnerJoin;
+
+    @Setter
+    private String playerNameCrossJoin;
+
+    @Id
+    public Long getId() {
+        return id;
+    }
+
+    @Column(name = "game_rounds")
+    @MetricFormula("SUM({{$game_rounds}})")
+    public Long getSessions() {
+        return sessions;
+    }
+
+    @MetricFormula("SUM({{$timeSpent}})")
+    public Long getTimeSpent() {
+        return timeSpent;
+    }
+
+    @MetricFormula("({{timeSpent}} / (CASE WHEN SUM({{$game_rounds}}) = 0 THEN 1 ELSE {{sessions}} END))")
+    public Float getTimeSpentPerSession() {
+        return timeSpentPerSession;
+    }
+
+    @ReadPermission(expression = "operator")
+    @MetricFormula("{{timeSpentPerSession}} / 100")
+    public Float getTimeSpentPerGame() {
+        return timeSpentPerGame;
+    }
+
+
+    @MetricFormula("{{playerStats.highScore}} / {{timeSpent}}")
+    public Float getNormalizedHighScore() {
+        return normalizedHighScore;
+    }
+
+    @Join(value = "{{$player_id}} = {{player.$id}}", type = JoinType.LEFT)
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Join(value = "{{$player_id}} = {{playerStats.$id}}", type = JoinType.LEFT)
+    public PlayerStats getPlayerStats() {
+        return playerStats;
+    }
+
+    @Join(value = "{{$player_id}} = {{playerInnerJoin.$id}}", type = JoinType.INNER)
+    public Player getPlayerInnerJoin() {
+        return playerInnerJoin;
+    }
+
+    @Join(value = "", type = JoinType.CROSS)
+    public Player getPlayerCrossJoin() {
+        return playerCrossJoin;
+    }
+
+    @DimensionFormula("{{player.name}}")
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    @DimensionFormula("{{playerInnerJoin.name}}")
+    public String getPlayerNameInnerJoin() {
+        return playerNameInnerJoin;
+    }
+
+    @DimensionFormula("{{playerCrossJoin.name}}")
+    public String getPlayerNameCrossJoin() {
+        return playerNameCrossJoin;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Continent.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Continent.java
new file mode 100644
index 0000000000..34ac00857c
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Continent.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Include
+@Table(name = "continents")
+@TableMeta(isFact = false, size = CardinalitySize.SMALL)
+public class Continent {
+
+    @Id
+    private String id;
+
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Country.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Country.java
new file mode 100644
index 0000000000..69cdc17122
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Country.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import org.hibernate.annotations.Formula;
+import lombok.Data;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Data
+@Entity
+@Include
+@Table(name = "countries")
+@TableMeta
+public class Country {
+
+    private String id;
+
+    private String isoCode;
+
+    private String name;
+
+    private Continent continent;
+
+    private String nickName;
+
+    private int unSeats;
+
+    @Setter
+    private boolean inUsa;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @Column(name = "iso_code")
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public void setIsoCode(final String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    @FriendlyName
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Column(name = "nick_name")
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(final String nickName) {
+        this.nickName = nickName;
+    }
+
+    @Column(name = "un_seats")
+    public int getUnSeats() {
+        return unSeats;
+    }
+
+    public void setUnSeats(int seats) {
+        this.unSeats = seats;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "continent_id")
+    public Continent getContinent() {
+        return continent;
+    }
+
+    public void setContinent(Continent continent) {
+        this.continent = continent;
+    }
+
+    @DimensionFormula("CASE WHEN {{name}} = 'United States' THEN true ELSE false END")
+    @Formula("CASE WHEN name = 'United States' THEN true ELSE false END")
+    public boolean isInUsa() {
+        return inUsa;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryView.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryView.java
new file mode 100644
index 0000000000..28423c10c6
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryView.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.annotation.Join;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * A view version of table countries.
+ */
+@Data
+@Include(rootLevel = false)
+@FromTable(name = "countries")
+public class CountryView {
+    @Column(name = "id")
+    private String countryId;
+
+    private String isoCode;
+
+    private String name;
+
+    private CountryViewNested nestedView;
+
+    @Join("{{$id}} = {{nestedView.$id}}")
+    public CountryViewNested getNestedView() {
+        return nestedView;
+    }
+
+    @DimensionFormula("{{nestedView.isoCode}}")
+    private String nestedViewIsoCode;
+
+    public String getCountryId() {
+        return countryId;
+    }
+
+    public void setCountryId(final String countryId) {
+        this.countryId = countryId;
+    }
+
+    @Column(name = "iso_code")
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public void setIsoCode(final String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    @FriendlyName
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryViewNested.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryViewNested.java
new file mode 100644
index 0000000000..727eb0036d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/CountryViewNested.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * A nested view for testing.
+ */
+@Data
+@Include(rootLevel = false)
+@FromTable(name = "countries")
+public class CountryViewNested {
+    private String id;
+
+    private String isoCode;
+
+    private String name;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @Column(name = "iso_code")
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public void setIsoCode(final String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    @FriendlyName
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/PlaceType.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/PlaceType.java
new file mode 100644
index 0000000000..6b1b1c1d0d
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/PlaceType.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.dimensions;
+
+public enum PlaceType {
+    COUNTRY,
+    STATE,
+    COUNTY,
+    TOWN,
+    PLACE
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Planet.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Planet.java
new file mode 100644
index 0000000000..5e99405b7b
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/Planet.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@Data
+@Include
+@FromTable(name = "planets")
+@TableMeta(isFact = false)
+public class Planet {
+    @Id
+    private String id;
+
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/RegionDetails.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/RegionDetails.java
new file mode 100644
index 0000000000..5c905d917e
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/RegionDetails.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.datastores.aggregation.annotation.CardinalitySize;
+import com.yahoo.elide.datastores.aggregation.annotation.ColumnMeta;
+import com.yahoo.elide.datastores.aggregation.annotation.DimensionFormula;
+import com.yahoo.elide.datastores.aggregation.annotation.TableMeta;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore.
+ */
+@EqualsAndHashCode
+@ToString
+@Data
+@FromTable(name = "region_details", dbConnectionName = "SalesDBConnection")
+@ReadPermission(expression = "guest user")
+@TableMeta(description = "RegionDetails", category = "", tags = {}, filterTemplate = "", size = CardinalitySize.SMALL)
+@Include(name = "regionDetails")
+public class RegionDetails {
+
+    private String id;
+    private String region;
+    private PlaceType placeType;
+    private PlaceType ordinalPlaceType;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @ReadPermission(expression = "guest user")
+    @ColumnMeta(description = "region", category = "", values = {}, tags = {})
+    @DimensionFormula("{{$region}}")
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    @Column(name = "type")
+    public PlaceType getPlaceType() {
+        return placeType;
+    }
+
+    public void setPlaceType(PlaceType placeType) {
+        this.placeType = placeType;
+    }
+
+    @Column(name = "ordinal_type")
+    public PlaceType getOrdinalPlaceType() {
+        return ordinalPlaceType;
+    }
+
+    public void setOrdinalPlaceType(PlaceType placeType) {
+        this.ordinalPlaceType = ordinalPlaceType;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/SubCountry.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/SubCountry.java
new file mode 100644
index 0000000000..c2783f89e0
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/SubCountry.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.FriendlyName;
+import org.hibernate.annotations.Subselect;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * A root level entity for testing AggregationDataStore with @Subselect annotation.
+ */
+@Data
+@Entity
+@Include
+@Subselect(value = "select * from countries")
+public class SubCountry {
+
+    private String id;
+
+    private String isoCode;
+
+    private String name;
+
+    @Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @Column(name = "iso_code")
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public void setIsoCode(final String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    @FriendlyName
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/package-info.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/package-info.java
new file mode 100644
index 0000000000..f6cd8c1157
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/dimensions/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@Include(friendlyName = "Dimensions", description = "Dimensions")
+package example.dimensions;
+
+import com.yahoo.elide.annotation.Include;
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/MetricRatio.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/MetricRatio.java
new file mode 100644
index 0000000000..eca576c03a
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/MetricRatio.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.metrics;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+
+import java.util.Map;
+
+/**
+ * Metric ratio cookbook example.
+ */
+public class MetricRatio implements MetricProjectionMaker {
+    @Override
+    public MetricProjection make(Metric metric, String alias, Map<String, Argument> arguments) {
+
+        Argument numerator = arguments.get("numerator");
+        Argument denominator = arguments.get("denominator");
+
+        if (numerator == null || denominator == null) {
+            throw new BadRequestException("'numerator' and 'denominator' arguments are required for "
+                    + metric.getName());
+        }
+
+        return SQLMetricProjection.builder()
+                .alias(alias)
+                .arguments(arguments)
+                .name(metric.getName())
+                .expression("{{" + numerator.getValue() + "}} / {{" + denominator.getValue() + "}}")
+                .valueType(metric.getValueType())
+                .columnType(metric.getColumnType())
+                .build();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/SalesViewOrderMax.java b/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/SalesViewOrderMax.java
new file mode 100644
index 0000000000..7e331889b1
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/java/example/metrics/SalesViewOrderMax.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.metrics;
+
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.datastores.aggregation.metadata.models.Metric;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjection;
+import com.yahoo.elide.datastores.aggregation.query.MetricProjectionMaker;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.SQLMetricProjection;
+
+import java.util.Map;
+
+/**
+ * For testing HJSON metric projection maker configuration.
+ */
+public class SalesViewOrderMax implements MetricProjectionMaker {
+    @Override
+    public MetricProjection make(Metric metric, String alias, Map<String, Argument> arguments) {
+        return SQLMetricProjection.builder()
+                .alias(alias)
+                .arguments(arguments)
+                .name(metric.getName())
+                .expression("MAX({{ $order_total }})")
+                .valueType(metric.getValueType())
+                .columnType(metric.getColumnType())
+                .build();
+    }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/META-INF/persistence.xml b/elide-datastore/elide-datastore-aggregation/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..6d3c05cc72
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+             version="2.0">
+    <persistence-unit name="aggregationStore">
+        <class>example.dimensions.Country</class>
+        <class>example.dimensions.SubCountry</class>
+        <class>example.Player</class>
+        <class>example.dimensions.Continent</class>
+
+
+        <properties>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.archive.autodetection" value="" />
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/db/sql/SalesDBConnection.hjson b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/db/sql/SalesDBConnection.hjson
new file mode 100644
index 0000000000..8e90a921b8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/db/sql/SalesDBConnection.hjson
@@ -0,0 +1,16 @@
+{
+  dbconfigs:
+  [
+    {
+      name: SalesDBConnection
+      url: jdbc:h2:mem:SalesDB;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'classpath:prepare_SalesDB_tables.sql'
+      driver: org.h2.Driver
+      user: guest
+      dialect: H2
+      propertyMap:
+      {
+        encrypted.password: Z3Vlc3RQYXNzd29yZA==
+      }
+    }
+  ]
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/namespaces/namespaces.hjson b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/namespaces/namespaces.hjson
new file mode 100644
index 0000000000..4cc4bd9f72
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/namespaces/namespaces.hjson
@@ -0,0 +1,18 @@
+{
+  namespaces:
+  [
+    {
+      name: SalesNamespace
+      description: Namespace for Sales Schema Tables
+      friendlyName: Sales
+    }
+    {
+      name: NoDescriptionNamespace
+    }
+    {
+      name: default
+      description: Default Namespace
+      friendlyName: DEFAULT
+    }
+  ]
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/security.hjson b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/security.hjson
new file mode 100644
index 0000000000..d2ed609239
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/security.hjson
@@ -0,0 +1,7 @@
+{
+  roles:
+  [
+    admin.user
+    guest user
+  ]
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesPerformance.hjson b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesPerformance.hjson
new file mode 100644
index 0000000000..0b953e5c0f
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesPerformance.hjson
@@ -0,0 +1,29 @@
+{
+  tables:
+  [
+    {
+      name: salesPerformance
+      table: sales_performance
+      dbConnectionName: SalesDBConnection
+      cardinality: small
+      hidden:true
+      namespace: SalesNamespace
+      measures:
+      [
+        {
+          name: totalSales
+          type: DECIMAL
+          definition: 'SUM({{ $sales }})'
+        }
+      ]
+      dimensions:
+      [
+        {
+          name: employeeId
+          type: INTEGER
+          definition: '{{ $employee_id }}'
+        }
+      ]
+    }
+  ]
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesView.hjson b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesView.hjson
new file mode 100644
index 0000000000..6bb8f46c41
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/configs/models/tables/SalesView.hjson
@@ -0,0 +1,341 @@
+{
+  tables:
+  [
+    {
+      name: orderDetails
+      table: order_details
+      dbConnectionName: SalesDBConnection
+      cardinality: large
+      readAccess: guest user
+      namespace: SalesNamespace
+      filterTemplate : deliveryTime>={{start}};deliveryTime<{{end}}
+      arguments:
+      [
+        { // An argument that can be used to divide orderTotal to convert orders in Millions, Thousands, etc.
+          name: denominator
+          type: DECIMAL
+          default: 1
+        }
+      ]
+      joins:
+      [
+        {
+          name: customer
+          to: customerDetails
+          namespace: SalesNamespace
+          type: Left
+          // References Physical Columns
+          definition: '{{$customer_id}} = {{ customer.$id}}'
+        }
+        {
+          name: delivery
+          to: deliveryDetails
+          namespace: SalesNamespace
+          kind: toOne
+          // References Logical Columns, multiple join condition
+          definition: '''
+          {{ orderId}} = {{delivery.orderId}} AND
+          {{ delivery.$delivered_on }} >= '{{ $$table.args.start }}' AND
+          {{ delivery.$delivered_on }} < '{{ $$table.args.end }}'
+          '''
+        }
+      ]
+      measures:
+      [
+        {
+          name: orderRatio
+          type: DECIMAL
+          maker: example.metrics.MetricRatio
+          arguments:
+          [
+             {
+               name: numerator
+               type: TEXT
+               values: ['orderTotal', 'orderMax']
+               default: 'orderTotal'
+             }
+             {
+               name: denominator
+               type: TEXT
+               values: ['orderTotal', 'orderMax']
+               default: 'orderTotal'
+             }
+          ]
+        }
+        {
+          name: orderTotal
+          type: DECIMAL
+          // TODO : Use Arguments
+          definition: 'SUM({{ $order_total }})'
+          readAccess: admin.user
+          arguments:
+          [
+            { // An argument that can be used to divide orderTotal to convert orders in Millions, Thousands, etc.
+              name: precision
+              type: DECIMAL
+              default: 0.00
+            }
+          ]
+        },
+        {
+          name: orderMax
+          type: DECIMAL
+          // TODO : Use Arguments
+          maker: example.metrics.SalesViewOrderMax
+          readAccess: admin.user
+          arguments:
+          [
+            { // An argument that can be used to divide orderTotal to convert orders in Millions, Thousands, etc.
+              name: precision
+              type: DECIMAL
+              default: 0.00
+            }
+          ]
+        }
+      ]
+      dimensions:
+      [
+        {
+          name: orderId
+          type: TEXT
+          definition: '{{ $order_id }}'
+          readAccess: guest user
+        }
+        {
+          name: courierName
+          type: TEXT
+          definition: '{{delivery.$courier_name}}'
+          readAccess: operator
+        }
+        {
+          name: customerRegion
+          type: TEXT
+          definition: '{{customer.customerRegion}}'
+          readAccess: operator
+          cardinality: small
+        }
+        //Tests a reference to an enum Java dimension stored as VARCHAR coerced to a string.
+        {
+          name: customerRegionType1
+          type: ENUM_TEXT
+          definition: '{{customer.region.placeType}}'
+          readAccess: guest user
+        }
+        //Tests a reference to an enum Java dimension stored as INT coerced to the enum.
+        {
+          name: customerRegionType2
+          type: ENUM_ORDINAL
+          definition: '{{customer.region.ordinalPlaceType}}'
+          readAccess: guest user
+          values: ['COUNTRY', 'STATE', 'COUNTY', 'TOWN', 'PLACE']
+        }
+        {
+          name: customerRegionRegion
+          type: TEXT
+          definition: '{{customer.region.region}}'
+          readAccess: operator
+          tableSource: {
+            table: regionDetails
+            column: region
+          }
+        }
+        {
+          name: zipCode
+          type: INTEGER
+          definition: '{{zipCodeHidden}}'
+          readAccess: operator
+        }
+
+        {
+          name: zipCodeHidden
+          type: INTEGER
+          hidden: true
+          definition: '{{customer.zipCode}}'
+          readAccess: operator
+        }
+        {
+          name: orderTime
+          type: TIME
+          // Physical Column Reference in same table
+          definition: '{{$created_on}}'
+          readAccess: guest user
+          grains:
+          [
+            {
+              type: MONTH
+              sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')
+            },
+            {
+              type: SECOND
+              sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd HH:mm:ss'), 'yyyy-MM-dd HH:mm:ss')
+            },
+            {
+              type: DAY
+              sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+            }
+          ]
+        }
+        {
+          name: deliveryTime
+          type: TIME
+          // Physical Column Reference in referred table
+          definition: '{{delivery.$delivered_on}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: SECOND
+          }]
+        }
+        {
+          name: deliveryDate
+          type: TIME
+          // Logical Column Reference in referred table, which references Physical column in referred table
+          definition: '{{delivery.time}}'
+          readAccess: guest user
+          grains:
+          [{
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+          }]
+        }
+        {
+          name: deliveryMonth
+          type: TIME
+          // Logical Column Reference in referred table, which references another Logical column in referred table, which references another Logical column in referred table, which references Physical column in referred table
+          definition: '{{delivery.month}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: MONTH
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')
+          }]
+        }
+        {
+          name: deliveryHour
+          type: TIME
+          // Logical Column Reference in same table, which references Physical column in referred table
+          definition: '{{deliveryTime}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: HOUR
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd HH'), 'yyyy-MM-dd HH')
+          }]
+        }
+        {
+          name: deliveryYear
+          type: TIME
+          // Logical Column Reference in same table, which references another Logical Column in referred table, which references another Logical column in referred table, which references another Logical column in referred table, which references Physical column in referred table
+          definition: '{{deliveryMonth}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: YEAR
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-01-01'), 'yyyy-MM-dd')
+          }]
+          filterTemplate: 'deliveryYear=={{deliveryYear}}'
+        }
+        {
+          name: deliveryDefault
+          type: TIME
+          // Logical Column Reference in same table, which references another Logical Column in referred table, which references another Logical column in referred table, which references another Logical column in referred table, which references Physical column in referred table
+          definition: '{{delivery.time}}'
+          readAccess: guest user
+        }
+      ]
+    } {
+      name: customerDetails
+      table: customer_details
+      hidden: true
+      dbConnectionName: SalesDBConnection
+      cardinality: small
+      readAccess: guest user
+      namespace: SalesNamespace
+      joins:
+      [
+        {
+          name: region
+          to: regionDetails
+          // References Physical & Logical Columns
+          definition: '{{zipCode}} = {{region.$zip_code}}'
+        }
+      ]
+      dimensions:
+      [
+        {
+          name: name
+          type: TEXT
+          definition: '{{$name}}'
+          readAccess: guest user
+        }
+        {
+          name: zipCode
+          type: INTEGER
+          definition: '{{[$zip code]}}'
+          readAccess: guest user
+        }
+        {
+          name: customerRegion
+          type: TEXT
+          definition: '{{region.region}}'
+          readAccess: guest user
+        }
+      ]
+    }
+    {
+      name: deliveryDetails
+      table: delivery_details
+      dbConnectionName: SalesDBConnection
+      cardinality: large
+      readAccess: guest user
+      namespace: SalesNamespace
+      dimensions:
+      [
+        {
+          name: orderId
+          type: TEXT
+          definition: '{{$order_id}}'
+          readAccess: guest user
+        }
+        {
+          name: trackingNumber
+          type: INTEGER
+          definition: '{{$tracking_number}}'
+          readAccess: operator
+        }
+        {
+          name: time
+          type: TIME
+          definition: '{{$delivered_on}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: SECOND
+            sql: '{{$$column.expr}}'
+          }]
+        }
+        {
+          name: date
+          type: TIME
+          definition: '{{time}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: DAY
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+          }]
+        }
+        {
+          name: month
+          type: TIME
+          definition: '{{date}}'
+          readAccess: guest user
+          grains:
+          [{
+            type: MONTH
+            sql: PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')
+          }]
+        }
+      ]
+    }
+  ]
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/graphql/responses/testGraphQLSchema.json b/elide-datastore/elide-datastore-aggregation/src/test/resources/graphql/responses/testGraphQLSchema.json
new file mode 100644
index 0000000000..4ba2f84747
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/graphql/responses/testGraphQLSchema.json
@@ -0,0 +1,80 @@
+{
+  "data": {
+    "__type": {
+      "name": "PlayerStatsWithViewEdge",
+      "fields": [
+        {
+          "name": "node",
+          "type": {
+            "name": "PlayerStatsWithView",
+            "fields": [
+              {
+                "name": "id",
+                "type": {
+                  "name": "DeferredID",
+                  "fields": null
+                }
+              },
+              {
+                "name": "countryIsoCode",
+                "type": {
+                  "name": "String",
+                  "fields": null
+                }
+              },
+              {
+                "name": "countryViewIsoCode",
+                "type": {
+                  "name": "String",
+                  "fields": null
+                }
+              },
+              {
+                "name": "countryViewViewIsoCode",
+                "type": {
+                  "name": "String",
+                  "fields": null
+                }
+              },
+              {
+                "name": "highScore",
+                "type": {
+                  "name": "Int",
+                  "fields": null
+                }
+              },
+              {
+                "name": "lowScore",
+                "type": {
+                  "name": "Int",
+                  "fields": null
+                }
+              },
+              {
+                "name": "overallRating",
+                "type": {
+                  "name": "String",
+                  "fields": null
+                }
+              },
+              {
+                "name": "recordedDate",
+                "type": {
+                  "name": "Date",
+                  "fields": null
+                }
+              },
+              {
+                "name": "subCountryIsoCode",
+                "type": {
+                  "name": "String",
+                  "fields": null
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/jpah2db.properties b/elide-datastore/elide-datastore-aggregation/src/test/resources/jpah2db.properties
new file mode 100644
index 0000000000..c510034fbb
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/jpah2db.properties
@@ -0,0 +1,4 @@
+driverClassName=org.h2.Driver
+jdbcUrl=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
+username=
+password=
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_SalesDB_tables.sql b/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_SalesDB_tables.sql
new file mode 100644
index 0000000000..536151e1b8
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_SalesDB_tables.sql
@@ -0,0 +1,70 @@
+CREATE TABLE IF NOT EXISTS customer_details
+(
+  id VARCHAR(255) NOT NULL,
+  name VARCHAR(255),
+  `zip code` INT,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE IF NOT EXISTS region_details
+(
+  zip_code INT NOT NULL,
+  region VARCHAR(255) NOT NULL,
+  type VARCHAR(255),
+  ordinal_type INT,
+  PRIMARY KEY (zip_code)
+);
+
+CREATE TABLE IF NOT EXISTS sales_performance
+(
+   employee_id VARCHAR(255) NOT NULL,
+   sales INT,
+   PRIMARY KEY (employee_id)
+);
+
+INSERT INTO customer_details SELECT 'cust1', 'foo1', 20166 from dual WHERE NOT EXISTS(SELECT * FROM customer_details WHERE id = 'cust1');
+INSERT INTO customer_details SELECT 'cust2', 'foo2', 10002 from dual WHERE NOT EXISTS(SELECT * FROM customer_details WHERE id = 'cust2');
+INSERT INTO customer_details SELECT 'cust3', 'foo3', 20170 from dual WHERE NOT EXISTS(SELECT * FROM customer_details WHERE id = 'cust3');
+INSERT INTO customer_details SELECT 'cust4', 'foo4', 0 from dual WHERE NOT EXISTS(SELECT * FROM customer_details WHERE id = 'cust4');
+
+INSERT INTO region_details SELECT 20166, 'Virginia', 'STATE', 1 from dual WHERE NOT EXISTS(SELECT * FROM region_details WHERE zip_code = 20166);
+INSERT INTO region_details SELECT 20170, 'Virginia', 'STATE', 1 from dual WHERE NOT EXISTS(SELECT * FROM region_details WHERE zip_code = 20170);
+INSERT INTO region_details SELECT 10002, 'NewYork', 'STATE', 1 from dual WHERE NOT EXISTS(SELECT * FROM region_details WHERE zip_code = 10002);
+INSERT INTO region_details SELECT 0, 'NewYork', null, null from dual WHERE NOT EXISTS(SELECT * FROM region_details WHERE zip_code = 10002);
+
+CREATE TABLE IF NOT EXISTS order_details
+(
+  order_id VARCHAR(255) NOT NULL,
+  customer_id VARCHAR(255),
+  order_total NUMERIC(10,2),
+  created_on DATETIME,
+  PRIMARY KEY (order_id)
+);
+
+INSERT INTO order_details SELECT 'order-1a', 'cust1', 103.72, '2020-08-30 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-1a');
+INSERT INTO order_details SELECT 'order-1b', 'cust1', 84.11, '2020-09-08 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-1b');
+INSERT INTO order_details SELECT 'order-1c', 'cust1', 97.36, '2020-09-08 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-1c');
+INSERT INTO order_details SELECT 'order-2a', 'cust2', 17.82, '2020-08-25 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-2a');
+INSERT INTO order_details SELECT 'order-2b', 'cust2', 43.61, '2020-08-26 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-2b');
+INSERT INTO order_details SELECT 'order-3a', 'cust3', 9.35, '2020-08-26 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-3a');
+INSERT INTO order_details SELECT 'order-3b', 'cust3', 78.87, '2020-09-09 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-3b');
+INSERT INTO order_details SELECT 'order-null-enum', 'cust4', 78.87, '2020-09-09 16:30:11' WHERE NOT EXISTS(SELECT * FROM order_details WHERE order_id = 'order-null-enum');
+
+CREATE TABLE IF NOT EXISTS delivery_details
+(
+  delivery_id VARCHAR(255) NOT NULL,
+  order_id VARCHAR(255) NOT NULL,
+  tracking_number BIGINT,
+  courier_name VARCHAR(255),
+  delivered_on DATETIME,
+  PRIMARY KEY (delivery_id)
+);
+
+INSERT INTO delivery_details SELECT 'del-1a', 'order-1a', 2602407706, 'UPS', '2020-09-05 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-1a');
+INSERT INTO delivery_details SELECT 'del-1b', 'order-1b', 1112021108893, 'FEDEX', '2020-09-11 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-1b');
+INSERT INTO delivery_details SELECT 'del-1c', 'order-1c', 1112021722136, 'FEDEX', '2020-09-11 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-1c');
+INSERT INTO delivery_details SELECT 'del-2a', 'order-2a', 1112021844256, 'FEDEX', '2020-08-30 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-2a');
+INSERT INTO delivery_details SELECT 'del-2b', 'order-2b', 2602534554, 'UPS', '2020-08-31 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-2b');
+INSERT INTO delivery_details SELECT 'del-3a', 'order-3a', 2602452494, 'UPS', '2020-08-31 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-3a');
+INSERT INTO delivery_details SELECT 'del-3b', 'order-3b', 2602475626, 'UPS', '2020-09-13 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-3b');
+INSERT INTO delivery_details SELECT 'del-4', 'order-null-enum', 2602475626, 'UPS', '2020-09-13 16:30:11' WHERE NOT EXISTS(SELECT * FROM delivery_details WHERE delivery_id = 'del-4');
diff --git a/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_tables.sql b/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_tables.sql
new file mode 100644
index 0000000000..234f5dfadc
--- /dev/null
+++ b/elide-datastore/elide-datastore-aggregation/src/test/resources/prepare_tables.sql
@@ -0,0 +1,99 @@
+CREATE TABLE IF NOT EXISTS playerStats
+    (
+      id VARCHAR(255),
+      highScore BIGINT,
+      lowScore BIGINT,
+      overallRating VARCHAR(255),
+      country_id VARCHAR(255),
+      sub_country_id VARCHAR(255),
+      player_id BIGINT,
+      player2_id BIGINT,
+      recordedDate DATETIME,
+      updatedDate DATETIME,
+      place_type_ordinal BIGINT,
+      place_type_text VARCHAR(255)
+    );
+TRUNCATE TABLE playerStats;
+INSERT INTO playerStats VALUES (1, 1234, 35, 'Good', '840', '840', 1, 2, '2019-07-12 00:00:00', '2019-10-12 00:00:00', 1, 'STATE');
+INSERT INTO playerStats VALUES (2, 2412, 241, 'Great', '840', '840', 2, 3, '2019-07-11 00:00:00', '2020-07-12 00:00:00', 1, 'STATE');
+INSERT INTO playerStats VALUES (3, 1000, 72, 'Good', '344', '344', 3, 1, '2019-07-13 00:00:00', '2020-01-12 00:00:00', 1, 'STATE');
+
+
+CREATE TABLE IF NOT EXISTS countries
+    (
+      id VARCHAR(255),
+      iso_code VARCHAR(255),
+      name VARCHAR(255),
+      continent_id VARCHAR(255),
+      nick_name VARCHAR(255),
+      un_seats INT
+    );
+TRUNCATE TABLE countries;
+INSERT INTO countries VALUES ('344', 'HKG', 'Hong Kong', '1', NULL, NULL);
+INSERT INTO countries VALUES ('840', 'USA', 'United States', '2', 'Uncle Sam', 1);
+
+
+CREATE TABLE IF NOT EXISTS players
+    (
+      id BIGINT,
+      name VARCHAR(255)
+    );
+TRUNCATE TABLE players;
+INSERT INTO players VALUES (1, 'Jon Doe');
+INSERT INTO players VALUES (2, 'Jane Doe');
+INSERT INTO players VALUES (3, 'Han');
+
+CREATE TABLE IF NOT EXISTS playerRanking
+    (
+      id BIGINT,
+      ranking BIGINT
+    );
+TRUNCATE TABLE playerRanking;
+INSERT INTO playerRanking VALUES (1, 1);
+INSERT INTO playerRanking VALUES (2, 2);
+INSERT INTO playerRanking VALUES (3, 3);
+
+
+CREATE TABLE IF NOT EXISTS videoGames
+    (
+      game_rounds BIGINT,
+      timeSpent BIGINT,
+      player_id BIGINT
+    );
+TRUNCATE TABLE videoGames;
+INSERT INTO videoGames VALUES (10, 50, 1);
+INSERT INTO videoGames VALUES (20, 150, 1);
+INSERT INTO videoGames VALUES (30, 520, 1);
+INSERT INTO videoGames VALUES (10, 200, 2);
+INSERT INTO videoGames VALUES (15, 150, 2);
+INSERT INTO videoGames VALUES (10, 300, 3);
+
+
+CREATE TABLE IF NOT EXISTS continents
+    (
+      id BIGINT,
+      name VARCHAR(255)
+    );
+TRUNCATE TABLE continents;
+INSERT INTO continents VALUES (1, 'Asia');
+INSERT INTO continents VALUES (2, 'North America');
+
+CREATE TABLE IF NOT EXISTS planets
+    (
+      id BIGINT,
+      name VARCHAR(255)
+    );
+TRUNCATE TABLE planets;
+INSERT INTO planets VALUES (1, 'Mercury');
+INSERT INTO planets VALUES (2, 'Venus');
+INSERT INTO planets VALUES (3, 'Earth');
+
+CREATE TABLE IF NOT EXISTS gameRevenue
+    (
+      revenue BIGINT,
+      country_id VARCHAR(255),
+      player_stats_id VARCHAR(255),
+      category VARCHAR(255),
+      saleDate DATETIME
+    );
+TRUNCATE TABLE gameRevenue;
diff --git a/elide-datastore/elide-datastore-hibernate/pom.xml b/elide-datastore/elide-datastore-hibernate/pom.xml
deleted file mode 100644
index f94ede5efd..0000000000
--- a/elide-datastore/elide-datastore-hibernate/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-datastore-hibernate</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Data Store: Hibernate Common</name>
-    <description>Common files for Elide Data Store Hibernate3 and Hibernate5</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-datastore-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-datastore/elide-datastore-hibernate/src/main/java/com/yahoo/elide/core/filter/HQLFilterOperation.java b/elide-datastore/elide-datastore-hibernate/src/main/java/com/yahoo/elide/core/filter/HQLFilterOperation.java
deleted file mode 100644
index c0a1519582..0000000000
--- a/elide-datastore/elide-datastore-hibernate/src/main/java/com/yahoo/elide/core/filter/HQLFilterOperation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter;
-
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-
-import java.util.Set;
-
-/**
- * FilterOperation that creates Hibernate query language fragments.
- */
-public class HQLFilterOperation implements FilterOperation<String> {
-    @Override
-    public String apply(Predicate predicate) {
-        switch (predicate.getOperator()) {
-            case IN:
-                return String.format("%s IN (:%s)", predicate.getField(), predicate.getField());
-            case NOT:
-                return String.format("%s NOT IN (:%s)", predicate.getField(), predicate.getField());
-            case PREFIX:
-                return String.format("%s LIKE CONCAT(:%s, '%%')", predicate.getField(), predicate.getField());
-            case POSTFIX:
-                return String.format("%s LIKE CONCAT('%%', :%s)", predicate.getField(), predicate.getField());
-            case INFIX:
-                return String.format("%s LIKE CONCAT('%%', :%s, '%%')", predicate.getField(), predicate.getField());
-            case ISNULL:
-                return String.format("%s IS NULL", predicate.getField());
-            case NOTNULL:
-                return String.format("%s IS NOT NULL", predicate.getField());
-            case LT:
-                return String.format("%s < :%s", predicate.getField(), predicate.getField());
-            case LE:
-                return String.format("%s <= :%s", predicate.getField(), predicate.getField());
-            case GT:
-                return String.format("%s > :%s", predicate.getField(), predicate.getField());
-            case GE:
-                return String.format("%s >= :%s", predicate.getField(), predicate.getField());
-
-            default:
-                throw new InvalidPredicateException("Operator not implemented: " + predicate.getOperator());
-        }
-    }
-
-    @Override
-    public String applyAll(Set<Predicate> predicates) {
-        StringBuilder filterString = new StringBuilder();
-
-        for (Predicate predicate : predicates) {
-            if (filterString.length() == 0) {
-                filterString.append("WHERE ");
-            } else {
-                filterString.append(" AND ");
-            }
-
-            filterString.append(apply(predicate));
-        }
-
-        return filterString.toString();
-    }
-
-    public String apply(FilterExpression filterExpression) {
-        HQLQueryVisitor visitor = new HQLQueryVisitor();
-        return "WHERE " + filterExpression.accept(visitor);
-
-    }
-
-    /**
-     * Filter expression visitor which builds an HQL query.
-     */
-    public class HQLQueryVisitor implements Visitor<String> {
-
-        private String query;
-
-        @Override
-        public String visitPredicate(Predicate predicate) {
-            query = apply(predicate);
-            return query;
-        }
-
-        @Override
-        public String visitAndExpression(AndFilterExpression expression) {
-            String left = expression.getLeft().accept(this);
-            String right = expression.getRight().accept(this);
-            query = "(" + left + " AND " + right + ")";
-            return query;
-        }
-
-        @Override
-        public String visitOrExpression(OrFilterExpression expression) {
-            String left = expression.getLeft().accept(this);
-            String right = expression.getRight().accept(this);
-            query = "(" + left + " OR " + right + ")";
-            return query;
-        }
-
-        @Override
-        public String visitNotExpression(NotFilterExpression expression) {
-            String negated = expression.getNegated().accept(this);
-            query = "NOT (" + negated + ")";
-            return query;
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/core/filter/HQLFilterOperationTest.java b/elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/core/filter/HQLFilterOperationTest.java
deleted file mode 100644
index dc1f1730a7..0000000000
--- a/elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/core/filter/HQLFilterOperationTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.core.filter;
-
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Tests Building a HQL Filter.
- */
-public class HQLFilterOperationTest {
-
-    class Book {
-        String name;
-        String genre;
-        Author author;
-    }
-
-    class Author {
-        String name;
-    }
-
-    @Test
-    public void testHQLQueryVisitor() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", Author.class, "authors"),
-                new Predicate.PathElement(Author.class, "author", String.class, "name")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("foo", "bar"));
-
-        List<Predicate.PathElement> p2Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "name")
-        );
-        Predicate p2 = new Predicate(p2Path, Operator.IN, Arrays.asList("blah"));
-
-        List<Predicate.PathElement> p3Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "genre")
-        );
-        Predicate p3 = new Predicate(p3Path, Operator.IN, Arrays.asList("scifi"));
-
-        OrFilterExpression or = new OrFilterExpression(p2, p3);
-        AndFilterExpression and = new AndFilterExpression(or, p1);
-        NotFilterExpression not = new NotFilterExpression(and);
-
-        HQLFilterOperation filterOp = new HQLFilterOperation();
-        String query = filterOp.apply(not);
-
-        Assert.assertEquals(query, "WHERE NOT (((name IN (:name) OR genre IN (:genre)) AND name IN (:name)))");
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/pom.xml b/elide-datastore/elide-datastore-hibernate3/pom.xml
deleted file mode 100644
index 8bffadae4d..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-datastore-hibernate3</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Data Store: Hibernate 3</name>
-    <description>Elide Data Store for Hibernate 3 support</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-datastore-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <dataStoreSupplier>com.yahoo.elide.datastores.hibernate3.HibernateDataStoreSupplier</dataStoreSupplier>
-    </properties>
-
-    <dependencies>
-        <!-- Elide (including integration tests) -->
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-integration-tests</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Hibernate 3 -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>3.6.6.Final</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xml-apis</artifactId>
-                    <groupId>xml-apis</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jasper-runtime</artifactId>
-                    <groupId>tomcat</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xerces</artifactId>
-                    <groupId>xerces</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jasper-compiler</artifactId>
-                    <groupId>tomcat</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- For proper serialization in elide-core -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-hibernate3</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-
-        <!-- Integration test -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.jcabi</groupId>
-                <artifactId>jcabi-mysql-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HQLTransaction.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HQLTransaction.java
deleted file mode 100644
index 4e09557e6d..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HQLTransaction.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.HQLFilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Generates an HQL Transaction.
- */
-public class HQLTransaction {
-    /**
-     * HQLTransaction Builder. Can build an HQL Query taking optional filters, sorting and pagination rules.
-     *
-     * @param <T> The Builder Type
-     */
-    public static class Builder<T> {
-        private final Session session;
-        private final Collection collection;
-        private final Class<T> entityClass;
-        private final EntityDictionary dictionary;
-        private Set<Predicate> filters = null;
-        private String sortingRules = "";
-        private Pagination pagination = null;
-        private FilterExpression filterExpression = null;
-
-        public Builder(final Session session, final Collection collection, final Class<T> entityClass,
-                       final EntityDictionary dictionary) {
-            this.session = session;
-            this.collection = collection;
-            this.entityClass = entityClass;
-            this.dictionary = dictionary;
-        }
-
-        public Builder withPossibleFilterExpression(Optional<FilterExpression> filterExpression) {
-            if (filterExpression.isPresent()) {
-                return withFilterExpression(filterExpression.get());
-            }
-            return this;
-        }
-
-        public Builder withFilterExpression(FilterExpression filterExpression) {
-            this.filterExpression = filterExpression;
-            PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-            this.filters = filterExpression.accept(visitor);
-            return this;
-        }
-
-        public Builder withPossibleFilters(final Optional<Set<Predicate>> possibleFilters) {
-            if (possibleFilters.isPresent()) {
-                return withFilters(possibleFilters.get());
-            }
-            return this;
-        }
-
-        public Builder withFilters(final Set<Predicate> filters) {
-            if (filters != null && !filters.isEmpty()) {
-                this.filters = filters;
-            }
-            return this;
-        }
-
-        public Builder withPossibleSorting(final Optional<Sorting> possibleSorting) {
-            if (possibleSorting.isPresent()) {
-                return withSorting(possibleSorting.get());
-            }
-            return this;
-        }
-
-        public Builder withSorting(final Sorting sorting) {
-            if (sorting != null && !sorting.isDefaultInstance()) {
-                final Map<String, Sorting.SortOrder> validSortingRules = sorting.getValidSortingRules(
-                        entityClass, dictionary
-                );
-                if (!validSortingRules.isEmpty()) {
-                    final List<String> ordering = new ArrayList<>();
-                    // pass over the sorting rules
-                    validSortingRules.entrySet().stream().forEachOrdered(entry ->
-                            ordering.add(entry.getKey() + " " + (entry.getValue().equals(Sorting.SortOrder.desc)
-                                    ? "desc"
-                                    : "asc"))
-                    );
-                    sortingRules += "order by " + StringUtils.join(ordering, ",");
-                }
-            }
-            return this;
-        }
-
-        public Builder withPossiblePagination(final Optional<Pagination> possiblePagination) {
-            if (possiblePagination.isPresent()) {
-                return withPagination(possiblePagination.get());
-            }
-            return this;
-        }
-
-        public Builder withPagination(final Pagination pagination) {
-            if (pagination != null) {
-                this.pagination = pagination;
-            }
-            return this;
-        }
-
-        public Optional<Query> build() {
-            String filterString = "";
-
-            // apply filtering - eg where clause's
-            if (filterExpression != null) {
-                filterString += new HQLFilterOperation().apply(filterExpression);
-            }
-            else if (filters != null) {
-                filterString += new HQLFilterOperation().applyAll(filters);
-            }
-
-            // add sorting into HQL string query generation
-            if (sortingRules != null && !sortingRules.isEmpty()) {
-                filterString += sortingRules;
-            }
-
-
-            Query query = null;
-            if (filterString.length() != 0) {
-                query = session.createFilter(collection, filterString);
-
-                if (filters != null) {
-                    for (Predicate predicate : filters) {
-                        if (predicate.getOperator().isParameterized()) {
-                            query = query.setParameterList(predicate.getField(), predicate.getValues());
-                        }
-                    }
-                }
-            }
-            if (pagination != null) {
-
-                if (query == null) {
-                    query = session.createFilter(collection, "");
-                }
-                query.setFirstResult(pagination.getOffset());
-                query.setMaxResults(pagination.getLimit());
-            }
-            return Optional.ofNullable(query);
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateStore.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateStore.java
deleted file mode 100644
index 6d62ca9850..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateStore.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.exceptions.TransactionException;
-
-import com.google.common.base.Preconditions;
-
-import org.hibernate.EntityMode;
-import org.hibernate.HibernateException;
-import org.hibernate.ScrollMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.metadata.ClassMetadata;
-
-/**
- * Hibernate interface library.
- */
-public class HibernateStore implements DataStore {
-    private final SessionFactory sessionFactory;
-    private final boolean isScrollEnabled;
-    private final ScrollMode scrollMode;
-
-    /**
-     * Initialize HibernateStore and dictionaries.
-     *
-     * @param aSessionFactory the a session factory
-     * @deprecated since 2.3.2. Use builder instead.
-     */
-    @Deprecated
-    public HibernateStore(SessionFactory aSessionFactory) {
-        this.sessionFactory = aSessionFactory;
-        this.isScrollEnabled = true;
-        this.scrollMode = ScrollMode.FORWARD_ONLY;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param aSessionFactory Session factory
-     * @param isScrollEnabled Whether or not scrolling is enabled on driver
-     * @param scrollMode Scroll mode to use for scrolling driver
-     */
-    protected HibernateStore(SessionFactory aSessionFactory, boolean isScrollEnabled, ScrollMode scrollMode) {
-        this.sessionFactory = aSessionFactory;
-        this.isScrollEnabled = isScrollEnabled;
-        this.scrollMode = scrollMode;
-    }
-
-    /**
-     * Builder object to configuration hibernate transaction.
-     */
-    public static class Builder {
-        private final SessionFactory sessionFactory;
-        private boolean isScrollEnabled;
-        private ScrollMode scrollMode;
-
-        public Builder(final SessionFactory sessionFactory) {
-            this.sessionFactory = sessionFactory;
-            this.isScrollEnabled = true;
-            this.scrollMode = ScrollMode.FORWARD_ONLY;
-        }
-
-        public Builder withScrollEnabled(final boolean isScrollEnabled) {
-            this.isScrollEnabled = isScrollEnabled;
-            return this;
-        }
-
-        public Builder withScrollMode(final ScrollMode scrollMode) {
-            this.scrollMode = scrollMode;
-            return this;
-        }
-
-        public HibernateStore build() {
-            return new HibernateStore(sessionFactory, isScrollEnabled, scrollMode);
-        }
-    }
-
-    @Override
-    public void populateEntityDictionary(EntityDictionary dictionary) {
-        /* bind all entities */
-        for (ClassMetadata meta : sessionFactory.getAllClassMetadata().values()) {
-            dictionary.bindEntity(meta.getMappedClass(EntityMode.POJO));
-        }
-    }
-
-    /**
-     * Get current Hibernate session.
-     *
-     * @return session
-     */
-    public Session getSession() {
-        try {
-            Session session = sessionFactory.getCurrentSession();
-            Preconditions.checkNotNull(session);
-            Preconditions.checkArgument(session.isConnected());
-            return session;
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    /**
-     * Start Hibernate transaction.
-     *
-     * @return transaction
-     */
-    @Override
-    public DataStoreTransaction beginTransaction() {
-        Session session = sessionFactory.getCurrentSession();
-        Preconditions.checkNotNull(session);
-        session.beginTransaction();
-        return new HibernateTransaction(session);
-    }
-
-    @Override
-    public DataStoreTransaction beginReadTransaction() {
-        Session session = sessionFactory.getCurrentSession();
-        Preconditions.checkNotNull(session);
-        session.beginTransaction();
-        session.setDefaultReadOnly(true);
-        return new HibernateTransaction(session, isScrollEnabled, scrollMode);
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateTransaction.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateTransaction.java
deleted file mode 100644
index 6048d73c10..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/HibernateTransaction.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3;
-
-import com.google.common.base.Objects;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.FilterScope;
-import com.yahoo.elide.core.RelationshipType;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.core.RequestScopedTransaction;
-import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
-import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.core.filter.HQLFilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import com.yahoo.elide.datastores.hibernate3.filter.CriterionFilterOperation;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.User;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.Query;
-import org.hibernate.ScrollMode;
-import org.hibernate.Session;
-import org.hibernate.collection.AbstractPersistentCollection;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-
-/**
- * Hibernate Transaction implementation.
- */
-public class HibernateTransaction implements RequestScopedTransaction {
-    private static final Function<Criterion, Criterion> NOT = Restrictions::not;
-    private static final BiFunction<Criterion, Criterion, Criterion> AND = Restrictions::and;
-    private static final BiFunction<Criterion, Criterion, Criterion> OR = Restrictions::or;
-
-    private final Session session;
-    private final LinkedHashSet<Runnable> deferredTasks = new LinkedHashSet<>();
-    private final boolean isScrollEnabled;
-    private final ScrollMode scrollMode;
-    @Getter(value = AccessLevel.PROTECTED)
-    private RequestScope requestScope = null;
-
-    /**
-     * Instantiates a new Hibernate transaction.
-     *
-     * @param session the session
-     * @deprecated since 2.3.2. Will be removed no later than the release of Elide 3.0.
-     */
-    @Deprecated
-    public HibernateTransaction(Session session) {
-        this.session = session;
-        this.isScrollEnabled = true;
-        this.scrollMode = ScrollMode.FORWARD_ONLY;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param session Hibernate session
-     * @param isScrollEnabled Whether or not scrolling is enabled
-     * @param scrollMode Scroll mode to use if scrolling enabled
-     */
-    protected HibernateTransaction(Session session, boolean isScrollEnabled, ScrollMode scrollMode) {
-        this.session = session;
-        this.isScrollEnabled = isScrollEnabled;
-        this.scrollMode = scrollMode;
-    }
-
-    @Override
-    public void delete(Object object) {
-        deferredTasks.add(() -> session.delete(object));
-    }
-
-    @Override
-    public void save(Object object) {
-        deferredTasks.add(() -> session.saveOrUpdate(object));
-    }
-
-    @Override
-    public void flush() {
-        try {
-            deferredTasks.forEach(Runnable::run);
-            deferredTasks.clear();
-            session.flush();
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    @Override
-    public void commit() {
-        try {
-            this.flush();
-            this.session.getTransaction().commit();
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    @Override
-    public <T> T createObject(Class<T> entityClass) {
-        try {
-            T object = entityClass.newInstance();
-            deferredTasks.add(() -> session.persist(object));
-            return object;
-        } catch (java.lang.InstantiationException | IllegalAccessException e) {
-            return null;
-        }
-    }
-
-    @Deprecated
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id) {
-
-        /*
-         * No join/global filters can be applied here until this interface can change in Elide 3.0.
-         * Ideally, this interface will need a RequestScope so that it can extract the global filter.
-         */
-
-        try {
-            if (isJoinQuery()) {
-                Criteria criteria = session.createCriteria(loadClass).add(Restrictions.idEq(id));
-                if (requestScope != null) {
-                    joinCriteria(criteria, loadClass);
-                }
-                @SuppressWarnings("unchecked")
-                T record = (T) criteria.uniqueResult();
-                return record;
-            }
-            @SuppressWarnings("unchecked")
-            T record = (T) session.load(loadClass, id);
-            Hibernate.initialize(record);
-            return record;
-        } catch (ObjectNotFoundException e) {
-            return null;
-        }
-    }
-
-    /**
-     * load a single record with id and filter.
-     *
-     * @param loadClass class of query object
-     * @param id id of the query object
-     * @param filterExpression FilterExpression contains the predicates
-     */
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id, Optional<FilterExpression> filterExpression) {
-
-        try {
-            Criteria criteria = session.createCriteria(loadClass).add(Restrictions.idEq(id));
-            if (requestScope != null && isJoinQuery()) {
-                joinCriteria(criteria, loadClass);
-            }
-            if (filterExpression.isPresent()) {
-                CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-                criteria = filterOpn.apply(filterExpression.get());
-            }
-            T record = (T) criteria.uniqueResult();
-            return record;
-        } catch (ObjectNotFoundException e) {
-            return null;
-        }
-    }
-
-    @Deprecated
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> loadClass) {
-        throw new IllegalStateException("" + loadClass);
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> loadClass, FilterScope filterScope) {
-        Criterion securityCriterion = filterScope.getCriterion(NOT, AND, OR);
-
-        Optional<FilterExpression> filterExpression =
-                filterScope.getRequestScope().getLoadFilterExpression(loadClass);
-
-        Criteria criteria = session.createCriteria(loadClass);
-        if (securityCriterion != null) {
-            criteria.add(securityCriterion);
-        }
-
-        if (filterExpression.isPresent()) {
-            CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-            criteria = filterOpn.apply(filterExpression.get());
-        }
-
-        return loadObjects(loadClass, criteria, Optional.empty(), Optional.empty());
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjectsWithSortingAndPagination(Class<T> entityClass,
-                                                               FilterScope filterScope) {
-        Criterion securityCriterion = filterScope.getCriterion(NOT, AND, OR);
-
-        Optional<FilterExpression> filterExpression =
-                filterScope.getRequestScope().getLoadFilterExpression(entityClass);
-
-        Criteria criteria = session.createCriteria(entityClass);
-        if (securityCriterion != null) {
-            criteria.add(securityCriterion);
-        }
-
-        if (filterExpression.isPresent()) {
-            CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-            criteria = filterOpn.apply(filterExpression.get());
-        }
-
-        final Pagination pagination = filterScope.getRequestScope().getPagination();
-
-        // if we have sorting and sorting isn't empty, then we should pull dictionary to validate the sorting rules
-        Set<Order> validatedSortingRules = null;
-        if (filterScope.hasSortingRules()) {
-            final Sorting sorting = filterScope.getRequestScope().getSorting();
-            final EntityDictionary dictionary = filterScope.getRequestScope().getDictionary();
-            validatedSortingRules = sorting.getValidSortingRules(entityClass, dictionary).entrySet()
-                    .stream()
-                    .map(entry -> entry.getValue().equals(Sorting.SortOrder.desc)
-                            ? Order.desc(entry.getKey())
-                            : Order.asc(entry.getKey())
-                    )
-                    .collect(Collectors.toCollection(LinkedHashSet::new));
-        }
-
-        return loadObjects(
-                entityClass,
-                criteria,
-                Optional.ofNullable(validatedSortingRules),
-                Optional.ofNullable(pagination));
-    }
-
-    /**
-     * Generates the Hibernate ScrollableIterator for Hibernate Query.
-     * @param loadClass The hibernate class to build the query off of.
-     * @param criteria The criteria to use for filters
-     * @param sortingRules The possibly empty sorting rules.
-     * @param pagination The Optional pagination object.
-     * @param <T> The return Iterable type.
-     * @return The Iterable for Hibernate.
-     */
-    public <T> Iterable<T> loadObjects(final Class<T> loadClass, final Criteria criteria,
-            final Optional<Set<Order>> sortingRules, final Optional<Pagination> pagination) {
-
-        if (sortingRules.isPresent()) {
-            sortingRules.get().forEach(criteria::addOrder);
-        }
-
-        if (pagination.isPresent()) {
-            final Pagination paginationData = pagination.get();
-            paginationData.evaluate(loadClass);
-            criteria.setFirstResult(paginationData.getOffset());
-            criteria.setMaxResults(paginationData.getLimit());
-        } else {
-            Integer queryLimit = getQueryLimit();
-            if (queryLimit != null) {
-                criteria.setMaxResults(queryLimit);
-            }
-        }
-
-        if (isJoinQuery()) {
-            joinCriteria(criteria, loadClass);
-        }
-
-        criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
-        if (!isScrollEnabled || isJoinQuery()) {
-            return criteria.list();
-        }
-        return new ScrollableIterator(criteria.scroll(scrollMode));
-    }
-
-    @Override
-    public <T> Long getTotalRecords(Class<T> entityClass) {
-        final Criteria sessionCriteria = session.createCriteria(entityClass);
-        sessionCriteria.setProjection(Projections.rowCount());
-        return (Long) sessionCriteria.uniqueResult();
-    }
-
-    /**
-     * Should this transaction use JOINs. Override to force joins.
-     *
-     * @return true to use join logic
-     */
-    public boolean isJoinQuery() {
-        return false;
-    }
-
-    private <T> void joinCriteria(Criteria criteria, final Class<T> loadClass) {
-        EntityDictionary dictionary = requestScope.getDictionary();
-        String type = dictionary.getJsonAliasFor(loadClass);
-        Set<String> fields = Objects.firstNonNull(
-                requestScope.getSparseFields().get(type), Collections.<String>emptySet());
-        for (String field : fields) {
-            try {
-                checkFieldReadPermission(loadClass, field);
-                criteria.setFetchMode(field, FetchMode.JOIN);
-            } catch (ForbiddenAccessException e) {
-                // continue
-            }
-        }
-
-        for (String include : getIncludeList()) {
-            criteria.setFetchMode(include, FetchMode.JOIN);
-        }
-    }
-
-    /**
-     * Parse include param into list of include fields.
-     * @return list of include fields
-     */
-    public List<String> getIncludeList() {
-        List<String> includeParam;
-        if (!requestScope.getQueryParams().isPresent()) {
-            return Collections.emptyList();
-        }
-        includeParam = requestScope.getQueryParams().get().get("include");
-        if (includeParam == null || includeParam.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        ArrayList<String> list = new ArrayList<>();
-        for (String includeList : includeParam) {
-            for (String includeItem : includeList.split(",")) {
-                for (int idx = 0; idx != -1;) {
-                    idx = includeItem.indexOf('.', idx + 1);
-                    String field = (idx == -1) ? includeItem : includeItem.substring(0, idx);
-                    list.add(field);
-                }
-            }
-        }
-        return list;
-    }
-
-    private <T> void checkFieldReadPermission(final Class<T> loadClass, String field) {
-        // wrap class as PersistentResource in order to check permission
-        PersistentResource<T> resource = new PersistentResource<T>() {
-            @Override
-            public boolean matchesId(String id) {
-                return false;
-            }
-
-            @Override
-            public Optional<String> getUUID() {
-                return Optional.empty();
-            }
-
-            @Override
-            public String getId() {
-                return null;
-            }
-
-            @Override
-            public String getType() {
-                return null;
-            }
-
-            @Override
-            public T getObject() {
-                return null;
-            }
-
-            @Override
-            public Class<T> getResourceClass() {
-                return loadClass;
-            }
-
-            @Override
-            public com.yahoo.elide.security.RequestScope getRequestScope() {
-                return requestScope;
-            }
-        };
-
-        requestScope.getPermissionExecutor().checkUserPermissions(resource, ReadPermission.class, field);
-    }
-
-    @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Optional<FilterExpression> filterExpression,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        Object val = com.yahoo.elide.core.PersistentResource.getValue(entity, relationName, dictionary);
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-            if (filteredVal instanceof AbstractPersistentCollection) {
-                Optional<Sorting> sortingRules = sorting != null ? Optional.of(sorting) : Optional.empty();
-                Optional<Pagination> paginationRules = pagination != null ? Optional.of(pagination) : Optional.empty();
-
-                @SuppressWarnings("unchecked")
-                final Optional<Query> possibleQuery = new HQLTransaction.Builder<>(session, filteredVal, relationClass,
-                        dictionary)
-                        .withPossibleFilterExpression(filterExpression)
-                        .withPossibleSorting(sortingRules)
-                        .withPossiblePagination(paginationRules)
-                        .build();
-                if (possibleQuery.isPresent()) {
-                    return possibleQuery.get().list();
-                }
-            }
-        }
-        return val;
-    }
-
-    @Override
-    @Deprecated
-    public <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
-        if ((collection instanceof AbstractPersistentCollection) && !predicates.isEmpty()) {
-            String filterString = new HQLFilterOperation().applyAll(predicates);
-
-            if (filterString.length() != 0) {
-                Query query = session.createFilter(collection, filterString);
-
-                for (Predicate predicate : predicates) {
-                    if (predicate.getOperator().isParameterized()) {
-                        query = query.setParameterList(predicate.getField(), predicate.getValues());
-                    }
-                }
-
-                return query.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list();
-            }
-        }
-
-        return collection;
-    }
-
-    @Override
-    @Deprecated
-    public <T> Collection filterCollectionWithSortingAndPagination(final Collection collection,
-                                                                   final Class<T> entityClass,
-                                                                   final EntityDictionary dictionary,
-                                                                   final Optional<Set<Predicate>> filters,
-                                                                   final Optional<Sorting> sorting,
-                                                                   final Optional<Pagination> pagination) {
-        if (((collection instanceof AbstractPersistentCollection))
-                && (filters.isPresent() || sorting.isPresent() || pagination.isPresent())) {
-            @SuppressWarnings("unchecked")
-            final Optional<Query> possibleQuery = new HQLTransaction.Builder<>(session, collection, entityClass,
-                    dictionary)
-                    .withPossibleFilters(filters)
-                    .withPossibleSorting(sorting)
-                    .withPossiblePagination(pagination)
-                    .build();
-            if (possibleQuery.isPresent()) {
-                return possibleQuery.get().list();
-            }
-        }
-        return collection;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (session.isOpen() && session.getTransaction().isActive()) {
-            session.getTransaction().rollback();
-            throw new IOException("Transaction not closed");
-        }
-    }
-
-    @Override
-    public User accessUser(Object opaqueUser) {
-        return new User(opaqueUser);
-    }
-
-    @Override
-    public void setRequestScope(RequestScope requestScope) {
-        this.requestScope = requestScope;
-    }
-
-    public Integer getQueryLimit() {
-        // no limit
-        return null;
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/ScrollableIterator.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/ScrollableIterator.java
deleted file mode 100644
index 743e70962c..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/ScrollableIterator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterators;
-import lombok.NonNull;
-import org.hibernate.ScrollableResults;
-
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-
-/**
- * Wraps ScrollableResult as Iterator.
- *
- * @param <T> type of return object
- */
-public class ScrollableIterator<T> implements Iterable<T>, Iterator<T> {
-    private final ScrollableResults scroll;
-    private boolean inUse = false;
-    private boolean hasNext;
-
-    public ScrollableIterator(ScrollableResults scroll) {
-        this.scroll = scroll;
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-        if (inUse) {
-            throw new ConcurrentModificationException();
-        }
-
-        if (!scroll.first()) {
-            return Collections.emptyListIterator();
-        }
-
-        inUse = true;
-        hasNext = true;
-        return Iterators.unmodifiableIterator(this);
-    }
-
-    @Override
-    public boolean hasNext() {
-        return hasNext;
-    }
-
-    @Override
-    @NonNull public T next() {
-        @SuppressWarnings("unchecked")
-        @NonNull T row = (T) scroll.get()[0];
-        Preconditions.checkNotNull(row);
-        hasNext = scroll.next();
-        return row;
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperation.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperation.java
deleted file mode 100644
index 3bffd770c9..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperation.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3.filter;
-
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.core.filter.FilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * FilterOperation that creates Hibernate Criteria from Predicates.
- */
-@Slf4j
-public class CriterionFilterOperation implements FilterOperation<Criterion> {
-
-    private final Criteria criteria;
-
-    private static String ALIAS_DELIM = "__";
-
-    public CriterionFilterOperation(Criteria criteria) {
-        this.criteria = criteria;
-    }
-
-    /**
-     * For 'author.books.chapters.title', should return
-     * 'author__books__chapters'.
-     * @param path
-     * @return
-     */
-    private static String getAlias(List<Predicate.PathElement> path) {
-        StringBuilder sb = new StringBuilder();
-
-        Predicate.PathElement first = path.get(0);
-        sb.append(first.getTypeName());
-        sb.append(ALIAS_DELIM);
-        sb.append(first.getFieldName());
-
-        for (int i = 1; i < path.size() - 1; i++) {
-            Predicate.PathElement element = path.get(i);
-            sb.append(ALIAS_DELIM);
-            sb.append(element.getFieldName());
-        }
-        return sb.toString();
-    }
-
-    /**
-     * For 'author.books.chapters.title', should return
-     * 'books.chapters'.
-     * @param path
-     * @return
-     */
-    private static String getAssociationPath(List<Predicate.PathElement> path) {
-        StringBuilder sb = new StringBuilder();
-
-        Predicate.PathElement first = path.get(0);
-        sb.append(first.getFieldName());
-
-        for (int i = 1; i < path.size() - 1; i++) {
-            Predicate.PathElement element = path.get(i);
-            sb.append(".");
-            sb.append(element.getFieldName());
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public Criterion apply(Predicate predicate) {
-        List<Predicate.PathElement> path = predicate.getPath();
-
-        /* If the predicate refers to a nested association, the restriction should be 'alias.fieldName' */
-        String alias;
-        if (path.size() > 1) {
-            alias = getAlias(path);
-            alias = alias + "." + path.get(path.size() - 1).getFieldName();
-        /* If the predicate refers to the root entity, the restriction should be 'fieldName' */
-        } else {
-            alias = path.get(0).getFieldName();
-        }
-
-        switch (predicate.getOperator()) {
-            case IN:
-                return Restrictions.in(alias, predicate.getValues());
-            case NOT:
-                return Restrictions.not(Restrictions.in(alias, predicate.getValues()));
-            case PREFIX:
-                return Restrictions.like(alias, predicate.getValues().get(0) + "%");
-            case POSTFIX:
-                return Restrictions.like(alias, "%" + predicate.getValues().get(0));
-            case INFIX:
-                return Restrictions.like(alias, "%" + predicate.getValues().get(0) + "%");
-            case ISNULL:
-                return Restrictions.isNull(alias);
-            case NOTNULL:
-                return Restrictions.isNotNull(alias);
-            case LT:
-                return Restrictions.lt(alias, predicate.getValues().get(0));
-            case LE:
-                return Restrictions.le(alias, predicate.getValues().get(0));
-            case GT:
-                return Restrictions.gt(alias, predicate.getValues().get(0));
-            case GE:
-                return Restrictions.ge(alias, predicate.getValues().get(0));
-            default:
-                throw new InvalidPredicateException("Operator not implemented: " + predicate.getOperator());
-        }
-    }
-
-    @Override
-    public Criterion applyAll(Set<Predicate> predicates) {
-        Criterion result = null;
-
-        for (Predicate predicate : predicates) {
-            if (result == null) {
-                result = apply(predicate);
-            }
-            result = Restrictions.and(result, apply(predicate));
-        }
-
-        return result;
-    }
-
-    public Criteria apply(FilterExpression filterExpression) {
-        CriteriaVisitor visitor = new CriteriaVisitor();
-        Criterion restrictions = filterExpression.accept(visitor);
-
-        Set<String> createdAliases = new HashSet<>();
-
-        for (Predicate predicate : visitor.getPredicates()) {
-            List<Predicate.PathElement> path = predicate.getPath();
-
-            /* We only create aliases (joins) for associations outside the root entity */
-            if (path.size() >= 2) {
-                List<Predicate.PathElement> copy = new ArrayList<>(path);
-                while (copy.size() > 1) {
-                    String alias = getAlias(copy);
-                    String associationPath = getAssociationPath(copy);
-                    if (!createdAliases.contains(alias)) {
-                        criteria.createAlias(associationPath, alias);
-                        createdAliases.add(alias);
-                    }
-                    copy = copy.subList(0, copy.size() - 1);
-                }
-            }
-        }
-
-        criteria.add(restrictions);
-        return criteria;
-    }
-
-    /**
-     * Builds a criteria from a filter expression.
-     */
-    public class CriteriaVisitor implements Visitor<Criterion> {
-        private Criterion criterion;
-
-        @Getter
-        private final Set<Predicate> predicates;
-
-        public CriteriaVisitor() {
-            predicates = new HashSet<>();
-        }
-
-        @Override
-        public Criterion visitPredicate(Predicate predicate) {
-            predicates.add(predicate);
-            criterion = apply(predicate);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitAndExpression(AndFilterExpression expression) {
-            Criterion left = expression.getLeft().accept(this);
-            Criterion right = expression.getRight().accept(this);
-            criterion = Restrictions.and(left, right);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitOrExpression(OrFilterExpression expression) {
-            Criterion left = expression.getLeft().accept(this);
-            Criterion right = expression.getRight().accept(this);
-            criterion = Restrictions.or(left, right);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitNotExpression(NotFilterExpression expression) {
-            Criterion negated = expression.getNegated().accept(this);
-            criterion =  Restrictions.not(negated);
-            return criterion;
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/security/CriteriaCheck.java b/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/security/CriteriaCheck.java
deleted file mode 100644
index ef96e6e821..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/main/java/com/yahoo/elide/datastores/hibernate3/security/CriteriaCheck.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3.security;
-
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CriterionCheck;
-import org.hibernate.criterion.Criterion;
-
-/**
- * Extends Check to support Hibernate Criteria to limit SQL query responses.
- * @param <T> Type of record for Check
- * @deprecated As of 2.1, replaced by {@link com.yahoo.elide.security.checks.CriterionCheck}
- */
-@Deprecated
-public interface CriteriaCheck<T> extends CriterionCheck<Criterion, T> {
-    /**
-     * Get criterion for request scope.
-     *
-     * @param requestScope the requestSCope
-     * @return the criterion
-     */
-    Criterion getCriterion(RequestScope requestScope);
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/HibernateDataStoreSupplier.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/HibernateDataStoreSupplier.java
deleted file mode 100644
index 567832754c..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/HibernateDataStoreSupplier.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.utils.ClassScanner;
-import example.Parent;
-import org.hibernate.MappingException;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-import javax.persistence.Entity;
-import java.util.function.Supplier;
-
-/**
- * Supplier of Hibernate 3 Data Store.
- */
-public class HibernateDataStoreSupplier implements Supplier<DataStore> {
-    @Override
-    public DataStore get() {
-        // method to force class initialization
-        Configuration configuration = new Configuration();
-        try {
-            ClassScanner.getAnnotatedClasses(Parent.class.getPackage(), Entity.class)
-                    .forEach(configuration::addAnnotatedClass);
-        } catch (MappingException e) {
-            throw new RuntimeException(e);
-        }
-
-        SessionFactory sessionFactory = configuration.configure("hibernate.cfg.xml")
-                .setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread")
-                .setProperty(Environment.URL,
-                        "jdbc:mysql://localhost:" + System.getProperty("mysql.port", "3306") + "/root")
-                .setProperty(Environment.USER, "root")
-                .setProperty(Environment.PASS, "root")
-                .buildSessionFactory();
-
-        // create example tables from beans
-        SchemaExport schemaExport = new SchemaExport(configuration).setHaltOnError(true);
-        schemaExport.drop(false, true);
-        schemaExport.execute(false, true, false, true);
-
-        if (!schemaExport.getExceptions().isEmpty()) {
-            throw new RuntimeException(schemaExport.getExceptions().toString());
-        }
-
-        return new HibernateStore(sessionFactory);
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperationTest.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperationTest.java
deleted file mode 100644
index b2f9a32a17..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/filter/CriterionFilterOperationTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate3.filter;
-
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import example.AddressFragment;
-import example.Author;
-import example.Book;
-import example.Person;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Criterion;
-import org.mockito.*;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests CriteriaFilterOperation.
- */
-public class CriterionFilterOperationTest {
-
-    @Test
-    public void testNestedCriterion() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", Author.class, "authors"),
-                new Predicate.PathElement(Author.class, "author", String.class, "name")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("foo", "bar"));
-
-        List<Predicate.PathElement> p2Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "name")
-        );
-        Predicate p2 = new Predicate(p2Path, Operator.IN, Arrays.asList("blah"));
-
-        List<Predicate.PathElement> p3Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "genre")
-        );
-        Predicate p3 = new Predicate(p3Path, Operator.IN, Arrays.asList("scifi"));
-
-        OrFilterExpression or = new OrFilterExpression(p2, p3);
-        AndFilterExpression and = new AndFilterExpression(or, p1);
-        NotFilterExpression not = new NotFilterExpression(and);
-
-        Criteria criteria = mock(Criteria.class);
-        CriterionFilterOperation filterOp = new CriterionFilterOperation(criteria);
-
-        ArgumentCaptor<Criterion> argument = ArgumentCaptor.forClass(Criterion.class);
-        filterOp.apply(not);
-        verify(criteria, times(1)).add(argument.capture());
-        verify(criteria, times(1)).createAlias("authors", "book__authors");
-
-        Assert.assertEquals(argument.getValue().toString(),
-                "not name in (blah) or genre in (scifi) and book__authors.name in (foo, bar)");
-    }
-
-    @Test
-    public void testMultipartAlias() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-            new Predicate.PathElement(Person.class, "person", AddressFragment.class, "address"),
-            new Predicate.PathElement(AddressFragment.class, "addressFragment", AddressFragment.ZipCode.class, "zip"),
-            new Predicate.PathElement(AddressFragment.ZipCode.class, "zipCode", String.class, "zip")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("61820"));
-
-        Criteria criteria = mock(Criteria.class);
-        CriterionFilterOperation filterOp = new CriterionFilterOperation(criteria);
-
-        ArgumentCaptor<Criterion> argument = ArgumentCaptor.forClass(Criterion.class);
-        filterOp.apply((FilterExpression) p1);
-
-        verify(criteria, times(1)).add(argument.capture());
-        verify(criteria).createAlias("address", "person__address");
-        verify(criteria).createAlias("address.zip", "person__address__zip");
-
-        Assert.assertEquals(argument.getValue().toString(), "person__address__zip.zip in (61820)");
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/usertypes/JsonType.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/usertypes/JsonType.java
deleted file mode 100644
index 59898f7de8..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/datastores/hibernate3/usertypes/JsonType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.datastores.hibernate3.usertypes;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.hibernate.HibernateException;
-import org.hibernate.usertype.ParameterizedType;
-import org.hibernate.usertype.UserType;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Objects;
-import java.util.Properties;
-
-/**
- * JsonType serializes an object to json string and vice versa.
- */
-
-public class JsonType implements UserType, ParameterizedType {
-
-    private Class<?> objectClass;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int[] sqlTypes() {
-        return new int[]{Types.LONGVARCHAR};
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Class returnedClass() {
-        return String.class;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object firstObject, Object secondObject)
-            throws HibernateException {
-
-        return Objects.equals(firstObject, secondObject);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int hashCode(Object object)
-            throws HibernateException {
-
-        return Objects.hashCode(object);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object nullSafeGet(ResultSet resultSet, String[] names, Object object)
-            throws HibernateException, SQLException {
-
-        if (resultSet.getString(names[0]) != null) {
-
-            // Get the rawJson
-            String rawJson = resultSet.getString(names[0]);
-
-            try {
-                ObjectMapper mapper = new ObjectMapper();
-                return mapper.readValue(rawJson, this.objectClass);
-            } catch (IOException e) {
-                throw new HibernateException("Could not retrieve an instance of the mapped class from a JDBC resultset.");
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index)
-            throws HibernateException, SQLException  {
-
-        if (value == null) {
-            preparedStatement.setNull(index, Types.NULL);
-        } else {
-            ObjectMapper mapper = new ObjectMapper();
-            try {
-                String json = mapper.writeValueAsString(value);
-                preparedStatement.setString(index, json);
-            } catch (JsonProcessingException e) {
-                throw new HibernateException("Could not write an instance of the mapped class to a prepared statement.");
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object deepCopy(Object object)
-            throws HibernateException {
-
-        // Since mutable is false, return the object
-        return object;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isMutable() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Serializable disassemble(Object value)
-            throws HibernateException {
-
-        return value == null ? null : (Serializable) deepCopy(value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object assemble(Serializable cached, Object owner)
-            throws HibernateException {
-
-        return cached == null ? null : deepCopy(cached);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object replace(Object original, Object target, Object owner)
-            throws HibernateException {
-
-        return deepCopy(original);
-    }
-
-    /**
-     * Setter used to set the class to serialize/deserialize.
-     * @param properties properties object
-     */
-    @Override
-    public void setParameterValues(Properties properties) {
-        try {
-            this.objectClass = Class.forName(properties.getProperty("class"));
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Unable set the `class` parameter for serialization/deserialization");
-        }
-
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/tests/DataStoreIT.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
deleted file mode 100644
index ad2bc0eb5c..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.ElideResponse;
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.RequestScope;
-import com.yahoo.elide.datastores.hibernate3.HibernateTransaction;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import com.yahoo.elide.utils.JsonParser;
-import example.Filtered;
-import org.apache.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
-public class DataStoreIT extends AbstractIntegrationTestInitializer {
-    private final JsonParser jsonParser = new JsonParser();
-
-    @BeforeClass
-    public static void setup() throws IOException {
-        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
-
-            tx.save(tx.createObject(Filtered.class));
-            tx.save(tx.createObject(Filtered.class));
-            tx.save(tx.createObject(Filtered.class));
-
-            tx.commit();
-        }
-    }
-
-    @Test
-    public void testFilteredWithPassingCheck() {
-        String expected = jsonParser.getJson("/ResourceIT/testFiltered.json");
-
-        Elide elide = new Elide.Builder(new TestAuditLogger(), AbstractIntegrationTestInitializer.getDatabaseManager()).build();
-        ElideResponse response = elide.get("filtered", new MultivaluedHashMap<>(), 1);
-        assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        assertEquals(response.getBody(), expected);
-    }
-
-    @Test
-    public void testFilteredWithFailingCheck() {
-        String expected = jsonParser.getJson("/ResourceIT/testFiltered.json");
-
-        Elide elide = new Elide.Builder(new TestAuditLogger(), AbstractIntegrationTestInitializer.getDatabaseManager()).build();
-        ElideResponse response = elide.get("filtered", new MultivaluedHashMap<>(), -1);
-        assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        assertEquals(response.getBody(), expected);
-    }
-
-    @Test
-    public void testIncludeList() throws IOException {
-        try (HibernateTransaction tx = (HibernateTransaction) dataStore.beginTransaction()) {
-            RequestScope requestScope = mock(RequestScope.class);
-
-            MultivaluedHashMap<String, String> params = new MultivaluedHashMap();
-            params.add("include", "foo,bar");
-            params.add("include", "car");
-            when(requestScope.getQueryParams()).thenReturn(Optional.of(params));
-
-            tx.setRequestScope(requestScope);
-            List<String> includes = tx.getIncludeList();
-            tx.commit();
-            assertEquals(includes, Arrays.asList("foo", "bar", "car"));
-        }
-    }
-
-    @Test
-    public void testJoinQuery() throws IOException {
-        try (HibernateTransaction tx = (HibernateTransaction) dataStore.beginTransaction()) {
-            RequestScope requestScope = mock(RequestScope.class);
-
-            MultivaluedHashMap<String, String> params = new MultivaluedHashMap();
-            when(requestScope.getQueryParams()).thenReturn(Optional.of(params));
-
-            tx.setRequestScope(requestScope);
-            assertFalse(tx.isJoinQuery());
-
-            params.add("join", "true");
-            assertFalse(tx.isJoinQuery());
-
-            params.remove("join");
-            params.add("join", "false");
-            assertFalse(tx.isJoinQuery());
-
-            params.remove("join");
-            params.add("include", "foo,bar");
-            assertFalse(tx.isJoinQuery());
-
-            params.add("join", "false");
-            assertFalse(tx.isJoinQuery());
-
-            tx.commit();
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/AddressFragment.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/example/AddressFragment.java
deleted file mode 100644
index 9c3c9e4a6e..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/AddressFragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.datastores.hibernate3.usertypes.JsonType;
-import org.hibernate.annotations.TypeDef;
-
-@TypeDef(typeClass = JsonType.class, name = "json")
-public class AddressFragment {
-   public String street;
-   public String state;
-   public ZipCode zip;
-
-   public class ZipCode {
-       public String zip;
-       public String plusFour;
-   }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Filtered.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Filtered.java
deleted file mode 100644
index 739f2e1836..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Filtered.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.datastores.hibernate3.security.CriteriaCheck;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.Filtered.FilterCheck;
-import example.Filtered.FilterCheck3;
-import lombok.ToString;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-
-import javax.persistence.Entity;
-import java.util.Optional;
-
-/**
- * Filtered permission check.
- */
-@CreatePermission(any = { FilterCheck.class })
-@ReadPermission(any = { Role.NONE.class, FilterCheck.class, FilterCheck3.class, NegativeIntegerUserCheck.class })
-@UpdatePermission(any = { FilterCheck.class })
-@DeletePermission(any = { FilterCheck.class })
-@Include(rootLevel = true)
-// Hibernate
-@Entity
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
-@ToString
-public class Filtered extends BaseId {
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
-
-    /**
-     * Filter for ID == 1.
-     */
-    static public class FilterCheck extends OperationCheck<Filtered> implements CriteriaCheck<Filtered> {
-        /* Limit reads to ID 1 */
-        @Override
-        public Criterion getCriterion(RequestScope requestScope) {
-            return Restrictions.idEq(1L);
-        }
-
-        @Override
-        public boolean ok(Filtered object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return true;
-        }
-    }
-
-    /**
-     * Filter for ID == 3.
-     */
-    static public class FilterCheck3 extends OperationCheck<Filtered> implements CriteriaCheck<Filtered> {
-        /* Limit reads to ID 3 */
-        @Override
-        public Criterion getCriterion(RequestScope requestScope) {
-            return Restrictions.idEq(3L);
-        }
-
-        @Override
-        public boolean ok(Filtered object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return true;
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Person.java b/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Person.java
deleted file mode 100644
index fe4c14182c..0000000000
--- a/elide-datastore/elide-datastore-hibernate3/src/test/java/example/Person.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.Include;
-import lombok.Getter;
-import lombok.Setter;
-import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-@Include(rootLevel = true)
-public class Person {
-    @Setter
-    private long id;
-
-    @Setter
-    @Getter
-    private String name;
-
-    @Setter
-    private AddressFragment address;
-
-    @Id
-    public long getId() {
-        return id;
-    }
-
-    @Column(name = "address", columnDefinition = "TEXT")
-    @Type(type = "com.yahoo.elide.datastores.hibernate3.usertypes.JsonType", parameters = {
-            @Parameter(name = "class", value = "example.AddressFragment")
-    })
-    public AddressFragment getAddress() {
-        return address;
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/pom.xml b/elide-datastore/elide-datastore-hibernate5/pom.xml
deleted file mode 100644
index 4ded1989be..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-datastore-hibernate5</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Data Store: Hibernate 5</name>
-    <description>Elide Data Store for Hibernate 5 support</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-datastore-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <dataStoreSupplier>com.yahoo.elide.datastores.hibernate5.HibernateDataStoreSupplier</dataStoreSupplier>
-    </properties>
-
-    <dependencies>
-        <!-- Elide (including integration tests) -->
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-integration-tests</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-    	</dependency>
-        <dependency>
-	    <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Hibernate 5 -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>5.0.2.Final</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xml-apis</artifactId>
-                    <groupId>xml-apis</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jasper-runtime</artifactId>
-                    <groupId>tomcat</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xerces</artifactId>
-                    <groupId>xerces</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jasper-compiler</artifactId>
-                    <groupId>tomcat</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- For proper serialization in elide-core -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-hibernate5</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-
-        <!-- Integration test -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.jcabi</groupId>
-                <artifactId>jcabi-mysql-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HQLTransaction.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HQLTransaction.java
deleted file mode 100644
index 2dd4ddfece..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HQLTransaction.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.HQLFilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Generates an HQL Transaction.
- */
-public class HQLTransaction {
-    /**
-     * HQLTransaction Builder. Can build an HQL Query taking optional filters, sorting and pagination rules.
-     * @param <T> The Builder Type
-     */
-    public static class Builder<T> {
-        private final Session session;
-        private final Collection collection;
-        private final Class<T> entityClass;
-        private final EntityDictionary dictionary;
-        private Set<Predicate> filters = null;
-        private String sortingRules = "";
-        private Pagination pagination = null;
-        private FilterExpression filterExpression = null;
-
-        public Builder(final Session session, final Collection collection, final Class<T> entityClass,
-                       final EntityDictionary dictionary) {
-            this.session = session;
-            this.collection = collection;
-            this.entityClass = entityClass;
-            this.dictionary = dictionary;
-        }
-
-        public Builder withPossibleFilterExpression(Optional<FilterExpression> filterExpression) {
-            if (filterExpression.isPresent()) {
-                return withFilterExpression(filterExpression.get());
-            }
-            return this;
-        }
-
-        public Builder withFilterExpression(FilterExpression filterExpression) {
-            this.filterExpression = filterExpression;
-            PredicateExtractionVisitor visitor = new PredicateExtractionVisitor();
-            this.filters = filterExpression.accept(visitor);
-            return this;
-        }
-
-        public Builder withPossibleFilters(final Optional<Set<Predicate>> possibleFilters) {
-            if (possibleFilters.isPresent()) {
-                return withFilters(possibleFilters.get());
-            }
-            return this;
-        }
-
-        public Builder withFilters(final Set<Predicate> filters) {
-            if (filters != null && !filters.isEmpty()) {
-                this.filters = filters;
-            }
-            return this;
-        }
-
-        public Builder withPossibleSorting(final Optional<Sorting> possibleSorting) {
-            if (possibleSorting.isPresent()) {
-                return withSorting(possibleSorting.get());
-            }
-            return this;
-        }
-
-        public Builder withSorting(final Sorting sorting) {
-            if (sorting != null && !sorting.isDefaultInstance()) {
-                final Map<String, Sorting.SortOrder> validSortingRules = sorting.getValidSortingRules(
-                        entityClass, dictionary
-                );
-                if (!validSortingRules.isEmpty()) {
-                    final List<String> ordering = new ArrayList<>();
-                    // pass over the sorting rules
-                    validSortingRules.entrySet().stream().forEachOrdered(entry ->
-                            ordering.add(entry.getKey() + " " + (entry.getValue().equals(Sorting.SortOrder.desc)
-                                    ? "desc"
-                                    : "asc"))
-                    );
-                    sortingRules += "order by " + StringUtils.join(ordering, ",");
-                }
-            }
-            return this;
-        }
-
-        public Builder withPossiblePagination(final Optional<Pagination> possiblePagination) {
-            if (possiblePagination.isPresent()) {
-                return withPagination(possiblePagination.get());
-            }
-            return this;
-        }
-
-        public Builder withPagination(final Pagination pagination) {
-            if (pagination != null) {
-                this.pagination = pagination;
-            }
-            return this;
-        }
-
-        public Optional<Query> build() {
-            String filterString = "";
-
-            // apply filtering - eg where clause's
-            if (filterExpression != null) {
-                filterString += new HQLFilterOperation().apply(filterExpression);
-            }
-            else if (filters != null) {
-                filterString += new HQLFilterOperation().applyAll(filters);
-            }
-
-            // add sorting into HQL string query generation
-            if (sortingRules != null && !sortingRules.isEmpty()) {
-                filterString += sortingRules;
-            }
-
-
-            Query query = null;
-            if (filterString.length() != 0) {
-                query = session.createFilter(collection, filterString);
-
-                if (filters != null) {
-                    for (Predicate predicate : filters) {
-                        if (predicate.getOperator().isParameterized()) {
-                            query = query.setParameterList(predicate.getField(), predicate.getValues());
-                        }
-                    }
-                }
-            }
-            if (pagination != null) {
-
-                if (query == null) {
-                    query = session.createFilter(collection, "");
-                }
-                query.setFirstResult(pagination.getOffset());
-                query.setMaxResults(pagination.getLimit());
-            }
-            return Optional.ofNullable(query);
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateStore.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateStore.java
deleted file mode 100644
index fd03d0c825..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateStore.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.exceptions.TransactionException;
-
-import com.google.common.base.Preconditions;
-
-import org.hibernate.HibernateException;
-import org.hibernate.ScrollMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.metadata.ClassMetadata;
-
-/**
- * Hibernate interface library.
- */
-public class HibernateStore implements DataStore {
-    private final SessionFactory sessionFactory;
-    private final boolean isScrollEnabled;
-    private final ScrollMode scrollMode;
-
-    /**
-     * Initialize HibernateStore and dictionaries.
-     *
-     * @param aSessionFactory the a session factory
-     */
-    public HibernateStore(SessionFactory aSessionFactory) {
-        this.sessionFactory = aSessionFactory;
-        this.isScrollEnabled = true;
-        this.scrollMode = ScrollMode.FORWARD_ONLY;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param aSessionFactory Session factory
-     * @param isScrollEnabled Whether or not scrolling is enabled on driver
-     * @param scrollMode Scroll mode to use for scrolling driver
-     */
-    protected HibernateStore(SessionFactory aSessionFactory, boolean isScrollEnabled, ScrollMode scrollMode) {
-        this.sessionFactory = aSessionFactory;
-        this.isScrollEnabled = isScrollEnabled;
-        this.scrollMode = scrollMode;
-    }
-
-    /**
-     * Builder object to configuration hibernate store.
-     */
-    public static class Builder {
-        private final SessionFactory sessionFactory;
-        private boolean isScrollEnabled;
-        private ScrollMode scrollMode;
-
-        public Builder(final SessionFactory sessionFactory) {
-            this.sessionFactory = sessionFactory;
-            this.isScrollEnabled = true;
-            this.scrollMode = ScrollMode.FORWARD_ONLY;
-        }
-
-        public Builder withScrollEnabled(final boolean isScrollEnabled) {
-            this.isScrollEnabled = isScrollEnabled;
-            return this;
-        }
-
-        public Builder withScrollMode(final ScrollMode scrollMode) {
-            this.scrollMode = scrollMode;
-            return this;
-        }
-
-        public HibernateStore build() {
-            return new HibernateStore(sessionFactory, isScrollEnabled, scrollMode);
-        }
-    }
-
-    @Override
-    public void populateEntityDictionary(EntityDictionary dictionary) {
-        /* bind all entities */
-        for (ClassMetadata meta : sessionFactory.getAllClassMetadata().values()) {
-            dictionary.bindEntity(meta.getMappedClass());
-        }
-    }
-
-    /**
-     * Get current Hibernate session.
-     *
-     * @return session
-     */
-    public Session getSession() {
-        try {
-            Session session = sessionFactory.getCurrentSession();
-            Preconditions.checkNotNull(session);
-            Preconditions.checkArgument(session.isConnected());
-            return session;
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    /**
-     * Start Hibernate transaction.
-     *
-     * @return transaction
-     */
-    @Override
-    public DataStoreTransaction beginTransaction() {
-        Session session = sessionFactory.getCurrentSession();
-        Preconditions.checkNotNull(session);
-        session.beginTransaction();
-        return new HibernateTransaction(session, isScrollEnabled, scrollMode);
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateTransaction.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateTransaction.java
deleted file mode 100644
index 92c6ccb794..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateTransaction.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.FilterScope;
-import com.yahoo.elide.core.RelationshipType;
-import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.core.filter.HQLFilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import com.yahoo.elide.datastores.hibernate5.filter.CriterionFilterOperation;
-import com.yahoo.elide.security.User;
-import org.hibernate.Criteria;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.Query;
-import org.hibernate.ScrollMode;
-import org.hibernate.Session;
-import org.hibernate.collection.internal.AbstractPersistentCollection;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-
-/**
- * Hibernate Transaction implementation.
- */
-public class HibernateTransaction implements DataStoreTransaction {
-    private static final Function<Criterion, Criterion> NOT = Restrictions::not;
-    private static final BiFunction<Criterion, Criterion, Criterion> AND = Restrictions::and;
-    private static final BiFunction<Criterion, Criterion, Criterion> OR = Restrictions::or;
-
-    private final Session session;
-    private final LinkedHashSet<Runnable> deferredTasks = new LinkedHashSet<>();
-    private final boolean isScrollEnabled;
-    private final ScrollMode scrollMode;
-
-    /**
-     * Instantiates a new Hibernate transaction.
-     *
-     * @param session the session
-     * @deprecated since Elide 2.3.2. Will be removed no later than the release of Elide 3.0.
-     */
-    @Deprecated
-    public HibernateTransaction(Session session) {
-        this.session = session;
-        this.isScrollEnabled = true;
-        this.scrollMode = ScrollMode.FORWARD_ONLY;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param session Hibernate session
-     * @param isScrollEnabled Whether or not scrolling is enabled
-     * @param scrollMode Scroll mode to use if scrolling enabled
-     */
-    protected HibernateTransaction(Session session, boolean isScrollEnabled, ScrollMode scrollMode) {
-        this.session = session;
-        this.isScrollEnabled = isScrollEnabled;
-        this.scrollMode = scrollMode;
-    }
-
-    @Override
-    public void delete(Object object) {
-        deferredTasks.add(() -> session.delete(object));
-    }
-
-    @Override
-    public void save(Object object) {
-        deferredTasks.add(() -> session.saveOrUpdate(object));
-    }
-
-    @Override
-    public void flush() {
-        try {
-            deferredTasks.forEach(Runnable::run);
-            deferredTasks.clear();
-            session.flush();
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    @Override
-    public void commit() {
-        try {
-            this.flush();
-            this.session.getTransaction().commit();
-        } catch (HibernateException e) {
-            throw new TransactionException(e);
-        }
-    }
-
-    @Override
-    public <T> T createObject(Class<T> entityClass) {
-        try {
-            T object = entityClass.newInstance();
-            deferredTasks.add(() -> session.persist(object));
-            return object;
-        } catch (java.lang.InstantiationException | IllegalAccessException e) {
-            return null;
-        }
-    }
-
-    /**
-     * load a single record with id and filter.
-     *
-     * @param loadClass class of query object
-     * @param id id of the query object
-     * @param filterExpression FilterExpression contains the predicates
-     */
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id,  Optional<FilterExpression> filterExpression) {
-
-        try {
-            Criteria criteria = session.createCriteria(loadClass).add(Restrictions.idEq(id));
-            if (filterExpression.isPresent()) {
-                CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-                criteria = filterOpn.apply(filterExpression.get());
-            }
-            T record = (T) criteria.uniqueResult();
-            return record;
-        } catch (ObjectNotFoundException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id) {
-        try {
-            T record = session.load(loadClass, id);
-            Hibernate.initialize(record);
-            return record;
-        } catch (ObjectNotFoundException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> loadClass) {
-        final Criteria sessionCriteria = session.createCriteria(loadClass);
-        if (isScrollEnabled) {
-            return new ScrollableIterator(sessionCriteria.scroll(scrollMode));
-        }
-        return sessionCriteria.list();
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> loadClass, FilterScope filterScope) {
-        Criterion securityCriterion = filterScope.getCriterion(NOT, AND, OR);
-
-        Optional<FilterExpression> filterExpression = filterScope.getRequestScope().getLoadFilterExpression(loadClass);
-
-        Criteria criteria = session.createCriteria(loadClass);
-        if (securityCriterion != null) {
-            criteria.add(securityCriterion);
-        }
-
-        if (filterExpression.isPresent()) {
-            CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-            criteria = filterOpn.apply(filterExpression.get());
-        }
-
-        return loadObjects(loadClass, criteria, Optional.empty(), Optional.empty());
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjectsWithSortingAndPagination(Class<T> entityClass, FilterScope filterScope) {
-        Criterion securityCriterion = filterScope.getCriterion(NOT, AND, OR);
-
-        Optional<FilterExpression> filterExpression =
-                filterScope.getRequestScope().getLoadFilterExpression(entityClass);
-
-        Criteria criteria = session.createCriteria(entityClass);
-        if (securityCriterion != null) {
-            criteria.add(securityCriterion);
-        }
-
-        if (filterExpression.isPresent()) {
-            CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
-            criteria = filterOpn.apply(filterExpression.get());
-        }
-
-        final Pagination pagination = filterScope.getRequestScope().getPagination();
-
-        // if we have sorting and sorting isn't empty, then we should pull dictionary to validate the sorting rules
-        Set<Order> validatedSortingRules = null;
-        if (filterScope.hasSortingRules()) {
-            final Sorting sorting = filterScope.getRequestScope().getSorting();
-            final EntityDictionary dictionary = filterScope.getRequestScope().getDictionary();
-            validatedSortingRules = sorting.getValidSortingRules(entityClass, dictionary).entrySet()
-                    .stream()
-                    .map(entry -> entry.getValue().equals(Sorting.SortOrder.desc)
-                            ? Order.desc(entry.getKey())
-                            : Order.asc(entry.getKey())
-                    )
-                    .collect(Collectors.toCollection(LinkedHashSet::new));
-        }
-
-        return loadObjects(
-                entityClass,
-                criteria,
-                Optional.ofNullable(validatedSortingRules),
-                Optional.ofNullable(pagination));
-    }
-
-    /**
-     * Generates the Hibernate ScrollableIterator for Hibernate Query.
-     * @param loadClass The hibernate class to build the query off of.
-     * @param criteria Filtering criteria
-     * @param sortingRules The possibly empty sorting rules.
-     * @param pagination The Optional pagination object.
-     * @param <T> The return Iterable type.
-     * @return The Iterable for Hibernate.
-     */
-    public <T> Iterable<T> loadObjects(final Class<T> loadClass, final Criteria criteria,
-            final Optional<Set<Order>> sortingRules, final Optional<Pagination> pagination) {
-        if (sortingRules.isPresent()) {
-            sortingRules.get().forEach(criteria::addOrder);
-        }
-
-        if (pagination.isPresent()) {
-            final Pagination paginationData = pagination.get();
-            paginationData.evaluate(loadClass);
-            criteria.setFirstResult(paginationData.getOffset());
-            criteria.setMaxResults(paginationData.getLimit());
-        }
-
-        if (isScrollEnabled) {
-            return new ScrollableIterator(criteria.scroll(scrollMode));
-        }
-        return criteria.list();
-    }
-
-    @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Optional<FilterExpression> filterExpression,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        Object val = com.yahoo.elide.core.PersistentResource.getValue(entity, relationName, dictionary);
-        if (val instanceof Collection) {
-            Collection filteredVal = (Collection) val;
-            if (filteredVal instanceof AbstractPersistentCollection) {
-                Optional<Sorting> sortingRules = sorting != null ? Optional.of(sorting) : Optional.empty();
-                Optional<Pagination> paginationRules = pagination != null ? Optional.of(pagination) : Optional.empty();
-
-                @SuppressWarnings("unchecked")
-                final Optional<Query> possibleQuery = new HQLTransaction.Builder<>(session, filteredVal, relationClass,
-                        dictionary)
-                        .withPossibleFilterExpression(filterExpression)
-                        .withPossibleSorting(sortingRules)
-                        .withPossiblePagination(paginationRules)
-                        .build();
-                if (possibleQuery.isPresent()) {
-                    return possibleQuery.get().list();
-                }
-            }
-        }
-        return val;
-    }
-
-    @Override
-    public <T> Long getTotalRecords(Class<T> entityClass) {
-        final Criteria sessionCriteria = session.createCriteria(entityClass);
-        sessionCriteria.setProjection(Projections.rowCount());
-        return (Long) sessionCriteria.uniqueResult();
-    }
-
-    @Override
-    @Deprecated
-    public <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
-        if ((collection instanceof AbstractPersistentCollection) && !predicates.isEmpty()) {
-            String filterString = new HQLFilterOperation().applyAll(predicates);
-
-            if (filterString.length() != 0) {
-                Query query = session.createFilter(collection, filterString);
-
-                for (Predicate predicate : predicates) {
-                    if (predicate.getOperator().isParameterized()) {
-                        query = query.setParameterList(predicate.getField(), predicate.getValues());
-                    }
-                }
-
-                return query.list();
-            }
-        }
-
-        return collection;
-    }
-
-    @Override
-    @Deprecated
-    public <T> Collection filterCollectionWithSortingAndPagination(final Collection collection,
-                                                                   final Class<T> entityClass,
-                                                                   final EntityDictionary dictionary,
-                                                                   final Optional<Set<Predicate>> filters,
-                                                                   final Optional<Sorting> sorting,
-                                                                   final Optional<Pagination> pagination) {
-        if (((collection instanceof AbstractPersistentCollection))
-                && (filters.isPresent() || sorting.isPresent() || pagination.isPresent())) {
-            @SuppressWarnings("unchecked")
-            final Optional<Query> possibleQuery = new HQLTransaction.Builder<>(session, collection, entityClass,
-                    dictionary)
-                    .withPossibleFilters(filters)
-                    .withPossibleSorting(sorting)
-                    .withPossiblePagination(pagination)
-                    .build();
-            if (possibleQuery.isPresent()) {
-                return possibleQuery.get().list();
-            }
-        }
-        return collection;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (session.isOpen() && session.getTransaction().getStatus() == TransactionStatus.ACTIVE) {
-            session.getTransaction().rollback();
-            throw new IOException("Transaction not closed");
-        }
-    }
-
-    @Override
-    public User accessUser(Object opaqueUser) {
-        return new User(opaqueUser);
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceStore.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceStore.java
deleted file mode 100644
index 0f377ecd9f..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceStore.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-
-import com.google.common.base.Preconditions;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.metamodel.EntityType;
-
-/**
- * Manager for javax.persistence compatible db resource.
- */
-public class PersistenceStore implements DataStore {
-    private final EntityManagerFactory entityManagerFactory;
-
-    public PersistenceStore(EntityManagerFactory entityManagerFactory) {
-        Preconditions.checkNotNull(entityManagerFactory);
-        this.entityManagerFactory = entityManagerFactory;
-    }
-
-    @Override
-    public void populateEntityDictionary(EntityDictionary dictionary) {
-        for (EntityType entity : entityManagerFactory.getMetamodel().getEntities()) {
-            dictionary.bindEntity(entity.getBindableJavaType());
-        }
-    }
-
-    @Override
-    public DataStoreTransaction beginTransaction() {
-        return new PersistenceTransaction(entityManagerFactory.createEntityManager());
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceTransaction.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceTransaction.java
deleted file mode 100644
index a04c1e3567..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/PersistenceTransaction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.security.User;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-import javax.persistence.EntityManager;
-
-/**
- * The type Persistence transaction.
- */
-public class PersistenceTransaction implements DataStoreTransaction {
-    private final EntityManager entityManager;
-
-    public PersistenceTransaction(EntityManager entityManager) {
-        this.entityManager = entityManager;
-        this.entityManager.getTransaction().begin();
-    }
-
-    @Override
-    public void save(Object entity) {
-        entityManager.persist(entity);
-    }
-
-    @Override
-    public void delete(Object entity) {
-        entityManager.remove(entity);
-    }
-
-    @Override
-    public void flush() {
-        entityManager.flush();
-    }
-
-    @Override
-    public void commit() {
-        flush();
-        entityManager.getTransaction().commit();
-    }
-
-    @Override
-    public <T> T createObject(Class<T> entityClass) {
-        try {
-            T entity = entityClass.newInstance();
-            entityManager.persist(entity);
-            return entity;
-        } catch (InstantiationException | IllegalAccessException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public <T> T loadObject(Class<T> entityClass, Serializable id) {
-        return entityManager.find(entityClass, id);
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> entityClass) {
-        return entityManager.createQuery("from " + entityClass.getName(), entityClass).getResultList();
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            if (entityManager.getTransaction().isActive()) {
-                entityManager.getTransaction().rollback();
-                throw new IOException("Transaction not closed");
-            }
-        } finally {
-            entityManager.close();
-        }
-    }
-
-    @Override
-    public User accessUser(Object opaqueUser) {
-        return new User(opaqueUser);
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/ScrollableIterator.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/ScrollableIterator.java
deleted file mode 100644
index 15e979c883..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/ScrollableIterator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterators;
-import lombok.NonNull;
-import org.hibernate.ScrollableResults;
-
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-
-/**
- * Wraps ScrollableResult as Iterator.
- *
- * @param <T> type of return object
- */
-public class ScrollableIterator<T> implements Iterable<T>, Iterator<T> {
-    private final ScrollableResults scroll;
-    private boolean inUse = false;
-    private boolean hasNext;
-
-    public ScrollableIterator(ScrollableResults scroll) {
-        this.scroll = scroll;
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-        if (inUse) {
-            throw new ConcurrentModificationException();
-        }
-
-        if (!scroll.first()) {
-            return Collections.emptyListIterator();
-        }
-
-        inUse = true;
-        hasNext = true;
-        return Iterators.unmodifiableIterator(this);
-    }
-
-    @Override
-    public boolean hasNext() {
-        return hasNext;
-    }
-
-    @Override
-    @NonNull public T next() {
-        @SuppressWarnings("unchecked")
-        @NonNull T row = (T) scroll.get()[0];
-        Preconditions.checkNotNull(row);
-        hasNext = scroll.next();
-        return row;
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperation.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperation.java
deleted file mode 100644
index 681b2edbc5..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperation.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5.filter;
-
-import com.yahoo.elide.core.exceptions.InvalidPredicateException;
-import com.yahoo.elide.core.filter.FilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import com.yahoo.elide.core.filter.expression.Visitor;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * FilterOperation that creates Hibernate Criteria from Predicates.
- */
-@Slf4j
-public class CriterionFilterOperation implements FilterOperation<Criterion> {
-
-    private final Criteria criteria;
-
-    private static String ALIAS_DELIM = "__";
-
-    public CriterionFilterOperation(Criteria criteria) {
-        this.criteria = criteria;
-    }
-
-    /**
-     * For 'author.books.chapters.title', should return
-     * 'author__books__chapters'.
-     * @param path
-     * @return
-     */
-    private static String getAlias(List<Predicate.PathElement> path) {
-        StringBuilder sb = new StringBuilder();
-
-        Predicate.PathElement first = path.get(0);
-        sb.append(first.getTypeName());
-        sb.append(ALIAS_DELIM);
-        sb.append(first.getFieldName());
-
-        for (int i = 1; i < path.size() - 1; i++) {
-            Predicate.PathElement element = path.get(i);
-            sb.append(ALIAS_DELIM);
-            sb.append(element.getFieldName());
-        }
-        return sb.toString().replace('-', '_');
-    }
-
-    /**
-     * For 'author.books.chapters.title', should return
-     * 'books.chapters'.
-     * @param path
-     * @return
-     */
-    private static String getAssociationPath(List<Predicate.PathElement> path) {
-        StringBuilder sb = new StringBuilder();
-
-        Predicate.PathElement first = path.get(0);
-        sb.append(first.getFieldName());
-
-        for (int i = 1; i < path.size() - 1; i++) {
-            Predicate.PathElement element = path.get(i);
-            sb.append(".");
-            sb.append(element.getFieldName());
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public Criterion apply(Predicate predicate) {
-        List<Predicate.PathElement> path = predicate.getPath();
-
-        /* If the predicate refers to a nested association, the restriction should be 'alias.fieldName' */
-        String alias;
-        if (path.size() > 1) {
-            alias = getAlias(path);
-            alias = alias + "." + path.get(path.size() - 1).getFieldName();
-        /* If the predicate refers to the root entity, the restriction should be 'fieldName' */
-        } else {
-            alias = path.get(0).getFieldName();
-        }
-
-        switch (predicate.getOperator()) {
-            case IN:
-                return Restrictions.in(alias, predicate.getValues());
-            case NOT:
-                return Restrictions.not(Restrictions.in(alias, predicate.getValues()));
-            case PREFIX:
-                return Restrictions.like(alias, predicate.getValues().get(0) + "%");
-            case POSTFIX:
-                return Restrictions.like(alias, "%" + predicate.getValues().get(0));
-            case INFIX:
-                return Restrictions.like(alias, "%" + predicate.getValues().get(0) + "%");
-            case ISNULL:
-                return Restrictions.isNull(alias);
-            case NOTNULL:
-                return Restrictions.isNotNull(alias);
-            case LT:
-                return Restrictions.lt(alias, predicate.getValues().get(0));
-            case LE:
-                return Restrictions.le(alias, predicate.getValues().get(0));
-            case GT:
-                return Restrictions.gt(alias, predicate.getValues().get(0));
-            case GE:
-                return Restrictions.ge(alias, predicate.getValues().get(0));
-            default:
-                throw new InvalidPredicateException("Operator not implemented: " + predicate.getOperator());
-        }
-    }
-
-    @Override
-    public Criterion applyAll(Set<Predicate> predicates) {
-        Criterion result = null;
-
-        for (Predicate predicate : predicates) {
-            if (result == null) {
-                result = apply(predicate);
-            }
-            result = Restrictions.and(result, apply(predicate));
-        }
-
-        return result;
-    }
-
-    public Criteria apply(FilterExpression filterExpression) {
-        CriteriaVisitor visitor = new CriteriaVisitor();
-        Criterion restrictions = filterExpression.accept(visitor);
-
-        Set<String> createdAliases = new HashSet<>();
-
-        for (Predicate predicate : visitor.getPredicates()) {
-            List<Predicate.PathElement> path = predicate.getPath();
-
-            /* We only create aliases (joins) for associations outside the root entity */
-            if (path.size() >= 2) {
-                List<Predicate.PathElement> copy = new ArrayList<>(path);
-                while (copy.size() > 1) {
-                    String alias = getAlias(copy);
-                    String associationPath = getAssociationPath(copy);
-                    if (!createdAliases.contains(alias)) {
-                        criteria.createAlias(associationPath, alias);
-                        createdAliases.add(alias);
-                    }
-                    copy = copy.subList(0, copy.size() - 1);
-                }
-            }
-        }
-
-        criteria.add(restrictions);
-        return criteria;
-    }
-
-    /**
-     * Builds a criteria from a filter expression.
-     */
-    public class CriteriaVisitor implements Visitor<Criterion> {
-        private Criterion criterion;
-
-        @Getter
-        private final Set<Predicate> predicates;
-
-        public CriteriaVisitor() {
-            predicates = new HashSet<>();
-        }
-
-        @Override
-        public Criterion visitPredicate(Predicate predicate) {
-            predicates.add(predicate);
-            criterion = apply(predicate);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitAndExpression(AndFilterExpression expression) {
-            Criterion left = expression.getLeft().accept(this);
-            Criterion right = expression.getRight().accept(this);
-            criterion = Restrictions.and(left, right);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitOrExpression(OrFilterExpression expression) {
-            Criterion left = expression.getLeft().accept(this);
-            Criterion right = expression.getRight().accept(this);
-            criterion = Restrictions.or(left, right);
-            return criterion;
-        }
-
-        @Override
-        public Criterion visitNotExpression(NotFilterExpression expression) {
-            Criterion negated = expression.getNegated().accept(this);
-            criterion =  Restrictions.not(negated);
-            return criterion;
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/security/CriteriaCheck.java b/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/security/CriteriaCheck.java
deleted file mode 100644
index cb62d1b7ba..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/security/CriteriaCheck.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5.security;
-
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CriterionCheck;
-import org.hibernate.criterion.Criterion;
-
-/**
- * Extends Check to support Hibernate Criteria to limit SQL query responses.
- * @param <T> Type of record for Check
- * @deprecated As of 2.1, replaced by {@link com.yahoo.elide.security.checks.CriterionCheck}
- */
-@Deprecated
-public interface CriteriaCheck<T> extends CriterionCheck<Criterion, T> {
-    /**
-     * Gets criterion.
-     *
-     * @param requestScope the request scope
-     * @return the criterion
-     * @see org.hibernate.criterion.Restrictions
-     */
-    Criterion getCriterion(RequestScope requestScope);
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/HibernateDataStoreSupplier.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/HibernateDataStoreSupplier.java
deleted file mode 100644
index a81091965e..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/HibernateDataStoreSupplier.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.utils.ClassScanner;
-import example.Parent;
-import org.hibernate.MappingException;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.cfg.Environment;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-import javax.persistence.Entity;
-import java.util.function.Supplier;
-
-/**
- * Supplier of Hibernate 5 Data Store.
- */
-public class HibernateDataStoreSupplier implements Supplier<DataStore> {
-    @Override
-    public DataStore get() {
-        // method to force class initialization
-        MetadataSources metadataSources = new MetadataSources(
-                new StandardServiceRegistryBuilder()
-                        .configure("hibernate.cfg.xml")
-                        .applySetting(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread")
-                        .applySetting(Environment.URL,
-                                "jdbc:mysql://localhost:" + System.getProperty("mysql.port", "3306") + "/root")
-                        .applySetting(Environment.USER, "root")
-                        .applySetting(Environment.PASS, "root")
-                        .build());
-
-        try {
-            ClassScanner.getAnnotatedClasses(Parent.class.getPackage(), Entity.class)
-                    .forEach(metadataSources::addAnnotatedClass);
-        } catch (MappingException e) {
-            throw new RuntimeException(e);
-        }
-
-        MetadataImplementor metadataImplementor = (MetadataImplementor) metadataSources.buildMetadata();
-
-        // create example tables from beans
-        SchemaExport schemaExport = new SchemaExport(metadataImplementor); //.setHaltOnError(true);
-        schemaExport.drop(false, true);
-        schemaExport.execute(false, true, false, true);
-
-        if (!schemaExport.getExceptions().isEmpty()) {
-            throw new RuntimeException(schemaExport.getExceptions().toString());
-        }
-
-        return new HibernateStore(metadataImplementor.buildSessionFactory());
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperationTest.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperationTest.java
deleted file mode 100644
index 147f433e9f..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/filter/CriterionFilterOperationTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.hibernate5.filter;
-
-import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.AndFilterExpression;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.filter.expression.NotFilterExpression;
-import com.yahoo.elide.core.filter.expression.OrFilterExpression;
-import example.AddressFragment;
-import example.Author;
-import example.Book;
-import example.Person;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Criterion;
-import org.mockito.ArgumentCaptor;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests CriteriaFilterOperation.
- */
-public class CriterionFilterOperationTest {
-
-    @Test
-    public void testNestedCriterion() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", Author.class, "authors"),
-                new Predicate.PathElement(Author.class, "author", String.class, "name")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("foo", "bar"));
-
-        List<Predicate.PathElement> p2Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "name")
-        );
-        Predicate p2 = new Predicate(p2Path, Operator.IN, Arrays.asList("blah"));
-
-        List<Predicate.PathElement> p3Path = Arrays.asList(
-                new Predicate.PathElement(Book.class, "book", String.class, "genre")
-        );
-        Predicate p3 = new Predicate(p3Path, Operator.IN, Arrays.asList("scifi"));
-
-        OrFilterExpression or = new OrFilterExpression(p2, p3);
-        AndFilterExpression and = new AndFilterExpression(or, p1);
-        NotFilterExpression not = new NotFilterExpression(and);
-
-        Criteria criteria = mock(Criteria.class);
-        CriterionFilterOperation filterOp = new CriterionFilterOperation(criteria);
-
-        ArgumentCaptor<Criterion> argument = ArgumentCaptor.forClass(Criterion.class);
-        filterOp.apply(not);
-        verify(criteria, times(1)).add(argument.capture());
-        verify(criteria, times(1)).createAlias("authors", "book__authors");
-
-        Assert.assertEquals(argument.getValue().toString(),
-                "not name in (blah) or genre in (scifi) and book__authors.name in (foo, bar)");
-    }
-
-    @Test
-    public void testMultipartAlias() throws Exception {
-        List<Predicate.PathElement> p1Path = Arrays.asList(
-            new Predicate.PathElement(Person.class, "person", AddressFragment.class, "address"),
-            new Predicate.PathElement(AddressFragment.class, "addressFragment", AddressFragment.ZipCode.class, "zip"),
-            new Predicate.PathElement(AddressFragment.ZipCode.class, "zipCode", String.class, "zip")
-        );
-        Predicate p1 = new Predicate(p1Path, Operator.IN, Arrays.asList("61820"));
-
-        Criteria criteria = mock(Criteria.class);
-        CriterionFilterOperation filterOp = new CriterionFilterOperation(criteria);
-
-        ArgumentCaptor<Criterion> argument = ArgumentCaptor.forClass(Criterion.class);
-        filterOp.apply((FilterExpression) p1);
-
-        verify(criteria, times(1)).add(argument.capture());
-        verify(criteria).createAlias("address", "person__address");
-        verify(criteria).createAlias("address.zip", "person__address__zip");
-
-        Assert.assertEquals(argument.getValue().toString(), "person__address__zip.zip in (61820)");
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/usertypes/JsonType.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/usertypes/JsonType.java
deleted file mode 100644
index 98a2b04eb8..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/datastores/hibernate5/usertypes/JsonType.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.datastores.hibernate5.usertypes;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.hibernate.HibernateException;
-import org.hibernate.usertype.ParameterizedType;
-import org.hibernate.usertype.UserType;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Objects;
-import java.util.Properties;
-
-/**
- * JsonType serializes an object to json string and vice versa
- */
-
-public class JsonType implements UserType, ParameterizedType {
-
-    private Class objectClass;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int[] sqlTypes() {
-        return new int[]{Types.LONGVARCHAR};
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Class returnedClass() {
-        return String.class;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object firstObject, Object secondObject)
-            throws HibernateException {
-
-        return Objects.equals(firstObject, secondObject);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int hashCode(Object object)
-            throws HibernateException {
-
-        return Objects.hashCode(object);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object nullSafeGet(ResultSet resultSet, String[] names, SessionImplementor session,
-            Object ownerSession) throws HibernateException, SQLException {
-
-        if (resultSet.getString(names[0]) != null) {
-
-            // Get the rawJson
-            String rawJson = resultSet.getString(names[0]);
-
-            try {
-                ObjectMapper mapper = new ObjectMapper();
-                return mapper.readValue(rawJson, this.objectClass);
-            } catch (IOException e) {
-                throw new HibernateException("Could not retrieve an instance of the mapped class from a JDBC resultset.");
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index, SessionImplementor session)
-            throws HibernateException, SQLException  {
-
-        if (value == null) {
-            preparedStatement.setNull(index, Types.NULL);
-        } else {
-            ObjectMapper mapper = new ObjectMapper();
-            try {
-                String json = mapper.writeValueAsString(value);
-                preparedStatement.setString(index, json);
-            } catch (JsonProcessingException e) {
-                throw new HibernateException("Could not write an instance of the mapped class to a prepared statement.");
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object deepCopy(Object object)
-            throws HibernateException {
-
-        // Since mutable is false, return the object
-        return object;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isMutable() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Serializable disassemble(Object value)
-            throws HibernateException {
-
-        return value == null ? null : (Serializable) deepCopy(value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object assemble(Serializable cached, Object owner)
-            throws HibernateException {
-
-        return cached == null ? null : deepCopy(cached);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object replace(Object original, Object target, Object owner)
-            throws HibernateException {
-
-        return deepCopy(original);
-    }
-
-    /**
-     * Setter used to set the class to serialize/deserialize
-     * @param properties properties object
-     */
-    @Override
-    public void setParameterValues(Properties properties) {
-        try {
-            this.objectClass = Class.forName(properties.getProperty("class"));
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Unable set the `class` parameter for serialization/deserialization");
-        }
-
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/tests/DataStoreIT.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
deleted file mode 100644
index a79d602031..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests;
-
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import com.yahoo.elide.utils.JsonParser;
-import example.Filtered;
-import org.apache.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static com.jayway.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.equalTo;
-
-public class DataStoreIT extends AbstractIntegrationTestInitializer {
-    private final JsonParser jsonParser = new JsonParser();
-
-    @BeforeClass
-    public static void setup() {
-        DataStoreTransaction tx = dataStore.beginTransaction();
-
-        tx.save(tx.createObject(Filtered.class));
-        tx.save(tx.createObject(Filtered.class));
-        tx.save(tx.createObject(Filtered.class));
-
-        tx.commit();
-    }
-
-    @Test
-    public void testFiltered() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/testFiltered.json");
-
-        given().when().get("/filtered").then().statusCode(HttpStatus.SC_OK)
-                .body(equalTo(expected));
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/AddressFragment.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/example/AddressFragment.java
deleted file mode 100644
index c4e8e2b288..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/AddressFragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.datastores.hibernate5.usertypes.JsonType;
-import org.hibernate.annotations.TypeDef;
-
-@TypeDef(typeClass = JsonType.class, name = "json")
-public class AddressFragment {
-   public String street;
-   public String state;
-   public ZipCode zip;
-
-   public class ZipCode {
-       public String zip;
-       public String plusFour;
-   }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Filtered.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Filtered.java
deleted file mode 100644
index 76992365a7..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Filtered.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.datastores.hibernate5.security.CriteriaCheck;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.Filtered.FilterCheck;
-import example.Filtered.FilterCheck3;
-import lombok.ToString;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import java.util.Optional;
-
-/**
- * Filtered permission check.
- */
-@CreatePermission(any = { FilterCheck.class })
-@ReadPermission(any = { Role.NONE.class, FilterCheck.class, FilterCheck3.class })
-@UpdatePermission(any = { FilterCheck.class })
-@DeletePermission(any = { FilterCheck.class })
-@Include(rootLevel = true)
-// Hibernate
-@Entity
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
-@ToString
-public class Filtered  {
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
-
-    private long id;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    /**
-     * Filter for ID == 1.
-     */
-    static public class FilterCheck extends OperationCheck<Filtered> implements CriteriaCheck<Filtered> {
-        @Override
-        public boolean ok(Filtered object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return true;
-        }
-
-        /* Limit reads to ID 1 */
-        @Override
-        public Criterion getCriterion(RequestScope requestScope) {
-            return Restrictions.idEq(1L);
-        }
-    }
-
-    /**
-     * Filter for ID == 3.
-     */
-    static public class FilterCheck3 extends OperationCheck<Filtered> implements CriteriaCheck<Filtered> {
-        @Override
-        public boolean ok(Filtered object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            return true;
-        }
-
-        /* Limit reads to ID 3 */
-        @Override
-        public Criterion getCriterion(RequestScope requestScope) {
-            return Restrictions.idEq(3L);
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Person.java b/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Person.java
deleted file mode 100644
index 11d33e26d0..0000000000
--- a/elide-datastore/elide-datastore-hibernate5/src/test/java/example/Person.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.Include;
-import lombok.Getter;
-import lombok.Setter;
-import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-@Include(rootLevel = true)
-public class Person {
-    @Setter
-    private long id;
-
-    @Setter
-    @Getter
-    private String name;
-
-    @Setter
-    private AddressFragment address;
-
-    @Id
-    public long getId() {
-        return id;
-    }
-
-    @Column(name = "address", columnDefinition = "TEXT")
-    @Type(type = "com.yahoo.elide.datastores.hibernate5.usertypes.JsonType", parameters = {
-            @Parameter(name = "class", value = "example.AddressFragment")
-    })
-    public AddressFragment getAddress() {
-        return address;
-    }
-}
diff --git a/elide-datastore/elide-datastore-inmemorydb/pom.xml b/elide-datastore/elide-datastore-inmemorydb/pom.xml
index a98890f548..6f7eee465c 100644
--- a/elide-datastore/elide-datastore-inmemorydb/pom.xml
+++ b/elide-datastore/elide-datastore-inmemorydb/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-datastore-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
+        <version>6.1.4-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -38,58 +38,112 @@
         <tag>HEAD</tag>
     </scm>
 
+    <properties>
+        <dataStoreHarness>com.yahoo.elide.initialization.InMemoryDataStoreHarness</dataStoreHarness>
+        <excludeTags>skipInMemory</excludeTags>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-integration-tests</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
+            <version>6.1.4-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.10</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
         </dependency>
-        <!-- Jackson data-binder -->
+
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.6.3</version>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
         </dependency>
-        <!-- Test deps -->
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <failIfNoTests>true</failIfNoTests>
+                    <excludedGroups>${excludeTags}</excludedGroups>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStore.java b/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStore.java
index 171d274851..947e0e1dc3 100644
--- a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStore.java
+++ b/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStore.java
@@ -5,64 +5,15 @@
  */
 package com.yahoo.elide.datastores.inmemory;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-
-import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
-import org.reflections.util.ClasspathHelper;
-import org.reflections.util.ConfigurationBuilder;
-
-import lombok.Getter;
-
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.persistence.Entity;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.utils.ClassScanner;
 
 /**
- * Simple non-persistent in-memory database.
+ * Simple non-persistent in-memory database.  Use HashMapDataStore instead.
  */
-public class InMemoryDataStore implements DataStore {
-    private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, Object>> dataStore =
-            new ConcurrentHashMap<>();
-    @Getter private EntityDictionary dictionary;
-    @Getter private final Package beanPackage;
-
-    public InMemoryDataStore(Package beanPackage) {
-        this.beanPackage = beanPackage;
-    }
-
-    @Override
-    public void populateEntityDictionary(EntityDictionary dictionary) {
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .addUrls(ClasspathHelper.forPackage(beanPackage.getName()))
-                .setScanners(new SubTypesScanner(), new TypeAnnotationsScanner()));
-        reflections.getTypesAnnotatedWith(Entity.class).stream()
-                .filter(entityAnnotatedClass -> entityAnnotatedClass.getPackage().getName()
-                        .startsWith(beanPackage.getName()))
-                .forEach(dictionary::bindEntity);
-        this.dictionary = dictionary;
-    }
-
-    @Override
-    public DataStoreTransaction beginTransaction() {
-        return new InMemoryTransaction(dataStore, dictionary);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Data store contents ");
-        for (Class<?> cls : dataStore.keySet()) {
-            sb.append("\n Table ").append(cls).append(" contents \n");
-            ConcurrentHashMap<String, Object> data = dataStore.get(cls);
-            for (Entry<String, Object> e : data.entrySet()) {
-                sb.append(" Id: ").append(e.getKey()).append(" Value: ").append(e.getValue());
-            }
-        }
-        return sb.toString();
+@Deprecated
+public class InMemoryDataStore extends HashMapDataStore {
+    public InMemoryDataStore(ClassScanner scanner, Package beanPackage) {
+        super(scanner, beanPackage);
     }
 }
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryTransaction.java b/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryTransaction.java
deleted file mode 100644
index 67a5689684..0000000000
--- a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/InMemoryTransaction.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.inmemory;
-
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.InMemoryFilterOperation;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import com.yahoo.elide.utils.coerce.CoerceUtil;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-
-import javax.persistence.Id;
-
-/**
- * InMemoryDataStore transaction handler.
- */
-public class InMemoryTransaction implements DataStoreTransaction {
-    private static final ConcurrentHashMap<Class<?>, AtomicLong> TYPEIDS = new ConcurrentHashMap<>();
-
-    private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, Object>> dataStore;
-    private final List<Operation> operations;
-    private final EntityDictionary dictionary;
-
-    public InMemoryTransaction(ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, Object>> dataStore,
-                               EntityDictionary dictionary) {
-        this.dataStore = dataStore;
-        this.dictionary = dictionary;
-        this.operations = new ArrayList<>();
-    }
-
-    @Override
-    public void flush() {
-        // Do nothing
-    }
-
-    @Override
-    public void save(Object object) {
-        if (object == null) {
-            return;
-        }
-        String id = dictionary.getId(object);
-        if (id.equals("0")) {
-            setId(object, dictionary.getId(createObject(object.getClass())));
-        }
-        id = dictionary.getId(object);
-        operations.add(new Operation(id, object, object.getClass(), false));
-    }
-
-    @Override
-    public void delete(Object object) {
-        if (object == null) {
-            return;
-        }
-        String id = dictionary.getId(object);
-        operations.add(new Operation(id, object, object.getClass(), true));
-    }
-
-    @Override
-    public void commit() {
-        operations.forEach(op -> {
-            Class<?> cls = op.getType();
-            ConcurrentHashMap<String, Object> data = dataStore.get(cls);
-            Object instance = op.getInstance();
-            if (instance == null) {
-                return;
-            }
-            String id = op.getId();
-            if (op.getDelete()) {
-                if (data != null) {
-                    data.remove(id);
-                }
-            } else {
-                if (data == null) {
-                    data = new ConcurrentHashMap<>();
-                    dataStore.put(cls, data);
-                }
-                data.put(id, instance);
-            }
-        });
-        operations.clear();
-    }
-
-    @Override
-    public <T> T createObject(Class<T> entityClass) {
-        if (dataStore.get(entityClass) == null) {
-            dataStore.putIfAbsent(entityClass, new ConcurrentHashMap<>());
-            TYPEIDS.putIfAbsent(entityClass, new AtomicLong(1));
-        }
-        AtomicLong idValue = TYPEIDS.get(entityClass);
-        String id = String.valueOf(idValue.getAndIncrement());
-        try {
-            T instance = entityClass.newInstance();
-            setId(instance, id);
-            return instance;
-        } catch (InstantiationException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public void setId(Object value, String id) {
-        for (Class<?> cls = value.getClass(); cls != null; cls = cls.getSuperclass()) {
-            for (Method method : cls.getMethods()) {
-                if (method.isAnnotationPresent(Id.class)) {
-                    if (method.getName().startsWith("get")) {
-                        String setName = "set" + method.getName().substring(3);
-                        for (Method setMethod : cls.getMethods()) {
-                            if (setMethod.getName().equals(setName) && setMethod.getParameterCount() == 1) {
-                                try {
-                                    setMethod.invoke(value,
-                                            CoerceUtil.coerce(id, setMethod.getParameters()[0].getType()));
-                                } catch (ReflectiveOperationException e) {
-                                    e.printStackTrace();
-                                }
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id) {
-        ConcurrentHashMap<String, Object> objs = dataStore.get(loadClass);
-        if (objs == null) {
-            return null;
-        }
-        return (T) objs.get(id.toString());
-    }
-
-    @Override
-    public <T> List<T> loadObjects(Class<T> loadClass) {
-        ConcurrentHashMap<String, Object> objs = dataStore.get(loadClass);
-        if (objs == null) {
-            return Collections.emptyList();
-        }
-        List<Object> results = new ArrayList<>();
-        objs.forEachValue(1, results::add);
-        return (List<T>) results;
-    }
-
-    @Override
-    public <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
-        Set<java.util.function.Predicate> filterFns = new InMemoryFilterOperation(dictionary).applyAll(predicates);
-        return (Collection) collection.stream()
-                .filter(e -> filterFns.stream().allMatch(fn -> fn.test(e)))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public <T> Collection filterCollectionWithSortingAndPagination(
-            Collection collection,
-            Class<T> entityClass,
-            EntityDictionary dictionary,
-            Optional<Set<Predicate>> filters,
-            Optional<Sorting> sorting,
-            Optional<Pagination> pagination
-    ) {
-        return filterCollection(collection, entityClass, filters.orElseGet(() -> Collections.emptySet()));
-    }
-
-    @Override
-    public void close() throws IOException {
-        operations.clear();
-    }
-
-    @Override
-    public <T> Long getTotalRecords(Class<T> entityClass) {
-        ConcurrentHashMap<String, Object> objs = dataStore.get(entityClass);
-        return objs == null ? 0L : objs.size();
-    }
-}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/Operation.java b/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/Operation.java
deleted file mode 100644
index 8b27bd9d35..0000000000
--- a/elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastores/inmemory/Operation.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.inmemory;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-class Operation {
-    @Getter private final String id;
-    @Getter private final Object instance;
-    @Getter private final Class<?> type;
-    @Getter private final Boolean delete;
-}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/HashMapDataStoreTest.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/HashMapDataStoreTest.java
new file mode 100644
index 0000000000..d3722062b4
--- /dev/null
+++ b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/HashMapDataStoreTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.inmemory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.example.beans.ExcludedBean;
+import com.yahoo.elide.example.beans.FirstBean;
+import com.yahoo.elide.example.beans.FirstChildBean;
+import com.yahoo.elide.example.beans.NonEntity;
+import com.yahoo.elide.example.beans.SecondBean;
+import com.google.common.collect.ImmutableSet;
+import org.apache.commons.collections4.IterableUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * HashMapDataStore tests.
+ */
+public class HashMapDataStoreTest {
+    private InMemoryDataStore inMemoryDataStore;
+    private EntityDictionary entityDictionary;
+
+    @BeforeEach
+    public void setup() {
+        entityDictionary = EntityDictionary.builder().build();
+        inMemoryDataStore = new InMemoryDataStore(DefaultClassScanner.getInstance(), FirstBean.class.getPackage());
+        inMemoryDataStore.populateEntityDictionary(entityDictionary);
+    }
+
+    private <T extends Object> T createNewInheritanceObject(Class<T> type)
+            throws IOException, InstantiationException, IllegalAccessException {
+        T obj = type.newInstance();
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            t.createObject(obj, null);
+            t.commit(null);
+        }
+        return obj;
+    }
+
+    @Test
+    public void dataStoreTestInheritance() throws IOException, InstantiationException, IllegalAccessException {
+        Map<String, Object> entry = inMemoryDataStore.get(ClassType.of(FirstBean.class));
+        assertEquals(0, entry.size());
+
+        FirstChildBean child = createNewInheritanceObject(FirstChildBean.class);
+
+        // Adding Child object, adds a parent entry.
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null);
+            assertNotNull(beans);
+            assertTrue(beans.iterator().hasNext());
+            FirstBean bean = (FirstBean) IterableUtils.first(beans);
+            assertEquals("1", bean.getId());
+        }
+
+        assertEquals("1", child.getId());
+        assertNotNull(entry);
+        assertEquals(1, entry.size());
+
+        // New Parent avoids id collision.
+        FirstBean parent = createNewInheritanceObject(FirstBean.class);
+        assertEquals("2", parent.getId());
+
+        // New Child avoids id collision
+        FirstChildBean child1 = createNewInheritanceObject(FirstChildBean.class);
+        assertEquals("3", child1.getId());
+    }
+
+    @Test
+    public void dataStoreTestInheritanceDelete() throws IOException, InstantiationException, IllegalAccessException {
+        Map<String, Object> entry = inMemoryDataStore.get(ClassType.of(FirstBean.class));
+        assertEquals(0, entry.size());
+
+        FirstChildBean child = createNewInheritanceObject(FirstChildBean.class);
+        createNewInheritanceObject(FirstBean.class);
+
+        // Delete Child
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            t.delete(child, null);
+            t.commit(null);
+        }
+
+        // Only 1 parent entry should remain.
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null);
+            assertNotNull(beans);
+            assertTrue(beans.iterator().hasNext());
+            FirstBean bean = (FirstBean) IterableUtils.first(beans);
+            assertEquals("2", bean.getId());
+        }
+    }
+
+    @Test
+    public void dataStoreTestInheritanceUpdate() throws IOException, InstantiationException, IllegalAccessException {
+        Map<String, Object> entry = inMemoryDataStore.get(ClassType.of(FirstBean.class));
+        assertEquals(0, entry.size());
+
+        FirstChildBean child = createNewInheritanceObject(FirstChildBean.class);
+        createNewInheritanceObject(FirstBean.class);
+
+        // update Child
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            child.setNickname("hello");
+            t.save(child, null);
+            t.commit(null);
+        }
+
+        // Only 1 parent entry should remain.
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null);
+            assertNotNull(beans);
+            assertTrue(beans.iterator().hasNext());
+            FirstChildBean bean = (FirstChildBean) IterableUtils.first(beans);
+            assertEquals("1", bean.getId());
+            assertEquals("hello", bean.getNickname());
+        }
+    }
+
+    @Test
+    public void checkLoading() {
+        final EntityDictionary entityDictionary = inMemoryDataStore.getDictionary();
+        assertNotNull(entityDictionary.getJsonAliasFor(ClassType.of(FirstBean.class)));
+        assertNotNull(entityDictionary.getJsonAliasFor(ClassType.of(SecondBean.class)));
+        assertThrows(IllegalArgumentException.class, () -> entityDictionary.getJsonAliasFor(ClassType.of(NonEntity.class)));
+        assertThrows(IllegalArgumentException.class, () -> entityDictionary.getJsonAliasFor(ClassType.of(ExcludedBean.class)));
+    }
+
+    @Test
+    public void testValidCommit() throws Exception {
+        FirstBean object = new FirstBean();
+        object.id = "0";
+        object.name = "Test";
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null).iterator().hasNext());
+            t.createObject(object, null);
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null).iterator().hasNext());
+            t.commit(null);
+        }
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null);
+            assertNotNull(beans);
+            assertTrue(beans.iterator().hasNext());
+            FirstBean bean = (FirstBean) IterableUtils.first(beans);
+            assertTrue(!"0".equals(bean.id) && "Test".equals(bean.name));
+        }
+    }
+
+    @Test
+    public void testCanGenerateIdsAfterDataCommitted() throws Exception {
+        // given an object with a non-generated ID has been created
+        FirstBean object = new FirstBean();
+        object.id = "1";
+        object.name = "number one";
+
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            t.createObject(object, null);
+            t.save(object, null);
+            t.commit(null);
+        }
+
+        // when an object without ID is created, that works
+        FirstBean object2 = new FirstBean();
+        object2.id = null;
+        object2.name = "number two";
+
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            t.createObject(object2, null);
+            t.save(object2, null);
+            t.commit(null);
+        }
+
+        // and a meaningful ID is assigned
+        Set<String> names = new HashSet<>();
+        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
+            for (Object objBean : t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null)) {
+                FirstBean bean = (FirstBean) objBean;
+                names.add(bean.name);
+                assertFalse(bean.id == null);
+            }
+        }
+
+        assertEquals(ImmutableSet.of("number one", "number two"), names);
+    }
+}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreSupplier.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreSupplier.java
deleted file mode 100644
index 1c33047240..0000000000
--- a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreSupplier.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.inmemory;
-
-import com.yahoo.elide.core.DataStore;
-import example.Parent;
-
-import java.util.function.Supplier;
-
-/**
- * Supplier of InMemory Data Store.
- */
-public class InMemoryDataStoreSupplier implements Supplier<DataStore> {
-    @Override
-    public DataStore get() {
-        return new InMemoryDataStore(Parent.class.getPackage());
-    }
-}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreTest.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreTest.java
deleted file mode 100644
index 317eb78ac5..0000000000
--- a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/datastores/inmemory/InMemoryDataStoreTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.datastores.inmemory;
-
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.example.beans.ExcludedBean;
-import com.yahoo.elide.example.beans.FirstBean;
-import com.yahoo.elide.example.beans.NonEntity;
-import com.yahoo.elide.example.beans.SecondBean;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.util.HashMap;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-/**
- * InMemoryDataStore tests.
- */
-public class InMemoryDataStoreTest {
-    private InMemoryDataStore inMemoryDataStore;
-
-    @BeforeTest
-    public void setup() {
-        final EntityDictionary entityDictionary = new EntityDictionary(new HashMap<>());
-        inMemoryDataStore = new InMemoryDataStore(FirstBean.class.getPackage());
-        inMemoryDataStore.populateEntityDictionary(entityDictionary);
-    }
-
-    @Test(expectedExceptions = {IllegalArgumentException.class})
-    public void checkLoading() {
-        final EntityDictionary entityDictionary = inMemoryDataStore.getDictionary();
-        assertNotNull(entityDictionary.getJsonAliasFor(FirstBean.class));
-        assertNotNull(entityDictionary.getJsonAliasFor(SecondBean.class));
-        assertNull(entityDictionary.getJsonAliasFor(ExcludedBean.class));
-        assertNull(entityDictionary.getJsonAliasFor(NonEntity.class));
-    }
-
-    @Test
-    public void testValidCommit() throws Exception {
-        FirstBean object = new FirstBean();
-        object.id = 0;
-        object.name = "Test";
-        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            t.save(object);
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            t.commit();
-        }
-        try (DataStoreTransaction t = inMemoryDataStore.beginTransaction()) {
-            Iterable<FirstBean> beans = t.loadObjects(FirstBean.class);
-            assertNotNull(beans);
-            assertTrue(beans.iterator().hasNext());
-            FirstBean bean = beans.iterator().next();
-            assertTrue(bean.id == 1 && bean.name.equals("Test"));
-        }
-    }
-}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstBean.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
index c33b660935..6821d7a1b9 100644
--- a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
+++ b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
@@ -8,24 +8,26 @@
 import com.yahoo.elide.annotation.Include;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 /**
  * test bean.
  */
 @Entity
-@Include
+@Include(rootLevel = false)
 public class FirstBean {
-    public int id;
+    public String id;
 
     public String name;
 
     @Id
-    public int getId() {
+    @GeneratedValue
+    public String getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(String id) {
         this.id = id;
     }
 }
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstChildBean.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstChildBean.java
new file mode 100644
index 0000000000..cb70b72b78
--- /dev/null
+++ b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/FirstChildBean.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.example.beans;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+
+/**
+ * child test bean for inheritance.
+ */
+@Entity
+@Include(rootLevel = false)
+public class FirstChildBean extends FirstBean {
+    private String nickname;
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getNickname() {
+        return this.nickname;
+    }
+}
diff --git a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/SecondBean.java b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/SecondBean.java
index 98556b3cda..d2f10ff477 100644
--- a/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/SecondBean.java
+++ b/elide-datastore/elide-datastore-inmemorydb/src/test/java/com/yahoo/elide/example/beans/SecondBean.java
@@ -14,7 +14,7 @@
  * test bean.
  */
 @Entity
-@Include
+@Include(rootLevel = false)
 public class SecondBean {
     @Id
     public int id;
diff --git a/elide-datastore/elide-datastore-jms/pom.xml b/elide-datastore/elide-datastore-jms/pom.xml
new file mode 100644
index 0000000000..d774b31025
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/pom.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-datastore-jms</artifactId>
+    <name>Elide Data Store: JMS</name>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <!-- Elide dependencies (include test dependencies) -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+        </dependency>
+
+        <!-- Jackson data-binder -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <!-- Subscription deserialization -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jms</groupId>
+            <artifactId>javax.jms-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-server</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jms-client-all</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- dependencies for native jetty websocket -->
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${version.jetty}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-client</artifactId>
+            <version>${version.jetty}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-servlet</artifactId>
+            <version>${version.jetty}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- dependencies for javax.websocket (JSR-356) websocket -->
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>javax-websocket-server-impl</artifactId>
+            <version>${version.jetty}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-test-helpers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStore.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStore.java
new file mode 100644
index 0000000000..37e34a7272
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStore.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import static com.yahoo.elide.graphql.subscriptions.SubscriptionModelBuilder.TOPIC_ARGUMENT;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionFieldSerde;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSContext;
+
+/**
+ * Elide datastore that reads models from JMS message topics.
+ */
+public class JMSDataStore implements DataStore {
+    //Maps supported subscription models to whether or not they support topics.
+    protected Map<Type<?>, Boolean> models;
+
+    protected ConnectionFactory connectionFactory;
+    protected EntityDictionary dictionary;
+
+    protected long timeoutInMs = -1;
+
+    //For serializing Elide models to topics.
+    protected Gson gson;
+
+    /**
+     * Constructor.
+     * @param models The set of models to manage.
+     * @param connectionFactory The JMS connection factory.
+     * @param dictionary The entity dictionary.
+     * @param timeoutInMs request timeout in milliseconds.  0 means immediate.  -1 means no timeout.
+     */
+    public JMSDataStore(
+            Set<Type<?>> models,
+            ConnectionFactory connectionFactory,
+            EntityDictionary dictionary,
+            long timeoutInMs
+    ) {
+        this.models = models.stream().collect(Collectors.toMap(
+                (model) -> model,
+                (model) -> {
+                    Subscription subscription = model.getAnnotation(Subscription.class);
+                    return subscription != null
+                            && subscription.operations() != null
+                            && subscription.operations().length > 0;
+                }
+        ));
+
+        this.connectionFactory = connectionFactory;
+        this.dictionary = dictionary;
+        this.timeoutInMs = timeoutInMs;
+
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        CoerceUtil.getSerdes().forEach((cls, serde) -> {
+            gsonBuilder.registerTypeAdapter(cls, new SubscriptionFieldSerde(serde));
+        });
+        gson = gsonBuilder.create();
+    }
+
+    /**
+     * Constructor.
+     * @param scanner to scan for subscription annotations.
+     * @param connectionFactory The JMS connection factory.
+     * @param dictionary The entity dictionary.
+     * @param timeoutInMs request timeout in milliseconds.  0 means immediate.  -1 means no timeout.
+     */
+    public JMSDataStore(
+            ClassScanner scanner,
+            ConnectionFactory connectionFactory,
+            EntityDictionary dictionary,
+            long timeoutInMs
+    ) {
+        this(
+                scanner.getAnnotatedClasses(Subscription.class, Include.class).stream()
+                        .map(ClassType::of)
+                        .collect(Collectors.toSet()),
+                connectionFactory, dictionary, timeoutInMs);
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        for (Type<?> model : models.keySet()) {
+
+            Boolean supportsTopics = models.get(model);
+
+            dictionary.bindEntity(model);
+
+            if (supportsTopics) {
+                //Add topic type argument to each model.
+                dictionary.addArgumentToEntity(model, ArgumentType
+                        .builder()
+                        .name(TOPIC_ARGUMENT)
+                        .defaultValue(TopicType.ADDED)
+                        .type(ClassType.of(TopicType.class))
+                        .build());
+            }
+        }
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        JMSContext context = connectionFactory.createContext();
+        return new JMSDataStoreTransaction(context, dictionary, gson, timeoutInMs);
+    }
+
+    @Override
+    public DataStoreTransaction beginReadTransaction() {
+        JMSContext context = connectionFactory.createContext();
+        return new JMSDataStoreTransaction(context, dictionary, gson, timeoutInMs);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStoreTransaction.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStoreTransaction.java
new file mode 100644
index 0000000000..0fbb17329d
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/JMSDataStoreTransaction.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import static com.yahoo.elide.graphql.subscriptions.SubscriptionModelBuilder.TOPIC_ARGUMENT;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+
+import com.google.gson.Gson;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import javax.jms.Destination;
+import javax.jms.JMSConsumer;
+import javax.jms.JMSContext;
+import javax.jms.JMSRuntimeException;
+
+/**
+ * Data store transaction for reading Elide models from JMS topics.
+ */
+@Slf4j
+public class JMSDataStoreTransaction implements DataStoreTransaction {
+    private JMSContext context;
+    private EntityDictionary dictionary;
+    private Gson gson;
+    private long timeoutInMs;
+    private List<JMSConsumer> consumers;
+
+    /**
+     * Constructor.
+     * @param context JMS Context
+     * @param dictionary Elide Entity Dictionary
+     * @param gson Gson serializer to convert Elide models to topic messages.
+     * @param timeoutInMs request timeout in milliseconds.  0 means immediate.  -1 means no timeout.
+     */
+    public JMSDataStoreTransaction(JMSContext context, EntityDictionary dictionary, Gson gson, long timeoutInMs) {
+        this.context = context;
+        this.gson = gson;
+        this.dictionary = dictionary;
+        this.timeoutInMs = timeoutInMs;
+        this.consumers = new ArrayList<>();
+    }
+
+    @Override
+    public <T> void save(T entity, RequestScope scope) {
+        throw new BadRequestException("Unsupported operation");
+    }
+
+    @Override
+    public <T> void delete(T entity, RequestScope scope) {
+        throw new BadRequestException("Unsupported operation");
+    }
+
+    @Override
+    public void flush(RequestScope scope) {
+
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+
+    }
+
+    @Override
+    public <T> void createObject(T entity, RequestScope scope) {
+        throw new BadRequestException("Unsupported operation");
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection entityProjection, RequestScope scope) {
+        TopicType topicType = getTopicType(entityProjection);
+
+        String topicName = topicType.toTopicName(entityProjection.getType(), dictionary);
+
+        Destination destination = context.createTopic(topicName);
+        JMSConsumer consumer = context.createConsumer(destination);
+
+        context.start();
+
+        consumers.add(consumer);
+
+        return new MessageIterable<>(
+                consumer,
+                timeoutInMs,
+                new MessageDeserializer<>(entityProjection.getType(), gson)
+        );
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        shutdown();
+    }
+
+    @Override
+    public void close() throws IOException {
+        shutdown();
+    }
+
+    private void shutdown() {
+        try {
+            consumers.forEach(JMSConsumer::close);
+            context.stop();
+            context.close();
+        } catch (JMSRuntimeException e) {
+            log.debug("Exception throws while closing context: {}", e.getMessage());
+        }
+    }
+
+    protected TopicType getTopicType(EntityProjection projection) {
+        Set<Argument> arguments = projection.getArguments();
+
+        for (Argument argument: arguments) {
+            if (argument.getName().equals(TOPIC_ARGUMENT)) {
+                return (TopicType) argument.getValue();
+            }
+        }
+
+        return TopicType.CUSTOM;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageDeserializer.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageDeserializer.java
new file mode 100644
index 0000000000..c4e67dbf7c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageDeserializer.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import com.yahoo.elide.core.exceptions.InternalServerErrorException;
+import com.yahoo.elide.core.type.Type;
+import com.google.gson.Gson;
+
+import java.util.function.Function;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.TextMessage;
+
+/**
+ * Converts JMS messages to elide model instances via Jackson.
+ * @param <T> elide model type.
+ */
+public class MessageDeserializer<T> implements Function<Message, T> {
+    private Type<?> type;
+    private Gson gson;
+
+    /**
+     * Constructor.
+     * @param type The type to deserialize to.
+     * @param gson Gson serializer to convert Elide models to topic messages.
+     */
+    public MessageDeserializer(Type<?> type, Gson gson) {
+        this.type = type;
+        this.gson = gson;
+    }
+
+    @Override
+    public T apply(Message message) {
+        try {
+            return (T) gson.fromJson(((TextMessage) message).getText(), type.getUnderlyingClass().get());
+        } catch (JMSException e) {
+            throw new InternalServerErrorException(e);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageIterable.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageIterable.java
new file mode 100644
index 0000000000..d9bf8899d6
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/MessageIterable.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.function.Function;
+import javax.jms.JMSConsumer;
+import javax.jms.JMSRuntimeException;
+import javax.jms.Message;
+
+/**
+ * Converts a JMS message consumer into an Iterable.
+ * @param <T> The type to convert a Message into.
+ */
+public class MessageIterable<T> implements DataStoreIterable<T> {
+
+    private JMSConsumer consumer;
+    private long timeout;
+    private Function<Message, T> messageConverter;
+
+    /**
+     * Constructor.
+     * @param consumer The JMS message consumer to convert to an interator.
+     * @param timeout The timeout to wait on message topics.  0 means no wait.  Less than 0 means wait forever.
+     * @param messageConverter Converts JMS messages into some other thing.
+     */
+    public MessageIterable(
+            JMSConsumer consumer,
+            long timeout,
+            Function<Message, T> messageConverter
+    ) {
+        this.consumer = consumer;
+        this.timeout = timeout;
+        this.messageConverter = messageConverter;
+    }
+
+    @Override
+    public Iterable<T> getWrappedIterable() {
+        return this;
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return new Iterator() {
+            T next;
+
+            @Override
+            public boolean hasNext() {
+                try {
+                    next = next();
+                } catch (NoSuchElementException e) {
+                    return false;
+                }
+
+                return true;
+            }
+
+            @Override
+            public T next() {
+                if (next != null) {
+                    T result = next;
+                    next = null;
+                    return result;
+                }
+
+                try {
+                    Message message;
+                    if (timeout == 0) {
+                        message = consumer.receiveNoWait();
+                    } else if (timeout > 0) {
+                        message = consumer.receive(timeout);
+                    } else {
+                        message = consumer.receive();
+                    }
+
+                    if (message != null) {
+                        return messageConverter.apply(message);
+                    }
+                    throw new NoSuchElementException();
+                } catch (JMSRuntimeException e)  {
+                    throw new NoSuchElementException();
+                }
+            }
+        };
+    }
+
+    @Override
+    public boolean needsInMemoryFilter() {
+        return true;
+    }
+
+    @Override
+    public boolean needsInMemorySort() {
+        return true;
+    }
+
+    @Override
+    public boolean needsInMemoryPagination() {
+        return true;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketConfigurator.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketConfigurator.java
new file mode 100644
index 0000000000..a58c8811eb
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketConfigurator.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms.websocket;
+
+import static com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket.DEFAULT_USER_FACTORY;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.datastores.jms.JMSDataStore;
+import com.yahoo.elide.graphql.ExecutionResultDeserializer;
+import com.yahoo.elide.graphql.ExecutionResultSerializer;
+import com.yahoo.elide.graphql.GraphQLErrorDeserializer;
+import com.yahoo.elide.graphql.GraphQLErrorSerializer;
+import com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+
+import java.util.Calendar;
+import javax.jms.ConnectionFactory;
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * Initializes and configures the subscription web socket.
+ */
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class SubscriptionWebSocketConfigurator extends ServerEndpointConfig.Configurator {
+
+    protected ConnectionFactory connectionFactory;
+
+    @Builder.Default
+    protected AuditLogger auditLogger = new Slf4jLogger();
+
+    @Builder.Default
+    protected ErrorMapper errorMapper = error -> null;
+
+    @Builder.Default
+    protected String baseUrl = "/";
+
+    @Builder.Default
+    protected boolean verboseErrors = false;
+
+    @Builder.Default
+    protected int connectionTimeoutMs = 5000;
+
+    @Builder.Default
+    protected int maxSubscriptions = 30;
+
+    @Builder.Default
+    private long maxIdleTimeoutMs = 300000;
+
+    @Builder.Default
+    private int maxMessageSize = 10000;
+
+    @Builder.Default
+    protected SubscriptionWebSocket.UserFactory userFactory = DEFAULT_USER_FACTORY;
+
+    @Builder.Default
+    protected boolean sendPingOnSubscribe = false;
+
+    @Override
+    public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
+        if (endpointClass.equals(SubscriptionWebSocket.class)) {
+
+            EntityDictionary dictionary = EntityDictionary.builder().build();
+
+            DataStore store = buildDataStore(dictionary);
+
+            Elide elide = buildElide(store, dictionary);
+
+            return (T) buildWebSocket(elide);
+        }
+
+        return super.getEndpointInstance(endpointClass);
+    }
+
+    protected Elide buildElide(DataStore store, EntityDictionary dictionary) {
+        RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(store)
+                .withAuditLogger(auditLogger)
+                .withErrorMapper(errorMapper)
+                .withBaseUrl(baseUrl)
+                .withJoinFilterDialect(rsqlFilterStrategy)
+                .withSubqueryFilterDialect(rsqlFilterStrategy)
+                .withEntityDictionary(dictionary)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone());
+
+        if (verboseErrors) {
+            builder = builder.withVerboseErrors();
+        }
+
+        Elide elide = new Elide(builder.build());
+
+        elide.doScans();
+
+        return elide;
+    }
+
+    protected DataStore buildDataStore(EntityDictionary dictionary) {
+        return new JMSDataStore(
+                dictionary.getScanner(),
+                connectionFactory, dictionary, -1);
+    }
+
+    protected SubscriptionWebSocket buildWebSocket(Elide elide) {
+        elide.getMapper().getObjectMapper().registerModule(new SimpleModule("ExecutionResult")
+            .addDeserializer(GraphQLError.class, new GraphQLErrorDeserializer())
+            .addDeserializer(ExecutionResult.class, new ExecutionResultDeserializer())
+            .addSerializer(GraphQLError.class, new GraphQLErrorSerializer())
+            .addSerializer(ExecutionResult.class, new ExecutionResultSerializer(new GraphQLErrorSerializer())));
+
+        return SubscriptionWebSocket.builder()
+                .elide(elide)
+                .connectTimeoutMs(connectionTimeoutMs)
+                .maxSubscriptions(maxSubscriptions)
+                .maxMessageSize(maxMessageSize)
+                .maxIdleTimeoutMs(maxIdleTimeoutMs)
+                .userFactory(userFactory)
+                .sendPingOnSubscribe(sendPingOnSubscribe)
+                .verboseErrors(verboseErrors)
+                .build();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketTestClient.java b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketTestClient.java
new file mode 100644
index 0000000000..b419440e1c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/main/java/com/yahoo/elide/datastores/jms/websocket/SubscriptionWebSocketTestClient.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms.websocket;
+
+import com.yahoo.elide.graphql.ExecutionResultSerializer;
+import com.yahoo.elide.graphql.GraphQLErrorSerializer;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Complete;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.ConnectionInit;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Error;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.MessageType;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Next;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Subscribe;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.websocket.ClientEndpoint;
+import javax.websocket.CloseReason;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * Test client for GraphQL subscriptions.  This class makes it simpler to write integration tests.
+ */
+@ClientEndpoint
+@Slf4j
+public class SubscriptionWebSocketTestClient {
+
+    private CountDownLatch sessionLatch;
+    private CountDownLatch subscribeLatch;
+    private ObjectMapper mapper;
+    private List<ExecutionResult> results;
+    private Session session;
+    private List<String> queries;
+    private int expectedNumberOfMessages;
+    private int expectedNumberOfSubscribes;
+    boolean isOpen = false;
+
+    /**
+     * Constructor.
+     * @param expectedNumberOfMessages The number of expected messages before notifying the test driver.
+     * @param queries The subscription queries to run.
+     */
+    public SubscriptionWebSocketTestClient(int expectedNumberOfMessages, List<String> queries) {
+        sessionLatch = new CountDownLatch(1);
+        subscribeLatch = new CountDownLatch(1);
+        results = new ArrayList<>();
+        this.queries = queries;
+        this.expectedNumberOfMessages = expectedNumberOfMessages;
+        this.expectedNumberOfSubscribes = queries.size();
+        this.mapper = new ObjectMapper();
+        GraphQLErrorSerializer errorSerializer = new GraphQLErrorSerializer();
+        SimpleModule module = new SimpleModule("ExecutionResultSerializer", Version.unknownVersion());
+        module.addSerializer(ExecutionResult.class, new ExecutionResultSerializer(errorSerializer));
+        module.addSerializer(GraphQLError.class, errorSerializer);
+        mapper.registerModule(module);
+    }
+
+
+    @OnOpen
+    public void onOpen(Session session) throws Exception {
+        this.session = session;
+        log.debug("WebSocket opened: " + session.getId());
+
+        isOpen = true;
+
+        session.getBasicRemote().sendText(mapper.writeValueAsString(new ConnectionInit()));
+    }
+
+    @OnMessage
+    public void onMessage(String text) throws Exception {
+
+        JsonNode type = mapper.readTree(text).get("type");
+        MessageType messageType = MessageType.valueOf(type.textValue().toUpperCase(Locale.ROOT));
+
+        switch (messageType) {
+            case CONNECTION_ACK: {
+                Integer id = 1;
+                for (String query : queries) {
+                    Subscribe subscribe = Subscribe.builder()
+                            .id(id.toString())
+                            .payload(Subscribe.Payload.builder()
+                                    .query(query)
+                                    .build())
+                            .build();
+
+                    session.getBasicRemote().sendText(mapper.writeValueAsString(subscribe));
+                    id++;
+                }
+
+                break;
+            }
+            case NEXT: {
+                Next next = mapper.readValue(text, Next.class);
+                results.add(next.getPayload());
+                expectedNumberOfMessages--;
+                if (expectedNumberOfMessages <= 0) {
+                    sessionLatch.countDown();
+                }
+                break;
+            }
+            case PING: {
+                expectedNumberOfSubscribes--;
+                if (expectedNumberOfSubscribes <= 0) {
+                    subscribeLatch.countDown();
+                }
+                break;
+            }
+            case ERROR: {
+                Error error = mapper.readValue(text, Error.class);
+                log.error("ERROR: {}", error.getPayload());
+                sessionLatch.countDown();
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+    }
+
+    @OnClose
+    public void onClose(CloseReason reason) throws Exception {
+        log.debug("Session closed: " + reason.getCloseCode() + " " + reason.getReasonPhrase());
+        isOpen = false;
+        sessionLatch.countDown();
+    }
+
+    @OnError
+    public void onError(Throwable t) throws Exception {
+        log.error("Session error: " + t.getMessage());
+        isOpen = false;
+        sessionLatch.countDown();
+    }
+
+    public void sendClose() throws Exception {
+        if (isOpen) {
+            Integer id = 1;
+            for (String query : queries) {
+                session.getBasicRemote().sendText(mapper.writeValueAsString(new Complete(id.toString())));
+                id++;
+            }
+            isOpen = false;
+        }
+    }
+
+    /**
+     * Wait for the subscription to deliver N messages and return them.
+     * @param waitInSeconds The number of seconds to wait before giving up.
+     * @return The messages received.
+     * @throws InterruptedException
+     */
+    public List<ExecutionResult> waitOnClose(int waitInSeconds) throws InterruptedException {
+        sessionLatch.await(waitInSeconds, TimeUnit.SECONDS);
+        return results;
+    }
+
+    /**
+     * Wait for the subscription to be setup.
+     * @param waitInSeconds The number of seconds to wait before giving up.
+     * @throws InterruptedException
+     */
+    public void waitOnSubscribe(int waitInSeconds) throws InterruptedException {
+        subscribeLatch.await(waitInSeconds, TimeUnit.SECONDS);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java
new file mode 100644
index 0000000000..6f8747f0b5
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.datastores.jms.TestBinder.EMBEDDED_JMS_URL;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketConfigurator;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketTestClient;
+import com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpStatus;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import graphql.ExecutionResult;
+import io.restassured.RestAssured;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.URI;
+import java.util.List;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Slf4j
+public class JMSDataStoreIntegrationTest {
+    private EmbeddedActiveMQ embedded;
+
+    @BeforeAll
+    public void init() throws Exception {
+
+        //Startup up an embedded active MQ.
+        embedded = new EmbeddedActiveMQ();
+        Configuration configuration = new ConfigurationImpl();
+        configuration.addAcceptorConfiguration("default", EMBEDDED_JMS_URL);
+        configuration.setPersistenceEnabled(false);
+        configuration.setSecurityEnabled(false);
+        configuration.setJournalType(JournalType.NIO);
+
+        embedded.setConfiguration(configuration);
+        embedded.start();
+
+        //Start embedded Jetty
+        setUpServer();
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        embedded.stop();
+    }
+
+    protected final Server setUpServer() throws Exception {
+        ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
+
+        // setup RestAssured
+        RestAssured.baseURI = "http://localhost/";
+        RestAssured.basePath = "/";
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
+
+        // port randomly picked in pom.xml
+        RestAssured.port = getRestAssuredPort();
+
+        // embedded jetty server
+        Server server = new Server(RestAssured.port);
+        servletContextHandler.setContextPath("/");
+        server.setHandler(servletContextHandler);
+
+        //JSON API
+        final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
+        servletHolder.setInitOrder(1);
+        servletHolder.setInitParameter("jersey.config.server.provider.packages",
+                JsonApiEndpoint.class.getPackage().getName());
+        servletHolder.setInitParameter("javax.ws.rs.Application", TestResourceConfig.class.getName());
+
+        //GraphQL API
+        ServletHolder graphqlServlet = servletContextHandler.addServlet(ServletContainer.class, "/graphQL/*");
+        graphqlServlet.setInitOrder(2);
+        graphqlServlet.setInitParameter("jersey.config.server.provider.packages",
+                com.yahoo.elide.graphql.GraphQLEndpoint.class.getPackage().getName());
+        graphqlServlet.setInitParameter("javax.ws.rs.Application", TestResourceConfig.class.getName());
+
+        // GraphQL subscription endpoint
+        ServerContainer container  = WebSocketServerContainerInitializer.configureContext(servletContextHandler);
+
+        ServerEndpointConfig subscriptionEndpoint = ServerEndpointConfig.Builder
+                .create(SubscriptionWebSocket.class, "/subscription")
+                .configurator(SubscriptionWebSocketConfigurator.builder()
+                        .baseUrl("/subscription")
+                        .connectionFactory(new ActiveMQConnectionFactory(EMBEDDED_JMS_URL))
+                        .sendPingOnSubscribe(true)
+                        .build())
+                .build();
+        container.addEndpoint(subscriptionEndpoint);
+
+        log.debug("...Starting Server...");
+        server.start();
+
+        return server;
+    }
+
+    @Test
+    public void testLifecycleEventBeforeSubscribe() throws Exception {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("book"),
+                                        id("2"),
+                                        attributes(attr("title", "foo"))
+                                )
+                        )
+                )
+                .post("/book")
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("2"));
+
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {book(topic: ADDED) {id title}}"));
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            List<ExecutionResult> results = client.waitOnClose(1);
+
+            assertEquals(0, results.size());
+        }
+    }
+
+    @Test
+    public void testLifecycleEventAfterSubscribe() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {book(topic: ADDED) {id title}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("1"),
+                                            attributes(attr("title", "foo"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
+
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+            assertEquals(1, results.size());
+        }
+    }
+
+    @Test
+    public void testLifecycleEventAfterSubscribeWithInaccessibleField() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {book(topic: ADDED) {id title nope}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("14"),
+                                            attributes(attr("title", "foo"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("14"));
+
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+            assertEquals(1, results.size());
+            assertEquals("{book={id=14, title=foo, nope=null}}", results.get(0).getData().toString());
+            assertEquals("[{ \"message\": \"Exception while fetching data (/book/nope) : ReadPermission Denied\", \"locations\": [SourceLocation{line=1, column=44}], \"path\": [book, nope]}]", results.get(0).getErrors().toString());
+        }
+    }
+
+    @Test
+    public void testLifecycleEventAfterSubscribeWithFilter() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {book(topic: ADDED, filter: \"title==foo\") {id title}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("10"),
+                                            attributes(attr("title", "bar"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("10"));
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("11"),
+                                            attributes(attr("title", "foo"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("11"));
+
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+            assertEquals(1, results.size());
+        }
+    }
+
+    @Test
+    public void testLifecycleEventAfterSubscribeWithSecurityFilter() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {book(topic: ADDED) {id title}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("1000"),
+                                            attributes(attr("title", "bar"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1000"));
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("99"),
+                                            attributes(attr("title", "foo"))
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("99"));
+
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+            assertEquals(1, results.size());
+        }
+    }
+
+    @Test
+    public void testCreateUpdateAndDelete() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(4,
+                List.of(
+                        "subscription {book(topic: ADDED) { id title authors { id name } publisher { id name }}}",
+                        "subscription {book(topic: DELETED) { id title }}",
+                        "subscription {book(topic: UPDATED) { id title publisher { id name }}}"
+                ));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("publisher"),
+                                            id("1"),
+                                            attributes(attr("name", "Some Company"))
+                                    )
+                            )
+                    )
+                    .post("/publisher")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("author"),
+                                            id("1"),
+                                            attributes(attr("name", "Jane Doe"))
+                                    )
+                            )
+                    )
+                    .post("/author")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("book"),
+                                            id("3"),
+                                            attributes(attr("title", "foo")),
+                                            relationships(
+                                                    relation("authors", linkage(type("author"), id("1"))),
+                                                    relation("publisher", linkage(type("publisher"), id("1")))
+                                            )
+                                    )
+                            )
+                    )
+                    .post("/book")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("3"));
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            datum(
+                                    resource(
+                                            type("book"),
+                                            id("3"),
+                                            attributes(attr("title", "new title"))
+                                    )
+                            )
+                    )
+                    .patch("/book/3")
+                    .then().log().all().statusCode(HttpStatus.SC_NO_CONTENT);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("publisher"),
+                                            id("1")
+                                    )
+                            )
+                    )
+                    .delete("/book/3/relationships/publisher")
+                    .then().log().all().statusCode(HttpStatus.SC_NO_CONTENT);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .delete("/book/3")
+                    .then().statusCode(HttpStatus.SC_NO_CONTENT);
+
+            List<ExecutionResult> results = client.waitOnClose(300);
+
+            assertEquals(4, results.size());
+            assertEquals("{book={id=3, title=foo, authors=[{id=1, name=Jane Doe}], publisher={id=1, name=Some Company}}}", results.get(0).getData().toString());
+            assertEquals("{book={id=3, title=new title, publisher={id=1, name=Some Company}}}", results.get(1).getData().toString());
+            assertEquals("{book={id=3, title=new title, publisher=null}}", results.get(2).getData().toString());
+            assertEquals("{book={id=3, title=new title}}", results.get(3).getData().toString());
+        }
+    }
+
+    @Test
+    public void testCustomSubscription() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(3,
+                List.of("subscription {chat {id message}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:9999/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            data(
+                                    resource(
+                                            type("chatBot"),
+                                            id("1"),
+                                            attributes(attr("name", "SocialBot"))
+                                    )
+                            )
+                    )
+                    .post("/chatBot")
+                    .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+            assertEquals(3, results.size());
+            assertEquals("{chat={id=1, message=Hello!}}", results.get(0).getData().toString());
+            assertEquals("{chat={id=2, message=How is your day?}}", results.get(1).getData().toString());
+            assertEquals("{chat={id=3, message=My name is SocialBot}}", results.get(2).getData().toString());
+        }
+    }
+
+    public static Integer getRestAssuredPort() {
+        String restassuredPort = System.getProperty("restassured.port", System.getenv("restassured.port"));
+        return Integer.parseInt(StringUtils.isNotEmpty(restassuredPort) ? restassuredPort : "9999");
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreTest.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreTest.java
new file mode 100644
index 0000000000..1357bf4fe2
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.datastores.jms.TestBinder.EMBEDDED_JMS_URL;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Sets;
+import example.Author;
+import example.Book;
+import example.Chat;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSContext;
+import javax.jms.JMSProducer;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class JMSDataStoreTest {
+
+    protected ConnectionFactory connectionFactory;
+    protected EntityDictionary dictionary;
+    protected JMSDataStore store;
+    protected EmbeddedActiveMQ embedded;
+
+    @BeforeAll
+    public void init() throws Exception {
+        embedded = new EmbeddedActiveMQ();
+        Configuration configuration = new ConfigurationImpl();
+        configuration.addAcceptorConfiguration("default", EMBEDDED_JMS_URL);
+        configuration.setPersistenceEnabled(false);
+        configuration.setSecurityEnabled(false);
+        configuration.setJournalType(JournalType.NIO);
+
+        embedded.setConfiguration(configuration);
+        embedded.start();
+
+        connectionFactory = new ActiveMQConnectionFactory(EMBEDDED_JMS_URL);
+        dictionary = EntityDictionary.builder().build();
+
+        store = new JMSDataStore(Sets.newHashSet(ClassType.of(Book.class), ClassType.of(Author.class),
+                ClassType.of(Chat.class)),
+                connectionFactory, dictionary, 2500);
+        store.populateEntityDictionary(dictionary);
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        embedded.stop();
+    }
+
+    @Test
+    public void testModelLabels() throws Exception {
+        assertTrue(store.models.get(ClassType.of(Book.class)));
+        assertTrue(store.models.get(ClassType.of(Author.class)));
+        assertFalse(store.models.get(ClassType.of(Chat.class)));
+    }
+
+    @Test
+    public void testLoadObjects() throws Exception {
+        Author author1 = new Author();
+        author1.setId(1);
+        author1.setName("Jon Doe");
+
+        Book book1 = new Book();
+        book1.setTitle("Enders Game");
+        book1.setId(1);
+        book1.setAuthors(Sets.newHashSet(author1));
+
+        Book book2 = new Book();
+        book2.setTitle("Grapes of Wrath");
+        book2.setId(2);
+
+        try (DataStoreTransaction tx = store.beginReadTransaction()) {
+
+
+            RequestScope scope = new RequestScope(
+                    "/json",
+                    "/",
+                    NO_VERSION,
+                    null,
+                    tx,
+                    null,
+                    null,
+                    Collections.EMPTY_MAP,
+                    UUID.randomUUID(),
+                    new ElideSettingsBuilder(store)
+                            .withEntityDictionary(dictionary)
+                            .build());
+
+            Iterable<Book> books = tx.loadObjects(
+                    EntityProjection.builder()
+                            .argument(Argument.builder()
+                                    .name("topic")
+                                    .value(TopicType.ADDED)
+                                    .build())
+                            .type(Book.class).build(),
+                    scope
+            );
+
+            JMSContext context = connectionFactory.createContext();
+            Destination destination = context.createTopic("bookAdded");
+
+            JMSProducer producer = context.createProducer();
+            ObjectMapper mapper = new ObjectMapper();
+            producer.send(destination, mapper.writeValueAsString(book1));
+            producer.send(destination, mapper.writeValueAsString(book2));
+
+            Iterator<Book> booksIterator = books.iterator();
+
+            assertTrue(booksIterator.hasNext());
+            Book receivedBook = booksIterator.next();
+            assertEquals("Enders Game", receivedBook.getTitle());
+            assertEquals(1, receivedBook.getId());
+
+            Set<Author> receivedAuthors = Sets.newHashSet((Iterable) tx.getToManyRelation(tx, receivedBook,
+                    Relationship.builder()
+                            .name("authors")
+                            .projection(EntityProjection.builder()
+                                    .type(Author.class)
+                                    .build())
+                            .build(), scope));
+
+            assertTrue(receivedAuthors.contains(author1));
+
+            assertTrue(booksIterator.hasNext());
+            receivedBook = booksIterator.next();
+            assertEquals("Grapes of Wrath", receivedBook.getTitle());
+            assertEquals(2, receivedBook.getId());
+
+            assertFalse(booksIterator.hasNext());
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageDeserializerTest.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageDeserializerTest.java
new file mode 100644
index 0000000000..5423824ea7
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageDeserializerTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jms;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.gson.GsonBuilder;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import javax.jms.TextMessage;
+
+public class MessageDeserializerTest {
+
+    @Test
+    public void testDeserialization() throws Exception {
+        TextMessage message = mock(TextMessage.class);
+        when(message.getText()).thenReturn("{ \"title\": \"Foo\", \"id\" : 123 }");
+
+        MessageDeserializer<Book> deserializer = new MessageDeserializer(ClassType.of(Book.class),
+                new GsonBuilder().create());
+
+        Book book = deserializer.apply(message);
+        assertEquals("Foo", book.getTitle());
+        assertEquals(123, book.getId());
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageIterableTest.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageIterableTest.java
new file mode 100644
index 0000000000..c8f384e440
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/MessageIterableTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jms;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.gson.GsonBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+import javax.jms.JMSConsumer;
+import javax.jms.JMSRuntimeException;
+import javax.jms.TextMessage;
+
+public class MessageIterableTest {
+
+    @Test
+    public void testIteratorMultipleItems() throws Exception {
+        JMSConsumer consumer = mock(JMSConsumer.class);
+        TextMessage msg1 = mock(TextMessage.class);
+        when(msg1.getText()).thenReturn("1");
+        TextMessage msg2 = mock(TextMessage.class);
+        when(msg2.getText()).thenReturn("2");
+        TextMessage msg3 = mock(TextMessage.class);
+        when(msg3.getText()).thenReturn("3");
+
+        when(consumer.receive(anyLong()))
+                .thenReturn(msg1)
+                .thenReturn(msg2)
+                .thenReturn(msg3)
+                .thenThrow(new JMSRuntimeException("timeout"));
+
+        Iterator<String> iterator = new MessageIterable(
+                consumer,
+                1000,
+                new MessageDeserializer(ClassType.of(String.class), new GsonBuilder().create())).iterator();
+
+        assertTrue(iterator.hasNext());
+        assertEquals("1", iterator.next());
+        assertTrue(iterator.hasNext());
+        assertEquals("2", iterator.next());
+        assertTrue(iterator.hasNext());
+        assertEquals("3", iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void testZeroTimeout() throws Exception {
+        JMSConsumer consumer = mock(JMSConsumer.class);
+        TextMessage msg1 = mock(TextMessage.class);
+        when(msg1.getText()).thenReturn("1");
+
+        when(consumer.receiveNoWait())
+                .thenReturn(msg1)
+                .thenReturn(null);
+
+        Iterator<String> iterator = new MessageIterable(
+                consumer,
+                0,
+                new MessageDeserializer(ClassType.of(String.class), new GsonBuilder().create())).iterator();
+
+        assertTrue(iterator.hasNext());
+        assertEquals("1", iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void testNegativeTimeout() throws Exception {
+        JMSConsumer consumer = mock(JMSConsumer.class);
+        TextMessage msg1 = mock(TextMessage.class);
+        when(msg1.getText()).thenReturn("1");
+
+        when(consumer.receive())
+                .thenReturn(msg1)
+                .thenReturn(null);
+
+        Iterator<String> iterator = new MessageIterable(
+                consumer,
+                -1,
+                new MessageDeserializer(ClassType.of(String.class), new GsonBuilder().create())).iterator();
+
+        assertTrue(iterator.hasNext());
+        assertEquals("1", iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestBinder.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestBinder.java
new file mode 100644
index 0000000000..4fd13ac962
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestBinder.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionScanner;
+import example.Author;
+import example.Book;
+import example.ChatBot;
+import example.Publisher;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.glassfish.hk2.api.Factory;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+
+import java.util.Calendar;
+import java.util.Set;
+import javax.jms.ConnectionFactory;
+
+/**
+ * HK2 Binder for the Integration test.
+ */
+public class TestBinder extends AbstractBinder {
+
+    public static final String EMBEDDED_JMS_URL = "vm://0";
+
+    private final AuditLogger auditLogger;
+    private final ServiceLocator injector;
+
+    public TestBinder(final AuditLogger auditLogger, final ServiceLocator injector) {
+        this.auditLogger = auditLogger;
+        this.injector = injector;
+    }
+
+    @Override
+    protected void configure() {
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .injector(injector::inject)
+                .build();
+
+        dictionary.scanForSecurityChecks();
+
+        bind(dictionary).to(EntityDictionary.class);
+
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(EMBEDDED_JMS_URL);
+
+        bind(connectionFactory).to(ConnectionFactory.class);
+
+        // Primary Elide instance for CRUD endpoints.
+        bindFactory(new Factory<Elide>() {
+            @Override
+            public Elide provide() {
+
+                HashMapDataStore inMemoryStore = new HashMapDataStore(
+                        Set.of(Book.class, Author.class, Publisher.class, ChatBot.class)
+                );
+                Elide elide = buildElide(inMemoryStore, dictionary);
+
+                elide.doScans();
+
+                SubscriptionScanner subscriptionScanner = SubscriptionScanner.builder()
+                        .connectionFactory(connectionFactory)
+                        .dictionary(elide.getElideSettings().getDictionary())
+                        .scanner(elide.getScanner())
+                        .build();
+
+                subscriptionScanner.bindLifecycleHooks();
+                return elide;
+            }
+
+            @Override
+            public void dispose(Elide elide) {
+
+            }
+        }).to(Elide.class).named("elide");
+    }
+
+    protected Elide buildElide(DataStore store, EntityDictionary dictionary) {
+        RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        return new Elide(new ElideSettingsBuilder(store)
+                .withAuditLogger(auditLogger)
+                .withJoinFilterDialect(rsqlFilterStrategy)
+                .withSubqueryFilterDialect(rsqlFilterStrategy)
+                .withEntityDictionary(dictionary)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                .build());
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestResourceConfig.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestResourceConfig.java
new file mode 100644
index 0000000000..42d36ac2e1
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/TestResourceConfig.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jms;
+
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.server.ResourceConfig;
+
+import javax.inject.Inject;
+
+/**
+ * Resource configuration for integration tests.
+ */
+public class TestResourceConfig extends ResourceConfig {
+
+    @Inject
+    public TestResourceConfig(ServiceLocator injector) {
+        register(new TestBinder(new Slf4jLogger(), injector));
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/Author.java b/elide-datastore/elide-datastore-jms/src/test/java/example/Author.java
new file mode 100644
index 0000000000..025184b82f
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/Author.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+@Include
+@Data
+@Subscription(operations = Subscription.Operation.CREATE)
+public class Author {
+    @Id
+    private long id;
+
+    @SubscriptionField
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/Book.java b/elide-datastore/elide-datastore-jms/src/test/java/example/Book.java
new file mode 100644
index 0000000000..6bf7401b68
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/Book.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import static example.checks.InternalBookCheck.HIDDEN_BOOK;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import lombok.Data;
+
+import java.util.Set;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+
+@Include
+@Data
+@Subscription
+@ReadPermission(expression = HIDDEN_BOOK)
+public class Book {
+    @Id
+    private long id;
+
+    @SubscriptionField
+    private String title;
+
+    @SubscriptionField
+    @ManyToMany
+    private Set<Author> authors;
+
+    @SubscriptionField
+    @ManyToOne
+    private Publisher publisher;
+
+    //Nobody can read this.
+    @ReadPermission(expression = "NONE")
+    @SubscriptionField
+    private String nope;
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/Chat.java b/elide-datastore/elide-datastore-jms/src/test/java/example/Chat.java
new file mode 100644
index 0000000000..1205d00415
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/Chat.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Id;
+
+@Include(name = Chat.CHAT)
+
+//This is a custom subscription
+@Subscription(operations = {})
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Chat {
+
+    public static final String CHAT = "chat";
+
+    @Id
+    long id;
+
+    @SubscriptionField
+    String message;
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/ChatBot.java b/elide-datastore/elide-datastore-jms/src/test/java/example/ChatBot.java
new file mode 100644
index 0000000000..243c1ddb4a
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/ChatBot.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import example.hooks.ChatBotCreateHook;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+@Include
+@Data
+@LifeCycleHookBinding(
+        hook = ChatBotCreateHook.class,
+        operation = LifeCycleHookBinding.Operation.CREATE,
+        phase = LifeCycleHookBinding.TransactionPhase.POSTCOMMIT
+)
+public class ChatBot {
+
+    @Id
+    long id;
+
+    String name;
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/Publisher.java b/elide-datastore/elide-datastore-jms/src/test/java/example/Publisher.java
new file mode 100644
index 0000000000..5adcd72d6c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/Publisher.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+@Include
+@Data
+public class Publisher {
+    @Id
+    private long id;
+
+    @SubscriptionField
+    private String name;
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/checks/InternalBookCheck.java b/elide-datastore/elide-datastore-jms/src/test/java/example/checks/InternalBookCheck.java
new file mode 100644
index 0000000000..9fd352ebe4
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/checks/InternalBookCheck.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.checks;
+
+import static example.checks.InternalBookCheck.HIDDEN_BOOK;
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.LEPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
+import example.Book;
+
+@SecurityCheck(HIDDEN_BOOK)
+public class InternalBookCheck extends FilterExpressionCheck {
+
+    public static final String HIDDEN_BOOK = "hidden book";
+
+    @Override
+    public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
+        return new LEPredicate(new Path.PathElement(Book.class, Long.class, "id"), 100);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jms/src/test/java/example/hooks/ChatBotCreateHook.java b/elide-datastore/elide-datastore-jms/src/test/java/example/hooks/ChatBotCreateHook.java
new file mode 100644
index 0000000000..e23639e27a
--- /dev/null
+++ b/elide-datastore/elide-datastore-jms/src/test/java/example/hooks/ChatBotCreateHook.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.hooks;
+
+import static example.Chat.CHAT;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.graphql.subscriptions.hooks.NotifyTopicLifeCycleHook;
+import com.google.gson.GsonBuilder;
+import example.Chat;
+import example.ChatBot;
+
+import lombok.Data;
+
+import java.util.Optional;
+import javax.inject.Inject;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSContext;
+
+@Data
+public class ChatBotCreateHook implements LifeCycleHook<ChatBot> {
+
+    @Inject
+    ConnectionFactory connectionFactory;
+
+    @Override
+    public void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            ChatBot bot,
+            RequestScope requestScope,
+            Optional<ChangeSpec> changes) {
+
+        NotifyTopicLifeCycleHook<Chat> publisher = new NotifyTopicLifeCycleHook<>(
+                connectionFactory,
+                JMSContext::createProducer,
+                new GsonBuilder().create()
+        );
+
+        publisher.publish(new Chat(1, "Hello!"), CHAT);
+        publisher.publish(new Chat(2, "How is your day?"), CHAT);
+        publisher.publish(new Chat(3, "My name is " + bot.getName()), CHAT);
+    }
+}
diff --git a/elide-datastore/elide-datastore-hibernate5/.gitignore b/elide-datastore/elide-datastore-jpa/.gitignore
similarity index 100%
rename from elide-datastore/elide-datastore-hibernate5/.gitignore
rename to elide-datastore/elide-datastore-jpa/.gitignore
diff --git a/elide-datastore/elide-datastore-jpa/pom.xml b/elide-datastore/elide-datastore-jpa/pom.xml
new file mode 100644
index 0000000000..5beb101089
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/pom.xml
@@ -0,0 +1,222 @@
+<!--
+  ~ Copyright 2016, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-datastore-jpa</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Data Store: JPA</name>
+    <description>Elide Data Store for JPA support</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Belov Aleksandr</name>
+            <url>https://github.com/belovaf</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <dataStoreHarness>com.yahoo.elide.datastores.jpa.JpaDataStoreHarness</dataStoreHarness>
+        <excludeTags>excludeOnJPA</excludeTags>
+    </properties>
+
+    <dependencies>
+        <!-- Elide -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-hibernate</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- JTA (Optional) -->
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>javax.transaction-api</artifactId>
+            <version>1.3</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-integration-tests</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy-agent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Integration test -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate5.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xml-apis</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jasper-runtime</artifactId>
+                    <groupId>tomcat</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xerces</artifactId>
+                    <groupId>xerces</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jasper-compiler</artifactId>
+                    <groupId>tomcat</groupId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Envers testing -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>${hibernate5.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <failIfNoTests>true</failIfNoTests>
+                    <excludedGroups>${excludeTags}</excludedGroups>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/JpaDataStore.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/JpaDataStore.java
new file mode 100644
index 0000000000..3cb6b5b06d
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/JpaDataStore.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa;
+
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpa.transaction.JpaTransaction;
+import com.yahoo.elide.datastores.jpql.JPQLDataStore;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import com.yahoo.elide.datastores.jpql.query.DefaultQueryLogger;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.EntityManager;
+import javax.persistence.metamodel.EntityType;
+
+/**
+ * Implementation for JPA EntityManager data store.
+ */
+@Slf4j
+public class JpaDataStore implements JPQLDataStore {
+    public static final QueryLogger DEFAULT_LOGGER = new DefaultQueryLogger();
+
+    protected final EntityManagerSupplier entityManagerSupplier;
+    protected final JpaTransactionSupplier readTransactionSupplier;
+    protected final JpaTransactionSupplier writeTransactionSupplier;
+    protected final Set<Type<?>> modelsToBind;
+    protected final QueryLogger logger;
+
+    public JpaDataStore(EntityManagerSupplier entityManagerSupplier,
+                        JpaTransactionSupplier readTransactionSupplier,
+                        JpaTransactionSupplier writeTransactionSupplier,
+                        QueryLogger logger,
+                        Type<?> ... models) {
+        this.entityManagerSupplier = entityManagerSupplier;
+        this.readTransactionSupplier = readTransactionSupplier;
+        this.writeTransactionSupplier = writeTransactionSupplier;
+        this.logger = logger;
+        this.modelsToBind = new HashSet<>();
+        for (Type<?> model : models) {
+            modelsToBind.add(model);
+        }
+    }
+
+    public JpaDataStore(EntityManagerSupplier entityManagerSupplier,
+                        JpaTransactionSupplier readTransactionSupplier,
+                        JpaTransactionSupplier writeTransactionSupplier,
+                        Type<?> ... models) {
+        this(entityManagerSupplier, readTransactionSupplier, writeTransactionSupplier, DEFAULT_LOGGER, models);
+    }
+
+
+    public JpaDataStore(EntityManagerSupplier entityManagerSupplier,
+                        JpaTransactionSupplier transactionSupplier,
+                        Type<?> ... models) {
+        this(entityManagerSupplier, transactionSupplier, transactionSupplier, models);
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        // If the user provided models, we'll manually add them and skip scanning for entities.
+        if (! modelsToBind.isEmpty()) {
+            modelsToBind.forEach((model) -> bindEntityClass(model, dictionary));
+            return;
+        }
+
+        // Use the entities defined in the entity manager factory.
+        for (EntityType type : entityManagerSupplier.get().getMetamodel().getEntities()) {
+            try {
+                Type<?> mappedClass = ClassType.of(type.getJavaType());
+                // Ignore this result. We are just checking to see if it throws an exception meaning that
+                // provided class was _not_ an entity.
+                dictionary.lookupEntityClass(mappedClass);
+
+                bindEntityClass(mappedClass, dictionary);
+            } catch (IllegalArgumentException e) {
+                // Ignore this entity.
+                // Turns out that JPA may include non-entity types in this list when using things like envers.
+                // Since they are not entities, we do not want to bind them into the entity dictionary.
+            }
+        }
+    }
+
+    @Override
+    public DataStoreTransaction beginReadTransaction() {
+        EntityManager entityManager = entityManagerSupplier.get();
+        JpaTransaction transaction = readTransactionSupplier.get(entityManager);
+        transaction.begin();
+        return transaction;
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        EntityManager entityManager = entityManagerSupplier.get();
+        JpaTransaction transaction = writeTransactionSupplier.get(entityManager);
+        transaction.begin();
+        return transaction;
+    }
+
+    /**
+     * Functional interface for describing a method to supply EntityManager.
+     */
+    @FunctionalInterface
+    public interface EntityManagerSupplier {
+        EntityManager get();
+    }
+
+    /**
+     * Functional interface for describing a method to supply JpaTransaction.
+     */
+    @FunctionalInterface
+    public interface JpaTransactionSupplier {
+        JpaTransaction get(EntityManager entityManager);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/PersistenceUnitInfoImpl.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/PersistenceUnitInfoImpl.java
new file mode 100644
index 0000000000..1804300785
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/PersistenceUnitInfoImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa;
+
+import lombok.Data;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
+import javax.persistence.spi.ClassTransformer;
+import javax.persistence.spi.PersistenceUnitInfo;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.sql.DataSource;
+
+/**
+ * Persistent Unit implementation for Dynamic Configuration.
+ */
+@Data
+public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
+
+    private String persistenceUnitName;
+    private String persistenceProviderClassName;
+    private PersistenceUnitTransactionType transactionType;
+    private DataSource jtaDataSource;
+    private DataSource nonJtaDataSource;
+    private List<String> mappingFileNames;
+    private List<URL> jarFileUrls;
+    private URL persistenceUnitRootUrl;
+    private List<String> managedClassNames;
+    private SharedCacheMode sharedCacheMode;
+    private ValidationMode validationMode;
+    private Properties properties;
+    private String persistenceXMLSchemaVersion;
+    private ClassLoader classLoader;
+    private ClassLoader newTempClassLoader;
+
+    public PersistenceUnitInfoImpl(
+            String persistenceUnitName,
+            List<String> managedClassNames,
+            Properties properties,
+            ClassLoader loader) {
+        this.persistenceUnitName = persistenceUnitName;
+        this.managedClassNames = managedClassNames;
+        this.properties = properties;
+        this.classLoader = loader;
+        this.newTempClassLoader = loader;
+    }
+
+    public PersistenceUnitInfoImpl(String persistenceUnitName, List<String> managedClassNames, Properties properties) {
+        this.persistenceUnitName = persistenceUnitName;
+        this.managedClassNames = managedClassNames;
+        this.properties = properties;
+    }
+
+
+    @Override
+    public boolean excludeUnlistedClasses() {
+        return false;
+    }
+
+    @Override
+    public void addTransformer(ClassTransformer classTransformer) {
+        //Not implemented
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/ScrollableIterator.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/ScrollableIterator.java
new file mode 100644
index 0000000000..b87a4922fe
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/ScrollableIterator.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa;
+
+import com.yahoo.elide.datastores.jpql.porting.ScrollableIteratorBase;
+
+import java.util.Iterator;
+
+/**
+ * Wraps ScrollableResult as Iterator.
+ *
+ * @param <T> type of return object
+ */
+public class ScrollableIterator<T> extends ScrollableIteratorBase<T, Iterator<T>> {
+    public ScrollableIterator(Iterator<T> results) {
+        super(results, Iterator::hasNext, Iterator::next);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/EntityManagerWrapper.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/EntityManagerWrapper.java
new file mode 100644
index 0000000000..c5c794d80f
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/EntityManagerWrapper.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.porting;
+
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.EntityManager;
+
+/**
+ * Wraps a JPA EntityManager allowing most data store logic
+ * to not directly depend on a specific version of JPA.
+ */
+@Slf4j
+public class EntityManagerWrapper implements Session {
+    private EntityManager entityManager;
+    private QueryLogger logger;
+
+    public EntityManagerWrapper(EntityManager entityManager) {
+        this(entityManager, DEFAULT_LOGGER);
+    }
+
+    public EntityManagerWrapper(EntityManager entityManager, QueryLogger logger) {
+        this.entityManager = entityManager;
+        this.logger = logger;
+    }
+
+    @Override
+    public Query createQuery(String queryText) {
+        Query query = new QueryWrapper(entityManager.createQuery(queryText));
+        logger.log(String.format("Query Hash: %d\tHQL Query: %s", query.hashCode(), queryText));
+        return query;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/QueryWrapper.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/QueryWrapper.java
new file mode 100644
index 0000000000..b1a9089389
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/porting/QueryWrapper.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.porting;
+
+import com.yahoo.elide.datastores.jpa.ScrollableIterator;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import lombok.Getter;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Wraps a JPA Query allowing most data store logic
+ * to not directly depend on a specific version of JPA.
+ */
+public class QueryWrapper implements Query {
+    @Getter
+    private javax.persistence.Query query;
+
+    public QueryWrapper(javax.persistence.Query query) {
+        this.query = query;
+    }
+
+    @Override
+    public Query setFirstResult(int num) {
+        this.query = query.setFirstResult(num);
+        return this;
+    }
+
+    @Override
+    public Query setMaxResults(int num) {
+        this.query = query.setMaxResults(num);
+        return this;
+    }
+
+    @Override
+    public Query setParameter(String name, Object value) {
+        this.query = query.setParameter(name, value);
+        return this;
+    }
+
+    @Override
+    public Query setParameterList(String name, Collection values) {
+        this.query = query.setParameter(name, values);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T uniqueResult() {
+        return (T) query.getSingleResult();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Iterable<T> scroll() {
+        Iterator<T> itr = query.getResultStream().iterator();
+        return new ScrollableIterator<>(itr);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Iterable<T> list() {
+        return query.getResultList();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/AbstractJpaTransaction.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/AbstractJpaTransaction.java
new file mode 100644
index 0000000000..e188ba2e0d
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/AbstractJpaTransaction.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.TransactionException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.datastores.jpa.porting.EntityManagerWrapper;
+import com.yahoo.elide.datastores.jpa.transaction.checker.PersistentCollectionChecker;
+import com.yahoo.elide.datastores.jpql.JPQLTransaction;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import org.apache.commons.collections4.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.NoResultException;
+import javax.validation.ConstraintViolationException;
+
+/**
+ * Base JPA transaction implementation class.
+ */
+@Slf4j
+public abstract class AbstractJpaTransaction extends JPQLTransaction implements JpaTransaction {
+
+    //Data store transaction properties must be prefixed with their package name.
+    public static final String ENTITY_MANAGER_PROPERTY = AbstractJpaTransaction.class.getPackage().getName()
+            + ".entityManager";
+
+    private static final Predicate<Collection<?>> IS_PERSISTENT_COLLECTION =
+            new PersistentCollectionChecker();
+
+    protected final EntityManager em;
+    private final LinkedHashSet<Runnable> deferredTasks = new LinkedHashSet<>();
+    private final Consumer<EntityManager> jpaTransactionCancel;
+
+    /**
+     * Creates a new JPA transaction.
+     *
+     * @param em The entity manager / session.
+     * @param jpaTransactionCancel A function which can cancel a session.
+     * @param logger Logs queries.
+     * @param isScrollEnabled Whether or not scrolling is enabled
+     * @param delegateToInMemoryStore When fetching a subcollection from another multi-element collection,
+     *                                whether or not to do sorting, filtering and pagination in memory - or
+     *                                do N+1 queries.
+     */
+    protected AbstractJpaTransaction(EntityManager em, Consumer<EntityManager> jpaTransactionCancel, QueryLogger logger,
+            boolean delegateToInMemoryStore, boolean isScrollEnabled) {
+        super(new EntityManagerWrapper(em, logger), delegateToInMemoryStore, isScrollEnabled);
+        this.em = em;
+        this.jpaTransactionCancel = jpaTransactionCancel;
+    }
+
+    protected AbstractJpaTransaction(EntityManager em, Consumer<EntityManager> jpaTransactionCancel, QueryLogger logger,
+            boolean delegateToInMemoryStore) {
+        this(em, jpaTransactionCancel, logger, delegateToInMemoryStore, true);
+    }
+
+    @Override
+    public <T> void delete(T object, RequestScope scope) {
+        deferredTasks.add(() -> em.remove(object));
+    }
+
+    @Override
+    public <T> void save(T object, RequestScope scope) {
+        deferredTasks.add(() -> {
+            if (!em.contains(object)) {
+                em.merge(object);
+            }
+        });
+    }
+
+    @Override
+    public void flush(RequestScope requestScope) {
+        if (!isOpen()) {
+            return;
+        }
+        try {
+            deferredTasks.forEach(Runnable::run);
+            deferredTasks.clear();
+            FlushModeType flushMode = em.getFlushMode();
+            if (flushMode == FlushModeType.AUTO && isOpen()) {
+                em.flush();
+            }
+        } catch (Exception e) {
+            try {
+                rollback();
+            } catch (RuntimeException e2) {
+                e.addSuppressed(e2);
+            } finally {
+                log.error("Caught entity manager exception during flush", e);
+            }
+            if (e instanceof ConstraintViolationException) {
+                throw e;
+            }
+            throw new TransactionException(e);
+        }
+    }
+
+    @Override
+    public abstract boolean isOpen();
+
+    @Override
+    public void commit(RequestScope scope) {
+        flush(scope);
+    }
+
+    @Override
+    public void rollback() {
+        deferredTasks.clear();
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (isOpen()) {
+            rollback();
+        }
+        if (CollectionUtils.isNotEmpty(deferredTasks)) {
+            throw new IOException("Transaction not closed");
+        }
+    }
+
+    @Override
+    public <T> void createObject(T entity, RequestScope scope) {
+
+        deferredTasks.add(() -> {
+            if (!em.contains(entity)) {
+                em.persist(entity);
+            }
+        });
+    }
+
+    /**
+     * load a single record with id and filter.
+     *
+     * @param projection       the projection to query
+     * @param id               id of the query object
+     * @param scope            Request scope associated with specific request
+     */
+    @Override
+    public <T> T loadObject(EntityProjection projection,
+                             Serializable id,
+                             RequestScope scope) {
+
+        try {
+            return super.loadObject(projection, id, scope);
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        jpaTransactionCancel.accept(em);
+    }
+
+    @Override
+    public <T> T getProperty(String propertyName) {
+        if (ENTITY_MANAGER_PROPERTY.equals(propertyName)) {
+            return (T) em;
+        }
+
+        return super.getProperty(propertyName);
+    }
+
+    @Override
+    protected Predicate<Collection<?>> isPersistentCollection() {
+        return IS_PERSISTENT_COLLECTION;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JpaTransaction.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JpaTransaction.java
new file mode 100644
index 0000000000..53d2088744
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JpaTransaction.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction;
+
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+
+/**
+ * Extended for JPA DataStoreTransaction.
+ */
+public interface JpaTransaction extends DataStoreTransaction {
+    void begin();
+
+    void rollback();
+
+    boolean isOpen();
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JtaTransaction.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JtaTransaction.java
new file mode 100644
index 0000000000..97603635a4
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/JtaTransaction.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.exceptions.TransactionException;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.Consumer;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+/**
+ * JTA transaction implementation.
+ */
+@Slf4j
+public class JtaTransaction extends AbstractJpaTransaction {
+    private final UserTransaction transaction;
+
+    /**
+     * Creates a new JPA transaction.
+     * @param entityManager The entity manager / session.
+     * @param txCancel A function which can cancel a session.
+     * @param logger Logs queries.
+     * @param delegateToInMemoryStore When fetching a subcollection from another multi-element collection,
+     *                                whether or not to do sorting, filtering and pagination in memory - or
+     *                                do N+1 queries.
+     */
+    public JtaTransaction(EntityManager entityManager, UserTransaction transaction, Consumer<EntityManager> txCancel,
+                          QueryLogger logger, boolean delegateToInMemoryStore) {
+        super(entityManager, txCancel, logger, delegateToInMemoryStore);
+        this.transaction = transaction;
+    }
+
+    private static UserTransaction lookupUserTransaction() {
+        try {
+            return (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
+        } catch (NamingException e) {
+            log.error("Fail lookup UserTransaction from InitialContext", e);
+            throw new TransactionException(e);
+        }
+    }
+
+    @Override
+    public void begin() {
+        try {
+            transaction.begin();
+        } catch (Exception e) {
+            log.error("Fail UserTransaction#begin()", e);
+            throw new TransactionException(e);
+        }
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        super.commit(scope);
+        try {
+            transaction.commit();
+        } catch (Exception e) {
+            log.error("Fail UserTransaction#commit()", e);
+            throw new TransactionException(e);
+        }
+    }
+
+    @Override
+    public void rollback() {
+        super.rollback();
+        try {
+            transaction.rollback();
+        } catch (Exception e) {
+            log.error("Fail UserTransaction#rollback()", e);
+        }
+    }
+
+    @Override
+    public boolean isOpen() {
+        try {
+            return (transaction.getStatus() == Status.STATUS_ACTIVE);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/NonJtaTransaction.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/NonJtaTransaction.java
new file mode 100644
index 0000000000..b59a85f36c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/NonJtaTransaction.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction;
+
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+
+/**
+ * Non-JTA transaction implementation.
+ */
+@Slf4j
+public class NonJtaTransaction extends AbstractJpaTransaction {
+    private final EntityTransaction transaction;
+
+    /**
+     * Creates a new Non-JTA, JPA transaction.
+     * @param entityManager The entity manager / session.
+     * @param jpaTransactionCancel A function which can cancel a session.
+     */
+    public NonJtaTransaction(EntityManager entityManager, Consumer<EntityManager> jpaTransactionCancel) {
+        this(entityManager, jpaTransactionCancel, DEFAULT_LOGGER, false, true);
+    }
+
+    /**
+     * Creates a new Non-JTA, JPA transaction.
+     * @param entityManager The entity manager / session.
+     * @param jpaTransactionCancel A function which can cancel a session.
+     * @param logger Logs queries.
+     * @param delegateToInMemoryStore When fetching a subcollection from another multi-element collection,
+     *                                whether or not to do sorting, filtering and pagination in memory - or
+     *                                do N+1 queries.
+     * @param isScrollEnabled Enables/disables scrollable iterators.
+     */
+    public NonJtaTransaction(EntityManager entityManager, Consumer<EntityManager> jpaTransactionCancel,
+                             QueryLogger logger,
+                             boolean delegateToInMemoryStore,
+                             boolean isScrollEnabled) {
+        super(entityManager, jpaTransactionCancel, logger, delegateToInMemoryStore, isScrollEnabled);
+        this.transaction = entityManager.getTransaction();
+        entityManager.clear();
+    }
+
+    @Override
+    public void begin() {
+        if (!transaction.isActive()) {
+            transaction.begin();
+        }
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        if (transaction.isActive()) {
+            super.commit(scope);
+            transaction.commit();
+        }
+    }
+
+    @Override
+    public void rollback() {
+        if (transaction.isActive()) {
+            try {
+                super.rollback();
+            } finally {
+                transaction.rollback();
+            }
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+        em.close();
+    }
+
+    @Override
+    public boolean isOpen() {
+        return transaction.isActive();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/PersistentCollectionChecker.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/PersistentCollectionChecker.java
new file mode 100644
index 0000000000..75102cb173
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/PersistentCollectionChecker.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction.checker;
+
+import com.yahoo.elide.datastores.jpa.transaction.checker.classes.EclipseLinkPersistentCollections;
+import com.yahoo.elide.datastores.jpa.transaction.checker.classes.HibernatePersistentCollections;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+
+/**
+ * Check is collection subclass of JPA provider special persistent collection.
+ * Now supported EclipseLink and Hibernate.
+ */
+public class PersistentCollectionChecker implements Predicate<Collection<?>> {
+    private final Set<String> classNames = new HashSet<>();
+
+    public PersistentCollectionChecker() {
+        classNames.addAll(Arrays.asList(HibernatePersistentCollections.CLASSES));
+        classNames.addAll(Arrays.asList(EclipseLinkPersistentCollections.CLASSES));
+    }
+
+    @Override
+    public boolean test(Collection<?> collection) {
+        return classNames.contains(collection.getClass().getName());
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/EclipseLinkPersistentCollections.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/EclipseLinkPersistentCollections.java
new file mode 100644
index 0000000000..ff295c3d97
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/EclipseLinkPersistentCollections.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction.checker.classes;
+
+/**
+ * All EclipseLink IndirectCollection subclasses.
+ * Needed to exclude EclipseLink dependency.
+ */
+public class EclipseLinkPersistentCollections {
+    public static final String[] CLASSES = {
+            "org.eclipse.persistence.indirection.IndirectList",
+            "org.eclipse.persistence.indirection.IndirectMap",
+            "org.eclipse.persistence.indirection.IndirectSet"
+    };
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/HibernatePersistentCollections.java b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/HibernatePersistentCollections.java
new file mode 100644
index 0000000000..0301af9cb3
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/main/java/com/yahoo/elide/datastores/jpa/transaction/checker/classes/HibernatePersistentCollections.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa.transaction.checker.classes;
+
+/**
+ * All Hibernate PersistentCollection subclasses.
+ * Needed to exclude Hibernate dependency.
+ */
+public class HibernatePersistentCollections {
+    public static final String[] CLASSES = {
+            "org.hibernate.collection.internal.PersistentArrayHolder",
+            "org.hibernate.collection.internal.PersistentBag",
+            "org.hibernate.collection.internal.PersistentIdentifierBag",
+            "org.hibernate.collection.internal.PersistentList",
+            "org.hibernate.collection.internal.PersistentMap",
+            "org.hibernate.collection.internal.PersistentSet",
+            "org.hibernate.collection.internal.PersistentSortedMap",
+            "org.hibernate.collection.internal.PersistentSortedSet"
+    };
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/EntityManagerLifeCycleHookIT.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/EntityManagerLifeCycleHookIT.java
new file mode 100644
index 0000000000..d434a70905
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/EntityManagerLifeCycleHookIT.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import example.Book;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+public class EntityManagerLifeCycleHookIT extends IntegrationTest {
+
+    @BeforeEach
+    public void setUp() throws IOException {
+        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
+            Book book1 = new Book();
+            book1.setTitle("Test Book1");
+            tx.createObject(book1, null);
+
+            Book book2 = new Book();
+            book2.setTitle("Test Book2");
+            tx.createObject(book2, null);
+
+            Book book3 = new Book();
+            book3.setTitle("Test Book3");
+            tx.createObject(book3, null);
+
+            tx.commit(null);
+        }
+    }
+
+    @Test
+    void testBookCatalogCreationHook() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("bookCatalog"),
+                                        id("123")
+                                )
+                        )
+                )
+                .post("/bookCatalog")
+                .then()
+                .body("data.relationships.books.data.id", containsInAnyOrder("1", "2", "3"))
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JPQLIntegrationTest.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JPQLIntegrationTest.java
new file mode 100644
index 0000000000..9be8c8cb26
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JPQLIntegrationTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import com.yahoo.elide.initialization.IntegrationTest;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+
+/**
+ * Base integration test for tests that want to verify JPQL issued by the JPA Data Store.
+ */
+public abstract class JPQLIntegrationTest extends IntegrationTest {
+    protected QueryLogger logger;
+
+    public JPQLIntegrationTest() {
+        super();
+        initializeLogger();
+    }
+
+    private void initializeLogger() {
+        if (logger == null) {
+            logger = mock(QueryLogger.class);
+        }
+    }
+
+    @Override
+    protected DataStoreTestHarness createHarness() {
+        initializeLogger();
+        return new JpaDataStoreHarness(logger, delegateToInMemoryStore());
+    }
+
+    protected boolean delegateToInMemoryStore() {
+        return false;
+    }
+
+    protected void verifyLoggingStatements(String ... statements) {
+        ArgumentCaptor<String> actual = ArgumentCaptor.forClass(String.class);
+        verify(logger, times(statements.length)).log(actual.capture());
+        List<String> actualAllValues = actual.getAllValues();
+        int idx = 0;
+        for (String statement : statements) {
+            assertEquals(normalizeQuery(statement), normalizeQuery(actualAllValues.get(idx)),
+                    String.format("Query %s Mismatch", idx));
+            idx++;
+        }
+    }
+
+    private static String normalizeQuery(String query) {
+        String normalized = query.replaceAll("Query Hash: \\d+\tHQL Query: ", "");
+        normalized = normalized.replaceAll(":\\w+", ":XXX");
+        normalized = normalized.trim();
+        normalized = normalized.replaceAll("\\s+", " ");
+        return normalized;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreHarness.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreHarness.java
new file mode 100644
index 0000000000..8b82cd003a
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreHarness.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa;
+
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+
+import example.Company;
+import example.Parent;
+import example.models.generics.Manager;
+import example.models.triggers.Invoice;
+import example.models.versioned.BookV2;
+
+import org.hibernate.MappingException;
+import org.hibernate.Session;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.Environment;
+import org.hibernate.jpa.AvailableSettings;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+/**
+ * IT Test Harness for the JpaDataStore.
+ */
+public class JpaDataStoreHarness implements DataStoreTestHarness {
+
+    private static final String JDBC = "jdbc:h2:mem:root;IGNORECASE=TRUE;MODE=MYSQL;NON_KEYWORDS=VALUE,USER";
+    private static final String ROOT = "root";
+
+    private DataStore store;
+    private MetadataImplementor metadataImplementor;
+    private final Consumer<EntityManager> txCancel = em -> em.unwrap(Session.class).cancelQuery();
+
+    public JpaDataStoreHarness() {
+        this(DEFAULT_LOGGER, true);
+    }
+
+    public JpaDataStoreHarness(QueryLogger logger, boolean delegateToInMemoryStore) {
+        ClassScanner scanner = DefaultClassScanner.getInstance();
+        Map<String, Object> options = new HashMap<>();
+        ArrayList<Class<?>> bindClasses = new ArrayList<>();
+
+        try {
+            bindClasses.addAll(scanner.getAnnotatedClasses(Parent.class.getPackage(), Entity.class));
+            bindClasses.addAll(scanner.getAnnotatedClasses(Manager.class.getPackage(), Entity.class));
+            bindClasses.addAll(scanner.getAnnotatedClasses(Invoice.class.getPackage(), Entity.class));
+            bindClasses.addAll(scanner.getAnnotatedClasses(BookV2.class.getPackage(), Entity.class));
+            bindClasses.addAll(scanner.getAnnotatedClasses(AsyncQuery.class.getPackage(), Entity.class));
+            bindClasses.addAll(scanner.getAnnotatedClasses(Company.class.getPackage(), Entity.class));
+        } catch (MappingException e) {
+            throw new IllegalStateException(e);
+        }
+
+        options.put("javax.persistence.jdbc.driver", "org.h2.Driver");
+        options.put("javax.persistence.jdbc.url", JDBC);
+        options.put("javax.persistence.jdbc.user", ROOT);
+        options.put("javax.persistence.jdbc.password", ROOT);
+        options.put("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");
+        options.put(AvailableSettings.LOADED_CLASSES, bindClasses);
+
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("elide-tests", options);
+
+        // method to force class initialization
+        MetadataSources metadataSources = new MetadataSources(
+                new StandardServiceRegistryBuilder()
+                        .configure("hibernate.cfg.xml")
+                        .applySetting(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread")
+                        .applySetting(Environment.URL, JDBC)
+                        .applySetting(Environment.USER, ROOT)
+                        .applySetting(Environment.PASS, ROOT)
+                        .applySetting(Environment.DIALECT, "org.hibernate.dialect.H2Dialect")
+                        .build());
+
+        try {
+            scanner.getAnnotatedClasses(Parent.class.getPackage(), Entity.class)
+                    .forEach(metadataSources::addAnnotatedClass);
+            scanner.getAnnotatedClasses(Manager.class.getPackage(), Entity.class)
+                    .forEach(metadataSources::addAnnotatedClass);
+            scanner.getAnnotatedClasses(Invoice.class.getPackage(), Entity.class)
+                    .forEach(metadataSources::addAnnotatedClass);
+            scanner.getAnnotatedClasses(AsyncQuery.class.getPackage(), Entity.class)
+                    .forEach(metadataSources::addAnnotatedClass);
+            scanner.getAnnotatedClasses(Company.class.getPackage(), Entity.class)
+                    .forEach(metadataSources::addAnnotatedClass);
+        } catch (MappingException e) {
+            throw new IllegalStateException(e);
+        }
+
+        metadataImplementor = (MetadataImplementor) metadataSources.buildMetadata();
+
+        resetSchema();
+
+        store = new JpaDataStore(
+                () -> emf.createEntityManager(),
+                entityManager -> new NonJtaTransaction(entityManager, txCancel, logger, delegateToInMemoryStore, true)
+        );
+    }
+
+    public void resetSchema() {
+        EnumSet<TargetType> type = EnumSet.of(TargetType.DATABASE);
+        // create example tables from beans
+        SchemaExport schemaExport = new SchemaExport();
+        schemaExport.drop(type, metadataImplementor);
+        schemaExport.execute(type, SchemaExport.Action.CREATE, metadataImplementor);
+
+        if (!schemaExport.getExceptions().isEmpty()) {
+            throw new IllegalStateException(schemaExport.getExceptions().toString());
+        }
+    }
+
+    @Override
+    public DataStore getDataStore() {
+        return store;
+    }
+
+    @Override
+    public void cleanseTestData() {
+        resetSchema();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTest.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTest.java
new file mode 100644
index 0000000000..5a22398b17
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpql.annotations.JPQLFilterFragment;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import com.yahoo.elide.datastores.jpql.filter.JPQLPredicateGenerator;
+import com.google.common.collect.Sets;
+import org.junit.jupiter.api.Test;
+
+import java.util.function.Function;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.Id;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.Metamodel;
+
+public class JpaDataStoreTest {
+    public static class TestGenerator implements JPQLPredicateGenerator {
+        @Override
+        public String generate(FilterPredicate predicate, Function<Path, String> parameters) {
+            return "FOO()";
+        }
+    }
+
+    @Test
+    public void verifyJPQLGeneratorRegistration() {
+
+        @Include(rootLevel = false)
+        @Entity
+        class Test {
+            @Id
+            private long id;
+
+            @JPQLFilterFragment(operator = Operator.IN, generator = TestGenerator.class)
+            private String name;
+        }
+
+        EntityType mockType = mock(EntityType.class);
+        when(mockType.getJavaType()).thenReturn(Test.class);
+
+        Metamodel mockModel = mock(Metamodel.class);
+        when(mockModel.getEntities()).thenReturn(Sets.newHashSet(mockType));
+
+        EntityManager managerMock = mock(EntityManager.class);
+        when(managerMock.getMetamodel()).thenReturn(mockModel);
+
+        JpaDataStore store = new JpaDataStore(() -> managerMock, unused -> null);
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+
+        try {
+            store.populateEntityDictionary(dictionary);
+
+            assertNotNull(FilterTranslator.lookupJPQLGenerator(Operator.IN, ClassType.of(Test.class), "name"));
+        } finally {
+            FilterTranslator.registerJPQLGenerator(Operator.IN, ClassType.of(Test.class), "name", null);
+        }
+    }
+
+    @Test
+    public void verifyManualEntityBinding() {
+
+        @Include(rootLevel = false)
+        @Entity
+        class Test {
+            @Id
+            private long id;
+
+            private String name;
+        }
+
+        Metamodel mockModel = mock(Metamodel.class);
+        when(mockModel.getEntities()).thenReturn(Sets.newHashSet());
+
+        EntityManager managerMock = mock(EntityManager.class);
+        when(managerMock.getMetamodel()).thenReturn(mockModel);
+
+        JpaDataStore store = new JpaDataStore(() -> managerMock, unused -> null, ClassType.of(Test.class));
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        store.populateEntityDictionary(dictionary);
+
+        assertNotNull(dictionary.lookupBoundClass(ClassType.of(Test.class)));
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTransactionTest.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTransactionTest.java
new file mode 100644
index 0000000000..82dd29523c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/JpaDataStoreTransactionTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpa;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpa.transaction.AbstractJpaTransaction;
+import example.Author;
+import example.Book;
+import org.hibernate.collection.internal.PersistentSet;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class JpaDataStoreTransactionTest {
+
+    protected EntityDictionary dictionary;
+    protected RequestScope scope;
+    protected EntityManager entityManager;
+    protected Query query;
+
+    @BeforeAll
+    public void initCommonMocks() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+
+        entityManager = mock(EntityManager.class);
+        query = mock(Query.class);
+        when(entityManager.createQuery(any(String.class))).thenReturn(query);
+        when(query.setParameter(any(String.class), any())).thenReturn(query);
+        when(query.setParameter(any(Integer.class), any())).thenReturn(query);
+
+        scope = mock(RequestScope.class);
+        when(scope.getDictionary()).thenReturn(dictionary);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testNoDelegationOnLoadRecords(boolean delegateToInMemory) {
+
+        AbstractJpaTransaction tx = new AbstractJpaTransaction(entityManager, (unused) -> {
+        }, DEFAULT_LOGGER, delegateToInMemory) {
+            @Override
+            public boolean isOpen() {
+                return false;
+            }
+
+            @Override
+            public void begin() {
+
+            }
+
+            @Override
+            protected Predicate<Collection<?>> isPersistentCollection() {
+                return (unused) -> true;
+            };
+        };
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Book.class)
+                .build();
+
+        DataStoreIterable<Book> result = tx.loadObjects(projection, scope);
+        assertFalse(result.needsInMemoryFilter());
+        assertFalse(result.needsInMemorySort());
+        assertFalse(result.needsInMemoryPagination());
+    }
+
+    @ParameterizedTest
+    @MethodSource("getTestArguments")
+    public void testGetRelationDelegation(
+            boolean delegateToInMemory,
+            int numberOfAuthors,
+            FilterExpression filter,
+            boolean usesInMemory) throws Exception {
+        AbstractJpaTransaction tx = new AbstractJpaTransaction(entityManager, (unused) -> {
+
+        }, DEFAULT_LOGGER, delegateToInMemory, false) {
+            @Override
+            public boolean isOpen() {
+                return false;
+            }
+
+            @Override
+            public void begin() {
+
+            }
+
+            @Override
+            protected Predicate<Collection<?>> isPersistentCollection() {
+                return (unused) -> true;
+            };
+        };
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Author.class)
+                .build();
+
+
+        List<Author> authors = new ArrayList<>();
+        Author author1 = mock(Author.class);
+        authors.add(author1);
+
+        for (int idx = 1; idx < numberOfAuthors; idx++) {
+            authors.add(mock(Author.class));
+        }
+
+        when (query.getResultList()).thenReturn(authors);
+
+        DataStoreIterable<Author> loadedAuthors = tx.loadObjects(projection, scope);
+        assertFalse(loadedAuthors.needsInMemoryPagination());
+        assertFalse(loadedAuthors.needsInMemorySort());
+        assertFalse(loadedAuthors.needsInMemoryFilter());
+
+        Relationship relationship = Relationship.builder()
+                .name("books")
+                .projection(EntityProjection.builder()
+                        .type(Book.class)
+                        .filterExpression(filter)
+                        .build())
+                .build();
+
+        PersistentSet returnCollection = mock(PersistentSet.class);
+
+        when(author1.getBooks()).thenReturn(returnCollection);
+
+        DataStoreIterable<Book> loadedBooks = tx.getToManyRelation(tx, author1, relationship, scope);
+
+        assertEquals(usesInMemory, loadedBooks.needsInMemoryFilter());
+        assertEquals(usesInMemory, loadedBooks.needsInMemorySort());
+        assertEquals(usesInMemory, loadedBooks.needsInMemoryPagination());
+    }
+
+    private Stream<Arguments> getTestArguments() throws Exception {
+        RSQLFilterDialect parser = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        FilterExpression expression = parser.parse(ClassType.of(Book.class), Collections.emptySet(), "title=='foo'", NO_VERSION);
+        return Stream.of(
+                arguments(true, 1, null, true),
+                arguments(true, 2, null, true),
+                arguments(false, 1, null, true),
+                arguments(false, 2, null, true),
+                arguments(true, 1, expression, false),
+                arguments(true, 2, expression, true),
+                arguments(false, 1, expression, false),
+                arguments(false, 2, expression, false)
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/LegacyNPlusOneIT.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/LegacyNPlusOneIT.java
new file mode 100644
index 0000000000..c2e9fa0430
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/LegacyNPlusOneIT.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa;
+
+import static io.restassured.RestAssured.given;
+import static org.mockito.Mockito.reset;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import example.Author;
+import example.Book;
+import example.Publisher;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+
+/**
+ * Verifies JPA Store reduces JPQL queries to solve N+1 problem (using legacy logic).
+ */
+public class LegacyNPlusOneIT extends JPQLIntegrationTest {
+
+    @Override
+    protected boolean delegateToInMemoryStore() {
+        return false;
+    }
+
+    @BeforeEach
+    public void setUp() throws IOException {
+        reset(logger);
+
+        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
+            Book book1 = new Book();
+            book1.setTitle("Test Book1");
+            tx.createObject(book1, null);
+
+            Book book2 = new Book();
+            book2.setTitle("Test Book2");
+            tx.createObject(book2, null);
+
+            Book book3 = new Book();
+            book3.setTitle("Test Book3");
+            tx.createObject(book3, null);
+
+            Author author1 = new Author();
+            author1.setName("Bob1");
+            tx.createObject(author1, null);
+
+            Author author2 = new Author();
+            author2.setName("Bob2");
+            tx.createObject(author2, null);
+
+            Author author3 = new Author();
+            author3.setName("Bob3");
+            tx.createObject(author3, null);
+
+            Publisher publisher = new Publisher();
+            tx.createObject(publisher, null);
+
+            author1.setBooks(Arrays.asList(book1, book2));
+            author2.setBooks(Arrays.asList(book1, book2));
+            author3.setBooks(Arrays.asList(book3));
+            book1.setAuthors(Arrays.asList(author1, author2));
+            book2.setAuthors(Arrays.asList(author1, author2));
+            book3.setAuthors(Arrays.asList(author3));
+
+            book1.setPublisher(publisher);
+            book2.setPublisher(publisher);
+            publisher.setBooks(new HashSet<>(Arrays.asList(book1, book2)));
+
+            tx.commit(null);
+        }
+    }
+
+    @Test
+    public void testLoadRootCollection() {
+        given()
+                .when().get("/book")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher"
+        );
+    }
+
+    @Test
+    public void testMultiElementRootCollectionWithIncludedSubcollection() {
+        given()
+                .when().get("/book?include=authors")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedSubcollection() {
+        given()
+                .when().get("/book?filter=title=='Test Book1'&include=authors")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedAndFilteredSingleElementSubcollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book1'&include=authors&filter[author]=name=='Bob1'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedAndFilteredMultielementSubcollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book1'&include=authors&filter[author]=name=='Bob*'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name LIKE CONCAT(:XXX, '%') AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name LIKE CONCAT(:XXX, '%') AND example_Book__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testMultiElementRootCollectionWithIncludedAndFilteredSubcollection() {
+        given()
+                .when().get("/book?include=authors&filter[author]=name=='Bob1'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testSingleElementSubcollectionWithFilter() {
+        given()
+                .when().get("/book/1/authors/1/books?filter[book]=title=='Test*'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book WHERE example_Book.id IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.id IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title LIKE CONCAT(:XXX, '%') AND example_Author__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testToOneRelationshipSubcollectionWithFilter() {
+        given()
+                .when().get("/book/1/publisher/1/books?filter[book]=title=='The'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.id IN (:XXX)",
+                "SELECT example_Book FROM example.Publisher example_Publisher__fetch JOIN example_Publisher__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Publisher__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testToOneRelationshipSubcollectionWithoutFilter() {
+        given()
+                .when().get("/book/1/publisher/1/books")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.id IN (:XXX)"
+        );
+    }
+
+    @Test
+    public void testSingleElementPersistentCollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book3'&include=authors,authors.books")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX"
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/NPlusOneIT.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/NPlusOneIT.java
new file mode 100644
index 0000000000..b39d8cf603
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/NPlusOneIT.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa;
+
+import static io.restassured.RestAssured.given;
+import static org.mockito.Mockito.reset;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import example.Author;
+import example.Book;
+import example.Publisher;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+
+/**
+ * Verifies JPA Store reduces JPQL queries to solve N+1 problem.
+ */
+public class NPlusOneIT extends JPQLIntegrationTest {
+
+    @Override
+    protected boolean delegateToInMemoryStore() {
+        return true;
+    }
+
+    @BeforeEach
+    public void setUp() throws IOException {
+        reset(logger);
+
+        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
+            Book book1 = new Book();
+            book1.setTitle("Test Book1");
+            tx.createObject(book1, null);
+
+            Book book2 = new Book();
+            book2.setTitle("Test Book2");
+            tx.createObject(book2, null);
+
+            Book book3 = new Book();
+            book3.setTitle("Test Book3");
+            tx.createObject(book3, null);
+
+            Author author1 = new Author();
+            author1.setName("Bob1");
+            tx.createObject(author1, null);
+
+            Author author2 = new Author();
+            author2.setName("Bob2");
+            tx.createObject(author2, null);
+
+            Author author3 = new Author();
+            author3.setName("Bob2");
+            tx.createObject(author3, null);
+
+            Publisher publisher = new Publisher();
+            tx.createObject(publisher, null);
+
+            author1.setBooks(Arrays.asList(book1, book2));
+            author2.setBooks(Arrays.asList(book1, book2));
+            author3.setBooks(Arrays.asList(book3));
+            book1.setAuthors(Arrays.asList(author1, author2));
+            book2.setAuthors(Arrays.asList(author1, author2));
+            book3.setAuthors(Arrays.asList(author3));
+
+            book1.setPublisher(publisher);
+            book2.setPublisher(publisher);
+            publisher.setBooks(new HashSet<>(Arrays.asList(book1, book2)));
+
+            tx.commit(null);
+        }
+    }
+
+    @Test
+    public void testLoadRootCollection() {
+        given()
+                .when().get("/book")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher"
+        );
+    }
+
+    @Test
+    public void testMultiElementRootCollectionWithIncludedSubcollection() {
+        given()
+                .when().get("/book?include=authors")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedSubcollection() {
+        given()
+                .when().get("/book?filter=title=='Test Book1'&include=authors")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedAndFilteredSingleElementSubcollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book1'&include=authors&filter[author]=name=='Bob1'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testSingleElementRootCollectionWithIncludedAndFilteredMultielementSubcollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book1'&include=authors&filter[author]=name=='Bob*'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name LIKE CONCAT(:XXX, '%') AND example_Book__fetch=:XXX",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.name LIKE CONCAT(:XXX, '%') AND example_Book__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testMultiElementRootCollectionWithIncludedAndFilteredSubcollection() {
+        given()
+                .when().get("/book?include=authors&filter[author]=name=='Bob1'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher"
+        );
+    }
+
+    @Test
+    public void testSingleElementSubcollectionWithFilter() {
+        given()
+                .when().get("/book/1/authors/1/books?filter[book]=title=='Test*'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book WHERE example_Book.id IN (:XXX)",
+                "SELECT example_Author FROM example.Book example_Book__fetch JOIN example_Book__fetch.authors example_Author WHERE example_Author.id IN (:XXX) AND example_Book__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title LIKE CONCAT(:XXX, '%') AND example_Author__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testToOneRelationshipSubcollectionWithFilter() {
+        given()
+                .when().get("/book/1/publisher/1/books?filter[book]=title=='The'")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.id IN (:XXX)",
+                "SELECT example_Book FROM example.Publisher example_Publisher__fetch JOIN example_Publisher__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Publisher__fetch=:XXX"
+        );
+    }
+
+    @Test
+    public void testToOneRelationshipSubcollectionWithoutFilter() {
+        given()
+                .when().get("/book/1/publisher/1/books")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.id IN (:XXX)"
+        );
+    }
+
+    @Test
+    public void testSingleElementPersistentCollection() {
+        given()
+                .when().get("/book?filter[book]=title=='Test Book3'&include=authors,authors.books")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        verifyLoggingStatements(
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX)",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX",
+                "SELECT example_Book FROM example.Author example_Author__fetch JOIN example_Author__fetch.books example_Book LEFT JOIN FETCH example_Book.publisher WHERE example_Book.title IN (:XXX) AND example_Author__fetch=:XXX"
+        );
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonConverter.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonConverter.java
new file mode 100644
index 0000000000..ad32de21a6
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonConverter.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa.usertypes;
+
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/**
+ * JsonType serializes an object to json string and vice versa.
+ */
+@Converter
+public class JsonConverter<T> implements AttributeConverter<T, String> {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private final Class<T> objectClass;
+
+    public JsonConverter(Class<T> objectClass) {
+        this.objectClass = objectClass;
+    }
+
+    @Override
+    public String convertToDatabaseColumn(T value) {
+        try {
+            return MAPPER.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            throw new InvalidValueException("Unable to serialize", e);
+        }
+    }
+
+    @Override
+    public T convertToEntityAttribute(String rawJson) {
+        try {
+            return MAPPER.readValue(rawJson, objectClass);
+        } catch (IOException e) {
+            throw new InvalidValueException("Unable to deserialize", e);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonType.java b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonType.java
new file mode 100644
index 0000000000..e625e20035
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/com/yahoo/elide/datastores/jpa/usertypes/JsonType.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpa.usertypes;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.usertype.UserType;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Objects;
+import java.util.Properties;
+
+/**
+ * JsonType serializes an object to json string and vice versa.
+ */
+
+public class JsonType implements UserType, ParameterizedType {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private Class<?> objectClass;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int[] sqlTypes() {
+        return new int[]{Types.LONGVARCHAR};
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> returnedClass() {
+        return String.class;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals(Object firstObject, Object secondObject)
+            throws HibernateException {
+
+        return Objects.equals(firstObject, secondObject);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode(Object object)
+            throws HibernateException {
+
+        return Objects.hashCode(object);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object nullSafeGet(ResultSet resultSet, String[] names, SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException, SQLException {
+        if (resultSet.getString(names[0]) != null) {
+
+            // Get the rawJson
+            String rawJson = resultSet.getString(names[0]);
+
+            try {
+                return MAPPER.readValue(rawJson, this.objectClass);
+            } catch (IOException e) {
+                throw new HibernateException("Could not retrieve an instance of the mapped class from a JDBC resultset.");
+            }
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void nullSafeSet(PreparedStatement preparedStatement, Object value, int i, SharedSessionContractImplementor sharedSessionContractImplementor) throws HibernateException, SQLException {
+        if (value == null) {
+            preparedStatement.setNull(i, Types.NULL);
+        } else {
+            try {
+                String json = MAPPER.writeValueAsString(value);
+                preparedStatement.setString(i, json);
+            } catch (JsonProcessingException e) {
+                throw new HibernateException("Could not write an instance of the mapped class to a prepared statement.");
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object deepCopy(Object object)
+            throws HibernateException {
+
+        // Since mutable is false, return the object
+        return object;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isMutable() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Serializable disassemble(Object value)
+            throws HibernateException {
+
+        return value == null ? null : (Serializable) deepCopy(value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object assemble(Serializable cached, Object owner)
+            throws HibernateException {
+
+        return cached == null ? null : deepCopy(cached);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object replace(Object original, Object target, Object owner)
+            throws HibernateException {
+
+        return deepCopy(original);
+    }
+
+    /**
+     * Setter used to set the class to serialize/deserialize.
+     * @param properties properties object
+     */
+    @Override
+    public void setParameterValues(Properties properties) {
+        try {
+            this.objectClass = Class.forName(properties.getProperty("class"));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Unable set the `class` parameter for serialization/deserialization");
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/example/AddressFragment.java b/elide-datastore/elide-datastore-jpa/src/test/java/example/AddressFragment.java
new file mode 100644
index 0000000000..c9ff861613
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/example/AddressFragment.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.datastores.jpa.usertypes.JsonConverter;
+
+public class AddressFragment {
+    public String street;
+    public String state;
+    public ZipCode zip;
+
+    public static class ZipCode {
+        public String zip;
+        public String plusFour;
+    }
+
+    public static class Converter extends JsonConverter<AddressFragment> {
+        public Converter() {
+            super(AddressFragment.class);
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/example/BookCatalog.java b/elide-datastore/elide-datastore-jpa/src/test/java/example/BookCatalog.java
new file mode 100644
index 0000000000..be11726f0f
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/example/BookCatalog.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import example.hook.BookCatalogOnCreateHook;
+import lombok.Data;
+
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Include
+@Entity
+@Data
+@LifeCycleHookBinding(
+        operation = LifeCycleHookBinding.Operation.CREATE,
+        phase = PREFLUSH,
+        hook = BookCatalogOnCreateHook.class
+)
+public class BookCatalog {
+
+    @Id
+    private long id;
+
+    @OneToMany
+    private Set<Book> books;
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/example/Person.java b/elide-datastore/elide-datastore-jpa/src/test/java/example/Person.java
new file mode 100644
index 0000000000..36ddc55eeb
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/example/Person.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.Type;
+import org.hibernate.envers.Audited;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Include
+@Audited // Ensure envers does not cause any issues
+@Data
+public class Person {
+    @Id
+    private long id;
+
+    private String name;
+
+    //For testing Convert annotation
+    @Column(name = "address", columnDefinition = "TEXT")
+    @Convert(converter = AddressFragment.Converter.class)
+    private AddressFragment address;
+
+    //For testing Type annotation
+    @Column(name = "addressAlternate", columnDefinition = "TEXT")
+    @Type(type = "com.yahoo.elide.datastores.jpa.usertypes.JsonType", parameters = {
+            @Parameter(name = "class", value = "example.AddressFragment")
+    })
+    private AddressFragment alternateAddress;
+}
diff --git a/elide-datastore/elide-datastore-jpa/src/test/java/example/hook/BookCatalogOnCreateHook.java b/elide-datastore/elide-datastore-jpa/src/test/java/example/hook/BookCatalogOnCreateHook.java
new file mode 100644
index 0000000000..31f6530c3e
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpa/src/test/java/example/hook/BookCatalogOnCreateHook.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.hook;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.datastores.jpa.transaction.AbstractJpaTransaction;
+import example.BookCatalog;
+
+import java.util.HashSet;
+import java.util.Optional;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+public class BookCatalogOnCreateHook implements LifeCycleHook<BookCatalog> {
+    @Override
+    public void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            BookCatalog catalog,
+            RequestScope requestScope,
+            Optional<ChangeSpec> changes) {
+
+        EntityManager entityManager =
+                requestScope.getTransaction().getProperty(AbstractJpaTransaction.ENTITY_MANAGER_PROPERTY);
+
+        /* Load all the books */
+        Query query = entityManager.createQuery("SELECT book FROM Book book");
+        catalog.setBooks(new HashSet<>(query.getResultList()));
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/pom.xml b/elide-datastore/elide-datastore-jpql/pom.xml
new file mode 100644
index 0000000000..d734469ca9
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/pom.xml
@@ -0,0 +1,92 @@
+<!--
+  ~ Copyright 2016, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-datastore-hibernate</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Data Store: Hibernate Common</name>
+    <description>Common files for Elide Data Store Hibernate3 and Hibernate5</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-integration-tests</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLDataStore.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLDataStore.java
new file mode 100644
index 0000000000..ff5cb3a203
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLDataStore.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpql.annotations.JPQLFilterFragment;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Common DataStore functionality for stores that leverage JPQL.
+ */
+public interface JPQLDataStore extends DataStore {
+    Logger LOGGER = LoggerFactory.getLogger(JPQLDataStore.class);
+
+    default void bindEntityClass(Type<?> entityClass, EntityDictionary dictionary) {
+        try {
+            // Ignore this result. We are just checking to see if it throws an exception meaning that
+            // provided class was _not_ an entity.
+            dictionary.lookupEntityClass(entityClass);
+        } catch (IllegalArgumentException e)  {
+            // Ignore this entity
+            // Turns out that JPA may include non-entity types in this list when using things
+            // like envers. Since they are not entities, we do not want to bind them into the entity
+            // dictionary
+            return;
+        }
+
+        //Register the entity class in the Entity Dictionary
+        dictionary.bindEntity(entityClass);
+
+        //Search for JPQFilterFragment annotations and register them.
+        dictionary.getAttributes(entityClass)
+           .stream()
+           .forEach((attribute) -> {
+               JPQLFilterFragment annotation = dictionary.getAttributeOrRelationAnnotation(entityClass,
+                       JPQLFilterFragment.class, attribute);
+
+               if (annotation != null) {
+                   try {
+                       FilterTranslator.registerJPQLGenerator(annotation.operator(),
+                               entityClass, attribute, annotation.generator().newInstance());
+                   } catch (InstantiationException | IllegalAccessException e) {
+                       LOGGER.error("Unable to instantiate the JPQL fragment generator: {}", e.getMessage());
+                       throw new IllegalStateException(e);
+                   }
+               }
+           });
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLTransaction.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLTransaction.java
new file mode 100644
index 0000000000..c54de6051c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/JPQLTransaction.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FalsePredicate;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.TimedFunction;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.ScrollableIteratorBase;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+import com.yahoo.elide.datastores.jpql.query.AbstractHQLQueryBuilder;
+import com.yahoo.elide.datastores.jpql.query.RelationshipImpl;
+import com.yahoo.elide.datastores.jpql.query.RootCollectionFetchQueryBuilder;
+import com.yahoo.elide.datastores.jpql.query.RootCollectionPageTotalsQueryBuilder;
+import com.yahoo.elide.datastores.jpql.query.SubCollectionFetchQueryBuilder;
+import com.yahoo.elide.datastores.jpql.query.SubCollectionPageTotalsQueryBuilder;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.function.Predicate;
+
+/**
+ * Hibernate Transaction implementation.
+ */
+public abstract class JPQLTransaction implements DataStoreTransaction {
+
+    private final Session sessionWrapper;
+    private final boolean isScrollEnabled;
+    private final Set<Object> singleElementLoads;
+    private final boolean delegateToInMemoryStore;
+
+
+    /**
+     * Constructor.
+     *
+     * @param session Hibernate session
+     * @param isScrollEnabled Whether or not scrolling is enabled
+     */
+    protected JPQLTransaction(Session session, boolean delegateToInMemoryStore, boolean isScrollEnabled) {
+        this.sessionWrapper = session;
+        this.isScrollEnabled = isScrollEnabled;
+
+        // We need to verify objects by reference equality (a == b) rather than equals equality in case the
+        // same object is loaded twice from two different collections.
+        this.singleElementLoads = Collections.newSetFromMap(new IdentityHashMap<>());
+        this.delegateToInMemoryStore = delegateToInMemoryStore;
+    }
+
+    /**
+     * load a single record with id and filter.
+     *
+     * @param projection The projection to query
+     * @param id id of the query object
+     * @param scope Request scope associated with specific request
+     */
+    @Override
+    public <T> T loadObject(EntityProjection projection,
+            Serializable id,
+            RequestScope scope) {
+
+        Type<?> entityClass = projection.getType();
+        FilterExpression filterExpression = projection.getFilterExpression();
+
+        EntityDictionary dictionary = scope.getDictionary();
+        Type<?> idType = dictionary.getIdType(entityClass);
+        String idField = dictionary.getIdFieldName(entityClass);
+
+        // Construct a predicate that selects an individual element of the relationship's parent (Author.id = 3).
+        FilterPredicate idExpression;
+        Path.PathElement idPath = new Path.PathElement(entityClass, idType, idField);
+        if (id != null) {
+            idExpression = new InPredicate(idPath, id);
+        } else {
+            idExpression = new FalsePredicate(idPath);
+        }
+
+        FilterExpression joinedExpression = (filterExpression != null)
+                ? new AndFilterExpression(filterExpression, idExpression)
+                : idExpression;
+
+        projection = projection
+                .copyOf()
+                .filterExpression(joinedExpression)
+                .build();
+
+        Query query =
+                new RootCollectionFetchQueryBuilder(projection, dictionary, sessionWrapper).build();
+
+        T loaded = new TimedFunction<T>(() -> query.uniqueResult(), "Query Hash: " + query.hashCode()).get();
+
+        if (loaded != null) {
+            singleElementLoads.add(loaded);
+        }
+        return loaded;
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(
+            EntityProjection projection,
+            RequestScope scope) {
+
+        Pagination pagination = projection.getPagination();
+
+        final Query query =
+                new RootCollectionFetchQueryBuilder(projection, scope.getDictionary(), sessionWrapper)
+                        .build();
+
+        Iterable<T> results = new TimedFunction<Iterable<T>>(() -> {
+            return isScrollEnabled ? query.scroll() : query.list();
+        }, "Query Hash: " + query.hashCode()).get();
+
+        final boolean hasResults;
+        if (results instanceof Collection) {
+            hasResults = !((Collection) results).isEmpty();
+        } else if (results instanceof Iterator) {
+            hasResults = ((Iterator) results).hasNext();
+        } else {
+            hasResults = results.iterator().hasNext();
+        }
+
+        if (pagination != null) {
+            // Issue #1429
+            if (pagination.returnPageTotals() && (hasResults || pagination.getLimit() == 0)) {
+                pagination.setPageTotals(getTotalRecords(projection, scope.getDictionary()));
+            }
+        }
+
+        return new DataStoreIterableBuilder<T>(addSingleElement(results)).build();
+    }
+
+    @Override
+    public <T, R> DataStoreIterable<R> getToManyRelation(
+            DataStoreTransaction relationTx,
+            T entity,
+            Relationship relation,
+            RequestScope scope) {
+
+        FilterExpression filterExpression = relation.getProjection().getFilterExpression();
+        Sorting sorting = relation.getProjection().getSorting();
+        Pagination pagination = relation.getProjection().getPagination();
+
+        EntityDictionary dictionary = scope.getDictionary();
+        Iterable val = (Iterable) com.yahoo.elide.core.PersistentResource.getValue(entity, relation.getName(), scope);
+
+        //If the query is safe for N+1 and the value is an ORM managed, persistent collection, run a JPQL query...
+        if (doInDatabase(entity) && val instanceof Collection && isPersistentCollection().test((Collection<?>) val)) {
+
+            /*
+             * If there is no filtering or sorting required in the data store, and the pagination is default,
+             * return the proxy and let Hibernate manage the SQL generation.
+             */
+            if (filterExpression == null && sorting == null
+                    && (pagination == null || (pagination.isDefaultInstance()))) {
+                return new DataStoreIterableBuilder<R>(addSingleElement(val)).allInMemory().build();
+            }
+
+            RelationshipImpl relationship = new RelationshipImpl(
+                    dictionary.lookupEntityClass(EntityDictionary.getType(entity)),
+                    entity,
+                    relation);
+
+            if (pagination != null && pagination.returnPageTotals()) {
+                pagination.setPageTotals(getTotalRecords(
+                        relationship,
+                        scope.getDictionary()));
+            }
+
+            final Query query =
+                    new SubCollectionFetchQueryBuilder(relationship, dictionary, sessionWrapper)
+                            .build();
+
+            if (query != null) {
+                return new DataStoreIterableBuilder(addSingleElement(query.list())).build();
+            }
+        }
+        return new DataStoreIterableBuilder<R>(addSingleElement(val)).allInMemory().build();
+    }
+
+    @Override
+    public <T, R> R getToOneRelation(
+            DataStoreTransaction relationTx,
+            T entity,
+            Relationship relationship,
+            RequestScope scope
+    ) {
+        R loaded = DataStoreTransaction.super.getToOneRelation(relationTx, entity, relationship, scope);
+        if (loaded != null) {
+            singleElementLoads.add(loaded);
+        }
+        return loaded;
+    }
+
+    protected abstract Predicate<Collection<?>> isPersistentCollection();
+
+    /**
+     * Returns the total record count for a root entity and an optional filter expression.
+     *
+     * @param entityProjection The entity projection to count
+     * @param dictionary the entity dictionary
+     * @return The total row count.
+     */
+    private Long getTotalRecords(EntityProjection entityProjection, EntityDictionary dictionary) {
+
+
+        Query query =
+                new RootCollectionPageTotalsQueryBuilder(entityProjection, dictionary, sessionWrapper)
+                        .build();
+
+        return new TimedFunction<Long>(() -> query.uniqueResult(), "Query Hash: " + query.hashCode()).get();
+    }
+
+    /**
+     * Returns the total record count for a entity relationship.
+     *
+     * @param relationship The relationship
+     * @param dictionary the entity dictionary
+     * @return The total row count.
+     */
+    private Long getTotalRecords(AbstractHQLQueryBuilder.Relationship relationship,
+                                 EntityDictionary dictionary) {
+
+        Query query =
+                new SubCollectionPageTotalsQueryBuilder(relationship, dictionary, sessionWrapper)
+                        .build();
+
+        return new TimedFunction<Long>(() -> query.uniqueResult(), "Query Hash: " + query.hashCode()).get();
+    }
+
+    private <R> Iterable<R> addSingleElement(Iterable<R> results) {
+        if (results instanceof ScrollableIteratorBase) {
+            ((ScrollableIteratorBase<R, ?>) results).singletonElement().ifPresent(singleElementLoads::add);
+        } else if (results instanceof Collection && ((Collection) results).size() == 1) {
+            ((Collection) results).forEach(singleElementLoads::add);
+        }
+
+        return results;
+    }
+
+    protected <T> boolean doInDatabase(T parent) {
+        // In-Memory delegation is disabled.
+        return !delegateToInMemoryStore
+                // We are fetching .../book/1/authors so N = 1 in N+1. No harm in the DB running a query.
+                || singleElementLoads.contains(parent);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/annotations/JPQLFilterFragment.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/annotations/JPQLFilterFragment.java
new file mode 100644
index 0000000000..9191228649
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/annotations/JPQLFilterFragment.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.datastores.jpql.filter.JPQLPredicateGenerator;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Maps an entity field to a custom JPQL Fragment Generator.
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+@Inherited
+public @interface JPQLFilterFragment {
+
+    /**
+     * The operator to bind the fragment to.
+     * @return the operator
+     */
+    Operator operator();
+
+    /**
+     * The function which generates the fragment.
+     * @return the generator
+     */
+    Class<? extends JPQLPredicateGenerator> generator();
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/CaseAwareJPQLGenerator.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/CaseAwareJPQLGenerator.java
new file mode 100644
index 0000000000..393829e0f2
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/CaseAwareJPQLGenerator.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.filter;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * JPQLPredicateGenerator that can generate both case sensitive/insensitive predicate fragments.
+ */
+@Slf4j
+public class CaseAwareJPQLGenerator implements JPQLPredicateGenerator {
+
+    private static final String COMMA = ", ";
+    private static final String FILTER_PATH_NOT_NULL = "Filtering field path cannot be empty.";
+    private static final String FILTER_ALIAS_NOT_NULL = "Filtering alias cannot be empty.";
+
+    private Case upperOrLower;
+    private String jpqlTemplate;
+    private ArgumentCount argumentCount;
+
+    /**
+     * Whether to use uppercase, lowercase, or not transformation for case insensitive queries.
+     */
+    public enum Case {
+        LOWER,
+        UPPER,
+        NONE;
+
+        public String wrap(String toWrap) {
+            if (this.equals(NONE)) {
+                return toWrap;
+            }
+
+            return String.format("%s(%s)", this.name(), toWrap);
+        }
+
+        public String wrap(FilterPredicate.FilterParameter toWrap) {
+            return wrap(toWrap.getPlaceholder());
+        }
+    }
+
+    /**
+     * The number of values that are passed to a filter predicate.
+     */
+    public enum ArgumentCount {
+        ZERO,
+        ONE,
+        MANY
+    }
+
+    /**
+     * Constructor.
+     * @param jpqlTemplate A JPQL Query Fragment Template
+     * @param upperOrLower UPPER, LOWER, or NONE
+     * @param argumentCount ZERO, ONE, or MANY
+     */
+    public CaseAwareJPQLGenerator(String jpqlTemplate, Case upperOrLower, ArgumentCount argumentCount) {
+        this.upperOrLower = upperOrLower;
+        this.jpqlTemplate = jpqlTemplate;
+        this.argumentCount = argumentCount;
+    }
+
+    @Override
+    public String generate(FilterPredicate predicate, Function<Path, String> aliasGenerator) {
+       String columnAlias = aliasGenerator.apply(predicate.getPath());
+       List<FilterPredicate.FilterParameter> parameters = predicate.getParameters();
+
+        if (StringUtils.isEmpty(columnAlias)) {
+            log.error("columnAlias cannot be NULL or empty");
+            throw new InvalidValueException(FILTER_PATH_NOT_NULL);
+        }
+
+        if (argumentCount == ArgumentCount.MANY) {
+            Preconditions.checkState(!parameters.isEmpty());
+        } else if (argumentCount == ArgumentCount.ONE) {
+            Preconditions.checkArgument(parameters.size() == 1);
+
+            if (StringUtils.isEmpty(parameters.get(0).getPlaceholder())) {
+                log.error("One non-null, non-empty argument was expected.");
+                throw new IllegalStateException(FILTER_ALIAS_NOT_NULL);
+            }
+        }
+
+        return String.format(jpqlTemplate, upperOrLower.wrap(columnAlias), parameters.stream()
+                .map(upperOrLower::wrap)
+                .collect(Collectors.joining(COMMA)));
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslator.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslator.java
new file mode 100644
index 0000000000..382901e7c4
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslator.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.filter;
+
+import static com.yahoo.elide.core.filter.Operator.BETWEEN;
+import static com.yahoo.elide.core.filter.Operator.FALSE;
+import static com.yahoo.elide.core.filter.Operator.GE;
+import static com.yahoo.elide.core.filter.Operator.GT;
+import static com.yahoo.elide.core.filter.Operator.HASMEMBER;
+import static com.yahoo.elide.core.filter.Operator.HASNOMEMBER;
+import static com.yahoo.elide.core.filter.Operator.IN;
+import static com.yahoo.elide.core.filter.Operator.INFIX;
+import static com.yahoo.elide.core.filter.Operator.INFIX_CASE_INSENSITIVE;
+import static com.yahoo.elide.core.filter.Operator.IN_INSENSITIVE;
+import static com.yahoo.elide.core.filter.Operator.ISEMPTY;
+import static com.yahoo.elide.core.filter.Operator.ISNULL;
+import static com.yahoo.elide.core.filter.Operator.LE;
+import static com.yahoo.elide.core.filter.Operator.LT;
+import static com.yahoo.elide.core.filter.Operator.NOT;
+import static com.yahoo.elide.core.filter.Operator.NOTBETWEEN;
+import static com.yahoo.elide.core.filter.Operator.NOTEMPTY;
+import static com.yahoo.elide.core.filter.Operator.NOTNULL;
+import static com.yahoo.elide.core.filter.Operator.NOT_INSENSITIVE;
+import static com.yahoo.elide.core.filter.Operator.POSTFIX;
+import static com.yahoo.elide.core.filter.Operator.POSTFIX_CASE_INSENSITIVE;
+import static com.yahoo.elide.core.filter.Operator.PREFIX;
+import static com.yahoo.elide.core.filter.Operator.PREFIX_CASE_INSENSITIVE;
+import static com.yahoo.elide.core.filter.Operator.TRUE;
+import static com.yahoo.elide.core.utils.TypeHelper.getFieldAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getPathAlias;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.FilterOperation;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate.FilterParameter;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.tuple.Triple;
+
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Translates a filter predicate into a JPQL fragment.
+ */
+public class FilterTranslator implements FilterOperation<String> {
+    private static final String COMMA = ", ";
+
+    private static Map<Operator, JPQLPredicateGenerator> globalOperatorGenerators;
+    private static Map<Triple<Operator, Type<?>, String>, JPQLPredicateGenerator> globalPredicateOverrides;
+
+    private Map<Operator, JPQLPredicateGenerator> operatorGenerators;
+    private Map<Triple<Operator, Type<?>, String>, JPQLPredicateGenerator> predicateOverrides;
+
+    static {
+        globalPredicateOverrides = new HashMap<>();
+
+        globalOperatorGenerators = new EnumMap<>(Operator.class);
+
+        globalOperatorGenerators.put(IN, new CaseAwareJPQLGenerator(
+                "%s IN (%s)",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.MANY)
+        );
+
+        globalOperatorGenerators.put(IN_INSENSITIVE, new CaseAwareJPQLGenerator(
+                "%s IN (%s)",
+                CaseAwareJPQLGenerator.Case.LOWER,
+                CaseAwareJPQLGenerator.ArgumentCount.MANY)
+        );
+
+        globalOperatorGenerators.put(NOT, new CaseAwareJPQLGenerator(
+                "%s NOT IN (%s)",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.MANY)
+        );
+
+        globalOperatorGenerators.put(NOT_INSENSITIVE, new CaseAwareJPQLGenerator(
+                "%s NOT IN (%s)",
+                CaseAwareJPQLGenerator.Case.LOWER,
+                CaseAwareJPQLGenerator.ArgumentCount.MANY)
+        );
+
+        globalOperatorGenerators.put(PREFIX, new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT(%s, '%%')",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(PREFIX_CASE_INSENSITIVE, new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT(%s, '%%')",
+                CaseAwareJPQLGenerator.Case.LOWER,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(POSTFIX, new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT('%%', %s)",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(POSTFIX_CASE_INSENSITIVE,  new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT('%%', %s)",
+                CaseAwareJPQLGenerator.Case.LOWER,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(INFIX, new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT('%%', CONCAT(%s, '%%'))",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(INFIX_CASE_INSENSITIVE, new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT('%%', CONCAT(%s, '%%'))",
+                CaseAwareJPQLGenerator.Case.LOWER,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE)
+        );
+
+        globalOperatorGenerators.put(LT, (predicate, aliasGenerator) -> {
+            Preconditions.checkState(!predicate.getParameters().isEmpty());
+            return String.format("%s < %s", aliasGenerator.apply(predicate.getPath()),
+                    predicate.getParameters().size() == 1
+                    ? predicate.getParameters().get(0).getPlaceholder()
+                    : leastClause(predicate.getParameters()));
+        });
+
+        globalOperatorGenerators.put(LE, (predicate, aliasGenerator) -> {
+            Preconditions.checkState(!predicate.getParameters().isEmpty());
+            return String.format("%s <= %s", aliasGenerator.apply(predicate.getPath()),
+                    predicate.getParameters().size() == 1
+                    ? predicate.getParameters().get(0).getPlaceholder()
+                    : leastClause(predicate.getParameters()));
+        });
+
+        globalOperatorGenerators.put(GT, (predicate, aliasGenerator) -> {
+            Preconditions.checkState(!predicate.getParameters().isEmpty());
+            return String.format("%s > %s", aliasGenerator.apply(predicate.getPath()),
+                    predicate.getParameters().size() == 1
+                    ? predicate.getParameters().get(0).getPlaceholder()
+                    : greatestClause(predicate.getParameters()));
+
+        });
+
+        globalOperatorGenerators.put(GE, (predicate, aliasGenerator) -> {
+            Preconditions.checkState(!predicate.getParameters().isEmpty());
+            return String.format("%s >= %s", aliasGenerator.apply(predicate.getPath()),
+                    predicate.getParameters().size() == 1
+                    ? predicate.getParameters().get(0).getPlaceholder()
+                    : greatestClause(predicate.getParameters()));
+        });
+
+        globalOperatorGenerators.put(ISNULL, (predicate, aliasGenerator) -> {
+            return String.format("%s IS NULL", aliasGenerator.apply(predicate.getPath()));
+        });
+
+        globalOperatorGenerators.put(NOTNULL, (predicate, aliasGenerator) -> {
+            return String.format("%s IS NOT NULL", aliasGenerator.apply(predicate.getPath()));
+        });
+
+        globalOperatorGenerators.put(TRUE, (predicate, aliasGenerator) -> {
+            return "(1 = 1)";
+        });
+
+        globalOperatorGenerators.put(FALSE, (predicate, aliasGenerator) -> {
+            return "(1 = 0)";
+        });
+
+        globalOperatorGenerators.put(ISEMPTY, (predicate, aliasGenerator) -> {
+            return String.format("%s IS EMPTY", aliasGenerator.apply(predicate.getPath()));
+        });
+
+        globalOperatorGenerators.put(NOTEMPTY, (predicate, aliasGenerator) -> {
+            return String.format("%s IS NOT EMPTY", aliasGenerator.apply(predicate.getPath()));
+        });
+
+        globalOperatorGenerators.put(BETWEEN, (predicate, aliasGenerator) -> {
+            List<FilterPredicate.FilterParameter> parameters = predicate.getParameters();
+            Preconditions.checkState(!parameters.isEmpty());
+            Preconditions.checkArgument(parameters.size() == 2);
+            return String.format("%s BETWEEN %s AND %s",
+                    aliasGenerator.apply(predicate.getPath()),
+                    parameters.get(0).getPlaceholder(),
+                    parameters.get(1).getPlaceholder());
+        });
+
+        globalOperatorGenerators.put(NOTBETWEEN, (predicate, aliasGenerator) -> {
+            List<FilterPredicate.FilterParameter> parameters = predicate.getParameters();
+            Preconditions.checkState(!parameters.isEmpty());
+            Preconditions.checkArgument(parameters.size() == 2);
+            return String.format("%s NOT BETWEEN %s AND %s",
+                    aliasGenerator.apply(predicate.getPath()),
+                    parameters.get(0).getPlaceholder(),
+                    parameters.get(1).getPlaceholder());
+        });
+    }
+
+    /**
+     * Overrides the default JPQL generator for a given operator.
+     * @param op The filter predicate operator
+     * @param generator The generator to resgister
+     */
+    public static void registerJPQLGenerator(Operator op,
+                                             JPQLPredicateGenerator generator) {
+        globalOperatorGenerators.put(op, generator);
+    }
+
+    /**
+     * Overrides the default JPQL generator for a given operator.
+     * @param op The filter predicate operator
+     * @param entityClass The entity class referenced in the predicate
+     * @param fieldName The field name of the entity class referenced in the predicate.
+     * @param generator The generator to resgister
+     */
+    public static void registerJPQLGenerator(Operator op,
+                                             Type<?> entityClass,
+                                             String fieldName,
+                                             JPQLPredicateGenerator generator) {
+        globalPredicateOverrides.put(Triple.of(op, entityClass, fieldName), generator);
+    }
+
+    /**
+     * Returns the registered JPQL generator for the given operator, class, and field.
+     * @param op The filter predicate operator
+     * @param entityClass The entity class referenced in the predicate
+     * @param fieldName The field name of the entity class referenced in the predicate.
+     * @return Returns null if no generator is registered.
+     */
+    public static JPQLPredicateGenerator lookupJPQLGenerator(Operator op,
+                                                             Type<?> entityClass,
+                                                             String fieldName) {
+        return globalPredicateOverrides.get(Triple.of(op, entityClass, fieldName));
+    }
+
+    /**
+     * Returns the registered JPQL generator for the given operator.
+     * This operation should only be performed at service startup.
+     * @param op The filter predicate operator
+     * @return Returns null if no generator is registered.
+     */
+    public static JPQLPredicateGenerator lookupJPQLGenerator(Operator op) {
+        return globalOperatorGenerators.get(op);
+    }
+
+    private final EntityDictionary dictionary;
+
+    /**
+     * Constructor.
+     * @param dictionary Model dictionary
+     */
+    public FilterTranslator(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+        if (! globalOperatorGenerators.containsKey(HASMEMBER)) {
+            globalOperatorGenerators.put(HASMEMBER, new HasMemberJPQLGenerator(dictionary));
+        }
+
+        if (! globalOperatorGenerators.containsKey(HASNOMEMBER)) {
+            globalOperatorGenerators.put(HASNOMEMBER, new HasMemberJPQLGenerator(dictionary, true));
+        }
+        this.operatorGenerators = new HashMap<>(globalOperatorGenerators);
+        this.predicateOverrides = new HashMap<>(globalPredicateOverrides);
+    }
+
+    /**
+     * Constructor.
+     * @param dictionary Model dictionary.
+     * @param operationOverrides Contains JPQL generators that override the system defaults.
+     */
+    public FilterTranslator(
+            EntityDictionary dictionary,
+            Map<Operator, JPQLPredicateGenerator> operationOverrides) {
+        this(dictionary);
+        this.operatorGenerators.putAll(operationOverrides);
+    }
+
+    /**
+     * Translates the filterPredicate to JPQL.
+     * @param filterPredicate The predicate to translate
+     * @return A JPQL query
+     */
+    @Override
+    public String apply(FilterPredicate filterPredicate) {
+        return apply(filterPredicate, this::expandPathNoAlias);
+    }
+
+    /**
+     * Transforms a filter predicate into a JPQL query fragment.
+     * @param filterPredicate The predicate to transform.
+     * @param aliasGenerator Function which supplies a HQL fragment which represents the column in the predicate.
+     * @return The hql query fragment.
+     */
+    protected String apply(FilterPredicate filterPredicate, Function<Path, String> aliasGenerator) {
+
+        Function<Path, String> removeThisFromAlias = (path) -> {
+            String fieldPath = aliasGenerator.apply(path);
+
+            //JPQL doesn't support 'this', but it does support aliases.
+            return fieldPath.replaceAll("\\.this", "");
+        };
+
+        Path.PathElement last = filterPredicate.getPath().lastElement().get();
+
+        Operator op = filterPredicate.getOperator();
+
+        JPQLPredicateGenerator generator = predicateOverrides.get(Triple.of(op, last.getType(), last.getFieldName()));
+
+        if (generator == null) {
+            generator = operatorGenerators.get(op);
+        }
+
+        if (generator == null) {
+            throw new BadRequestException("Operator not implemented: " + filterPredicate.getOperator());
+        }
+
+        return generator.generate(filterPredicate, removeThisFromAlias);
+    }
+
+    private static String greatestClause(List<FilterParameter> params) {
+        return String.format("greatest(%s)", params.stream()
+                .map(FilterParameter::getPlaceholder)
+                .collect(Collectors.joining(COMMA)));
+    }
+
+    private static String leastClause(List<FilterParameter> params) {
+        return String.format("least(%s)", params.stream()
+                .map(FilterParameter::getPlaceholder)
+                .collect(Collectors.joining(COMMA)));
+    }
+
+    /**
+     * Translates the filterExpression to a JPQL filter fragment.
+     * @param filterExpression The filterExpression to translate
+     * @param prefixWithAlias If true, use the default alias provider to append the predicates with an alias.
+     *                        Otherwise, don't append aliases.
+     * @return A JPQL filter fragment.
+     */
+    public String apply(FilterExpression filterExpression, boolean prefixWithAlias) {
+        Function<Path, String> aliasGenerator = this::expandPathNoAlias;
+        if (prefixWithAlias) {
+            aliasGenerator = this::expandPathWithAlias;
+        }
+
+        return apply(filterExpression, aliasGenerator);
+    }
+
+    public String expandPathNoAlias(Path path) {
+        return path.getPathElements().stream()
+                .map(Path.PathElement::getFieldName)
+                .collect(Collectors.joining("."));
+    }
+
+    public String expandPathWithAlias(Path path) {
+        return getFieldAlias(getPathAlias(path, dictionary),
+                        path.lastElement().map(Path.PathElement::getFieldName).orElse(null));
+    }
+
+    /**
+     * Translates the filterExpression to a JPQL filter fragment.
+     * @param filterExpression The filterExpression to translate
+     * @param aliasGenerator Generates a HQL fragment that represents a column in the predicate
+     * @return A JPQL filter fragment.
+     */
+    public String apply(FilterExpression filterExpression, Function<Path, String> aliasGenerator) {
+        JPQLQueryVisitor visitor = new JPQLQueryVisitor(aliasGenerator);
+        return filterExpression.accept(visitor);
+    }
+
+    /**
+     * Filter expression visitor which builds an JPQL query.
+     */
+    public class JPQLQueryVisitor implements FilterExpressionVisitor<String> {
+        private Function<Path, String> aliasGenerator;
+
+        public JPQLQueryVisitor(Function<Path, String> aliasGenerator) {
+            this.aliasGenerator = aliasGenerator;
+        }
+
+        @Override
+        public String visitPredicate(FilterPredicate filterPredicate) {
+            return apply(filterPredicate, aliasGenerator);
+        }
+
+        @Override
+        public String visitAndExpression(AndFilterExpression expression) {
+            FilterExpression left = expression.getLeft();
+            FilterExpression right = expression.getRight();
+            return "(" + left.accept(this) + " AND " + right.accept(this) + ")";
+        }
+
+        @Override
+        public String visitOrExpression(OrFilterExpression expression) {
+            FilterExpression left = expression.getLeft();
+            FilterExpression right = expression.getRight();
+            return "(" + left.accept(this) + " OR " + right.accept(this) + ")";
+        }
+
+        @Override
+        public String visitNotExpression(NotFilterExpression expression) {
+            String negated = expression.getNegated().accept(this);
+            return "NOT (" + negated + ")";
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGenerator.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGenerator.java
new file mode 100644
index 0000000000..e0ebccb3fa
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGenerator.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.filter;
+
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getPathAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.base.Preconditions;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.Function;
+
+/**
+ * Generates JPQL filter fragments for the 'hasmember' and 'hasnomember' operators.
+ */
+public class HasMemberJPQLGenerator implements JPQLPredicateGenerator {
+    private final EntityDictionary dictionary;
+    private final boolean negated;
+
+    private static String INNER = "_INNER_";
+
+    public HasMemberJPQLGenerator(EntityDictionary dictionary) {
+        this(dictionary, false);
+    }
+
+    public HasMemberJPQLGenerator(EntityDictionary dictionary, boolean negated) {
+        this.dictionary = dictionary;
+        this.negated = negated;
+    }
+
+    @Override
+    public String generate(FilterPredicate predicate, Function<Path, String> aliasGenerator) {
+        Preconditions.checkArgument(predicate.getParameters().size() == 1);
+
+        String notMember = negated ? "NOT " : "";
+
+        if (! FilterPredicate.toManyInPath(dictionary, predicate.getPath())) {
+            return String.format("%s %sMEMBER OF %s",
+                    predicate.getParameters().get(0).getPlaceholder(),
+                    notMember,
+                    aliasGenerator.apply(predicate.getPath()));
+        }
+
+        Path path = predicate.getPath();
+        Preconditions.checkArgument(path.lastElement().isPresent());
+        Preconditions.checkArgument(! (path.lastElement().get().getType() instanceof Collection));
+
+        //Creates JPQL like:
+        //EXISTS (SELECT 1
+        //FROM example.Book
+        //    _INNER_example_Book
+        //LEFT JOIN
+        //    _INNER_example_Book.authors  _INNER_example_Book_authors
+        //WHERE
+        //    _INNER_example_Book.id = example_Book.id
+        //    AND
+        //    _INNER_example_Book_authors.name = :authors_name_7c02839c_0)
+        return String.format("%sEXISTS (SELECT 1 FROM %s WHERE %s = %s AND %s = %s)",
+                notMember,
+                getFromClause(path),
+                getInnerQueryIdField(path),
+                getOuterQueryIdField(path, aliasGenerator),
+                getInnerFilterFieldReference(path),
+                predicate.getParameters().get(0).getPlaceholder());
+    }
+
+    private String getOuterQueryIdField(Path path, Function<Path, String> aliasGenerator) {
+        Path.PathElement firstElement = path.getPathElements().get(0);
+        Type<?> modelType = firstElement.getType();
+        String idField = dictionary.getIdFieldName(modelType);
+        Type<?> idFieldType = dictionary.getIdType(modelType);
+
+        Path idPath = new Path(Arrays.asList(new Path.PathElement(
+                modelType,
+                idFieldType,
+                idField
+        )));
+
+        return aliasGenerator.apply(idPath);
+    }
+
+    private String getInnerQueryIdField(Path path) {
+        Path.PathElement firstElement = path.getPathElements().get(0);
+
+        Path firstElementPath = new Path(Arrays.asList(firstElement));
+        Type<?> modelType = firstElement.getType();
+        String idField = dictionary.getIdFieldName(modelType);
+
+        return INNER + getPathAlias(firstElementPath, dictionary) + "." + idField;
+    }
+
+    private String getInnerFilterFieldReference(Path path) {
+        Path.PathElement lastElement = path.lastElement().get();
+        String fieldName = lastElement.getFieldName();
+
+        return INNER + getPathAlias(path, dictionary) + "." + fieldName;
+    }
+
+    private String getFromClause(Path path) {
+        Path.PathElement firstElement = path.getPathElements().get(0);
+        Path.PathElement lastElement = path.lastElement().get();
+
+        String entityName = firstElement.getType().getCanonicalName();
+        String currentAlias = INNER + getTypeAlias(firstElement.getType());
+
+        StringBuilder fromClause = new StringBuilder();
+        fromClause.append(entityName).append(" ").append(currentAlias);
+
+        for (Path.PathElement element : path.getPathElements()) {
+
+            //No need to join the last path segment.
+            if (element == lastElement) {
+                break;
+            }
+            String nextAlias = appendAlias(currentAlias, element.getFieldName());
+
+            fromClause.append(" LEFT JOIN ")
+                    .append(currentAlias).append(".").append(element.getFieldName())
+                    .append(" ").append(nextAlias);
+
+            currentAlias = nextAlias;
+        }
+
+        return fromClause.toString();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/JPQLPredicateGenerator.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/JPQLPredicateGenerator.java
new file mode 100644
index 0000000000..027a8c4247
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/filter/JPQLPredicateGenerator.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.filter;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+
+import java.util.function.Function;
+
+/**
+ * Converts a column alias and list of arguments into a JPQL filter predicate fragment.
+ */
+@FunctionalInterface
+public interface JPQLPredicateGenerator {
+
+    /**
+     * Generates a JPQL/SQL expression for a filter predicate.
+     * @param predicate The predicate to generate.
+     * @param aliasGenerator Takes a predicate path and converts it into a JPQL/SQL column alias.
+     * @return A JPQL/SQL filter expression.
+     */
+    String generate(FilterPredicate predicate, Function<Path, String> aliasGenerator);
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Query.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Query.java
new file mode 100644
index 0000000000..c692ffcc97
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Query.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.porting;
+
+import java.util.Collection;
+
+/**
+ * Interface that represents a Hibernate query but has no dependencies on a specific version of Hibernate.
+ */
+public interface Query {
+    public Query setFirstResult(int num);
+    public Query setMaxResults(int num);
+    public Query setParameter(String name, Object value);
+    public Query setParameterList(String name, Collection<?> values);
+    public <T> T uniqueResult();
+    public <T> Iterable<T> scroll();
+    public <T> Iterable<T> list();
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/QueryLogger.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/QueryLogger.java
new file mode 100644
index 0000000000..6bc58f4cf3
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/QueryLogger.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.porting;
+
+/**
+ * Logs JPQL queries from the JPA Store.
+ */
+@FunctionalInterface
+public interface QueryLogger {
+    void log(String query);
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/ScrollableIteratorBase.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/ScrollableIteratorBase.java
new file mode 100644
index 0000000000..e834acd83b
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/ScrollableIteratorBase.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.porting;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterators;
+import lombok.NonNull;
+
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * Wraps ScrollableResult as Iterator.
+ *
+ * @param <T> type of return object
+ * @param <R> Result object
+ */
+public class ScrollableIteratorBase<T, R> implements Iterable<T>, Iterator<T> {
+    private final R scroll;
+    private final Predicate<R> nextFun;
+    private final Function<R, T> getFun;
+    private boolean inUse = false;
+    private boolean hasNext = false;
+    private T first;
+
+    public ScrollableIteratorBase(R scroll, Predicate<R> nextFun, Function<R, T> getFun) {
+        this.scroll = scroll;
+        this.nextFun = nextFun;
+        this.getFun = getFun;
+
+        hasNext = nextFun.test(scroll);
+        // extract the first element to see if it is singleton
+        if (hasNext) {
+            first = getFun.apply(scroll);
+            hasNext = nextFun.test(scroll);
+        }
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        if (inUse) {
+            throw new ConcurrentModificationException();
+        }
+
+        inUse = true;
+        return Iterators.unmodifiableIterator(this);
+    }
+
+    @Override
+    public boolean hasNext() {
+        return hasNext || first != null;
+    }
+
+    @Override
+    @NonNull public T next() {
+        if (!hasNext && first == null) {
+            throw new NoSuchElementException();
+        }
+        @NonNull T row;
+        if (first != null) {
+            row = first;
+            first = null;
+        } else {
+            row = getFun.apply(scroll);
+            hasNext = nextFun.test(scroll);
+        }
+        Preconditions.checkNotNull(row);
+        return row;
+    }
+
+    /**
+     * Returns element if a singleton.
+     * @return singleton element
+     */
+    public Optional<T> singletonElement() {
+        if (first != null && !hasNext) {
+            return Optional.of(first);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Session.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Session.java
new file mode 100644
index 0000000000..6ccbce2e04
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/porting/Session.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.porting;
+
+/**
+ * Interface that represents a Hibernate session but has no dependencies on a specific version of Hibernate.
+ */
+public interface Session {
+    public Query createQuery(String queryText);
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/AbstractHQLQueryBuilder.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/AbstractHQLQueryBuilder.java
new file mode 100644
index 0000000000..8618d9de89
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/AbstractHQLQueryBuilder.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Abstract class used to construct HQL queries.
+ */
+public abstract class AbstractHQLQueryBuilder {
+    protected final Session session;
+    protected final EntityDictionary dictionary;
+    protected EntityProjection entityProjection;
+    protected static final String SPACE = " ";
+    protected static final String PERIOD = ".";
+    protected static final String COMMA = ",";
+    protected static final String FROM = " FROM ";
+    protected static final String JOIN = " JOIN ";
+    protected static final String LEFT = " LEFT";
+    protected static final String FETCH = " FETCH ";
+    protected static final String SELECT = "SELECT ";
+    protected static final String AS = " AS ";
+    protected static final String DISTINCT = "DISTINCT ";
+    protected static final String WHERE = " WHERE ";
+
+    protected static final boolean USE_ALIAS = true;
+    protected static final boolean NO_ALIAS = false;
+    protected Set<String> alreadyJoined = new HashSet<>();
+
+    /**
+     * Represents a relationship between two entities.
+     */
+    public interface Relationship {
+
+        com.yahoo.elide.core.request.Relationship getRelationship();
+
+        Type<?> getParentType();
+
+        default Type<?> getChildType() {
+            return getRelationship().getProjection().getType();
+        }
+
+        default String getRelationshipName() {
+            return getRelationship().getName();
+        }
+
+        Object getParent();
+    }
+
+    public AbstractHQLQueryBuilder(EntityProjection entityProjection, EntityDictionary dictionary, Session session) {
+        this.session = session;
+        this.dictionary = dictionary;
+        this.entityProjection = entityProjection;
+    }
+
+    public abstract Query build();
+
+    /**
+     * Given a collection of filter predicates and a Hibernate query, populates the named parameters in the
+     * Hibernate query.
+     *
+     * @param query The HQL query
+     * @param predicates The predicates to extract named parameter values from
+     */
+    protected void supplyFilterQueryParameters(Query query, Collection<FilterPredicate> predicates) {
+        for (FilterPredicate filterPredicate : predicates) {
+            if (filterPredicate.getOperator().isParameterized()) {
+                boolean shouldEscape = filterPredicate.isMatchingOperator();
+                filterPredicate.getParameters().forEach(param ->
+                    query.setParameter(param.getName(), shouldEscape ? param.escapeMatching() : param.getValue())
+                );
+            }
+        }
+    }
+
+    /**
+     * Extracts all the HQL JOIN clauses from given filter expression.
+     * @param filterExpression the filter expression to extract a join clause from
+     * @return an HQL join clause
+     */
+    protected String getJoinClauseFromFilters(FilterExpression filterExpression) {
+        return getJoinClauseFromFilters(filterExpression, false);
+    }
+
+    /**
+     * Extracts all the HQL JOIN clauses from given filter expression.
+     * @param filterExpression the filter expression to extract a join clause from
+     * @param skipFetches JOIN but don't FETCH JOIN a relationship.
+     * @return an HQL join clause
+     */
+    protected String getJoinClauseFromFilters(FilterExpression filterExpression, boolean skipFetches) {
+        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor(new ArrayList<>());
+        Collection<FilterPredicate> predicates = filterExpression.accept(visitor);
+
+        return predicates.stream()
+                .map(predicate -> extractJoinClause(predicate.getPath(), skipFetches))
+                .collect(Collectors.joining(SPACE));
+    }
+
+
+    /**
+     * Extracts all the HQL JOIN clauses from given filter expression.
+     * @param sorting the sort expression to extract a join clause from
+     * @return an HQL join clause
+     */
+    protected String getJoinClauseFromSort(Sorting sorting) {
+        return getJoinClauseFromSort(sorting, false);
+    }
+
+    /**
+     * Extracts all the HQL JOIN clauses from given filter expression.
+     * @param sorting the sort expression to extract a join clause from
+     * @param skipFetches JOIN but don't FETCH JOIN a relationship.
+     * @return an HQL join clause
+     */
+    protected String getJoinClauseFromSort(Sorting sorting, boolean skipFetches) {
+        if (sorting != null && !sorting.isDefaultInstance()) {
+            Map<Path, Sorting.SortOrder> validSortingRules = sorting.getSortingPaths();
+            return validSortingRules.keySet().stream()
+                    .map(path -> extractJoinClause(path, skipFetches))
+                    .collect(Collectors.joining(SPACE));
+        }
+        return "";
+    }
+
+
+    /**
+     * Modifies the HQL query to add OFFSET and LIMIT.
+     * @param query The HQL query object
+     */
+    protected void addPaginationToQuery(Query query) {
+        Pagination pagination = entityProjection.getPagination();
+        if (pagination != null) {
+            query.setFirstResult(pagination.getOffset());
+            query.setMaxResults(pagination.getLimit());
+        }
+    }
+
+    /**
+     * Extracts a join clause from a path (if it exists).
+     * @param path The path to examine
+     * @param skipFetches Don't fetch join
+     * @return A HQL string representing the join
+     */
+    private String extractJoinClause(Path path, boolean skipFetches) {
+        StringBuilder joinClause = new StringBuilder();
+
+        String previousAlias = null;
+
+        for (Path.PathElement pathElement : path.getPathElements()) {
+            String fieldName = pathElement.getFieldName();
+            Type<?> typeClass = dictionary.lookupEntityClass(pathElement.getType());
+            String typeAlias = getTypeAlias(typeClass);
+
+            // Nothing left to join.
+            if (! dictionary.isRelation(pathElement.getType(), fieldName)) {
+                return joinClause.toString();
+            }
+
+            String alias = previousAlias == null
+                    ? appendAlias(typeAlias, fieldName)
+                    : appendAlias(previousAlias, fieldName);
+
+            String joinKey;
+
+            //This is the first path element
+            if (previousAlias == null) {
+                joinKey = typeAlias + PERIOD + fieldName;
+            } else {
+                joinKey = previousAlias + PERIOD + fieldName;
+            }
+
+            String fetch = "";
+            RelationshipType type = dictionary.getRelationshipType(pathElement.getType(), fieldName);
+
+            //This is a to-One relationship belonging to the collection being retrieved.
+            if (!skipFetches && entityProjection.getIncludedRelationsName().contains(fieldName) && type.isToOne()
+                    && !type.isComputed() && previousAlias == null) {
+                fetch = "FETCH ";
+
+            }
+            String joinFragment = LEFT + JOIN + fetch + joinKey + SPACE + alias + SPACE;
+
+            if (!alreadyJoined.contains(joinKey)) {
+                joinClause.append(joinFragment);
+                alreadyJoined.add(joinKey);
+            }
+
+            previousAlias = alias;
+        }
+
+        return joinClause.toString();
+    }
+
+    /**
+     * Builds a JOIN clause that eagerly fetches to-one relationships that Hibernate needs to hydrate.
+     * @param entityClass The entity class that is being queried in the HQL query.
+     * @param alias The HQL alias for the entity class.
+     * @return The JOIN clause that can be added to the FROM clause.
+     */
+    protected String extractToOneMergeJoins(Type<?> entityClass, String alias) {
+        return extractToOneMergeJoins(entityClass, alias, (unused) -> false);
+    }
+
+    protected String extractToOneMergeJoins(Type<?> entityClass, String alias,
+                                            Predicate<String> skipRelation) {
+        List<String> relationshipNames = dictionary.getRelationships(entityClass);
+        StringBuilder joinString = new StringBuilder("");
+        for (String relationshipName : relationshipNames) {
+            if (!entityProjection.getIncludedRelationsName().contains(relationshipName)) {
+                continue;
+            }
+            RelationshipType type = dictionary.getRelationshipType(entityClass, relationshipName);
+            if (type.isToOne() && !type.isComputed()) {
+                if (skipRelation.test(relationshipName)) {
+                    continue;
+                }
+                String joinKey = alias + PERIOD + relationshipName;
+
+                if (alreadyJoined.contains(joinKey)) {
+                    continue;
+                }
+
+                joinString.append(" LEFT JOIN FETCH ");
+                joinString.append(joinKey);
+                joinString.append(SPACE);
+                alreadyJoined.add(joinKey);
+            }
+        }
+        return joinString.toString();
+    }
+
+    /**
+     * Returns a sorting object into a HQL ORDER BY string.
+     * @param sorting The sorting object passed from the client
+     * @return The sorting clause
+     */
+    protected String getSortClause(final Sorting sorting) {
+        String sortingRules = "";
+        if (sorting != null && !sorting.isDefaultInstance()) {
+            final Map<Path, Sorting.SortOrder> validSortingRules = sorting.getSortingPaths();
+            if (!validSortingRules.isEmpty()) {
+                final List<String> ordering = new ArrayList<>();
+                // pass over the sorting rules
+                validSortingRules.forEach((path, order) -> {
+
+                    Type<?> typeClass = dictionary.lookupEntityClass(path.getPathElements().get(0).getType());
+                    String prefix = getTypeAlias(typeClass);
+
+                    for (Path.PathElement pathElement : path.getPathElements()) {
+                        String fieldName = pathElement.getFieldName();
+
+                        if (dictionary.isComplexAttribute(pathElement.getType(), fieldName)
+                                || !dictionary.isRelation(pathElement.getType(), fieldName)) {
+                            prefix = prefix + PERIOD + fieldName;
+                        } else {
+                            prefix = appendAlias(prefix, fieldName);
+                        }
+                    }
+                    ordering.add(prefix + SPACE
+                            + (order.equals(Sorting.SortOrder.desc) ? "desc" : "asc"));
+                });
+                sortingRules = " order by " + StringUtils.join(ordering, COMMA);
+            }
+        }
+        return sortingRules;
+    }
+
+    /**
+     * Returns whether filter expression contains toMany relationship.
+     * @param filterExpression
+     * @return true or false
+     */
+    protected boolean containsOneToMany(FilterExpression filterExpression) {
+        PredicateExtractionVisitor visitor = new PredicateExtractionVisitor(new ArrayList<>());
+        Collection<FilterPredicate> predicates = filterExpression.accept(visitor);
+
+        return predicates.stream()
+                .anyMatch(predicate -> FilterPredicate.toManyInPath(dictionary, predicate.getPath()));
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/DefaultQueryLogger.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/DefaultQueryLogger.java
new file mode 100644
index 0000000000..2016549e83
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/DefaultQueryLogger.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.query;
+
+import com.yahoo.elide.datastores.jpql.porting.QueryLogger;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DefaultQueryLogger implements QueryLogger {
+    @Override
+    public void log(String query) {
+       log.debug("{}", query);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RelationshipImpl.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RelationshipImpl.java
new file mode 100644
index 0000000000..2a7f525c6b
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RelationshipImpl.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.query;
+
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.Type;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * Holds all the properties of an entity relationship.
+ */
+@Data
+@AllArgsConstructor
+public class RelationshipImpl implements AbstractHQLQueryBuilder.Relationship {
+    private Type<?> parentType;
+    private Object parent;
+    private Relationship relationship;
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionFetchQueryBuilder.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionFetchQueryBuilder.java
new file mode 100644
index 0000000000..f8d65dc925
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionFetchQueryBuilder.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+
+import java.util.Collection;
+
+/**
+ * Constructs a HQL query to fetch a root collection.
+ */
+public class RootCollectionFetchQueryBuilder extends AbstractHQLQueryBuilder {
+
+    public RootCollectionFetchQueryBuilder(EntityProjection entityProjection,
+                                           EntityDictionary dictionary,
+                                           Session session) {
+        super(entityProjection, dictionary, session);
+    }
+
+    /**
+     * Constructs a query that fetches a root collection.
+     *
+     * @return the constructed query
+     */
+    @Override
+    public Query build() {
+        Type<?> entityClass = this.entityProjection.getType();
+        String entityName = entityClass.getCanonicalName();
+        String entityAlias = getTypeAlias(entityClass);
+
+        Query query;
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+        if (filterExpression != null) {
+            PredicateExtractionVisitor extractor = new PredicateExtractionVisitor();
+            Collection<FilterPredicate> predicates = filterExpression.accept(extractor);
+
+            //Build the WHERE clause
+            String filterClause = WHERE + new FilterTranslator(dictionary).apply(filterExpression, USE_ALIAS);
+
+            //Build the JOIN clause
+            String joinClause =  getJoinClauseFromFilters(filterExpression)
+                    + getJoinClauseFromSort(entityProjection.getSorting())
+                    + extractToOneMergeJoins(entityClass, entityAlias);
+
+            boolean requiresDistinct = entityProjection.getPagination() != null
+                    && containsOneToMany(filterExpression);
+
+            boolean sortOverRelationship = entityProjection.getSorting() != null
+                    && entityProjection.getSorting().getSortingPaths().keySet()
+                    .stream().anyMatch(path -> path.getPathElements().size() > 1);
+            if (requiresDistinct && sortOverRelationship) {
+                //SQL does not support distinct and order by on columns which are not selected
+                throw new InvalidValueException("Combination of pagination, sorting over relationship and"
+                        + " filtering over toMany relationships unsupported");
+            }
+            query = session.createQuery(
+                    SELECT
+                            + (requiresDistinct ? DISTINCT : "")
+                            + entityAlias
+                            + FROM
+                            + entityName
+                            + AS
+                            + entityAlias
+                            + SPACE
+                            + joinClause
+                            + SPACE
+                            + filterClause
+                            + SPACE
+                            + getSortClause(entityProjection.getSorting())
+            );
+
+            //Fill in the query parameters
+            supplyFilterQueryParameters(query, predicates);
+        } else {
+            query = session.createQuery(SELECT
+                    + entityAlias
+                    + FROM
+                    + entityName
+                    + AS
+                    + entityAlias
+                    + SPACE
+                    + getJoinClauseFromSort(entityProjection.getSorting())
+                    + extractToOneMergeJoins(entityClass, entityAlias)
+                    + SPACE
+                    + getSortClause(entityProjection.getSorting()));
+        }
+
+        addPaginationToQuery(query);
+        return query;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionPageTotalsQueryBuilder.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionPageTotalsQueryBuilder.java
new file mode 100644
index 0000000000..275b106a15
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/RootCollectionPageTotalsQueryBuilder.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Constructs a HQL query to fetch the size of a root collection.
+ */
+public class RootCollectionPageTotalsQueryBuilder extends AbstractHQLQueryBuilder {
+
+    public RootCollectionPageTotalsQueryBuilder(EntityProjection entityProjection,
+                                                EntityDictionary dictionary,
+                                                Session session) {
+        super(entityProjection, dictionary, session);
+    }
+
+    /**
+     * Constructs a query that returns the count of a root collection.
+     *
+     * Constructs a query like:
+     *
+     * SELECT COUNT(DISTINCT Author)
+     * FROM Author AS Author
+     *
+     * @return the constructed query
+     */
+    @Override
+    public Query build() {
+        Type<?> entityClass = entityProjection.getType();
+        String entityName = entityClass.getCanonicalName();
+        String entityAlias = getTypeAlias(entityClass);
+
+        Collection<FilterPredicate> predicates;
+
+        String filterClause;
+        String joinClause;
+
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+        if (filterExpression != null) {
+            PredicateExtractionVisitor extractor = new PredicateExtractionVisitor();
+            predicates = filterExpression.accept(extractor);
+
+            //Build the WHERE clause
+            filterClause = WHERE + new FilterTranslator(dictionary).apply(filterExpression, USE_ALIAS);
+
+            //Build the JOIN clause
+            joinClause =  getJoinClauseFromFilters(filterExpression, true);
+
+        } else {
+            predicates = new HashSet<>();
+            filterClause = "";
+            joinClause = "";
+        }
+
+        Query query = session.createQuery("SELECT COUNT(DISTINCT "
+                + entityAlias
+                + ") "
+                + FROM
+                + entityName
+                + AS
+                + entityAlias
+                + SPACE
+                + joinClause
+                + SPACE
+                + filterClause
+        );
+        supplyFilterQueryParameters(query, predicates);
+        return query;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionFetchQueryBuilder.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionFetchQueryBuilder.java
new file mode 100644
index 0000000000..93d4f3f6e1
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionFetchQueryBuilder.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+
+import java.util.Collection;
+import java.util.function.Predicate;
+
+/**
+ * Constructs a HQL query to fetch a hibernate collection proxy.
+ */
+public class SubCollectionFetchQueryBuilder extends AbstractHQLQueryBuilder {
+
+    private final Relationship relationship;
+
+    public SubCollectionFetchQueryBuilder(Relationship relationship,
+                                          EntityDictionary dictionary,
+                                          Session session) {
+        super(relationship.getRelationship().getProjection(), dictionary, session);
+        this.relationship = relationship;
+    }
+
+    @Override
+    protected String extractToOneMergeJoins(Type<?> entityClass, String alias) {
+        Predicate<String> shouldSkip = (relationshipName) -> {
+            String inverseRelationName = dictionary.getRelationInverse(entityClass, relationshipName);
+            if (inverseRelationName.isEmpty()) {
+                return false;
+            }
+
+            Type<?> relationshipClass = dictionary.getParameterizedType(entityClass, relationshipName);
+
+            //We don't need (or want) to fetch join the parent object.
+            return relationshipClass.equals(relationship.getParentType())
+                    && inverseRelationName.equals(relationship.getRelationshipName());
+        };
+
+        return extractToOneMergeJoins(entityClass, alias, shouldSkip);
+    }
+
+    /**
+     * Constructs a query that returns the members of a relationship.
+     *
+     * @return the constructed query or null if the collection proxy does not require any
+     * sorting, pagination, or filtering.
+     */
+    @Override
+    public Query build() {
+
+        if (entityProjection.getFilterExpression() == null && entityProjection.getPagination() == null
+                && (entityProjection.getSorting() == null || entityProjection.getSorting().isDefaultInstance())) {
+            return null;
+        }
+
+        String childAlias = getTypeAlias(relationship.getChildType());
+        String parentAlias = getTypeAlias(relationship.getParentType()) + "__fetch";
+        String parentName = relationship.getParentType().getCanonicalName();
+        String relationshipName = relationship.getRelationshipName();
+
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+        Query query;
+        if (filterExpression != null) {
+            PredicateExtractionVisitor extractor = new PredicateExtractionVisitor();
+            Collection<FilterPredicate> predicates = filterExpression.accept(extractor);
+            String filterClause = new FilterTranslator(dictionary).apply(filterExpression, USE_ALIAS);
+
+            String joinClause =  getJoinClauseFromFilters(filterExpression)
+                    + getJoinClauseFromSort(entityProjection.getSorting())
+                    + extractToOneMergeJoins(relationship.getChildType(), childAlias);
+
+            //SELECT parent_children from Parent parent JOIN parent.children parent_children
+            query = session.createQuery(SELECT
+                    + childAlias
+                    + FROM
+                    + parentName + SPACE + parentAlias
+                    + JOIN
+                    + parentAlias + PERIOD + relationshipName + SPACE + childAlias
+                    + joinClause
+                    + WHERE
+                    + filterClause
+                    + " AND " + parentAlias + "=:" + parentAlias
+                    + SPACE
+                    + getSortClause(entityProjection.getSorting())
+            );
+
+            supplyFilterQueryParameters(query, predicates);
+        } else {
+            query = session.createQuery(SELECT
+                    + childAlias
+                    + FROM
+                    + parentName + SPACE + parentAlias
+                    + JOIN
+                    + parentAlias + PERIOD + relationshipName + SPACE + childAlias
+                    + getJoinClauseFromSort(entityProjection.getSorting())
+                    + extractToOneMergeJoins(relationship.getChildType(), childAlias)
+                    + " WHERE " + parentAlias + "=:" + parentAlias
+                    + getSortClause(entityProjection.getSorting())
+            );
+        }
+
+        query.setParameter(parentAlias, relationship.getParent());
+
+        addPaginationToQuery(query);
+        return query;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionPageTotalsQueryBuilder.java b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionPageTotalsQueryBuilder.java
new file mode 100644
index 0000000000..f723a94188
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/main/java/com/yahoo/elide/datastores/jpql/query/SubCollectionPageTotalsQueryBuilder.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.query;
+
+import static com.yahoo.elide.core.utils.TypeHelper.appendAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getTypeAlias;
+import com.yahoo.elide.core.Path.PathElement;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.ExpressionScopingVisitor;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.jpql.filter.FilterTranslator;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Constructs a HQL query to fetch the size of a hibernate collection proxy.
+ */
+public class SubCollectionPageTotalsQueryBuilder extends AbstractHQLQueryBuilder {
+
+    private final Relationship relationship;
+
+    public SubCollectionPageTotalsQueryBuilder(Relationship relationship,
+                                               EntityDictionary dictionary,
+                                               Session session) {
+        super(relationship.getRelationship().getProjection(), dictionary, session);
+        this.relationship = relationship;
+    }
+
+    /**
+     * Constructs a query that returns the count of the members of a relationship.
+     *
+     * For a relationship like author#3.books, constructs a query like:
+     *
+     * SELECT COUNT(DISTINCT Author_books)
+     * FROM Author AS Author JOIN Author.books AS Author_books
+     * WHERE Author.id = :author_books_id;
+     *
+     * Rather than query relationship directly (FROM Book), this query starts at the relationship
+     * owner to support scenarios where there is no inverse relationship from the relationship back to
+     * the owner.
+     *
+     * @return the constructed query
+     */
+    @Override
+    public Query build() {
+        Type<?> parentType = dictionary.lookupEntityClass(relationship.getParentType());
+        Type<?> idType = dictionary.getIdType(parentType);
+        Object idVal = CoerceUtil.coerce(dictionary.getId(relationship.getParent()), idType);
+        String idField = dictionary.getIdFieldName(parentType);
+
+        //Construct a predicate that selects an individual element of the relationship's parent (Author.id = 3).
+        FilterPredicate idExpression = new InPredicate(new PathElement(parentType, idType, idField), idVal);
+
+        Collection<FilterPredicate> predicates = new ArrayList<>();
+        String joinClause = "";
+        String filterClause = "";
+
+        String relationshipName = relationship.getRelationshipName();
+
+        //Relationship alias is Author_books
+        String parentAlias = getTypeAlias(parentType);
+        String relationshipAlias = appendAlias(parentAlias, relationshipName);
+
+        FilterExpression filterExpression = entityProjection.getFilterExpression();
+        if (filterExpression != null) {
+            // Copy and scope the filter expression for the join clause
+            ExpressionScopingVisitor visitor = new ExpressionScopingVisitor(
+                    new PathElement(parentType, relationship.getChildType(), relationship.getRelationshipName()));
+
+            FilterExpression scoped = filterExpression.accept(visitor);
+
+            //For each filter predicate, prepend the predicate with the parent:
+            //books.title = 'Foobar' becomes author.books.title = 'Foobar'
+            PredicateExtractionVisitor extractor = new PredicateExtractionVisitor(new ArrayList<>());
+
+            predicates = scoped.accept(extractor);
+            predicates.add(idExpression);
+
+            //Join together the provided filter expression with the expression which selects the collection owner.
+            FilterExpression joinedExpression = new AndFilterExpression(scoped, idExpression);
+
+            //Build the JOIN clause from the filter predicate
+            joinClause = getJoinClauseFromFilters(joinedExpression, true);
+
+            //Build the WHERE clause
+            filterClause = new FilterTranslator(dictionary).apply(joinedExpression, USE_ALIAS);
+        } else {
+
+            //If there is no filter, we still need to explicitly JOIN book and authors.
+            joinClause = JOIN
+                    + parentAlias
+                    + PERIOD + relationshipName
+                    + SPACE
+                    + relationshipAlias
+                    + SPACE;
+
+            filterClause = new FilterTranslator(dictionary).apply(idExpression, USE_ALIAS);
+            predicates.add(idExpression);
+        }
+
+        Query query = session.createQuery(
+                "SELECT COUNT(DISTINCT "
+                        + relationshipAlias
+                        + ") "
+                        + FROM
+                        + parentType.getCanonicalName()
+                        + AS
+                        + parentAlias
+                        + SPACE
+                        + joinClause
+                        + WHERE
+                        + filterClause);
+
+        //Fill in the query parameters
+        supplyFilterQueryParameters(query, predicates);
+        return query;
+    }
+}
diff --git a/elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java
similarity index 76%
rename from elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java
rename to elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java
index 18c5f8ae2d..f8e810fe74 100644
--- a/elide-datastore/elide-datastore-hibernate/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/AbstractHibernateTestService.java
@@ -5,35 +5,33 @@
  */
 package com.yahoo.elide.datastores.hibernate;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.EntityDictionary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import com.yahoo.elide.core.datastore.DataStore;
 import com.yahoo.elide.jsonapi.JsonApiMapper;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import org.junit.jupiter.api.BeforeAll;
 import lombok.NoArgsConstructor;
-import org.testng.annotations.BeforeTest;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.function.Supplier;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
 @NoArgsConstructor
 public abstract class AbstractHibernateTestService {
     public static DataStore dataStore = null;
 
     /* Empty dictionary is OK provided the OBJECT_MAPPER is used for reading only */
-    protected final JsonApiMapper jsonApiMapper = new JsonApiMapper(new EntityDictionary(new HashMap<>()));
+    protected final JsonApiMapper jsonApiMapper = new JsonApiMapper();
 
     public static DataStore getDatabaseManager() {
         if (dataStore == null) {
             try {
                 final String dataStoreSupplierName = System.getProperty("dataStoreSupplier");
+                @SuppressWarnings("unchecked")
                 Supplier<DataStore> dataStoreSupplier =
-                        (Supplier<DataStore>) Class.forName(dataStoreSupplierName).newInstance();
+                        Class.forName(dataStoreSupplierName).asSubclass(Supplier.class).newInstance();
                 dataStore = dataStoreSupplier.get();
-            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | ClassCastException e) {
                 throw new IllegalStateException(e);
             }
         }
@@ -41,7 +39,7 @@ public static DataStore getDatabaseManager() {
         return dataStore;
     }
 
-    @BeforeTest
+    @BeforeAll
     public static void initHibernate() {
         getDatabaseManager();
     }
@@ -50,7 +48,7 @@ protected void assertEqualDocuments(String actual, String expected) {
         try {
             JsonApiDocument expectedDoc = jsonApiMapper.readJsonApiDocument(expected);
             JsonApiDocument actualDoc = jsonApiMapper.readJsonApiDocument(actual);
-            assertEquals(actualDoc, expectedDoc, "\n" + actual + "\n" + expected + "\n");
+            assertEquals(expectedDoc, actualDoc, "\n" + actual + "\n" + expected + "\n");
         } catch (IOException e) {
             fail("\n" + actual + "\n" + expected + "\n", e);
         }
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/AbstractHQLQueryBuilderTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/AbstractHQLQueryBuilderTest.java
new file mode 100644
index 0000000000..12f9eb10f6
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/AbstractHQLQueryBuilderTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.predicates.InfixPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.query.AbstractHQLQueryBuilder;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Left;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class AbstractHQLQueryBuilderTest extends AbstractHQLQueryBuilder {
+
+    private static final String AUTHORS = "authors";
+    private static final String BOOKS = "books";
+    private static final String TITLE = "title";
+    private static final String PUBLISHER = "publisher";
+    private static final String GENRE = "genre";
+    private static final String ABC = "ABC";
+    private static final String DEF = "DEF";
+    private static final String NAME = "name";
+
+
+    public AbstractHQLQueryBuilderTest() {
+        super(getMockEntityProjection(), EntityDictionary.builder().build(), new TestSessionWrapper());
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Chapter.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Left.class);
+    }
+
+    private static  EntityProjection getMockEntityProjection() {
+        EntityProjection entityProjection = mock(EntityProjection.class);
+        when(entityProjection.getIncludedRelationsName()).thenReturn(new HashSet<>());
+        return entityProjection;
+    }
+
+    @BeforeEach
+    public void reInitializeMock() {
+        this.entityProjection = getMockEntityProjection();
+    }
+
+    @Override
+    public Query build() {
+        return null;
+    }
+
+    @Test
+    public void testFilterJoinClause() {
+        List<Path.PathElement> chapterTitlePath = Arrays.asList(
+                new Path.PathElement(Author.class, Book.class, BOOKS),
+                new Path.PathElement(Book.class, Chapter.class, "chapters"),
+                new Path.PathElement(Chapter.class, String.class, TITLE)
+        );
+
+        FilterPredicate titlePredicate = new InPredicate(
+                new Path(chapterTitlePath),
+                ABC, DEF);
+
+        FilterPredicate titlePredicateDuplicate = new InPredicate(
+                new Path(chapterTitlePath),
+                ABC, DEF);
+
+        List<Path.PathElement>  publisherNamePath = Arrays.asList(
+                new Path.PathElement(Author.class, Book.class, BOOKS),
+                new Path.PathElement(Book.class, Publisher.class, PUBLISHER),
+                new Path.PathElement(Publisher.class, String.class, NAME)
+        );
+
+        FilterPredicate publisherNamePredicate = new InPredicate(
+                new Path(publisherNamePath),
+                "Pub1");
+
+        OrFilterExpression orExpression = new OrFilterExpression(titlePredicate, publisherNamePredicate);
+        AndFilterExpression andExpression = new AndFilterExpression(orExpression, titlePredicateDuplicate);
+
+        String actual = getJoinClauseFromFilters(andExpression);
+        String expected = " LEFT JOIN example_Author.books example_Author_books  "
+                + "LEFT JOIN example_Author_books.chapters example_Author_books_chapters   "
+                + "LEFT JOIN example_Author_books.publisher example_Author_books_publisher  ";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testFetchJoinClause() {
+        Set<String> relationsIncludedInProjection = new HashSet<>();
+        relationsIncludedInProjection.add("one2one");
+
+        when(this.entityProjection.getIncludedRelationsName()).thenReturn(relationsIncludedInProjection);
+
+        String actual = extractToOneMergeJoins(ClassType.of(Left.class), "right_alias");
+
+        String expected = "LEFT JOIN FETCH right_alias.one2one";
+        assertEquals(expected, actual.trim());
+    }
+
+    @Test
+    public void testSortClauseWithoutPrefix() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+        sorting.put(GENRE, Sorting.SortOrder.desc);
+
+        String actual = getSortClause(new SortingImpl(sorting, Book.class, dictionary));
+
+        String expected = " order by example_Book.title asc,example_Book.genre desc";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortClauseWithPrefix() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+        sorting.put(GENRE, Sorting.SortOrder.desc);
+
+        String actual = getSortClause(new SortingImpl(sorting, Book.class, dictionary));
+
+        String expected = " order by example_Book.title asc,example_Book.genre desc";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortClauseWithComplexAttribute() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put("price.total", Sorting.SortOrder.asc);
+
+        String actual = getSortClause(new SortingImpl(sorting, Book.class, dictionary));
+
+        String expected = " order by example_Book.price.total asc";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortClauseWithNestedComplexAttribute() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put("price.currency.isoCode", Sorting.SortOrder.asc);
+
+        String actual = getSortClause(new SortingImpl(sorting, Book.class, dictionary));
+
+        String expected = " order by example_Book.price.currency.isoCode asc";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortClauseWithJoin() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put(PUBLISHER + PERIOD + NAME, Sorting.SortOrder.asc);
+
+        String actual = getSortClause(new SortingImpl(sorting, Book.class, dictionary));
+
+        String expected = " order by example_Book_publisher.name asc";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortClauseWithInvalidJoin() {
+        Map<String, Sorting.SortOrder> sorting = new LinkedHashMap<>();
+        sorting.put(AUTHORS + PERIOD + NAME, Sorting.SortOrder.asc);
+
+        assertThrows(InvalidValueException.class, () -> getSortClause(new SortingImpl(sorting, Book.class, dictionary)));
+    }
+
+    @Test
+    public void testSettingQueryParams() {
+        Path.PathElement idPath = new Path.PathElement(Book.class, Chapter.class, "id");
+
+        Query query = mock(Query.class);
+        FilterPredicate predicate = new InPredicate(idPath, ABC, DEF);
+        supplyFilterQueryParameters(query, Arrays.asList(predicate));
+
+        verify(query, times(2)).setParameter(anyString(), any());
+
+        query = mock(Query.class);
+        predicate = new InfixPredicate(idPath, ABC);
+        supplyFilterQueryParameters(query, Arrays.asList(predicate));
+
+        verify(query, times(1)).setParameter(anyString(), any());
+    }
+
+    @Test
+    public void testSettingQueryPagination() {
+        Query query = mock(Query.class);
+
+        PaginationImpl paginationMock = mock(PaginationImpl.class);
+        when(paginationMock.getLimit()).thenReturn(10);
+        when(paginationMock.getOffset()).thenReturn(50);
+
+        when(this.entityProjection.getPagination()).thenReturn(paginationMock);
+
+
+        addPaginationToQuery(query);
+        verify(query, times(1)).setMaxResults(10);
+        verify(query, times(1)).setFirstResult(50);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionFetchQueryBuilderTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionFetchQueryBuilderTest.java
new file mode 100644
index 0000000000..d7a6d5ed80
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionFetchQueryBuilderTest.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.CaseSensitivityStrategy;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpql.query.RootCollectionFetchQueryBuilder;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Editor;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class RootCollectionFetchQueryBuilderTest {
+    private EntityDictionary dictionary;
+
+    private static final String TITLE = "title";
+    private static final String PUBLISHER = "publisher";
+    private static final String EDITOR = "editor";
+    private static final String PERIOD = ".";
+    private static final String NAME = "name";
+    private static final String FIRSTNAME = "firstName";
+    private RSQLFilterDialect filterParser;
+
+    @BeforeAll
+    public void initialize() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Chapter.class);
+        dictionary.bindEntity(Editor.class);
+        filterParser = RSQLFilterDialect.builder()
+                .dictionary(dictionary)
+                .caseSensitivityStrategy(new CaseSensitivityStrategy.UseColumnCollation())
+                .build();
+    }
+
+    @Test
+    public void testRootFetch() {
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class).build();
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT example_Book FROM example.Book AS example_Book";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithSorting() {
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder()
+                .type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Book AS example_Book "
+                + "order by example_Book.title asc";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithJoinFilter() throws ParseException {
+
+        final FilterExpression titlePredicate = filterParser.parseFilterExpression("books.chapters.title=in=('ABC','DEF')", ClassType.of(Author.class), true);
+        final FilterExpression publisherNamePredicate = filterParser.parseFilterExpression("books.publisher.name=in='Pub1'", ClassType.of(Author.class), true);
+
+        OrFilterExpression expression = new OrFilterExpression(titlePredicate, publisherNamePredicate);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder()
+                .type(Author.class)
+                .filterExpression(expression)
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+
+        String expected =
+                "SELECT example_Author FROM example.Author AS example_Author  "
+                + "LEFT JOIN example_Author.books example_Author_books  "
+                + "LEFT JOIN example_Author_books.chapters example_Author_books_chapters   "
+                + "LEFT JOIN example_Author_books.publisher example_Author_books_publisher   "
+                + "WHERE (example_Author_books_chapters.title IN (:books_chapters_title_XXX, :books_chapters_title_XXX) "
+                + "OR example_Author_books_publisher.name IN (:books_publisher_name_XXX)) ";
+
+        String actual = query.getQueryText();
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_publisher_name_\\w\\w\\w\\w+", ":books_publisher_name_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDistinctRootFetchWithToManyJoinFilterAndPagination() throws ParseException {
+        final Pagination pagination = new PaginationImpl(Book.class, 0, 10, 10, 10, false, false);
+
+        final FilterExpression titlePredicate = filterParser.parseFilterExpression("books.chapters.title=in=('ABC','DEF')", ClassType.of(Author.class), true);
+        final FilterExpression publisherNamePredicate = filterParser.parseFilterExpression("books.publisher.name=in='Pub1'", ClassType.of(Author.class), true);
+
+        OrFilterExpression expression = new OrFilterExpression(titlePredicate, publisherNamePredicate);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder()
+                .type(Author.class)
+                .pagination(pagination)
+                .filterExpression(expression)
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT DISTINCT example_Author FROM example.Author AS example_Author "
+                + "LEFT JOIN example_Author.books example_Author_books "
+                + "LEFT JOIN example_Author_books.chapters example_Author_books_chapters "
+                + "LEFT JOIN example_Author_books.publisher example_Author_books_publisher "
+                + "WHERE (example_Author_books_chapters.title IN (:books_chapters_title_XXX, :books_chapters_title_XXX) "
+                + "OR example_Author_books_publisher.name IN (:books_publisher_name_XXX))";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_publisher_name_\\w\\w\\w\\w+", ":books_publisher_name_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithSortingAndFilters() {
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        Path.PathElement idPath = new Path.PathElement(Book.class, Chapter.class, "id");
+
+        FilterPredicate idPredicate = new InPredicate(idPath, 1);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder().type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .filterExpression(idPredicate)
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT example_Book FROM example.Book AS example_Book"
+                + " WHERE example_Book.id IN (:id_XXX) order by example_Book.title asc";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortingWithJoin() {
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(PUBLISHER + PERIOD + NAME, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder().type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT example_Book FROM example.Book AS example_Book "
+                        + "LEFT JOIN example_Book.publisher example_Book_publisher "
+                        + "order by example_Book_publisher.name asc";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithRelationshipSortingAndFilters() {
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(PUBLISHER + PERIOD + EDITOR + PERIOD + FIRSTNAME, Sorting.SortOrder.desc);
+
+        Path.PathElement idPath = new Path.PathElement(Book.class, Chapter.class, "id");
+
+        FilterPredicate idPredicate = new InPredicate(idPath, 1);
+
+        EntityProjection entityProjection = EntityProjection
+                .builder().type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .filterExpression(idPredicate)
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT example_Book FROM example.Book AS example_Book"
+                        + " LEFT JOIN example_Book.publisher example_Book_publisher"
+                        + " LEFT JOIN example_Book_publisher.editor example_Book_publisher_editor"
+                        + " WHERE example_Book.id IN (:id_XXX)"
+                        + " order by example_Book_publisher_editor.firstName desc";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithToOneRelationIncluded() {
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .relationship(
+                        Relationship.builder().name(PUBLISHER).projection(
+                                EntityProjection.builder().type(Publisher.class).build()
+                        ).build()
+                )
+                .build();
+
+        RootCollectionFetchQueryBuilder builder = new RootCollectionFetchQueryBuilder(
+                entityProjection,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT example_Book FROM example.Book AS example_Book LEFT JOIN FETCH example_Book.publisher";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionPageTotalsQueryBuilderTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionPageTotalsQueryBuilderTest.java
new file mode 100644
index 0000000000..77d3769542
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/RootCollectionPageTotalsQueryBuilderTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.datastores.jpql.query.RootCollectionPageTotalsQueryBuilder;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Arrays;
+import java.util.List;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class RootCollectionPageTotalsQueryBuilderTest {
+    private EntityDictionary dictionary;
+
+    private static final String TITLE = "title";
+    private static final String BOOKS = "books";
+    private static final String PUBLISHER = "publisher";
+
+    @BeforeAll
+    public void initialize() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Chapter.class);
+    }
+
+    @Test
+    public void testRootFetch() {
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class).build();
+        RootCollectionPageTotalsQueryBuilder builder = new RootCollectionPageTotalsQueryBuilder(
+                entityProjection, dictionary, new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+            "SELECT COUNT(DISTINCT example_Book) "
+            + "FROM example.Book AS example_Book";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithSorting() {
+        Sorting sorting = mock(Sorting.class);
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .sorting(sorting)
+                .build();
+        TestQueryWrapper query = (TestQueryWrapper) new RootCollectionPageTotalsQueryBuilder(
+                entityProjection, dictionary, new TestSessionWrapper()
+        )
+                .build();
+        String expected = "SELECT COUNT(DISTINCT example_Book) FROM example.Book AS example_Book";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithPagination() {
+        PaginationImpl pagination = mock(PaginationImpl.class);
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .pagination(pagination)
+                .build();
+        TestQueryWrapper query = (TestQueryWrapper) new RootCollectionPageTotalsQueryBuilder(
+                entityProjection, dictionary, new TestSessionWrapper()
+        )
+                .build();
+        String expected = "SELECT COUNT(DISTINCT example_Book) FROM example.Book AS example_Book";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRootFetchWithJoinFilter() {
+        List<Path.PathElement> chapterTitlePath = Arrays.asList(
+                new Path.PathElement(Author.class, Book.class, BOOKS),
+                new Path.PathElement(Book.class, Chapter.class, "chapters"),
+                new Path.PathElement(Chapter.class, String.class, TITLE)
+        );
+
+        FilterPredicate titlePredicate = new InPredicate(
+                new Path(chapterTitlePath),
+                "ABC", "DEF");
+
+        List<Path.PathElement>  publisherNamePath = Arrays.asList(
+                new Path.PathElement(Author.class, Book.class, BOOKS),
+                new Path.PathElement(Book.class, Publisher.class, PUBLISHER),
+                new Path.PathElement(Publisher.class, String.class, "name")
+        );
+
+        FilterPredicate publisherNamePredicate = new InPredicate(
+                new Path(publisherNamePath), "Pub1");
+
+        OrFilterExpression expression = new OrFilterExpression(titlePredicate, publisherNamePredicate);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Author.class)
+                .filterExpression(expression)
+                .build();
+
+        RootCollectionPageTotalsQueryBuilder builder = new RootCollectionPageTotalsQueryBuilder(
+                entityProjection, dictionary, new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT COUNT(DISTINCT example_Author) FROM example.Author AS example_Author "
+                + "LEFT JOIN example_Author.books example_Author_books "
+                + "LEFT JOIN example_Author_books.chapters example_Author_books_chapters "
+                + "LEFT JOIN example_Author_books.publisher example_Author_books_publisher "
+                + "WHERE (example_Author_books_chapters.title IN "
+                + "(:books_chapters_title_XXX, :books_chapters_title_XXX) "
+                + "OR example_Author_books_publisher.name IN (:books_publisher_name_XXX))";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_chapters_title_\\w\\w\\w\\w+", ":books_chapters_title_XXX");
+        actual = actual.replaceFirst(":books_publisher_name_\\w\\w\\w\\w+", ":books_publisher_name_XXX");
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionFetchQueryBuilderTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionFetchQueryBuilderTest.java
new file mode 100644
index 0000000000..9beae973c6
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionFetchQueryBuilderTest.java
@@ -0,0 +1,397 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpql.query.RelationshipImpl;
+import com.yahoo.elide.datastores.jpql.query.SubCollectionFetchQueryBuilder;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SubCollectionFetchQueryBuilderTest {
+
+    private EntityDictionary dictionary;
+
+    private static final String AUTHORS = "authors";
+    private static final String TITLE = "title";
+    private static final String BOOKS = "books";
+    private static final String NAME = "name";
+    private static final String PUBLISHER = "publisher";
+    private static final String PERIOD = ".";
+    private static final String PUB1 = "Pub1";
+
+    @BeforeAll
+    public void initialize() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Chapter.class);
+    }
+
+    @Test
+    public void testSubCollectionFetch() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class).build();
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        assertNull(query);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithIncludedRelation() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .relationship(
+                        Relationship.builder().name(PUBLISHER).projection(
+                                EntityProjection.builder().type(Publisher.class).build()
+                        ).build()
+                )
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book LEFT JOIN FETCH example_Book.publisher "
+                + "WHERE example_Author__fetch=:example_Author__fetch order by example_Book.title asc";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithIncludedToManyRelation() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .relationship(
+                        Relationship.builder().name(AUTHORS).projection(
+                                EntityProjection.builder().type(Author.class).build()
+                        ).build()
+                )
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book "
+                + "WHERE example_Author__fetch=:example_Author__fetch order by example_Book.title asc";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithSorting() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book "
+                + "WHERE example_Author__fetch=:example_Author__fetch order by example_Book.title asc";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithJoinFilter() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        List<Path.PathElement>  publisherNamePath = Arrays.asList(
+                new Path.PathElement(Book.class, Publisher.class, PUBLISHER),
+                new Path.PathElement(Publisher.class, String.class, NAME)
+        );
+
+        FilterPredicate publisherNamePredicate = new InPredicate(
+                new Path(publisherNamePath),
+                PUB1);
+
+
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(publisherNamePredicate)
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book "
+                + "LEFT JOIN example_Book.publisher example_Book_publisher  "
+                + "WHERE example_Book_publisher.name IN (:books_publisher_name_XXX) AND example_Author__fetch=:example_Author__fetch ";
+        String actual = query.getQueryText();
+        actual = actual.replaceFirst(":publisher_name_\\w+_\\w+", ":books_publisher_name_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithSortingAndFilters() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        List<Path.PathElement>  publisherNamePath = Arrays.asList(
+                new Path.PathElement(Book.class, Publisher.class, PUBLISHER),
+                new Path.PathElement(Publisher.class, String.class, NAME)
+        );
+
+        FilterPredicate publisherNamePredicate = new InPredicate(
+                new Path(publisherNamePath),
+                PUB1);
+
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(TITLE, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .filterExpression(publisherNamePredicate)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book "
+                + "LEFT JOIN example_Book.publisher example_Book_publisher "
+                + "WHERE example_Book_publisher.name IN (:publisher_name_XXX) AND example_Author__fetch=:example_Author__fetch order by example_Book.title asc";
+
+        String actual = query.getQueryText();
+        actual = actual.replaceFirst(":publisher_name_\\w+", ":publisher_name_XXX");
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testFetchJoinExcludesParent() {
+        Publisher publisher = new Publisher();
+        publisher.setId(1);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Pagination pagination = new PaginationImpl(Book.class, 0, 10, 10, 10, false, false);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class).pagination(pagination).build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Publisher.class),
+                publisher,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Publisher example_Publisher__fetch "
+                + "JOIN example_Publisher__fetch.books example_Book "
+                + "WHERE example_Publisher__fetch=:example_Publisher__fetch";
+
+        String actual = query.getQueryText();
+        actual = actual.replaceFirst(":publisher_name_\\w+", ":publisher_name_XXX");
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionFetchWithRelationshipSorting() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Map<String, Sorting.SortOrder> sorting = new HashMap<>();
+        sorting.put(PUBLISHER + PERIOD + NAME, Sorting.SortOrder.asc);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class)
+                .sorting(new SortingImpl(sorting, Book.class, dictionary))
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionFetchQueryBuilder builder = new SubCollectionFetchQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected = "SELECT example_Book FROM example.Author example_Author__fetch "
+                + "JOIN example_Author__fetch.books example_Book "
+                + "LEFT JOIN example_Book.publisher example_Book_publisher "
+                + "WHERE example_Author__fetch=:example_Author__fetch order by example_Book_publisher.name asc";
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionPageTotalsQueryBuilderTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionPageTotalsQueryBuilderTest.java
new file mode 100644
index 0000000000..bd29129858
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/SubCollectionPageTotalsQueryBuilderTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.datastores.jpql.query.RelationshipImpl;
+import com.yahoo.elide.datastores.jpql.query.SubCollectionPageTotalsQueryBuilder;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Arrays;
+import java.util.List;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SubCollectionPageTotalsQueryBuilderTest {
+
+    private EntityDictionary dictionary;
+
+    private static final String BOOKS = "books";
+    private static final String PUBLISHER = "publisher";
+
+    @BeforeAll
+    public void initialize() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Chapter.class);
+    }
+
+    @Test
+    public void testSubCollectionPageTotals() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        EntityProjection entityProjection = EntityProjection.builder().type(Book.class).build();
+        Relationship relationshipProjection = Relationship.builder().projection(entityProjection).name(BOOKS).build();
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionPageTotalsQueryBuilder builder = new SubCollectionPageTotalsQueryBuilder(
+                relationship, dictionary, new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder
+                .build();
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+
+        String expected =
+                "SELECT COUNT(DISTINCT example_Author_books) "
+                + "FROM example.Author AS example_Author "
+                + "JOIN example_Author.books example_Author_books "
+                + "WHERE example_Author.id IN (:id_XXX)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionPageTotalsWithSorting() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        Sorting sorting = mock(Sorting.class);
+
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .sorting(sorting)
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) new SubCollectionPageTotalsQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        ).build();
+
+        String expected =
+                "SELECT COUNT(DISTINCT example_Author_books) "
+                        + "FROM example.Author AS example_Author "
+                        + "JOIN example_Author.books example_Author_books "
+                        + "WHERE example_Author.id IN (:id_XXX)";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionPageTotalsWithPagination() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        PaginationImpl pagination = mock(PaginationImpl.class);
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .pagination(pagination)
+                .build();
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) new SubCollectionPageTotalsQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        ).build();
+
+        String expected =
+                "SELECT COUNT(DISTINCT example_Author_books) "
+                        + "FROM example.Author AS example_Author "
+                        + "JOIN example_Author.books example_Author_books "
+                        + "WHERE example_Author.id IN (:id_XXX)";
+
+        String actual = query.getQueryText();
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSubCollectionPageTotalsWithJoinFilter() {
+        Author author = new Author();
+        author.setId(1L);
+
+        Book book = new Book();
+        book.setId(2);
+
+        List<Path.PathElement>  publisherNamePath = Arrays.asList(
+                new Path.PathElement(Book.class, Publisher.class, PUBLISHER),
+                new Path.PathElement(Publisher.class, String.class, "name")
+        );
+
+        FilterPredicate publisherNamePredicate = new InPredicate(
+                new Path(publisherNamePath),
+                "Pub1");
+
+        EntityProjection entityProjection = EntityProjection.builder()
+                .type(Book.class)
+                .filterExpression(publisherNamePredicate)
+                .build();
+
+        Relationship relationshipProjection = Relationship.builder().name(BOOKS).projection(entityProjection).build();
+
+        RelationshipImpl relationship = new RelationshipImpl(
+                ClassType.of(Author.class),
+                author,
+                relationshipProjection
+        );
+
+        SubCollectionPageTotalsQueryBuilder builder = new SubCollectionPageTotalsQueryBuilder(
+                relationship,
+                dictionary,
+                new TestSessionWrapper()
+        );
+
+        TestQueryWrapper query = (TestQueryWrapper) builder.build();
+
+        String expected =
+                "SELECT COUNT(DISTINCT example_Author_books) "
+                + "FROM example.Author AS example_Author "
+                + "LEFT JOIN example_Author.books example_Author_books "
+                + "LEFT JOIN example_Author_books.publisher example_Author_books_publisher "
+                + "WHERE (example_Author_books_publisher.name IN (:books_publisher_name_XXX) "
+                + "AND example_Author.id IN (:id_XXX))";
+
+        String actual = query.getQueryText();
+        actual = actual.replaceFirst(":books_publisher_name_\\w+", ":books_publisher_name_XXX");
+        actual = actual.trim().replaceAll(" +", " ");
+        actual = actual.replaceFirst(":id_\\w+", ":id_XXX");
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestQueryWrapper.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestQueryWrapper.java
new file mode 100644
index 0000000000..ac99575572
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestQueryWrapper.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import lombok.Getter;
+
+import java.util.Collection;
+
+public class TestQueryWrapper implements Query {
+
+    @Getter
+    private String queryText;
+
+    public TestQueryWrapper(String queryText) {
+        this.queryText = queryText;
+    }
+
+    @Override
+    public Query setFirstResult(int num) {
+        return this;
+    }
+
+    @Override
+    public Query setMaxResults(int num) {
+        return this;
+    }
+
+    @Override
+    public Query setParameter(String name, Object value) {
+
+        return this;
+    }
+
+    @Override
+    public Query setParameterList(String name, Collection<?> values) {
+        return this;
+    }
+
+    @Override
+    public <T> T uniqueResult() {
+        return null;
+    }
+
+    @Override
+    public <T> Iterable<T> scroll() {
+        return null;
+    }
+
+    @Override
+    public <T> Iterable<T> list() {
+        return null;
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestSessionWrapper.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestSessionWrapper.java
new file mode 100644
index 0000000000..c40e9e29dc
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/hibernate/hql/TestSessionWrapper.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.hibernate.hql;
+
+import com.yahoo.elide.datastores.jpql.porting.Query;
+import com.yahoo.elide.datastores.jpql.porting.Session;
+
+public class TestSessionWrapper implements Session {
+    @Override
+    public Query createQuery(String queryText) {
+        return new TestQueryWrapper(queryText);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslatorTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslatorTest.java
new file mode 100644
index 0000000000..32c9c9954c
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/FilterTranslatorTest.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.jpql.filter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InPredicate;
+import com.yahoo.elide.core.filter.predicates.NotEmptyPredicate;
+import com.yahoo.elide.core.type.ClassType;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Tests Building a HQL Filter.
+ */
+public class FilterTranslatorTest {
+
+    private EntityDictionary dictionary;
+    private RSQLFilterDialect dialect;
+
+    public FilterTranslatorTest() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+
+        dialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+    }
+
+    @Test
+    public void testComplexAttributeAlias() throws Exception {
+        FilterExpression expression =
+                dialect.parseFilterExpression("price.total>=10", ClassType.of(Book.class), true);
+
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+
+        String actual = filterOp.apply(expression, true);
+        actual = actual.replaceAll(":\\w+", ":XXX");
+
+        assertEquals("example_Book.price.total >= :XXX", actual);
+    }
+
+    @Test
+    public void testNestedComplexAttributeAlias() throws Exception {
+        FilterExpression expression =
+                dialect.parseFilterExpression("price.currency.isoCode==USD", ClassType.of(Book.class), true);
+
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+
+        String actual = filterOp.apply(expression, true);
+        actual = actual.replaceAll(":\\w+", ":XXX");
+
+        assertEquals("example_Book.price.currency.isoCode IN (:XXX)", actual);
+    }
+
+    @Test
+    public void testHQLQueryVisitor() throws Exception {
+        List<Path.PathElement> p0Path = Arrays.asList(
+                new Path.PathElement(Book.class, Author.class, "authors")
+        );
+        FilterPredicate p0 = new NotEmptyPredicate(new Path(p0Path));
+
+        List<Path.PathElement> p1Path = Arrays.asList(
+                new Path.PathElement(Book.class, Author.class, "authors"),
+                new Path.PathElement(Author.class, String.class, "name")
+        );
+        FilterPredicate p1 = new InPredicate(new Path(p1Path), "foo", "bar");
+
+        List<Path.PathElement> p2Path = Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "name")
+        );
+        FilterPredicate p2 = new InPredicate(new Path(p2Path), "blah");
+
+        List<Path.PathElement> p3Path = Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "genre")
+        );
+        FilterPredicate p3 = new InPredicate(new Path(p3Path), "scifi");
+
+        OrFilterExpression or = new OrFilterExpression(p2, p3);
+        AndFilterExpression and1 = new AndFilterExpression(p0, p1);
+        AndFilterExpression and2 = new AndFilterExpression(or, and1);
+        NotFilterExpression not = new NotFilterExpression(and2);
+
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        String query = filterOp.apply(not, false);
+        query = query.trim().replaceAll(" +", " ");
+
+        String p1Params = p1.getParameters().stream()
+                .map(FilterPredicate.FilterParameter::getPlaceholder).collect(Collectors.joining(", "));
+        String p2Params = p2.getParameters().stream()
+                .map(FilterPredicate.FilterParameter::getPlaceholder).collect(Collectors.joining(", "));
+        String p3Params = p3.getParameters().stream()
+                .map(FilterPredicate.FilterParameter::getPlaceholder).collect(Collectors.joining(", "));
+        String expected = "NOT (((name IN (" + p2Params + ") OR genre IN (" + p3Params + ")) "
+                + "AND (authors IS NOT EMPTY AND authors.name IN (" + p1Params + "))))";
+        assertEquals(expected, query);
+    }
+
+    @Test
+    public void testBetweenOperator() throws Exception {
+        List<Path.PathElement> authorId = Arrays.asList(
+                new Path.PathElement(Book.class, Author.class, "authors"),
+                new Path.PathElement(Author.class, Long.class, "id")
+        );
+        List<Path.PathElement> publishDate = Arrays.asList(
+                new Path.PathElement(Book.class, Long.class, "publishDate")
+        );
+        FilterPredicate authorPred = new FilterPredicate(new Path(authorId), Operator.BETWEEN, Arrays.asList(1, 15));
+        FilterPredicate publishPred = new FilterPredicate(new Path(publishDate), Operator.NOTBETWEEN, Arrays.asList(1, 15));
+
+
+        AndFilterExpression andFilter = new AndFilterExpression(authorPred, publishPred);
+
+
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        String query = filterOp.apply(andFilter, false);
+
+
+        String authorP1 = authorPred.getParameters().get(0).getPlaceholder();
+        String authorP2 = authorPred.getParameters().get(1).getPlaceholder();
+
+
+        String publishP1 = publishPred.getParameters().get(0).getPlaceholder();
+        String publishP2 = publishPred.getParameters().get(1).getPlaceholder();
+
+        String expected = "(authors.id BETWEEN " + authorP1 + " AND " + authorP2 + " AND "
+                + "publishDate NOT BETWEEN " + publishP1 + " AND " + publishP2 + ")";
+        assertEquals(expected, query);
+
+
+        // Assert excepetion if parameter length is not 2
+        assertThrows(IllegalArgumentException.class,
+                () -> filterOp.apply(
+                        new FilterPredicate(new Path(authorId), Operator.BETWEEN, Arrays.asList(3))
+                ));
+    }
+
+    @Test
+    public void testMemberOfOperator() throws Exception {
+        List<Path.PathElement> path = Arrays.asList(
+                new Path.PathElement(Book.class, String.class, "awards")
+        );
+        FilterPredicate p1 = new FilterPredicate(new Path(path), Operator.HASMEMBER, Arrays.asList("awards1"));
+        FilterPredicate p2 = new FilterPredicate(new Path(path), Operator.HASNOMEMBER, Arrays.asList("awards2"));
+
+        AndFilterExpression and = new AndFilterExpression(p1, p2);
+
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        String query = filterOp.apply(and, false);
+
+        String p1Params = p1.getParameters().stream()
+                .map(FilterPredicate.FilterParameter::getPlaceholder).collect(Collectors.joining(", "));
+        String p2Params = p2.getParameters().stream()
+                .map(FilterPredicate.FilterParameter::getPlaceholder).collect(Collectors.joining(", "));
+        String expected = "(" + p1Params + " MEMBER OF awards "
+                + "AND " + p2Params + " NOT MEMBER OF awards)";
+        assertEquals(expected, query);
+    }
+
+    @Test
+    public void testEmptyFieldOnPrefix() throws Exception {
+        FilterPredicate pred = new FilterPredicate(new Path.PathElement(Book.class, String.class, ""),
+                Operator.PREFIX_CASE_INSENSITIVE, Arrays.asList("value"));
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        assertThrows(InvalidValueException.class, () -> filterOp.apply(pred));
+    }
+
+    @Test
+    public void testEmptyFieldOnInfix() throws Exception {
+        FilterPredicate pred = new FilterPredicate(new Path.PathElement(Book.class, String.class, ""),
+                Operator.INFIX_CASE_INSENSITIVE, Arrays.asList("value"));
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        assertThrows(InvalidValueException.class, () -> filterOp.apply(pred));
+    }
+
+    @Test
+    public void testEmptyFieldOnPostfix() throws Exception {
+        FilterPredicate pred = new FilterPredicate(new Path.PathElement(Book.class, String.class, ""),
+                Operator.POSTFIX_CASE_INSENSITIVE, Arrays.asList("value"));
+        FilterTranslator filterOp = new FilterTranslator(dictionary);
+        assertThrows(InvalidValueException.class, () -> filterOp.apply(pred));
+    }
+
+    @Test
+    public void testCustomPredicate() throws Exception {
+
+        JPQLPredicateGenerator generator = (predicate, aliasGenerator) -> "FOO";
+
+        try {
+            FilterTranslator.registerJPQLGenerator(Operator.INFIX_CASE_INSENSITIVE, ClassType.of(Author.class), "name", generator);
+
+            FilterPredicate pred = new FilterPredicate(new Path.PathElement(Author.class, String.class, "name"),
+                    Operator.INFIX_CASE_INSENSITIVE, Arrays.asList("value"));
+
+            String actual = new FilterTranslator(dictionary).apply(pred);
+            assertEquals("FOO", actual);
+        } finally {
+            FilterTranslator.registerJPQLGenerator(Operator.INFIX_CASE_INSENSITIVE, ClassType.of(Author.class), "name", null);
+        }
+    }
+
+    @Test
+    public void testCustomGlobalOperator() throws Exception {
+
+        JPQLPredicateGenerator generator = (predicate, aliasGenerator) -> "FOO";
+
+        JPQLPredicateGenerator old = FilterTranslator.lookupJPQLGenerator(Operator.INFIX_CASE_INSENSITIVE);
+        try {
+            FilterTranslator.registerJPQLGenerator(Operator.INFIX_CASE_INSENSITIVE, generator);
+
+            FilterPredicate pred = new FilterPredicate(new Path.PathElement(Author.class, String.class, "name"),
+                    Operator.INFIX_CASE_INSENSITIVE, Arrays.asList("value"));
+
+            String actual = new FilterTranslator(dictionary).apply(pred);
+            assertEquals("FOO", actual);
+        } finally {
+            FilterTranslator.registerJPQLGenerator(Operator.INFIX_CASE_INSENSITIVE, old);
+        }
+    }
+
+    @Test
+    public void testCustomLocalOperator() throws Exception {
+
+        JPQLPredicateGenerator generator = new CaseAwareJPQLGenerator(
+                "%s LIKE CONCAT('%%', %s, '%%')",
+                CaseAwareJPQLGenerator.Case.NONE,
+                CaseAwareJPQLGenerator.ArgumentCount.ONE
+        );
+
+        FilterPredicate pred = new FilterPredicate(new Path.PathElement(Author.class, String.class, "name"),
+                    Operator.INFIX, Arrays.asList("value"));
+
+        Map<Operator, JPQLPredicateGenerator> overrides = new HashMap<>();
+        overrides.put(Operator.INFIX, generator);
+
+        String actual = new FilterTranslator(dictionary, overrides)
+                .apply(pred)
+                .replaceAll(":\\w+", ":XXX");
+
+        assertEquals("name LIKE CONCAT('%', :XXX, '%')", actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGeneratorTest.java b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGeneratorTest.java
new file mode 100644
index 0000000000..314f888d12
--- /dev/null
+++ b/elide-datastore/elide-datastore-jpql/src/test/java/com/yahoo/elide/datastores/jpql/filter/HasMemberJPQLGeneratorTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.jpql.filter;
+
+import static com.yahoo.elide.core.utils.TypeHelper.getFieldAlias;
+import static com.yahoo.elide.core.utils.TypeHelper.getPathAlias;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.ClassType;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import org.junit.jupiter.api.Test;
+
+import java.util.function.Function;
+
+public class HasMemberJPQLGeneratorTest {
+    private EntityDictionary dictionary;
+    private RSQLFilterDialect dialect;
+    private Function<Path, String> aliasGenerator;
+
+    public HasMemberJPQLGeneratorTest() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Chapter.class);
+
+        dialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        aliasGenerator = (path) -> getFieldAlias(getPathAlias(path, dictionary),
+                path.lastElement().map(Path.PathElement::getFieldName).orElse(null));
+    }
+
+    @Test
+    void testHasMemberBookAuthorName() throws Exception {
+        HasMemberJPQLGenerator generator = new HasMemberJPQLGenerator(dictionary);
+
+        FilterExpression expression = dialect.parseFilterExpression("authors.name=hasmember='Jon Doe'",
+                ClassType.of(Book.class),
+                true);
+
+        String actual = generator.generate((FilterPredicate) expression, aliasGenerator);
+        actual = actual.replaceFirst(":\\w+", ":XXX");
+
+        String expected = "EXISTS (SELECT 1 FROM example.Book _INNER_example_Book LEFT JOIN _INNER_example_Book.authors _INNER_example_Book_authors "
+                + "WHERE _INNER_example_Book.id = example_Book.id AND _INNER_example_Book_authors.name = :XXX)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void testHasNoMemberBookAuthorName() throws Exception {
+        HasMemberJPQLGenerator generator = new HasMemberJPQLGenerator(dictionary, true);
+
+        FilterExpression expression = dialect.parseFilterExpression("authors.name=hasnomember='Jon Doe'",
+                ClassType.of(Book.class),
+                true);
+
+        String actual = generator.generate((FilterPredicate) expression, aliasGenerator);
+        actual = actual.replaceFirst(":\\w+", ":XXX");
+
+        String expected = "NOT EXISTS (SELECT 1 FROM example.Book _INNER_example_Book LEFT JOIN _INNER_example_Book.authors _INNER_example_Book_authors "
+                + "WHERE _INNER_example_Book.id = example_Book.id AND _INNER_example_Book_authors.name = :XXX)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void testHasMemberAuthorBookChapterTitle() throws Exception {
+        HasMemberJPQLGenerator generator = new HasMemberJPQLGenerator(dictionary);
+
+        FilterExpression expression = dialect.parseFilterExpression("books.chapters.title=hasmember='A title'",
+                ClassType.of(Author.class),
+                true);
+
+        String actual = generator.generate((FilterPredicate) expression, aliasGenerator);
+        actual = actual.replaceFirst(":\\w+", ":XXX");
+
+        String expected = "EXISTS (SELECT 1 FROM example.Author _INNER_example_Author LEFT JOIN _INNER_example_Author.books _INNER_example_Author_books "
+                + "LEFT JOIN _INNER_example_Author_books.chapters _INNER_example_Author_books_chapters WHERE _INNER_example_Author.id = example_Author.id AND _INNER_example_Author_books_chapters.title = :XXX)";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void testHasMemberBookAwards() throws Exception {
+        HasMemberJPQLGenerator generator = new HasMemberJPQLGenerator(dictionary);
+
+        FilterExpression expression = dialect.parseFilterExpression("awards=hasmember='Foo'",
+                ClassType.of(Book.class),
+                true);
+
+        String actual = generator.generate((FilterPredicate) expression, aliasGenerator);
+        actual = actual.replaceFirst(":\\w+", ":XXX");
+
+        String expected = ":XXX MEMBER OF example_Book.awards";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void testHasNoMemberBookAwards() throws Exception {
+        HasMemberJPQLGenerator generator = new HasMemberJPQLGenerator(dictionary, true);
+
+        FilterExpression expression = dialect.parseFilterExpression("awards=hasnomember='Foo'",
+                ClassType.of(Book.class),
+                true);
+
+        String actual = generator.generate((FilterPredicate) expression, aliasGenerator);
+        actual = actual.replaceFirst(":\\w+", ":XXX");
+
+        String expected = ":XXX NOT MEMBER OF example_Book.awards";
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-datastore/elide-datastore-multiplex/pom.xml b/elide-datastore/elide-datastore-multiplex/pom.xml
index 84464b8ca5..c3be41215a 100644
--- a/elide-datastore/elide-datastore-multiplex/pom.xml
+++ b/elide-datastore/elide-datastore-multiplex/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-datastore-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
+        <version>6.1.4-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -34,31 +34,43 @@
         <tag>HEAD</tag>
     </scm>
 
+    <properties>
+        <dataStoreHarness>com.yahoo.elide.datastores.multiplex.bridgeable.BridgeableDataStoreHarness</dataStoreHarness>
+    </properties>
+
     <dependencies>
         <!-- Elide dependencies (include test dependencies) -->
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-core</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-inmemorydb</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- For proper serialization in elide-core -->
+
         <dependency>
             <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0.2</version>
+            <artifactId>javax.persistence-api</artifactId>
             <scope>test</scope>
         </dependency>
+
         <!-- Test dependencies -->
+
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -78,6 +90,30 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipITs>true</skipITs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <dataStoreHarness>${dataStoreHarness}</dataStoreHarness>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexManager.java b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexManager.java
index 32da3da25a..f81b16e8d6 100644
--- a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexManager.java
+++ b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexManager.java
@@ -5,13 +5,21 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.PermissionExecutor;
+import com.yahoo.elide.core.type.Type;
+import lombok.AccessLevel;
+import lombok.Setter;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 /**
  * Allows multiple database handlers to each process their own beans while keeping the main
@@ -28,10 +36,12 @@
  * <li>Attempt to reverse DB1 commit fails
  * </ul>
  */
-public class MultiplexManager implements DataStore {
+public final class MultiplexManager implements DataStore {
 
     protected final List<DataStore> dataStores;
-    protected final ConcurrentHashMap<Class<?>, DataStore> dataStoreMap = new ConcurrentHashMap<>();
+    protected final ConcurrentHashMap<Type<?>, DataStore> dataStoreMap = new ConcurrentHashMap<>();
+
+    @Setter(AccessLevel.PROTECTED)
     private EntityDictionary dictionary;
 
     /**
@@ -47,14 +57,27 @@ public void populateEntityDictionary(EntityDictionary dictionary) {
         this.dictionary = dictionary;
 
         for (DataStore dataStore : dataStores) {
-            EntityDictionary subordinateDictionary = new EntityDictionary(dictionary.getCheckMappings());
+            EntityDictionary subordinateDictionary = new EntityDictionary(
+                    dictionary.getCheckMappings(),
+                    dictionary.getRoleChecks(),
+                    dictionary.getInjector(),
+                    dictionary.getSerdeLookup(),
+                    dictionary.getEntitiesToExclude(),
+                    dictionary.getScanner());
 
             dataStore.populateEntityDictionary(subordinateDictionary);
-            for (Class<?> cls : subordinateDictionary.getBindings()) {
+            for (EntityBinding binding : subordinateDictionary.getBindings(false)) {
                 // route class to this database manager
-                this.dataStoreMap.put(cls, dataStore);
+                this.dataStoreMap.put(binding.entityClass, dataStore);
+
                 // bind to multiplex dictionary
-                dictionary.bindEntity(cls);
+                dictionary.bindEntity(binding);
+            }
+
+            for (Map.Entry<Type<?>, Function<RequestScope, PermissionExecutor>> entry
+                    : subordinateDictionary.getEntityPermissionExecutor().entrySet()) {
+                dictionary.bindPermissionExecutor(entry.getKey(), entry.getValue());
+
             }
         }
     }
@@ -75,12 +98,13 @@ public EntityDictionary getDictionary() {
 
     /**
      * Lookup subordinate database manager for provided entity class.
+     * @param <T> type
      * @param cls provided class
      * @return database manager handling this entity
      */
-    protected <T> DataStore getSubManager(Class<T> cls) {
+    protected <T> DataStore getSubManager(Type<T> cls) {
         // Follow for this class or super-class for Entity annotation
-        Class<T> type = (Class<T>) dictionary.lookupEntityClass(cls);
+        Type<T> type = (Type<T>) dictionary.lookupBoundClass(cls);
         return dataStoreMap.get(type);
     }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexReadTransaction.java b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexReadTransaction.java
index 02f4091b38..a90b80c5b2 100644
--- a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexReadTransaction.java
+++ b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexReadTransaction.java
@@ -5,14 +5,14 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
 
 /**
  * Multiplex transaction handler.
  */
 public class MultiplexReadTransaction extends MultiplexTransaction {
-
     public MultiplexReadTransaction(MultiplexManager multiplexManager) {
         super(multiplexManager);
     }
@@ -24,12 +24,12 @@ protected DataStoreTransaction beginTransaction(DataStore dataStore) {
     }
 
     @Override
-    public void save(Object object) {
+    public <T> void save(T entity, RequestScope scope) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void delete(Object object) {
+    public <T> void delete(T entity, RequestScope scope) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexTransaction.java b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexTransaction.java
index c357725984..33c724ea50 100644
--- a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexTransaction.java
+++ b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexTransaction.java
@@ -5,23 +5,26 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.FilterScope;
-import com.yahoo.elide.core.RelationshipType;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.exceptions.InvalidCollectionException;
-import com.yahoo.elide.core.filter.Predicate;
+import com.yahoo.elide.core.filter.Operator;
 import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-import com.yahoo.elide.security.User;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
 
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashMap;
-import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -29,9 +32,8 @@
  * If any commit fails in process, reverse any commits already completed.
  */
 public abstract class MultiplexTransaction implements DataStoreTransaction {
-    protected final LinkedHashMap<DataStore, DataStoreTransaction> transactions;
+    protected LinkedHashMap<DataStore, DataStoreTransaction> transactions;
     protected final MultiplexManager multiplexManager;
-    protected final DataStoreTransaction lastDataStoreTransaction;
 
     /**
      * Multiplex transaction handler.
@@ -40,75 +42,50 @@ public abstract class MultiplexTransaction implements DataStoreTransaction {
     public MultiplexTransaction(MultiplexManager multiplexManager) {
         this.multiplexManager = multiplexManager;
         this.transactions = new LinkedHashMap<>(multiplexManager.dataStores.size());
-
-        // create each subordinate transaction
-        DataStoreTransaction transaction = null;
-        for (DataStore dataStore : multiplexManager.dataStores) {
-            transaction = beginTransaction(dataStore);
-            transactions.put(dataStore, transaction);
-        }
-        lastDataStoreTransaction = transaction;
     }
 
     protected abstract DataStoreTransaction beginTransaction(DataStore dataStore);
 
     @Override
-    public User accessUser(Object opaqueUser) {
-        User user = new User(opaqueUser);
-        for (DataStore dataStore : multiplexManager.dataStores) {
-            DataStoreTransaction transaction = transactions.get(dataStore);
-            user = transaction.accessUser(user.getOpaqueUser());
-        }
-        return user;
-    }
-
-    @Override
-    public <T> T createObject(Class<T> createObject) {
-        return getTransaction(createObject).createObject(createObject);
-    }
-
-    @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id) {
-        return getTransaction(loadClass).loadObject(loadClass, id);
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> loadClass) {
-        return getTransaction(loadClass).loadObjects(loadClass);
-    }
-
-    @Override
-    public <T> Iterable<T> loadObjects(Class<T> entityClass, FilterScope filterScope) {
-        return getTransaction(entityClass).loadObjects(entityClass, filterScope);
+    public <T> void createObject(T entity, RequestScope scope) {
+        getTransaction(EntityDictionary.getType(entity)).createObject(entity, scope);
     }
 
     @Override
-    public <T> T loadObject(Class<T> entityClass, Serializable id, Optional<FilterExpression> filterExpression) {
-        return getTransaction(entityClass).loadObject(entityClass, id, filterExpression);
+    public <T> T loadObject(EntityProjection projection,
+                             Serializable id,
+                             RequestScope scope) {
+        return getTransaction(projection.getType()).loadObject(projection, id, scope);
     }
 
     @Override
-    @Deprecated
-    public <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
-        return getTransaction(entityClass).filterCollection(collection, entityClass, predicates);
+    public <T> DataStoreIterable<T> loadObjects(
+            EntityProjection projection,
+            RequestScope scope) {
+        return getTransaction(projection.getType()).loadObjects(projection, scope);
     }
 
     @Override
-    public void flush() {
-        transactions.values().forEach(DataStoreTransaction::flush);
+    public void flush(RequestScope requestScope) {
+        transactions.values().stream()
+                .filter(dataStoreTransaction -> dataStoreTransaction != null)
+                .forEach(dataStoreTransaction -> dataStoreTransaction.flush(requestScope));
     }
 
     @Override
-    public void preCommit() {
-        transactions.values().forEach(DataStoreTransaction::preCommit);
+    public void preCommit(RequestScope scope) {
+        transactions.values().stream()
+                .filter(dataStoreTransaction -> dataStoreTransaction != null)
+                .forEach(tx -> tx.preCommit(scope));
     }
 
     @Override
-    public void commit() {
+    public void commit(RequestScope scope) {
         // flush all before commit
-        flush();
-        transactions.values().forEach(DataStoreTransaction::commit);
-        transactions.clear();
+        flush(scope);
+        transactions.values().stream()
+               .filter(dataStoreTransaction -> dataStoreTransaction != null)
+               .forEach(dataStoreTransaction -> dataStoreTransaction.commit(scope));
     }
 
     @Override
@@ -128,84 +105,135 @@ public void close() throws IOException {
                 }
             }
         }
+        transactions.clear();
         if (cause != null) {
             throw cause;
         }
     }
 
     protected DataStoreTransaction getTransaction(Object object) {
-        return getTransaction(object.getClass());
+        return getTransaction(ClassType.of(object.getClass()));
     }
 
-    protected DataStoreTransaction getTransaction(Class<?> cls) {
-        DataStoreTransaction transaction = transactions.get(this.multiplexManager.getSubManager(cls));
+    protected DataStoreTransaction getTransaction(Type<?> cls) {
+        DataStore lookupDataStore = this.multiplexManager.getSubManager(cls);
+
+        DataStoreTransaction transaction = transactions.get(lookupDataStore);
         if (transaction == null) {
-            Class entityClass = multiplexManager.getDictionary().lookupEntityClass(cls);
-            throw new InvalidCollectionException(entityClass == null ? cls.getName() : entityClass.getName());
+            for (DataStore dataStore : multiplexManager.dataStores) {
+                if (dataStore.equals(lookupDataStore)) {
+                    transaction = beginTransaction(dataStore);
+                    transactions.put(dataStore, transaction);
+                    break;
+                }
+            }
+            if (transaction == null) {
+                throw new InvalidCollectionException(cls.getName());
+            }
         }
         return transaction;
     }
 
+    protected DataStoreTransaction getRelationTransaction(Object object, String relationName) {
+        EntityDictionary dictionary = multiplexManager.getDictionary();
+        Type<?> relationClass = dictionary.getParameterizedType(EntityDictionary.getType(object), relationName);
+        return getTransaction(relationClass);
+    }
+
     @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Optional<FilterExpression> filterExpression,
-            Sorting sorting,
-            Pagination pagination
+    public <T, R> DataStoreIterable<R> getToManyRelation(
+            DataStoreTransaction tx,
+            T entity,
+            Relationship relation,
+            RequestScope scope
     ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        return transaction.getRelation(entity, relationshipType, relationName,
-                relationClass, dictionary, filterExpression, sorting, pagination);
+        DataStoreTransaction relationTx = getRelationTransaction(entity, relation.getName());
+        Type<Object> entityType = EntityDictionary.getType(entity);
+        DataStoreTransaction entityTransaction = getTransaction(entityType);
+
+        return entityTransaction.getToManyRelation(relationTx, entity, relation, scope);
     }
 
     @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters
+    public <T, R> R getToOneRelation(
+            DataStoreTransaction tx,
+            T entity,
+            Relationship relation,
+            RequestScope scope
     ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        return transaction.getRelation(entity, relationshipType, relationName, relationClass, dictionary, filters);
+        DataStoreTransaction relationTx = getRelationTransaction(entity, relation.getName());
+        Type<Object> entityType = EntityDictionary.getType(entity);
+        DataStoreTransaction entityTransaction = getTransaction(entityType);
+
+        return entityTransaction.getToOneRelation(relationTx, entity, relation, scope);
     }
 
     @Override
-    public <T> Object getRelationWithSortingAndPagination(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        return transaction.getRelationWithSortingAndPagination(entity, relationshipType, relationName,
-                relationClass, dictionary, filters, sorting, pagination);
+    public <T, R> void updateToManyRelation(DataStoreTransaction tx,
+                                     T entity, String relationName,
+                                     Set<R> newRelationships,
+                                     Set<R> deletedRelationships,
+                                     RequestScope scope) {
+        DataStoreTransaction relationTx = getRelationTransaction(entity, relationName);
+        DataStoreTransaction entityTransaction = getTransaction(EntityDictionary.getType(entity));
+        entityTransaction.updateToManyRelation(relationTx, entity, relationName,
+                newRelationships, deletedRelationships, scope);
     }
 
     @Override
-    public <T> Iterable<T> loadObjectsWithSortingAndPagination(Class<T> entityClass, FilterScope filterScope) {
-        return getTransaction(entityClass).loadObjectsWithSortingAndPagination(entityClass, filterScope);
+    public <T, R> void updateToOneRelation(DataStoreTransaction tx, T entity,
+                                    String relationName, R relationshipValue, RequestScope scope) {
+        DataStoreTransaction relationTx = getRelationTransaction(entity, relationName);
+        DataStoreTransaction entityTransaction = getTransaction(EntityDictionary.getType(entity));
+        entityTransaction.updateToOneRelation(relationTx, entity, relationName, relationshipValue, scope);
     }
 
     @Override
-    public <T> Collection filterCollectionWithSortingAndPagination(Collection collection, Class<T> entityClass,
-            EntityDictionary dictionary, Optional<Set<Predicate>> filters, Optional<Sorting> sorting,
-            Optional<Pagination> pagination) {
-        return getTransaction(entityClass).filterCollectionWithSortingAndPagination(
-                collection, entityClass, dictionary, filters, sorting, pagination);
+    public <T, R> R getAttribute(T entity, Attribute attribute, RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(EntityDictionary.getType(entity));
+        return transaction.getAttribute(entity, attribute, scope);
     }
 
     @Override
-    public <T> Long getTotalRecords(Class<T> entityClass) {
-        return getTransaction(entityClass).getTotalRecords(entityClass);
+    public <T> void setAttribute(T entity, Attribute attribute, RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(EntityDictionary.getType(entity));
+        transaction.setAttribute(entity, attribute, scope);
+    }
+
+    private Serializable extractId(FilterExpression filterExpression,
+                                   String idFieldName,
+                                   Type<?> relationClass) {
+        Collection<FilterPredicate> predicates = filterExpression.accept(new PredicateExtractionVisitor());
+        return predicates.stream()
+                .filter(p -> p.getEntityType() == relationClass && p.getOperator() == Operator.IN)
+                .filter(p -> p.getValues().size() == 1)
+                .filter(p -> p.getField().equals(idFieldName))
+                .findFirst()
+                .map(p -> (Serializable) p.getValues().get(0))
+                .orElse(null);
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        transactions.values().forEach(dataStoreTransaction -> dataStoreTransaction.cancel(scope));
+    }
+
+    @Override
+    public <T> T getProperty(String propertyName) {
+        DataStore matchingStore = multiplexManager.dataStores.stream()
+                .filter(store -> propertyName.startsWith(store.getClass().getPackage().getName()))
+                .findFirst().orElse(null);
+
+        //Data store transaction properties must be prefixed with their package name.
+        if (matchingStore == null) {
+            return null;
+        }
+
+        if (! transactions.containsKey(matchingStore)) {
+            DataStoreTransaction tx = beginTransaction(matchingStore);
+            transactions.put(matchingStore, tx);
+        }
+
+        return transactions.get(matchingStore).getProperty(propertyName);
     }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexWriteTransaction.java b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexWriteTransaction.java
index dcc13db45d..7ee53141f3 100644
--- a/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexWriteTransaction.java
+++ b/elide-datastore/elide-datastore-multiplex/src/main/java/com/yahoo/elide/datastores/multiplex/MultiplexWriteTransaction.java
@@ -5,30 +5,28 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.RelationshipType;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
 import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.core.filter.expression.FilterExpression;
-import com.yahoo.elide.core.pagination.Pagination;
-import com.yahoo.elide.core.sort.Sorting;
-
-import com.google.common.collect.Lists;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.Field;
+import com.yahoo.elide.core.type.Method;
+import com.yahoo.elide.core.type.Type;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MultivaluedHashMap;
 
 /**
@@ -50,34 +48,38 @@ protected DataStoreTransaction beginTransaction(DataStore dataStore) {
     }
 
     @Override
-    public void save(Object entity) {
-        getTransaction(entity).save(entity);
-        dirtyObjects.add(this.multiplexManager.getSubManager(entity.getClass()), entity);
+    public <T> void save(T entity, RequestScope requestScope) {
+        Type<Object> entityType = EntityDictionary.getType(entity);
+        getTransaction(entityType).save(entity, requestScope);
+        dirtyObjects.add(this.multiplexManager.getSubManager(entityType), entity);
     }
 
     @Override
-    public void delete(Object entity) {
-        getTransaction(entity).delete(entity);
-        dirtyObjects.add(this.multiplexManager.getSubManager(entity.getClass()), entity);
+    public <T> void delete(T entity, RequestScope requestScope) {
+        Type<Object> entityType = EntityDictionary.getType(entity);
+        getTransaction(entityType).delete(entity, requestScope);
+        dirtyObjects.add(this.multiplexManager.getSubManager(entityType), entity);
     }
 
     @Override
-    public void commit() {
+    public void commit(RequestScope scope) {
         // flush all before commits
-        flush();
+        flush(scope);
 
         ArrayList<DataStore> commitList = new ArrayList<>();
         for (Entry<DataStore, DataStoreTransaction> entry : transactions.entrySet()) {
             try {
-                entry.getValue().commit();
+                entry.getValue().commit(scope);
                 commitList.add(entry.getKey());
+            } catch (HttpStatusException | WebApplicationException e) {
+                reverseTransactions(commitList, e, scope);
+                throw e;
             } catch (Error | RuntimeException e) {
                 TransactionException transactionException = new TransactionException(e);
-                reverseTransactions(commitList, transactionException);
+                reverseTransactions(commitList, transactionException, scope);
                 throw transactionException;
             }
         }
-        transactions.clear();
     }
 
     /**
@@ -85,19 +87,19 @@ public void commit() {
      * @param restoreList List of database managers to reverse the last commit
      * @param cause cause to add any suppressed exceptions
      */
-    private void reverseTransactions(ArrayList<DataStore> restoreList, Throwable cause) {
+    private void reverseTransactions(ArrayList<DataStore> restoreList, Throwable cause, RequestScope requestScope) {
         for (DataStore dataStore : restoreList) {
             try (DataStoreTransaction transaction = dataStore.beginTransaction()) {
                 List<Object> list = dirtyObjects.get(dataStore);
                 for (Object dirtyObject : list == null ? Collections.emptyList() : list) {
                     Object cloned = clonedObjects.get(dirtyObject);
                     if (cloned == NEWLY_CREATED_OBJECT) {
-                        transaction.delete(dirtyObject);
+                        transaction.delete(dirtyObject, requestScope);
                     } else {
-                        transaction.save(cloned);
+                        transaction.save(cloned, requestScope);
                     }
                 }
-                transaction.commit();
+                transaction.commit(requestScope);
             } catch (RuntimeException | IOException e) {
                 cause.addSuppressed(e);
             }
@@ -106,24 +108,24 @@ private void reverseTransactions(ArrayList<DataStore> restoreList, Throwable cau
 
     @SuppressWarnings("resource")
     @Override
-    public <T> T createObject(Class<T> createObject) {
-        DataStoreTransaction transaction = getTransaction(createObject);
-        T object = transaction.createObject(createObject);
+    public <T> void createObject(T entity, RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(EntityDictionary.getType(entity));
+        transaction.createObject(entity, scope);
         // mark this object as newly created to be deleted on reverse transaction
-        clonedObjects.put(object, NEWLY_CREATED_OBJECT);
-        return object;
-
+        clonedObjects.put(entity, NEWLY_CREATED_OBJECT);
     }
 
-    private <T> Iterable<T> hold(DataStoreTransaction transaction, Iterable<T> list) {
-        if (transaction != lastDataStoreTransaction) {
-            ArrayList<T> newList = Lists.newArrayList(list);
-            for (T object : newList) {
-                hold(transaction, object);
-            }
-            return newList;
+    private <T> DataStoreIterable<T> hold(DataStoreTransaction transaction, DataStoreIterable<T> list) {
+        ArrayList<T> newList = new ArrayList<>();
+        list.forEach(newList::add);
+        for (T object : newList) {
+            hold(transaction, object);
         }
-        return list;
+        return new DataStoreIterableBuilder<T>(newList)
+                .paginateInMemory(list.needsInMemoryPagination())
+                .filterInMemory(list.needsInMemoryFilter())
+                .sortInMemory(list.needsInMemorySort())
+                .build();
     }
 
     /**
@@ -133,9 +135,7 @@ private <T> Iterable<T> hold(DataStoreTransaction transaction, Iterable<T> list)
      * @return original object
      */
     private <T> T hold(DataStoreTransaction subTransaction, T object) {
-        if (subTransaction != lastDataStoreTransaction) {
-            clonedObjects.put(object, cloneObject(object));
-        }
+        clonedObjects.put(object, cloneObject(object));
         return object;
     }
 
@@ -147,7 +147,7 @@ private Object cloneObject(Object object) {
             return null;
         }
 
-        Class<?> cls = multiplexManager.getDictionary().lookupEntityClass(object.getClass());
+        Type<?> cls = multiplexManager.getDictionary().lookupBoundClass(EntityDictionary.getType(object));
         try {
             Object clone = cls.newInstance();
             for (Field field : cls.getFields()) {
@@ -172,78 +172,37 @@ private Object cloneObject(Object object) {
     }
 
     @Override
-    public <T> T loadObject(Class<T> loadClass, Serializable id) {
-        DataStoreTransaction transaction = getTransaction(loadClass);
-        return hold(transaction, transaction.loadObject(loadClass, id));
-    }
-
-    @Override
-    @Deprecated
-    public <T> Iterable<T> loadObjects(Class<T> loadClass) {
-        DataStoreTransaction transaction = getTransaction(loadClass);
-        return hold(transaction, transaction.loadObjects(loadClass));
+    public <T> T loadObject(EntityProjection projection,
+                             Serializable id,
+                             RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(projection.getType());
+        return hold(transaction, (T) transaction.loadObject(projection, id, scope));
     }
 
     @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Optional<FilterExpression> filterExpression,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        Object relation = transaction.getRelation(entity, relationshipType, relationName,
-                relationClass, dictionary, filterExpression, sorting, pagination);
-
-        if (relation instanceof Iterable) {
-            return hold(transaction, (Iterable) relation);
-        }
-
-        return hold(transaction, relation);
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection projection, RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(projection.getType());
+        return hold(transaction, transaction.loadObjects(projection, scope));
     }
 
     @Override
-    public <T> Object getRelation(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters
-    ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        Object relation = transaction
-                .getRelation(entity, relationshipType, relationName, relationClass, dictionary, filters);
-
-        if (relation instanceof Iterable) {
-            return hold(transaction, (Iterable) relation);
-        }
+    public <T, R> DataStoreIterable<R> getToManyRelation(DataStoreTransaction relationTx,
+                                                         T entity,
+                                                         Relationship relationship,
+                                                         RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(EntityDictionary.getType(entity));
+        DataStoreIterable<R> relation = super.getToManyRelation(relationTx, entity, relationship, scope);
 
         return hold(transaction, relation);
     }
 
     @Override
-    public <T> Object getRelationWithSortingAndPagination(
-            Object entity,
-            RelationshipType relationshipType,
-            String relationName,
-            Class<T> relationClass,
-            EntityDictionary dictionary,
-            Set<Predicate> filters,
-            Sorting sorting,
-            Pagination pagination
-    ) {
-        DataStoreTransaction transaction = getTransaction(entity.getClass());
-        Object relation = transaction.getRelationWithSortingAndPagination(entity, relationshipType, relationName,
-                relationClass, dictionary, filters, sorting, pagination);
-
-        if (relation instanceof Iterable) {
-            return hold(transaction, (Iterable) relation);
-        }
+    public <T, R> R getToOneRelation(DataStoreTransaction relationTx,
+                                     T entity,
+                                     Relationship relationship,
+                                     RequestScope scope) {
+        DataStoreTransaction transaction = getTransaction(EntityDictionary.getType(entity));
+        R relation = super.getToOneRelation(relationTx, entity, relationship, scope);
 
         return hold(transaction, relation);
     }
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexManagerTest.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexManagerTest.java
index dd2e5ca8b1..7684e309e6 100644
--- a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexManagerTest.java
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexManagerTest.java
@@ -5,38 +5,49 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.google.common.collect.Lists;
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
 import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.datastores.inmemory.InMemoryDataStore;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.example.beans.ComplexAttribute;
 import com.yahoo.elide.example.beans.FirstBean;
 import com.yahoo.elide.example.other.OtherBean;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.IterableUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 /**
  * MultiplexManager tests.
  */
+@Slf4j
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class MultiplexManagerTest {
     private MultiplexManager multiplexManager;
+    private EntityDictionary entityDictionary;
 
-    @BeforeTest
+    @BeforeAll
     public void setup() {
-        final EntityDictionary entityDictionary = new EntityDictionary(new HashMap<>());
-        final InMemoryDataStore inMemoryDataStore1 = new InMemoryDataStore(FirstBean.class.getPackage());
-        final InMemoryDataStore inMemoryDataStore2 = new InMemoryDataStore(OtherBean.class.getPackage());
+        ClassScanner scanner = DefaultClassScanner.getInstance();
+        entityDictionary = EntityDictionary.builder().build();
+        final HashMapDataStore inMemoryDataStore1 = new HashMapDataStore(scanner, FirstBean.class.getPackage());
+        final HashMapDataStore inMemoryDataStore2 = new HashMapDataStore(scanner, OtherBean.class.getPackage());
         multiplexManager = new MultiplexManager(inMemoryDataStore1, inMemoryDataStore2);
         multiplexManager.populateEntityDictionary(entityDictionary);
     }
@@ -44,69 +55,125 @@ public void setup() {
     @Test
     public void checkLoading() {
         EntityDictionary entityDictionary = multiplexManager.getDictionary();
-        assertNotNull(entityDictionary.getJsonAliasFor(FirstBean.class));
-        assertNotNull(entityDictionary.getJsonAliasFor(OtherBean.class));
+        assertNotNull(entityDictionary.getJsonAliasFor(ClassType.of(FirstBean.class)));
+        assertNotNull(entityDictionary.getJsonAliasFor(ClassType.of(OtherBean.class)));
+        assertNotNull(entityDictionary.getJsonAliasFor(ClassType.of(ComplexAttribute.class)));
     }
 
     @Test
     public void testValidCommit() throws IOException {
         final FirstBean object = new FirstBean();
-        object.id = 0;
-        object.name = "Test";
+        object.setId(null);
+        object.setName("Test");
         try (DataStoreTransaction t = multiplexManager.beginTransaction()) {
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            t.save(object);
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            t.commit();
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null)
+                    .iterator().hasNext());
+            t.createObject(object, null);
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null)
+                    .iterator().hasNext());
+            t.commit(null);
         }
         try (DataStoreTransaction t = multiplexManager.beginTransaction()) {
-            Iterable<FirstBean> beans = t.loadObjects(FirstBean.class);
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                            .type(FirstBean.class)
+                            .build(), null);
             assertNotNull(beans);
             assertTrue(beans.iterator().hasNext());
-            FirstBean bean = beans.iterator().next();
-            assertTrue(bean.id == 1 && bean.name.equals("Test"));
+            FirstBean bean = (FirstBean) IterableUtils.first(beans);
+            assertTrue(bean.getId() != null && "Test".equals(bean.getName()));
         }
     }
 
-    @Test(priority = 3)
+    @Test
     public void partialCommitFailure() throws IOException {
-        final EntityDictionary entityDictionary = new EntityDictionary(new HashMap<>());
-        final InMemoryDataStore ds1 = new InMemoryDataStore(FirstBean.class.getPackage());
+        final EntityDictionary entityDictionary = EntityDictionary.builder().build();
+        final HashMapDataStore ds1 = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                FirstBean.class.getPackage());
         final DataStore ds2 = new TestDataStore(OtherBean.class.getPackage());
         final MultiplexManager multiplexManager = new MultiplexManager(ds1, ds2);
         multiplexManager.populateEntityDictionary(entityDictionary);
 
-        assertEquals(multiplexManager.getSubManager(FirstBean.class), ds1);
-        assertEquals(multiplexManager.getSubManager(OtherBean.class), ds2);
+        assertEquals(ds1, multiplexManager.getSubManager(ClassType.of(FirstBean.class)));
+        assertEquals(ds2, multiplexManager.getSubManager(ClassType.of(OtherBean.class)));
 
         try (DataStoreTransaction t = ds1.beginTransaction()) {
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            FirstBean firstBean = t.createObject(FirstBean.class);
-            firstBean.name = "name";
-            t.save(firstBean);
-            assertFalse(t.loadObjects(FirstBean.class).iterator().hasNext());
-            t.commit();
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null).iterator().hasNext());
+
+            FirstBean firstBean = FirstBean.class.newInstance();
+            firstBean.setName("name");
+            t.createObject(firstBean, null);
+            //t.save(firstBean);
+            assertFalse(t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null).iterator().hasNext());
+            t.commit(null);
+        } catch (InstantiationException | IllegalAccessException e) {
+            log.error("", e);
         }
         try (DataStoreTransaction t = multiplexManager.beginTransaction()) {
-            FirstBean firstBean = t.loadObjects(FirstBean.class).iterator().next();
-            firstBean.name = "update";
-            t.save(firstBean);
-            OtherBean otherBean = t.createObject(OtherBean.class);
-            t.save(otherBean);
-            try {
-                t.commit();
-                fail("TransactionException expected");
-            } catch (TransactionException expected) {
-                // expected
-            }
+            FirstBean firstBean = (FirstBean) t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null).iterator().next();
+            firstBean.setName("update");
+            t.save(firstBean, null);
+            OtherBean otherBean = OtherBean.class.newInstance();
+            t.createObject(otherBean, null);
+            //t.save(firstBean);
+
+            assertThrows(TransactionException.class, () -> t.commit(null));
+        } catch (InstantiationException | IllegalAccessException e) {
+            log.error("", e);
         }
         // verify state
         try (DataStoreTransaction t = ds1.beginTransaction()) {
-            Iterable<FirstBean> beans = t.loadObjects(FirstBean.class);
+            Iterable<Object> beans = t.loadObjects(EntityProjection.builder()
+                    .type(FirstBean.class)
+                    .build(), null);
             assertNotNull(beans);
-            ArrayList<FirstBean> list = Lists.newArrayList(beans.iterator());
+            ArrayList<Object> list = Lists.newArrayList(beans.iterator());
             assertEquals(list.size(), 1);
-            assertEquals(list.get(0).name, "name");
+            assertEquals(((FirstBean) list.get(0)).getName(), "name");
+        }
+    }
+
+    @Test
+    public void subordinateEntityDictionaryInheritsInjector() {
+        final Injector injector = entity -> {
+                    //NOOP
+            };
+        final QueryDictionaryDataStore ds1 = new QueryDictionaryDataStore();
+        final MultiplexManager multiplexManager = new MultiplexManager(ds1);
+        multiplexManager.populateEntityDictionary(
+                EntityDictionary.builder().injector(injector).build()
+        );
+        assertEquals(
+            ds1.getDictionary().getInjector(),
+            injector
+        );
+    }
+
+    private static class QueryDictionaryDataStore implements DataStore {
+        private EntityDictionary dictionary;
+
+        @Override
+        public void populateEntityDictionary(final EntityDictionary dictionary) {
+            this.dictionary = dictionary;
         }
+
+        @Override
+        public DataStoreTransaction beginTransaction() {
+            throw new UnsupportedOperationException();
+        }
+
+        public EntityDictionary getDictionary() {
+            return this.dictionary;
+        }
+
     }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexTransactionTest.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexTransactionTest.java
index fcf15204ac..7b96ba2792 100644
--- a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexTransactionTest.java
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/MultiplexTransactionTest.java
@@ -5,17 +5,22 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-
-import org.testng.annotations.Test;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.datastore.inmemory.HashMapStoreTransaction;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 /**
- * Tests MultiplexTransaction
+ * Tests MultiplexTransaction.
  */
 public class MultiplexTransactionTest {
     @Test
@@ -24,6 +29,7 @@ public void testPrecommit() throws Exception {
         DataStore store2 =  mock(DataStore.class);
         DataStoreTransaction tx1 = mock(DataStoreTransaction.class);
         DataStoreTransaction tx2 = mock(DataStoreTransaction.class);
+        RequestScope scope = mock(RequestScope.class);
 
         when(store1.beginReadTransaction()).thenReturn(tx1);
         when(store2.beginReadTransaction()).thenReturn(tx2);
@@ -32,9 +38,44 @@ public void testPrecommit() throws Exception {
 
         DataStoreTransaction multiplexTx = store.beginReadTransaction();
 
-        multiplexTx.preCommit();
+        multiplexTx.preCommit(scope);
+
+        // Since transactions are lazy initialized,
+        // preCommit will not be called on individual transactions.
+        verify(tx1, Mockito.times(0)).preCommit(any());
+        verify(tx2, Mockito.times(0)).preCommit(any());
+
+        MultiplexReadTransaction multiplexReadTx = (MultiplexReadTransaction) multiplexTx;
+
+        long countInitializedTransaction = multiplexReadTx.transactions.values().stream()
+                .filter(dataStoreTransaction -> dataStoreTransaction != null)
+                .count();
+
+        assertEquals(0, countInitializedTransaction);
+
+    }
+
+    @Test
+    public void testGetProperty() throws Exception {
+        DataStore store1 =  mock(HashMapDataStore.class);
+        DataStore store2 =  mock(DataStore.class);
+        DataStoreTransaction tx1 = mock(HashMapStoreTransaction.class);
+        DataStoreTransaction tx2 = mock(DataStoreTransaction.class);
+
+        when(store1.beginReadTransaction()).thenReturn(tx1);
+        when(store2.beginReadTransaction()).thenReturn(tx2);
+        when(tx1.getProperty(any())).thenReturn(null);
+        when(tx2.getProperty(any())).thenReturn("Foo");
+
+        MultiplexManager store = new MultiplexManager(store1, store2);
+        DataStoreTransaction multiplexTx = store.beginReadTransaction();
+        String propertyName = "com.yahoo.elide.core.datastore.Bar";
+
+        String result = multiplexTx.getProperty(propertyName);
+
+        verify(tx1, Mockito.never()).getProperty(eq(propertyName));
+        verify(tx2, Mockito.times(1)).getProperty(eq(propertyName));
 
-        verify(tx1).preCommit();
-        verify(tx2).preCommit();
+        assertEquals("Foo", result);
     }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/TestDataStore.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/TestDataStore.java
index d86170b494..d3d47289b0 100644
--- a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/TestDataStore.java
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/TestDataStore.java
@@ -5,19 +5,17 @@
  */
 package com.yahoo.elide.datastores.multiplex;
 
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.EntityDictionary;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.exceptions.TransactionException;
-import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
-import org.reflections.util.ClasspathHelper;
-import org.reflections.util.ConfigurationBuilder;
+import com.yahoo.elide.core.request.EntityProjection;
 
-import javax.persistence.Entity;
 import java.io.IOException;
 import java.io.Serializable;
+import javax.persistence.Entity;
 
 class TestDataStore implements DataStore, DataStoreTransaction {
 
@@ -29,13 +27,7 @@ public TestDataStore(Package beanPackage) {
 
     @Override
     public void populateEntityDictionary(EntityDictionary dictionary) {
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .addUrls(ClasspathHelper.forPackage(beanPackage.getName()))
-                .setScanners(new SubTypesScanner(), new TypeAnnotationsScanner()));
-        reflections.getTypesAnnotatedWith(Entity.class).stream()
-                .filter(entityAnnotatedClass -> entityAnnotatedClass.getPackage().getName()
-                        .startsWith(beanPackage.getName()))
-                .forEach(dictionary::bindEntity);
+        dictionary.getScanner().getAnnotatedClasses(beanPackage, Entity.class).stream().forEach(dictionary::bindEntity);
     }
 
     @Override
@@ -48,35 +40,43 @@ public void close() throws IOException {
     }
 
     @Override
-    public void save(Object entity) {
+    public void save(Object entity, RequestScope scope) {
     }
 
     @Override
-    public void delete(Object entity) {
+    public void delete(Object entity, RequestScope scope) {
         throw new UnsupportedOperationException(this.toString());
     }
 
     @Override
-    public void commit() {
+    public void flush(RequestScope scope) {
+        // Nothing
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
         throw new UnsupportedOperationException(this.toString());
     }
 
     @Override
-    public <T> T createObject(Class<T> entityClass) {
-        try {
-            return entityClass.newInstance();
-        } catch (InstantiationException | IllegalAccessException | Error | RuntimeException e) {
-            throw new TransactionException(e);
-        }
+    public void createObject(Object entity, RequestScope scope) {
+
     }
 
     @Override
-    public <T> T loadObject(Class<T> entityClass, Serializable id) {
+    public Object loadObject(EntityProjection projection,
+                             Serializable id,
+                             RequestScope scope) {
         throw new TransactionException(null);
     }
 
     @Override
-    public <T> Iterable<T> loadObjects(Class<T> entityClass) {
+    public DataStoreIterable<Object> loadObjects(EntityProjection projection, RequestScope scope) {
         throw new TransactionException(null);
     }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        // Nothing
+    }
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/ComplexAttribute.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/ComplexAttribute.java
new file mode 100644
index 0000000000..652fe3ace0
--- /dev/null
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/ComplexAttribute.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.example.beans;
+
+import lombok.Data;
+
+@Data
+public class ComplexAttribute {
+    private String a;
+    private String b;
+}
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/FirstBean.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
index c33b660935..2084459be6 100644
--- a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/FirstBean.java
@@ -6,26 +6,22 @@
 package com.yahoo.elide.example.beans;
 
 import com.yahoo.elide.annotation.Include;
+import lombok.Data;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 /**
  * test bean.
  */
 @Entity
-@Include
+@Include(rootLevel = false)
+@Data
 public class FirstBean {
-    public int id;
-
-    public String name;
-
     @Id
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
+    @GeneratedValue
+    private String id;
+    private String name;
+    private ComplexAttribute complex;
 }
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/HibernateUser.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/HibernateUser.java
new file mode 100644
index 0000000000..f416f6548a
--- /dev/null
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/beans/HibernateUser.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.example.beans;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Hibernate-managed user.
+ */
+@Include
+@Entity
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
+@DeletePermission(expression = "Prefab.Role.All")
+public class HibernateUser {
+    private Long id;
+    private String firstName;
+    private Integer specialActionId;
+
+    @Id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    @Exclude // Hide this from elide: this is the internal pointer for finding this value in hbase
+    public Integer getSpecialActionId() {
+        return specialActionId;
+    }
+
+    public void setSpecialActionId(Integer specialActionId) {
+        this.specialActionId = specialActionId;
+    }
+}
diff --git a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/other/OtherBean.java b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/other/OtherBean.java
index 2d1f08b91e..89337ad0e1 100644
--- a/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/other/OtherBean.java
+++ b/elide-datastore/elide-datastore-multiplex/src/test/java/com/yahoo/elide/example/other/OtherBean.java
@@ -13,7 +13,7 @@
  * Exclude Test bean.
  */
 @Entity
-@Include
+@Include(rootLevel = false)
 public class OtherBean {
     private boolean excluded;
 }
diff --git a/elide-datastore/elide-datastore-noop/pom.xml b/elide-datastore/elide-datastore-noop/pom.xml
new file mode 100644
index 0000000000..7197c27462
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-datastore-noop</artifactId>
+    <name>Elide Data Store: No-Operation Library</name>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <!-- Elide dependencies (include test dependencies) -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+        </dependency>
+        <!-- Jackson data-binder -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopDataStore.java b/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopDataStore.java
new file mode 100644
index 0000000000..69a232165c
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopDataStore.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.noop;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * The Noop Datastore allows ephemeral beans to be accessed via Elide. Specifically, beans which you
+ * want to make callable endpoints to perform some function but do not wish to persist their values.
+ */
+public class NoopDataStore implements DataStore {
+    protected final ArrayList<Class> entityClasses;
+
+    /**
+     * Create a new no-op data store.
+     *
+     * @param entityClasses Entity classes controlled by this datastore.
+     */
+    public NoopDataStore(Collection<Class> entityClasses) {
+        this.entityClasses = new ArrayList<>(entityClasses);
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        entityClasses.forEach(dictionary::bindEntity);
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new NoopTransaction();
+    }
+}
diff --git a/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopTransaction.java b/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopTransaction.java
new file mode 100644
index 0000000000..7d730f2f6b
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/src/main/java/com/yahoo/elide/datastores/noop/NoopTransaction.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.noop;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.request.EntityProjection;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collections;
+
+/**
+ * Noop transaction. Specifically, this transaction does not perform any actions (i.e. no operation).
+ */
+@Slf4j
+public class NoopTransaction implements DataStoreTransaction {
+    /**
+     * No-op transaction, do nothing.
+     * @param entity - the object to save.
+     * @param scope - contains request level metadata.
+     */
+    @Override
+    public <T> void save(T entity, RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param entity - the object to delete.
+     * @param scope - contains request level metadata.
+     */
+    @Override
+    public <T> void delete(T entity, RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param scope the request scope for the current request
+     */
+    @Override
+    public void flush(RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param scope the request scope for the current request
+     */
+    @Override
+    public void commit(RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param entity - the object to create in the data store.
+     * @param scope - contains request level metadata.
+     */
+    @Override
+    public <T> void createObject(T entity, RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param projection the projection to query
+     * @param id - the ID of the object to load.
+     * @param scope - the current request scope. It is optional for the data store to attempt evaluation.
+     * @return a new persistent resource with a new instance of {@code entityClass}
+     */
+    @Override
+    public <T> T loadObject(EntityProjection projection,
+                             Serializable id,
+                             RequestScope scope) {
+        // Loads are supported but empty object (with specified id) is returned.
+        // NOTE: This is primarily useful for enabling objects of solely computed properties to be fetched.
+        Object entity;
+        try {
+            entity = projection.getType().newInstance();
+        } catch (IllegalAccessException | InstantiationException e) {
+            log.error("Could not load object {} through NoopStore", projection.getType(), e);
+            throw new RuntimeException(e);
+        }
+
+        String uuid = scope.getUUIDFor(entity);
+        // Side-effecting method of the PersistentResource :( however, it enables us to do this without reinventing
+        // the wheel. Should probably be refactored eventually nonetheless.
+        new PersistentResource<>(entity, uuid, scope).setId(id.toString());
+
+        return (T) entity;
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     * @param projection - the projection to load
+     * @param scope - contains request level metadata.
+     * @return a {@link Collections#singletonList} with a new persistent resource with id 1
+     */
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection projection,
+                                                RequestScope scope) {
+        // Default behavior: load object 1 and return as an array
+        return new DataStoreIterableBuilder(
+                Collections.singletonList(this.loadObject(projection, 1L, scope))).build();
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     */
+    @Override
+    public void close() throws IOException {
+        // No-op transaction, do nothing.
+    }
+
+    /**
+     * No-op transaction, do nothing.
+     */
+    @Override
+    public void cancel(RequestScope scope) {
+        // No-op transaction, do nothing.
+    }
+}
diff --git a/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/beans/NoopBean.java b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/beans/NoopBean.java
new file mode 100644
index 0000000000..d24a9995f8
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/beans/NoopBean.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.beans;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Id;
+
+/**
+ * Simple bean intended to not be persisted.
+ */
+@Include(rootLevel = false, name = "theNoopBean")
+public class NoopBean {
+    private Long id;
+    private String test;
+
+    @Id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTest() {
+        return test;
+    }
+
+    public void setTest(String test) {
+        this.test = test;
+    }
+}
diff --git a/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopDataStoreTest.java b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopDataStoreTest.java
new file mode 100644
index 0000000000..1c5e9a42ef
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopDataStoreTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.noop;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.beans.NoopBean;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+public class NoopDataStoreTest {
+
+    @Test
+    public void testPopulateEntityDictionary() throws Exception {
+        DataStore store = new NoopDataStore(Arrays.asList(NoopBean.class));
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        store.populateEntityDictionary(dictionary);
+        assertEquals(ClassType.of(NoopBean.class), dictionary.getEntityClass("theNoopBean", EntityDictionary.NO_VERSION));
+    }
+
+    @Test
+    public void testBeginTransaction() throws Exception {
+        DataStore store = new NoopDataStore(Arrays.asList(NoopBean.class));
+        DataStoreTransaction tx = store.beginReadTransaction();
+        assertTrue(tx instanceof NoopTransaction);
+    }
+}
diff --git a/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopTransactionTest.java b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopTransactionTest.java
new file mode 100644
index 0000000000..7190c0d6fd
--- /dev/null
+++ b/elide-datastore/elide-datastore-noop/src/test/java/com/yahoo/elide/datastores/noop/NoopTransactionTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.noop;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.beans.NoopBean;
+import com.yahoo.elide.core.ObjectEntityCache;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.IterableUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class NoopTransactionTest {
+    private DataStoreTransaction tx = new NoopTransaction();
+    private NoopBean bean = new NoopBean();
+    private RequestScope requestScope;
+    private EntityDictionary dictionary;
+
+    @BeforeAll
+    public void setup() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(NoopBean.class);
+        requestScope = mock(RequestScope.class);
+        JsonApiMapper mapper = mock(JsonApiMapper.class);
+
+
+        when(requestScope.getDictionary()).thenReturn(dictionary);
+        when(requestScope.getObjectEntityCache()).thenReturn(new ObjectEntityCache());
+        when(requestScope.getMapper()).thenReturn(mapper);
+        when(mapper.getObjectMapper()).thenReturn(new ObjectMapper());
+    }
+
+    @Test
+    public void testSave() throws Exception {
+        // Should do nothing. No backing store, so should succeed
+        tx.save(bean, null);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        // Should do nothing. No backing store, so should succeed
+        tx.delete(bean, null);
+    }
+
+    @Test
+    public void testFlush() throws Exception {
+        // Should do nothing. No backing store, so should succeed
+        tx.flush(null);
+    }
+
+    @Test
+    public void testCommit() throws Exception {
+        // Should do nothing. No backing store, so should succeed
+        tx.commit(null);
+    }
+
+    @Test
+    public void testCreateObject() throws Exception {
+        // Should do nothing. No backing store, so should succeed
+        tx.createObject(bean, null);
+    }
+
+    @Test
+    public void testLoadObject() throws Exception {
+
+        // Should return bean with id set
+        NoopBean bean = (NoopBean) tx.loadObject(EntityProjection.builder()
+                .type(NoopBean.class)
+                .build(), 1, requestScope);
+        assertEquals(bean.getId(), (Long) 1L);
+    }
+
+    @Test
+    public void testLoadObjects() throws Exception {
+        Iterable<NoopBean> iterable = (Iterable) tx.loadObjects(EntityProjection.builder()
+                .type(NoopBean.class)
+                .build(), requestScope);
+        NoopBean bean = IterableUtils.first(iterable);
+        assertEquals((Long) 1L, bean.getId());
+    }
+
+    @Test
+    public void testClose() throws Exception {
+        tx.close();
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/README.md b/elide-datastore/elide-datastore-search/README.md
new file mode 100644
index 0000000000..4e1ee85586
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/README.md
@@ -0,0 +1,118 @@
+# Overview
+
+Provides full text search for Elide.  
+
+## Requirements
+
+This store leverages [Hibernate Search](https://hibernate.org/search/) which requires Hibernate 5.4+.
+
+## Usage
+
+`SearchDataStore` wraps another fully featured store and supports full text search on fields that are indexed using Hibernate Search.
+If the query cannot be answered by the `SearchDataStore`, it delegates the query to the underlying (wrapped) data store.
+
+### Annotate Your Entity 
+
+Use Hibernate Search annotations to describe how your entities are indexed and stored in Lucene or Elasticsearch.
+Some of the annotations (like `AnalyzerDef`) can be defined once at the package level if desired.
+
+```java
+@Entity
+@Include(rootLevel = true)
+@Indexed
+@AnalyzerDef(name = "case_insensitive",
+        tokenizer = @TokenizerDef(factory = NGramTokenizerFactory.class, params = {
+            @Parameter(name = "minGramSize", value = "3"),
+            @Parameter(name = "maxGramSize", value = "10")
+        }),
+        filters = {
+                @TokenFilterDef(factory = LowerCaseFilterFactory.class)
+        }
+)
+public class Item {
+    @Id
+    private long id;
+
+    @Fields({
+            @Field(name = "name", index = Index.YES,
+                    analyze = Analyze.YES, store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive")),
+            @Field(name = "sortName", analyze = Analyze.NO, store = Store.NO, index = Index.YES)
+    })
+    @SortableField(forField = "sortName")
+    private String name;
+
+    @Field(index = Index.YES, analyze = Analyze.YES,
+            store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
+    private String description;
+
+    @Field(index = Index.YES, analyze = Analyze.NO, store = Store.NO)
+    @DateBridge(resolution = Resolution.MINUTE, encoding = EncodingType.STRING)
+    @SortableField
+    private Date modifiedDate;
+
+    private BigDecimal price;
+}
+```
+
+### Wrap Your DataStore
+
+```java
+/* Create your ORM based data store */
+DataStore store = ...
+
+/* Wrap it with a SearchDataStore */
+EntityManagerFactory emf = Persistence.createEntityManagerFactory("MyPersistenceUnitName");
+
+boolean indexOnStartup = true; //Create a fresh index when the server starts
+searchStore = new SearchDataStore(store, emf, indexOnStartup);
+
+/* Configure Elide with your store */
+ElideSettings = new ElideSettingsBuidler(searchStore).build();
+```
+
+### Indexing your Data
+You can index data either by:
+
+1.  When the `SearchDataStore` is initialized, indicate (by setting `indexOnStartup` to true) that the search store should build a complete index.
+2.  Issuing created, updated, and delete requests against your Elide service.
+3.  Using an out of band process using Hibernate Search APIs.
+
+## Caveats
+
+### Data Type Support
+
+Only text fields (String) are supported/tested. Other data types (dates, numbers, etc) have not been tested.  Embedded index support has not been implemented.
+
+### Operators
+
+Only INFIX, and PREFIX operators (and their case insensitive equivalents) are supported.
+
+### Analyzer Assumptions
+
+#### Index Analysis
+
+To implement correct behavior for Elide's INFIX and PREFIX operators, the search store assumes an ngram (non-edge) tokenizer is used.  
+This allows white spaces and punctuation to be included in the index.  
+
+If the client provides a filter predicate with a term which is smaller or larger than the min/max ngram sizes respectively, it will not be found in the index.
+The search store can be configured to return a 400 error to the client in those scenarios by passing the minimum and maximum ngram size to
+the constructor of the `SearchDataStore`.  The sizes are global and apply to all Elide entities managed by the store instance:
+
+```java
+new SearchDataStore(mockStore, emf, true, 3, 50);
+```
+
+#### Search Term Analysis
+
+Elide uses a Lucene `KeywordAnalyzer` to analyze the query predicates in filter expressions.  This allows correct handling of white space and punctuation (to match Elide's default behavior
+when not using the `SearchDataStore`.
+
+The resulting single token is then used to construct a Lucene prefix query.
+
+#### Sorting and Pagination
+
+When using the INFIX operator, sorting and pagination are pushed to down Lucene/ElasticSearch. When using the PREFIX operator, they are performed in-memory in the Elide service.
+
+Elide constructs a Lucene Prefix query, which together with an ngram index fully implements the INFIX operator.  However, the ngram analyzer adds ngrams to the index that do not start on word 
+boundaries.  For the prefix operator, the search store first performs the lucene filter and then filters again in-memory to return the correct set of matching terms.  
+In this instance, because filtering is performed partially in memory, Elide also sorts and paginates in memory as well.
diff --git a/elide-datastore/elide-datastore-search/pom.xml b/elide-datastore/elide-datastore-search/pom.xml
new file mode 100644
index 0000000000..fc9de1125e
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/pom.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>elide-datastore-search</artifactId>
+
+    <packaging>jar</packaging>
+    <name>Elide Data Store: Search Store</name>
+    <description>Elide Data Store for Indexed Search</description>
+    <url>https://github.com/yahoo/elide/tree/master/elide-datastore/elide-datastore-search</url>
+
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-datastore-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-search-orm</artifactId>
+            <version>5.11.9.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-integration-tests</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jpa</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy-agent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/FilterExpressionToLuceneQuery.java b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/FilterExpressionToLuceneQuery.java
new file mode 100644
index 0000000000..2d1d215690
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/FilterExpressionToLuceneQuery.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpressionVisitor;
+import com.yahoo.elide.core.filter.expression.NotFilterExpression;
+import com.yahoo.elide.core.filter.expression.OrFilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.type.ClassType;
+import com.google.common.base.Preconditions;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.Query;
+import org.hibernate.search.jpa.FullTextEntityManager;
+import org.hibernate.search.query.dsl.QueryBuilder;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Converts an Elide filter expression into a Lucene Search query.
+ */
+public class FilterExpressionToLuceneQuery implements FilterExpressionVisitor<Query> {
+
+    private QueryBuilder builder;
+    private Class<?> entityClass;
+
+    public FilterExpressionToLuceneQuery(FullTextEntityManager entityManager, Class<?> entityClass) {
+        this.entityClass = entityClass;
+        builder = entityManager.getSearchFactory().buildQueryBuilder().forEntity(entityClass).get();
+    }
+
+    @Override
+    public Query visitPredicate(FilterPredicate filterPredicate) {
+        Preconditions.checkArgument(filterPredicate.getPath().getPathElements().size() == 1);
+        Preconditions.checkArgument(filterPredicate.getEntityType().equals(ClassType.of(entityClass)));
+
+        Analyzer analyzer = new KeywordAnalyzer();
+        QueryParser queryParser = new QueryParser(filterPredicate.getField(), analyzer);
+
+        String queryString = "";
+
+        List<String> predicateValues = filterPredicate.getValues()
+                .stream()
+                .map(Object::toString)
+                .map(QueryParser::escape)
+                .map(FilterExpressionToLuceneQuery::escapeWhiteSpace)
+                .collect(Collectors.toList());
+
+        Operator op = filterPredicate.getOperator();
+
+        boolean lowerCaseTerms = lowerCaseTerms(op);
+
+        queryString = buildQueryString(op, predicateValues);
+
+        queryParser.setLowercaseExpandedTerms(lowerCaseTerms);
+
+        try {
+            return queryParser.parse(queryString);
+        } catch (ParseException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public Query visitAndExpression(AndFilterExpression expression) {
+        return builder.bool()
+                .must(expression.getLeft().accept(this))
+                .must(expression.getRight().accept(this))
+                .createQuery();
+    }
+
+    @Override
+    public Query visitOrExpression(OrFilterExpression expression) {
+        return builder.bool()
+                .should(expression.getLeft().accept(this))
+                .should(expression.getRight().accept(this))
+                .createQuery();
+    }
+
+    @Override
+    public Query visitNotExpression(NotFilterExpression expression) {
+        return builder.bool()
+                .must(expression.getNegated().accept(this))
+                .not()
+                .createQuery();
+    }
+
+    private boolean lowerCaseTerms(Operator op) {
+        switch (op) {
+            case INFIX_CASE_INSENSITIVE:
+            case PREFIX_CASE_INSENSITIVE:
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private String buildQueryString(Operator op, List<String> predicateValues) {
+        switch (op) {
+            case INFIX_CASE_INSENSITIVE:
+            case PREFIX_CASE_INSENSITIVE:
+            case PREFIX:
+            case INFIX: {
+                return predicateValues.stream()
+                        .map((str) -> str + "*")
+                        .collect(Collectors.joining(" | "));
+            }
+            default:
+                throw new IllegalArgumentException("Unsupported Predicate Operator: " + op);
+        }
+    }
+
+    public static String escapeWhiteSpace(String str) {
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+
+            if (Character.isWhitespace(c)) {
+                sb.append('\\');
+            }
+            sb.append(c);
+        }
+        return sb.toString();
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataStore.java b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataStore.java
new file mode 100644
index 0000000000..c1c3e19278
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataStore.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.base.Preconditions;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.jpa.FullTextEntityManager;
+import org.hibernate.search.jpa.Search;
+
+import javax.persistence.EntityManagerFactory;
+
+/**
+ * Performs full text search when it can.  Otherwise delegates to a wrapped store.
+ */
+public class SearchDataStore implements DataStore {
+
+    private static final int DEFAULT_MIN_NGRAM = 3;
+    private static final int DEFAULT_MAX_NGRAM = 5;
+
+    private DataStore wrapped;
+    private EntityDictionary dictionary;
+    private EntityManagerFactory entityManagerFactory;
+    private boolean indexOnStartup = false;
+    private int minNgramSize;
+    private int maxNgramSize;
+
+    public SearchDataStore(DataStore wrapped, EntityManagerFactory entityManagerFactory, boolean indexOnStartup) {
+        this(wrapped, entityManagerFactory, indexOnStartup, DEFAULT_MIN_NGRAM, DEFAULT_MAX_NGRAM);
+    }
+
+    public SearchDataStore(DataStore wrapped,
+                           EntityManagerFactory entityManagerFactory,
+                           boolean indexOnStartup,
+                           int minNgramSize,
+                           int maxNgramSize) {
+        this.wrapped = wrapped;
+        this.entityManagerFactory = entityManagerFactory;
+        this.indexOnStartup = indexOnStartup;
+
+        this.minNgramSize = minNgramSize;
+        this.maxNgramSize = maxNgramSize;
+    }
+
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary entityDictionary) {
+        wrapped.populateEntityDictionary(entityDictionary);
+
+        if (indexOnStartup) {
+
+            FullTextEntityManager em = Search.getFullTextEntityManager(entityManagerFactory.createEntityManager());
+            try {
+                for (Type<?> entityType : entityDictionary.getBoundClasses()) {
+                    if (entityDictionary.getAnnotation(entityType, Indexed.class) != null) {
+                        Preconditions.checkState(entityType instanceof ClassType);
+                        Class<?> entityClass = ((ClassType) entityType).getCls();
+                        em.createIndexer(entityClass).startAndWait();
+                    }
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IllegalStateException(e);
+            } finally {
+                em.close();
+            }
+        }
+
+        this.dictionary = entityDictionary;
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return wrapped.beginTransaction();
+    }
+
+    @Override
+    public DataStoreTransaction beginReadTransaction() {
+
+        FullTextEntityManager em = Search.getFullTextEntityManager(entityManagerFactory.createEntityManager());
+
+        return new SearchDataTransaction(wrapped.beginReadTransaction(), dictionary, em, minNgramSize, maxNgramSize);
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataTransaction.java b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataTransaction.java
new file mode 100644
index 0000000000..8416b5c071
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/main/java/com/yahoo/elide/datastores/search/SearchDataTransaction.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.wrapped.TransactionWrapper;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.expression.PredicateExtractionVisitor;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.google.common.base.Preconditions;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Sort;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Fields;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.SortableField;
+import org.hibernate.search.engine.ProjectionConstants;
+import org.hibernate.search.jpa.FullTextEntityManager;
+import org.hibernate.search.jpa.FullTextQuery;
+import org.hibernate.search.query.dsl.QueryBuilder;
+import org.hibernate.search.query.dsl.sort.SortFieldContext;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Performs full text search when it can.  Otherwise delegates to a wrapped transaction.
+ */
+public class SearchDataTransaction extends TransactionWrapper {
+
+    private enum FilterSupport {
+        FULL,
+        PARTIAL,
+        NONE
+    }
+
+    private EntityDictionary dictionary;
+    private FullTextEntityManager em;
+    private int minNgram;
+    private int maxNgram;
+    public SearchDataTransaction(DataStoreTransaction tx,
+                                 EntityDictionary dictionary,
+                                 FullTextEntityManager em,
+                                 int minNgramSize,
+                                 int maxNgramSize) {
+        super(tx);
+        this.dictionary = dictionary;
+        this.em = em;
+        this.minNgram = minNgramSize;
+        this.maxNgram = maxNgramSize;
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection projection,
+                                                RequestScope requestScope) {
+        if (projection.getFilterExpression() == null) {
+            return super.loadObjects(projection, requestScope);
+        }
+
+        FilterSupport filterSupport = canSearch(projection.getType(), projection.getFilterExpression());
+        boolean canSearch = (filterSupport != FilterSupport.NONE);
+
+        if (mustSort(Optional.ofNullable(projection.getSorting()))) {
+            canSearch = canSearch && canSort(projection.getSorting(), projection.getType());
+        }
+
+        if (canSearch) {
+            Iterable<T> result = search(projection.getType(), projection.getFilterExpression(),
+                    Optional.ofNullable(projection.getSorting()),
+                    Optional.ofNullable(projection.getPagination()));
+            if (filterSupport == FilterSupport.PARTIAL) {
+                return new DataStoreIterableBuilder(result).allInMemory().build();
+            } else {
+                return new DataStoreIterableBuilder(result).build();
+            }
+        }
+
+        return super.loadObjects(projection, requestScope);
+    }
+
+    /**
+     * Indicates whether sorting has been requested for this entity.
+     * @param sorting An optional elide sorting clause.
+     * @return True if the entity must be sorted. False otherwise.
+     */
+    private boolean mustSort(Optional<Sorting> sorting) {
+        return sorting.filter(s -> !s.getSortingPaths().isEmpty()).isPresent();
+    }
+
+    /**
+     * Returns whether or not Lucene can be used to sort the query.
+     * @param sorting The elide sorting clause
+     * @param entityClass The entity being sorted.
+     * @return true if Lucene can sort.  False otherwise.
+     */
+    private boolean canSort(Sorting sorting, Type<?> entityClass) {
+
+        for (Map.Entry<Path, Sorting.SortOrder> entry
+                : sorting.getSortingPaths().entrySet()) {
+
+            Path path = entry.getKey();
+
+            if (path.getPathElements().size() != 1) {
+                return false;
+            }
+
+            Path.PathElement last = path.lastElement().get();
+            String fieldName = last.getFieldName();
+
+            if (dictionary.getAttributeOrRelationAnnotation(entityClass, SortableField.class, fieldName) == null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Builds a lucene Sort object from and Elide Sorting object.
+     * @param sorting Elide sorting object
+     * @param entityType The entity being sorted.
+     * @return A lucene Sort object
+     */
+    private Sort buildSort(Sorting sorting, Type<?> entityType) {
+        Class<?> entityClass = null;
+        if (entityType != null) {
+            Preconditions.checkState(entityType instanceof ClassType);
+            entityClass = ((ClassType) entityType).getCls();
+        }
+        QueryBuilder builder = em.getSearchFactory().buildQueryBuilder().forEntity(entityClass).get();
+
+        SortFieldContext context = null;
+        for (Map.Entry<Path, Sorting.SortOrder> entry
+                : sorting.getSortingPaths().entrySet()) {
+
+            String fieldName = entry.getKey().lastElement().get().getFieldName();
+
+            SortableField sortableField =
+                    dictionary.getAttributeOrRelationAnnotation(entityType, SortableField.class, fieldName);
+
+            fieldName = sortableField.forField().isEmpty() ? fieldName : sortableField.forField();
+
+            if (context == null) {
+                context = builder.sort().byField(fieldName);
+            } else {
+                context.andByField(fieldName);
+            }
+
+            Sorting.SortOrder order = entry.getValue();
+
+            if (order == Sorting.SortOrder.asc) {
+                context = context.asc();
+            } else {
+                context = context.desc();
+            }
+        }
+        if (context == null) {
+            throw new IllegalStateException("Invalid Sort rules");
+        }
+
+        return context.createSort();
+    }
+
+    private FilterSupport canSearch(Type<?> entityClass, FilterExpression expression) {
+
+        /* Collapse the filter expression to a list of leaf predicates */
+        Collection<FilterPredicate> predicates = expression.accept(new PredicateExtractionVisitor());
+
+        /* Return the least support among all the predicates */
+        FilterSupport support = predicates.stream()
+                .map((predicate) -> canSearch(entityClass, predicate))
+                .max(Comparator.comparing(Enum::ordinal)).orElse(FilterSupport.NONE);
+
+        if (support == FilterSupport.NONE) {
+            return support;
+        }
+
+        /* Throw an exception if ngram size is violated */
+        predicates.stream().forEach((predicate) -> {
+            predicate.getValues().stream().map(Object::toString).forEach((value) -> {
+                if (value.length() < minNgram || value.length() > maxNgram) {
+                    String message = String.format("Field values for %s on entity %s must be >= %d and <= %d",
+                            predicate.getField(), dictionary.getJsonAliasFor(entityClass), minNgram, maxNgram);
+                    throw new InvalidValueException(predicate.getValues(), message);
+                }
+            });
+        });
+
+        return support;
+    }
+
+    private FilterSupport canSearch(Type<?> entityClass, FilterPredicate predicate) {
+
+        boolean isIndexed = fieldIsIndexed(entityClass, predicate);
+
+        if (!isIndexed) {
+            return FilterSupport.NONE;
+        }
+
+        /* We don't support joins to other relationships */
+        if (predicate.getPath().getPathElements().size() != 1) {
+            return FilterSupport.NONE;
+        }
+
+        return operatorSupport(entityClass, predicate);
+    }
+
+    /**
+     * Perform the full-text search.
+     * @param entityType The class to search
+     * @param filterExpression The filter expression to apply
+     * @param sorting Optional sorting
+     * @param pagination Optional pagination
+     * @return A list of records of type entityClass.
+     */
+    private <T> List<T> search(Type<?> entityType, FilterExpression filterExpression, Optional<Sorting> sorting,
+                                Optional<Pagination> pagination) {
+            Query query;
+            Class<?> entityClass = null;
+            if (entityType != null) {
+                Preconditions.checkState(entityType instanceof ClassType);
+                entityClass = ((ClassType) entityType).getCls();
+            }
+            try {
+                query = filterExpression.accept(new FilterExpressionToLuceneQuery(em, entityClass));
+            } catch (IllegalArgumentException e) {
+                throw new BadRequestException(e.getMessage());
+            }
+
+            FullTextQuery fullTextQuery = em.createFullTextQuery(query, entityClass);
+
+            if (mustSort(sorting)) {
+                fullTextQuery = fullTextQuery.setSort(buildSort(sorting.get(), entityType));
+            }
+
+            if (pagination.isPresent()) {
+                fullTextQuery = fullTextQuery.setMaxResults(pagination.get().getLimit());
+                fullTextQuery = fullTextQuery.setFirstResult(pagination.get().getOffset());
+            }
+
+            List<T[]> results = fullTextQuery
+                    .setProjection(ProjectionConstants.THIS)
+                    .getResultList();
+
+            if (pagination.filter(Pagination::returnPageTotals).isPresent()) {
+                pagination.get().setPageTotals((long) fullTextQuery.getResultSize());
+            }
+
+            if (results.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            return results.stream()
+                    .map(result -> result[0])
+                    .collect(Collectors.toList());
+    }
+
+    private boolean fieldIsIndexed(Type<?> entityClass, FilterPredicate predicate) {
+        String fieldName = predicate.getField();
+
+        List<Field> fields = new ArrayList<>();
+
+        Field fieldAnnotation = dictionary.getAttributeOrRelationAnnotation(entityClass, Field.class, fieldName);
+
+        if (fieldAnnotation != null) {
+            fields.add(fieldAnnotation);
+        } else {
+            Fields fieldsAnnotation =
+                    dictionary.getAttributeOrRelationAnnotation(entityClass, Fields.class, fieldName);
+
+            if (fieldsAnnotation != null) {
+                Arrays.stream(fieldsAnnotation.value()).forEach(fields::add);
+            }
+        }
+
+        boolean indexed = false;
+
+        for (Field field : fields) {
+            if (field.index() == Index.YES && (field.name().equals(fieldName) || field.name().isEmpty())) {
+                indexed = true;
+            }
+        }
+
+        return indexed;
+    }
+
+    private FilterSupport operatorSupport(Type<?> entityClass, FilterPredicate predicate)
+            throws HttpStatusException {
+
+        Operator op = predicate.getOperator();
+
+        /* We only support INFIX & PREFIX */
+        switch (op) {
+            case INFIX:
+            case INFIX_CASE_INSENSITIVE:
+                return FilterSupport.FULL;
+            case PREFIX:
+            case PREFIX_CASE_INSENSITIVE:
+                return FilterSupport.PARTIAL;
+            default:
+                return FilterSupport.NONE;
+        }
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreLoadTest.java b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreLoadTest.java
new file mode 100644
index 0000000000..0a8811d737
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreLoadTest.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.InMemoryStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.datastores.search.models.Item;
+import com.google.common.collect.Lists;
+import org.h2.store.fs.FileUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class DataStoreLoadTest {
+
+    private RSQLFilterDialect filterParser;
+    private SearchDataStore searchStore;
+    private DataStoreTransaction wrappedTransaction;
+    private RequestScope mockScope;
+    private EntityDictionary dictionary;
+
+    public DataStoreLoadTest() {
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Item.class);
+
+        filterParser = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        DataStore mockStore = mock(DataStore.class);
+        wrappedTransaction = mock(DataStoreTransaction.class);
+        when(mockStore.beginReadTransaction()).thenReturn(wrappedTransaction);
+
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStoreTest");
+
+        searchStore = new SearchDataStore(mockStore, emf, true, 3, 10);
+        searchStore.populateEntityDictionary(dictionary);
+
+
+        mockScope = mock(RequestScope.class);
+        when(mockScope.getDictionary()).thenReturn(dictionary);
+
+        CoerceUtil.register(Date.class, new ISO8601DateSerde());
+    }
+
+    @AfterAll
+    public void cleanup() {
+        FileUtils.deleteRecursive("/tmp/lucene", false);
+    }
+
+    @BeforeEach
+    public void beforeMethods() {
+        reset(wrappedTransaction);
+    }
+
+    @Test
+    public void testEqualityPredicate() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        //Case sensitive query against case insensitive index must lowercase
+        FilterExpression filter = filterParser.parseFilterExpression("name==drum", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(
+                EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertNull(loaded);
+
+        /* This query should hit the underlying store */
+        verify(wrappedTransaction, times(1)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testEscapedPrefixPredicate() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        /* Verify that '-' is escaped before we run the query */
+        FilterExpression filter = filterParser.parseFilterExpression("name==-lucen*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(6L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testEmptyResult() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==+lucen*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList());
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPrefixPredicateWithInMemoryFiltering() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        testTransaction = new InMemoryStoreTransaction(testTransaction);
+
+        //Case sensitive query against case insensitive index must lowercase
+        FilterExpression filter = filterParser.parseFilterExpression("name==dru*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList());
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPrefixPredicatePhrase() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        //Case sensitive query against case insensitive index must lowercase
+        FilterExpression filter = filterParser.parseFilterExpression("name=='snare\\ dru*'", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(1L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testTabCharacter() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        //Case sensitive query against case insensitive index must lowercase
+        FilterExpression filter = filterParser.parseFilterExpression("name=ini='*est\tTa*'", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(7L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testContainsPredicate() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        //Case insensitive query against case insensitive index
+        FilterExpression filter = filterParser.parseFilterExpression("name=ini=*DrU*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(1L, 3L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPredicateConjunction() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==drum*;description==brass*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(1L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testNonIndexedPredicate() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        FilterExpression filter = filterParser.parseFilterExpression("price==123;description==brass*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertNull(loaded);
+
+        /* This query should hit the underlying store */
+        verify(wrappedTransaction, times(1)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPredicateDisjunction() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==drum*,description==ride*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(1L, 2L, 3L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testSortingAscending() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        Map<String, Sorting.SortOrder> sortRules = new HashMap<>();
+        sortRules.put("name", Sorting.SortOrder.asc);
+        sortRules.put("modifiedDate", Sorting.SortOrder.desc);
+        Sorting sorting = new SortingImpl(sortRules, Item.class, dictionary);
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==cymbal*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .sorting(sorting)
+                .build(), mockScope);
+
+        assertListContains(loaded, Lists.newArrayList(4L, 5L, 2L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testSortingDescending() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        Map<String, Sorting.SortOrder> sortRules = new HashMap<>();
+        sortRules.put("name", Sorting.SortOrder.desc);
+        sortRules.put("modifiedDate", Sorting.SortOrder.asc);
+        Sorting sorting = new SortingImpl(sortRules, Item.class, dictionary);
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==cymbal*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .sorting(sorting)
+                .build(), mockScope);
+
+        assertListMatches(loaded, Lists.newArrayList(2L, 5L, 4L));
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPaginationPageOne() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        Map<String, Sorting.SortOrder> sortRules = new HashMap<>();
+        sortRules.put("name", Sorting.SortOrder.desc);
+        sortRules.put("modifiedDate", Sorting.SortOrder.asc);
+        Sorting sorting = new SortingImpl(sortRules, Item.class, dictionary);
+
+        PaginationImpl pagination = new PaginationImpl(Item.class, 0, 1,
+                PaginationImpl.DEFAULT_PAGE_LIMIT,
+                PaginationImpl.MAX_PAGE_LIMIT,
+                true,
+                false);
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==cymbal*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .sorting(sorting)
+                .pagination(pagination)
+                .build(), mockScope);
+
+        assertListMatches(loaded, Lists.newArrayList(2L));
+        assertEquals(pagination.getPageTotals(), 3);
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPaginationPageTwo() throws Exception {
+
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+
+        Map<String, Sorting.SortOrder> sortRules = new HashMap<>();
+        sortRules.put("name", Sorting.SortOrder.desc);
+        sortRules.put("modifiedDate", Sorting.SortOrder.asc);
+        Sorting sorting = new SortingImpl(sortRules, Item.class, dictionary);
+
+        PaginationImpl pagination = new PaginationImpl(Item.class, 1, 1,
+                PaginationImpl.DEFAULT_PAGE_LIMIT,
+                PaginationImpl.MAX_PAGE_LIMIT,
+                true,
+                false);
+
+        FilterExpression filter = filterParser.parseFilterExpression("name==cymbal*", ClassType.of(Item.class), false);
+
+        Iterable<Object> loaded = testTransaction.loadObjects(EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .sorting(sorting)
+                .pagination(pagination)
+                .build(), mockScope);
+
+        assertListMatches(loaded, Lists.newArrayList(5L));
+        assertEquals(pagination.getPageTotals(), 3);
+        verify(wrappedTransaction, never()).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testEscapeWhiteSpace() {
+        String toReplace = "Foo\tBar Blah\nFoobar";
+        String expected = "Foo\\\tBar\\ Blah\\\nFoobar";
+
+        String actual = FilterExpressionToLuceneQuery.escapeWhiteSpace(toReplace);
+
+        assertEquals(expected, actual);
+    }
+
+    private void assertListMatches(Iterable<Object> actual, List<Long> expectedIds) {
+        List<Long> actualIds = StreamSupport.stream(actual.spliterator(), false)
+                .map((obj) -> (Item) obj)
+                .map(Item::getId)
+                .collect(Collectors.toList());
+
+        assertEquals(expectedIds, actualIds);
+    }
+
+    private void assertListContains(Iterable<Object> actual, List<Long> expectedIds) {
+        List<Long> actualIds = StreamSupport.stream(actual.spliterator(), false)
+                .map((obj) -> (Item) obj)
+                .map(Item::getId)
+                .sorted()
+                .collect(Collectors.toList());
+
+        List<Long> expectedIdsSorted = expectedIds.stream().sorted().collect(Collectors.toList());
+
+        assertEquals(expectedIdsSorted, actualIds);
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreSupportsFilteringTest.java b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreSupportsFilteringTest.java
new file mode 100644
index 0000000000..295ae2eaef
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DataStoreSupportsFilteringTest.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.datastores.search.models.Item;
+import org.h2.store.fs.FileUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Date;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class DataStoreSupportsFilteringTest {
+
+    private RSQLFilterDialect filterParser;
+    private SearchDataStore searchStore;
+    private DataStoreTransaction wrappedTransaction;
+    private RequestScope mockScope;
+
+    public DataStoreSupportsFilteringTest() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Item.class);
+
+        filterParser = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        DataStore mockStore = mock(DataStore.class);
+        wrappedTransaction = mock(DataStoreTransaction.class);
+        when(mockStore.beginReadTransaction()).thenReturn(wrappedTransaction);
+
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStoreTest");
+
+        searchStore = new SearchDataStore(mockStore, emf, true, 3, 10);
+        searchStore.populateEntityDictionary(dictionary);
+
+        mockScope = mock(RequestScope.class);
+        when(mockScope.getDictionary()).thenReturn(dictionary);
+
+        CoerceUtil.register(Date.class, new ISO8601DateSerde());
+    }
+
+    @AfterAll
+    public void cleanup() {
+        FileUtils.deleteRecursive("/tmp/lucene", false);
+    }
+
+    @BeforeEach
+    public void beforeMethods() {
+        reset(wrappedTransaction);
+    }
+
+    @Test
+    public void testIndexedFields() throws Exception {
+        /* The field is indexed using the @Fields annotation */
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterExpression filter = filterParser.parseFilterExpression("name==*rum*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+
+        assertFalse(loaded.needsInMemoryFilter());
+        assertFalse(loaded.needsInMemoryPagination());
+        assertFalse(loaded.needsInMemorySort());
+        verify(wrappedTransaction, times(0)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testIndexedField() throws Exception {
+        /* The field is indexed using the @Field annotation */
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterExpression filter = filterParser.parseFilterExpression("description==*rum*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+
+        assertFalse(loaded.needsInMemoryFilter());
+        assertFalse(loaded.needsInMemoryPagination());
+        assertFalse(loaded.needsInMemorySort());
+        verify(wrappedTransaction, times(0)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testUnindexedField() throws Exception {
+        /* The field is not indexed */
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterExpression filter = filterParser.parseFilterExpression("price==123",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        //The query was passed to the wrapped transaction which is a mock.
+        assertNull(loaded);
+        verify(wrappedTransaction, times(1)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testNgramTooSmall() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("description==*ru*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        assertThrows(InvalidValueException.class, () -> testTransaction.loadObjects(projection, mockScope));
+    }
+
+    @Test
+    public void testNgramTooLarge() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("description==*abcdefghijk*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        assertThrows(InvalidValueException.class, () -> testTransaction.loadObjects(projection, mockScope));
+    }
+
+    @Test
+    public void testLargeNgramForEqualityOperator() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("description==abcdefghijk",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        //The query was passed to the wrapped transaction which is a mock.
+        assertNull(loaded);
+        verify(wrappedTransaction, times(1)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testNgramJustRight() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("description==*ruabc*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        assertFalse(loaded.needsInMemoryFilter());
+        assertFalse(loaded.needsInMemoryPagination());
+        assertFalse(loaded.needsInMemorySort());
+        verify(wrappedTransaction, times(0)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testInfixOperator() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("name==*rum*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        assertFalse(loaded.needsInMemoryFilter());
+        assertFalse(loaded.needsInMemoryPagination());
+        assertFalse(loaded.needsInMemorySort());
+        verify(wrappedTransaction, times(0)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testPrefixOperator() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("name==drum*",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        assertTrue(loaded.needsInMemoryFilter());
+        assertTrue(loaded.needsInMemoryPagination());
+        assertTrue(loaded.needsInMemorySort());
+        verify(wrappedTransaction, times(0)).loadObjects(any(), any());
+    }
+
+    @Test
+    public void testEqualityOperator() throws Exception {
+        DataStoreTransaction testTransaction = searchStore.beginReadTransaction();
+        FilterPredicate filter = (FilterPredicate) filterParser.parseFilterExpression("name==drum",
+                ClassType.of(Item.class), false);
+
+        EntityProjection projection = EntityProjection.builder()
+                .type(Item.class)
+                .filterExpression(filter)
+                .build();
+
+        DataStoreIterable<Object> loaded = testTransaction.loadObjects(projection, mockScope);
+        //The query was passed to the wrapped transaction which is a mock.
+        assertNull(loaded);
+        verify(wrappedTransaction, times(1)).loadObjects(any(), any());
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DependencyBinder.java b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DependencyBinder.java
new file mode 100644
index 0000000000..9dbb278bb5
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/DependencyBinder.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.datastores.jpa.JpaDataStore;
+import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.hibernate.Session;
+
+import java.io.File;
+import java.util.TimeZone;
+import java.util.function.Consumer;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+/**
+ * Jetty resource configuration that configures dependency injection.
+ */
+public class DependencyBinder extends ResourceConfig {
+    public DependencyBinder() {
+        register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+
+                //We can only create the index once.
+                boolean indexOnStartup = false;
+                File file = new File("/tmp/lucene");
+
+                if (! file.exists()) {
+                    file.mkdirs();
+                    indexOnStartup = true;
+                }
+
+                Consumer<EntityManager> txCancel = em -> em.unwrap(Session.class).cancelQuery();
+                EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStoreTest");
+                DataStore jpaStore = new JpaDataStore(
+                        emf::createEntityManager,
+                        em -> new NonJtaTransaction(em, txCancel));
+
+                EntityDictionary dictionary = EntityDictionary.builder().build();
+
+                DataStore searchStore = new SearchDataStore(jpaStore, emf, indexOnStartup, 3, 50);
+                jpaStore.populateEntityDictionary(dictionary);
+                searchStore.populateEntityDictionary(dictionary);
+
+                Elide elide = new Elide(new ElideSettingsBuilder(searchStore)
+                        .withAuditLogger(new Slf4jLogger())
+                        .withEntityDictionary(dictionary)
+                        .withVerboseErrors()
+                        .withDefaultMaxPageSize(PaginationImpl.MAX_PAGE_LIMIT)
+                        .withDefaultPageSize(PaginationImpl.DEFAULT_PAGE_LIMIT)
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"))
+                        .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                        .withJoinFilterDialect(new DefaultFilterDialect(dictionary))
+                        .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                        .withSubqueryFilterDialect(new DefaultFilterDialect(dictionary))
+                        .build());
+
+                bind(elide).to(Elide.class).named("elide");
+            }
+        });
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/SearchDataStoreITTest.java b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/SearchDataStoreITTest.java
new file mode 100644
index 0000000000..52dbb9a086
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/SearchDataStoreITTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.AbstractApiResourceInitializer;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+public class SearchDataStoreITTest extends AbstractApiResourceInitializer {
+
+    public SearchDataStoreITTest() {
+        super(DependencyBinder.class);
+    }
+
+    @Test
+    public void getEscapedItem() {
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .get("/item?filter[item]=name==*-luc*")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.id", equalTo(Arrays.asList("6")));
+    }
+
+    @Test
+    public void testObjectIndexing() {
+       /* Add a new item */
+       given()
+           .contentType(JSONAPI_CONTENT_TYPE)
+           .body(
+                   data(
+                       resource(
+                          type("item"),
+                          id(1000),
+                          attributes(
+                                  attr("name", "Another Drum"),
+                                  attr("description", "Onyx Timpani Drum")
+                          )
+                       )
+                   ).toJSON())
+           .when()
+           .post("/item")
+           .then()
+           .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        /* This query hits the index */
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .get("/item?filter[item]=name=ini=*DrU*")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.id", containsInAnyOrder("1", "3", "1000"));
+
+        /* This query hits the DB */
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .get("/item")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.id", containsInAnyOrder("1", "2", "3", "4", "5", "6", "7", "1000"));
+
+        /* Delete the newly added item */
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .delete("/item/1000")
+            .then()
+            .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        /* This query hits the index */
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .get("/item?filter[item]=name==*dru*")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.id", containsInAnyOrder("1", "3"));
+
+        /* This query hits the DB */
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .when()
+            .get("/item")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.id", containsInAnyOrder("1", "2", "3", "4", "5", "6", "7"));
+    }
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/models/Item.java b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/models/Item.java
new file mode 100644
index 0000000000..f0137352df
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/java/com/yahoo/elide/datastores/search/models/Item.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.datastores.search.models;
+
+import com.yahoo.elide.annotation.Include;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.DateBridge;
+import org.hibernate.search.annotations.EncodingType;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Fields;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Resolution;
+import org.hibernate.search.annotations.SortableField;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Include
+@Indexed
+@Data
+@AnalyzerDef(name = "case_insensitive",
+        tokenizer = @TokenizerDef(factory = NGramTokenizerFactory.class, params = {
+            @Parameter(name = "minGramSize", value = "3"),
+            @Parameter(name = "maxGramSize", value = "50")
+        }),
+        filters = {
+                @TokenFilterDef(factory = LowerCaseFilterFactory.class)
+        }
+)
+public class Item {
+    @Id
+    private long id;
+
+    @Fields({
+            @Field(name = "name", index = Index.YES,
+                    analyze = Analyze.YES, store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive")),
+            @Field(name = "sortName", analyze = Analyze.NO, store = Store.NO, index = Index.YES)
+    })
+    @SortableField(forField = "sortName")
+    private String name;
+
+    @Field(index = Index.YES, analyze = Analyze.YES,
+            store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
+    private String description;
+
+    @Field(index = Index.YES, analyze = Analyze.NO, store = Store.NO)
+    @DateBridge(resolution = Resolution.MINUTE, encoding = EncodingType.STRING)
+    @SortableField
+    private Date modifiedDate;
+
+    private BigDecimal price;
+}
diff --git a/elide-datastore/elide-datastore-search/src/test/resources/META-INF/persistence.xml b/elide-datastore/elide-datastore-search/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..d55eec1ce8
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+             version="2.0">
+    <persistence-unit name="searchDataStoreTest">
+        <class>com.yahoo.elide.datastores.search.models.Item</class>
+
+        <properties>
+            <property name="hibernate.search.default.directory_provider" value="filesystem"/>
+            <property name="hibernate.search.default.indexBase" value="/tmp/lucene/indexes"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.search.default.locking_strategy" value="single"/>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'classpath:create_tables.sql'"/>
+            <property name="javax.persistence.jdbc.user" value=""/>
+            <property name="javax.persistence.jdbc.password" value=""/>
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/elide-datastore/elide-datastore-search/src/test/resources/create_tables.sql b/elide-datastore/elide-datastore-search/src/test/resources/create_tables.sql
new file mode 100644
index 0000000000..297db1e410
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/resources/create_tables.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS item
+    (
+      id BIGINT,
+      name VARCHAR(255),
+      description VARCHAR(2047),
+      modifiedDate TIMESTAMP,
+      price BIGINT
+    ) AS SELECT * FROM CSVREAD('classpath:items.csv');
diff --git a/elide-datastore/elide-datastore-search/src/test/resources/items.csv b/elide-datastore/elide-datastore-search/src/test/resources/items.csv
new file mode 100644
index 0000000000..9ab26c2bb8
--- /dev/null
+++ b/elide-datastore/elide-datastore-search/src/test/resources/items.csv
@@ -0,0 +1,8 @@
+id,name,description,modifiedDate,price
+1,Snare Drum,A brass snare drum,2018-01-01 00:00:00,4000
+2,Ride Cymbal,A 16 inch ride cymbal,2018-01-01 00:00:00,250
+3,Bass Drum,A 22 inch base drum,2018-01-01 00:00:00,600
+4,Cymbal Stand, A cymbal stand,2018-02-01 00:00:00,50
+5,Cymbal Stand, B cymbal stand,2018-01-01 00:00:00,75
+6,Test !Escaping -Lucene +Query,Escape character test,2018-01-01 00:00:00,0
+7,Test	Tab,Tab Test,2018-01-01 00:00:00,0
diff --git a/elide-datastore/pom.xml b/elide-datastore/pom.xml
index d9ab8029f2..0a51748896 100644
--- a/elide-datastore/pom.xml
+++ b/elide-datastore/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
+        <version>6.1.4-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -40,15 +40,18 @@
 
     <properties>
         <parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
-        <mysql.data.directory>${project.build.directory}/mysql-data</mysql.data.directory>
+        <mysql.data.directory>${java.io.tmpdir}/mysql-data</mysql.data.directory>
     </properties>
 
     <modules>
-        <module>elide-datastore-hibernate</module>
-        <module>elide-datastore-hibernate5</module>
-        <module>elide-datastore-hibernate3</module>
+        <module>elide-datastore-aggregation</module>
+        <module>elide-datastore-jpql</module>
+        <module>elide-datastore-jpa</module>
         <module>elide-datastore-inmemorydb</module>
         <module>elide-datastore-multiplex</module>
+        <module>elide-datastore-noop</module>
+        <module>elide-datastore-search</module>
+        <module>elide-datastore-jms</module>
     </modules>
 
     <dependencyManagement>
@@ -56,22 +59,22 @@
             <dependency>
                 <groupId>com.yahoo.elide</groupId>
                 <artifactId>elide-core</artifactId>
-                <version>2.3.14-SNAPSHOT</version>
+                <version>6.1.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yahoo.elide</groupId>
+                <artifactId>elide-graphql</artifactId>
+                <version>6.1.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yahoo.elide</groupId>
+                <artifactId>elide-test-helpers</artifactId>
+                <version>6.1.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>4.3.2.Final</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>slf4j-api</artifactId>
-                        <groupId>org.slf4j</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>validation-api</artifactId>
-                        <groupId>javax.validation</groupId>
-                    </exclusion>
-                </exclusions>
+                <version>5.4.3.Final</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -87,6 +90,15 @@
             <artifactId>logback-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <pluginManagement>
@@ -94,7 +106,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.10</version>
+                    <version>3.3.0</version>
                     <executions>
                         <execution>
                             <id>add-source-generate-sources</id>
@@ -108,18 +120,6 @@
                                 </sources>
                             </configuration>
                         </execution>
-                        <execution>
-                            <id>reserve-network-port-pre-integration-test</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>reserve-network-port</goal>
-                            </goals>
-                            <configuration>
-                                <portNames>
-                                    <portName>mysql.port</portName>
-                                </portNames>
-                            </configuration>
-                        </execution>
                         <execution>
                             <id>reserve-network-port-process-test-classes</id>
                             <phase>process-test-classes</phase>
@@ -134,66 +134,18 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>
-                    <executions>
-                        <execution>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>unpack</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <artifactItem>
-                                        <groupId>com.jcabi</groupId>
-                                        <artifactId>mysql-dist</artifactId>
-                                        <version>5.6.14</version>
-                                        <classifier>${mysql.classifier}</classifier>
-                                        <type>zip</type>
-                                        <overWrite>false</overWrite>
-                                        <outputDirectory>${project.build.directory}/mysql-dist</outputDirectory>
-                                    </artifactItem>
-                                </artifactItems>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.jcabi</groupId>
-                    <artifactId>jcabi-mysql-maven-plugin</artifactId>
-                    <version>0.9</version>
-                    <executions>
-                        <execution>
-                            <id>mysql-test</id>
-                            <goals>
-                                <goal>classify</goal>
-                                <goal>start</goal>
-                                <goal>stop</goal>
-                            </goals>
-                            <configuration>
-                                <port>${mysql.port}</port>
-                                <data>${mysql.data.directory}</data>
-                                <socket>/tmp/elide.sock</socket>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.19</version>
                     <configuration>
                         <systemPropertyVariables>
-                            <mysql.port>${mysql.port}</mysql.port>
                             <restassured.port>${restassured.port}</restassured.port>
-                            <dataStoreSupplier>${dataStoreSupplier}</dataStoreSupplier>
+                            <dataStoreHarness>${dataStoreHarness}</dataStoreHarness>
                         </systemPropertyVariables>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.basedir}/../testng.xml</suiteXmlFile>
-                            <suiteXmlFile>${project.basedir}/../testng-audit.xml</suiteXmlFile>
-                        </suiteXmlFiles>
+                        <includes>
+                            <include>%regex[.*IT.*]</include>
+                        </includes>
+                        <dependenciesToScan>com.yahoo.elide:elide-integration-tests</dependenciesToScan>
                     </configuration>
                     <executions>
                         <execution>
diff --git a/elide-datastore/testng-audit.xml b/elide-datastore/testng-audit.xml
deleted file mode 100644
index fbad4310f4..0000000000
--- a/elide-datastore/testng-audit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Audit Test Suite">
-    <test name="com.yahoo.elide.tests.AuditIT">
-        <packages>
-            <package name="com.yahoo.elide.auditTests" />
-        </packages>
-    </test>
-</suite>
diff --git a/elide-datastore/testng.xml b/elide-datastore/testng.xml
deleted file mode 100644
index 929d5030a6..0000000000
--- a/elide-datastore/testng.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Test Suite">
-    <test name="com.yahoo.elide.tests">
-        <packages>
-            <package name="com.yahoo.elide.tests"/>
-        </packages>
-    </test>
-</suite>
diff --git a/elide-eclipse.importorder b/elide-eclipse.importorder
new file mode 100644
index 0000000000..2e7098b3d0
--- /dev/null
+++ b/elide-eclipse.importorder
@@ -0,0 +1,10 @@
+#Organize Import Order
+#Sat May 16 09:45:37 CDT 2020
+0=\#
+1=com.yahoo
+2=com
+3=example
+4=org
+5=
+6=java
+7=javax
diff --git a/elide-example/dropwizard-elide-example/README.md b/elide-example/dropwizard-elide-example/README.md
deleted file mode 100644
index c0af9f67db..0000000000
--- a/elide-example/dropwizard-elide-example/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Dropwizard Elide Example
-This example demonstrates how to use the dropwizard-elide bundle.
-
-## Usage
-
-1. Install and start a MySQL server
-
-2. Create ```elide``` database
-
-        mysql> create database elide;
-
-3. Create ```elide``` user with password ```elide123```
-
-        mysql> grant all on elide.* to 'elide'@'localhost' identified by 'elide123';
-
-4. Launch the example webservice
-
-        ~/elide $ mvn install
-        ~/elide $ cd elide-example/dropwizard-elide-example
-        ~/elide/elide-example/dropwizard-elide-example $ java -jar target/dropwizard-elide-example-{version}-SNAPSHOT.jar server example.yml
-
-   Replace {version} with appropriate value, which can be found under ./target
-
-   The output of the last command will have a line at the very bottom like this
-
-        INFO  [2016-05-07 21:25:09,453] org.eclipse.jetty.server.ServerConnector: Started application@***{HTTP/1.1}{0.0.0.0:{port}}
-
-   The application starts listening at port {port}. This port number is specified in [configuration file](https://github.com/yahoo/elide/blob/master/elide-example/dropwizard-elide-example/example.yml). Let's take {port}=4080 for an example.
-
-5. Create an author
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "-",
-            "type": "author",
-            "attributes": {
-              "name": "Ernest Hemingway"
-            }
-          }
-        }' -X POST http://localhost:4080/author
-
-6. Create a book
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "-",
-            "type": "book",
-            "attributes": {
-              "title": "The Old Man and the Sea",
-              "genre": "Literary Fiction",
-              "language": "English"
-            }
-          }
-        }' -X POST http://localhost:4080/book
-
-7. Associate the author and book
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "1",
-            "type": "author"
-          }
-        }' -X PATCH http://localhost:4080/book/1/relationships/authors
-
-8. Get books
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' http://localhost:4080/book/
-
-You can also load some pre-configured authors and books using `load_elide.sh` in `/scripts`
diff --git a/elide-example/dropwizard-elide-example/example.yml b/elide-example/dropwizard-elide-example/example.yml
deleted file mode 100644
index 670bf63586..0000000000
--- a/elide-example/dropwizard-elide-example/example.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Database settings.
-database:
-  # the name of your JDBC driver
-  driverClass: com.mysql.jdbc.Driver
-
-  # the username
-  user: elide
-
-  # the password
-  password: elide123
-
-  # the JDBC URL
-  url: jdbc:mysql://localhost:3306/elide
-
-  # additional hibernate properties
-  properties:
-    hibernate.current_session_context_class: thread
-    hibernate.dialect: org.hibernate.dialect.MySQLDialect
-    hibernate.hbm2ddl.auto: create
-
-server:
-  applicationConnectors:
-    - type: http
-      port: 4080
-
-logging:
-  level: INFO
-  loggers:
-    im.xiaoyao: DEBUG
-    com.yahoo.elide: DEBUG
-    io.dropwizard: DEBUG
-    org.hibernate.SQL:
-      level: DEBUG
-
-  appenders:
-    - type: console
-    - type: file
-      threshold: INFO
-      logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n"
-      currentLogFilename: /tmp/application.log
-      archivedLogFilenamePattern: /tmp/application-%d{yyyy-MM-dd}-%i.log.gz
-      archivedFileCount: 7
-      timeZone: UTC
-      maxFileSize: 10MB
diff --git a/elide-example/dropwizard-elide-example/pom.xml b/elide-example/dropwizard-elide-example/pom.xml
deleted file mode 100644
index 9dd482b82e..0000000000
--- a/elide-example/dropwizard-elide-example/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dropwizard-elide-example</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Example: Elide with Dropwizard</name>
-    <description>Elide example integrating with Dropwizard</description>
-    <parent>
-        <artifactId>elide-example-parent-pom</artifactId>
-        <groupId>com.yahoo.elide</groupId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <!--Dropwizard Uses Jetty 9.2-->
-        <version.jetty>9.2.13.v20150730</version.jetty>
-        <version.dropwizard>0.9.2</version.dropwizard>
-    </properties>
-
-    <dependencies>
-        <!-- Dropwizard -->
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-core</artifactId>
-            <version>${version.dropwizard}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-db</artifactId>
-            <version>${version.dropwizard}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>dropwizard-elide</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Jersey -->
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet-core</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-servlet</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-
-        <!-- MySQL -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${version.logback}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${version.logback}</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <createDependencyReducedPom>true</createDependencyReducedPom>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.yahoo.elide.example.application.DropwizardElideApplication</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- Do not deploy -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-example/dropwizard-elide-example/scripts/load_elide.sh b/elide-example/dropwizard-elide-example/scripts/load_elide.sh
deleted file mode 100755
index fcbdb971d5..0000000000
--- a/elide-example/dropwizard-elide-example/scripts/load_elide.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-
-# Loads the locally running Elide instance with some books and authors
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345678-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Ernest Hemingway"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345678-1234-1234-1234-1234567890ac"
-            },
-            {
-              "type": "book",
-              "id": "12345678-1234-1234-1234-1234567890ad"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345678-1234-1234-1234-1234567890ac",
-      "attributes": {
-        "title": "The Old Man and the Sea",
-        "genre": "Literary Fiction",
-        "language": "English"
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345678-1234-1234-1234-1234567890ad",
-      "attributes": {
-        "title": "For Whom the Bell Tolls",
-        "genre": "Literary Fiction",
-        "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345679-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Orson Scott Card"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345679-1234-1234-1234-1234567890ac"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345679-1234-1234-1234-1234567890ac",
-      "attributes": {
-      "title": "Enders Game",
-      "genre": "Science Fiction",
-      "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345680-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Isaac Asimov"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345680-1234-1234-1234-1234567890ac"
-            },
-            {
-              "type": "book",
-              "id": "12345680-1234-1234-1234-1234567890ad"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345680-1234-1234-1234-1234567890ac",
-      "attributes": {
-      "title": "Foundation",
-      "genre": "Science Fiction",
-      "language": "English"
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345680-1234-1234-1234-1234567890ad",
-      "attributes": {
-      "title": "The Roman Republic",
-      "genre": "History",
-      "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
diff --git a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideApplication.java b/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideApplication.java
deleted file mode 100644
index 049b4c1052..0000000000
--- a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideApplication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.example.application;
-
-import com.yahoo.elide.contrib.dropwizard.elide.ElideBundle;
-import com.yahoo.elide.example.persistence.Author;
-import com.yahoo.elide.example.persistence.Book;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-
-import io.dropwizard.Application;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-
-/**
- * Dropwizard Application
- */
-public class DropwizardElideApplication extends Application<DropwizardElideConfiguration> {
-    private final String name = "dropwizard-elide-example";
-
-    private final ElideBundle<DropwizardElideConfiguration> elideBundle;
-
-    public DropwizardElideApplication() {
-        this.elideBundle = new ElideBundle<DropwizardElideConfiguration>(
-                Author.class,
-                Book.class
-        ) {
-            @Override
-            public DataSourceFactory getDataSourceFactory(DropwizardElideConfiguration configuration) {
-                return configuration.getDataSourceFactory();
-            }
-        };
-    }
-
-    @Override
-    public void initialize(Bootstrap<DropwizardElideConfiguration> bootstrap) {
-        bootstrap.addBundle(elideBundle);
-    }
-
-    @Override
-    public void run(DropwizardElideConfiguration config, Environment environment) {
-        environment.jersey().register(JsonApiEndpoint.class);
-    }
-
-    public static void main(String[] args) throws Exception {
-//        new DropwizardElideApplication().run("server", "elide-example/dropwizard-elide-example/example.yml");
-        new DropwizardElideApplication().run(args);
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
diff --git a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideConfiguration.java b/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideConfiguration.java
deleted file mode 100644
index 75c15526f7..0000000000
--- a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/application/DropwizardElideConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.example.application;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DataSourceFactory;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-/**
- * Dropwizard Configuration
- */
-public class DropwizardElideConfiguration extends Configuration {
-    @Valid
-    @NotNull
-    private DataSourceFactory database = new DataSourceFactory();
-
-    @JsonProperty("database")
-    public DataSourceFactory getDataSourceFactory() {
-        return database;
-    }
-
-    @JsonProperty("database")
-    public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
-        this.database = dataSourceFactory;
-    }
-}
diff --git a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Author.java b/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Author.java
deleted file mode 100644
index b18f253f2b..0000000000
--- a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Author.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
-/**
- * Model for authors
- */
-@Entity
-@SharePermission(any = {Role.ALL.class})
-@Table(name = "author")
-@Include(rootLevel = true)
-public class Author {
-    private long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ManyToMany(mappedBy = "authors")
-    public Collection<Book> getBooks() {
-        return books;
-    }
-
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
-    }
-}
diff --git a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Book.java b/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Book.java
deleted file mode 100644
index 544d324648..0000000000
--- a/elide-example/dropwizard-elide-example/src/main/java/com/yahoo/elide/example/persistence/Book.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.annotation.Include;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
-/**
- * Model for books
- */
-@Entity
-@Table(name = "book")
-@Include(rootLevel = true)
-public class Book {
-    private long id;
-    private String title;
-    private String genre;
-    private String language;
-    private Collection<Author> authors = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    @ManyToMany
-    public Collection<Author> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(Collection<Author> authors) {
-        this.authors = authors;
-    }
-}
diff --git a/elide-example/dropwizard-elide-example/src/main/resources/banner.txt b/elide-example/dropwizard-elide-example/src/main/resources/banner.txt
deleted file mode 100644
index 632b366e08..0000000000
--- a/elide-example/dropwizard-elide-example/src/main/resources/banner.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- .----------------.  .----------------.  .----------------.  .----------------.  .----------------.
-| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. |
-| |  _________   | || |   _____      | || |     _____    | || |  ________    | || |  _________   | |
-| | |_   ___  |  | || |  |_   _|     | || |    |_   _|   | || | |_   ___ `.  | || | |_   ___  |  | |
-| |   | |_  \_|  | || |    | |       | || |      | |     | || |   | |   `. \ | || |   | |_  \_|  | |
-| |   |  _|  _   | || |    | |   _   | || |      | |     | || |   | |    | | | || |   |  _|  _   | |
-| |  _| |___/ |  | || |   _| |__/ |  | || |     _| |_    | || |  _| |___.' / | || |  _| |___/ |  | |
-| | |_________|  | || |  |________|  | || |    |_____|   | || | |________.'  | || | |_________|  | |
-| |              | || |              | || |              | || |              | || |              | |
-| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------'  '----------------'  '----------------'  '----------------'  '----------------'
diff --git a/elide-example/elide-blog-example/README.md b/elide-example/elide-blog-example/README.md
deleted file mode 100644
index c386536e63..0000000000
--- a/elide-example/elide-blog-example/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Elide Example
-
-## Usage
-
-1. Install and start a MySQL server
-
-2. Create ```elide``` database
-
-        mysql> create database elide;
-
-3. Create ```elide``` user with password ```elide123```
-
-        mysql> grant all on elide.* to 'elide'@'localhost' identified by 'elide123';
-
-4. Launch the example webservice
-
-        ~/elide $ mvn install
-        ~/elide $ cd elide-example/elide-blog-example
-        ~/elide/elide-example/elide-blog-example $ mvn exec:java -Dexec.mainClass="com.yahoo.elide.example.persistence.Main"
-
-5. Create an admin user
-
-        $ curl -H'Content-Type: application/vnd.api+json' \
-               -H'Accept: application/vnd.api+json' --data '
-          {
-            "data": {
-              "type": "user",
-              "attributes": {
-                "name": "Michael Admin",
-                "role": "Admin"
-              }
-            }
-          }
-          ' -X POST http://localhost:4080/user
-
-6. Create a registered user
-
-        $ curl -H'Content-Type: application/vnd.api+json' \
-               -H'Accept: application/vnd.api+json' --data '
-          {
-            "data": {
-              "type": "user",
-              "attributes": {
-                "name": "Ken Registered",
-                "role": "Registered"
-              }
-            }
-          }
-          ' -X POST http://localhost:4080/user
-
-7. Create an unregistered user
-
-        $ curl -H'Content-Type: application/vnd.api+json' \
-               -H'Accept: application/vnd.api+json' --data '
-          {
-            "data": {
-              "type": "user",
-              "attributes": {
-                "name": "Shad Unreg",
-                "role": "Unregistered"
-              }
-            }
-          }
-          ' -X POST http://localhost:4080/user
-
-8. Create a post as an admin:
-
-        $ curl -H'Content-Type: application/vnd.api+json' \
-               -H'Accept: application/vnd.api+json' --data '
-          {
-            "data": {
-              "type": "post",
-              "attributes": {
-                "content": "The greatest thing ever by Michael",
-                "me": "1"
-              },
-              "relationships": {
-                "author": {
-                  "data": {
-                    "type": "user",
-                    "id": "1"
-                  }
-                }
-              }
-            }
-          }
-          ' -X POST http://localhost:4080/post
-
-9. Create a post as a registered user:
-
-        $ curl -H'Content-Type: application/vnd.api+json' \
-               -H'Accept: application/vnd.api+json' --data '
-          {
-            "data": {
-              "type": "post",
-              "attributes": {
-                "content": "The 2nd best thing ever by Ken",
-                "me": "2"
-              },
-              "relationships": {
-                "author": {
-                  "data": {
-                    "type": "user",
-                    "id": "2"
-                  }
-                }
-              }
-            }
-          }
-          ' -X POST http://localhost:4080/post
-
-You can also load some data using `load_blog.sh` in `src/main/scripts/`
diff --git a/elide-example/elide-blog-example/pom.xml b/elide-example/elide-blog-example/pom.xml
deleted file mode 100644
index eeade84bea..0000000000
--- a/elide-example/elide-blog-example/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-blog-example</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Example: Persistence API with Security</name>
-    <description>Elide example using javax.persistence, MySQL and Elide Security</description>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-example-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <mysql.data.directory>${project.build.directory}/mysql-data</mysql.data.directory>
-    </properties>
-
-    <dependencies>
-        <!-- Elide dependencies for example -->
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate5</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Jetty -->
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-        </dependency>
-        <!-- Jersey -->
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet-core</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-servlet</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <!-- Persistence -->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.0.2.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.37</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- JSON -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>json-schema-validator</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.yahoo.elide.example.persistence.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- Do not deploy -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java
deleted file mode 100644
index 1f84008b98..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.Slf4jLogger;
-import com.yahoo.elide.datastores.hibernate5.PersistenceStore;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.server.ResourceConfig;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-/**
- * Example application for resource config.
- */
-public class ElideResourceConfig extends ResourceConfig {
-    public ElideResourceConfig() {
-        register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                JsonApiEndpoint.DefaultOpaqueUserFunction noUserFn = v -> null;
-                bind(noUserFn)
-                        .to(JsonApiEndpoint.DefaultOpaqueUserFunction.class)
-                        .named("elideUserExtractionFunction");
-
-                EntityManagerFactory entityManagerFactory =
-                        Persistence.createEntityManagerFactory("com.yahoo.elide.example");
-
-                bind(new Elide.Builder(new Slf4jLogger(), new PersistenceStore(entityManagerFactory)).build())
-                        .to(Elide.class).named("elide");
-            }
-        });
-    }
-}
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/Main.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/Main.java
deleted file mode 100644
index aa19785010..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/Main.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.glassfish.jersey.servlet.ServletContainer;
-
-/**
- * Example backend using Elide library.
- */
-@Slf4j
-public class Main {
-    public static void main(String[] args) throws Exception {
-        final Server server = new Server(4080);
-        final ServletContextHandler servletContextHandler = new ServletContextHandler();
-        servletContextHandler.setContextPath("/");
-        server.setHandler(servletContextHandler);
-
-        final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
-        servletHolder.setInitOrder(1);
-        servletHolder.setInitParameter("jersey.config.server.provider.packages",
-                JsonApiEndpoint.class.getPackage().getName());
-        servletHolder.setInitParameter("javax.ws.rs.Application",
-                ElideResourceConfig.class.getCanonicalName());
-
-        log.info("Web service starting...");
-        server.start();
-
-        log.info("Web service running...");
-        server.join();
-        server.destroy();
-    }
-}
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Comment.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Comment.java
deleted file mode 100644
index ed1862c52a..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Comment.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-import com.yahoo.elide.annotation.ComputedAttribute;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-/**
- * Model for Comments on Posts
- */
-@Entity
-@Table(name = "comment")
-@Include
-@SharePermission(any = { Role.ALL.class })
-public class Comment {
-    private long id;
-    private Post post;
-    private User author;
-    private String content;
-    private long me;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @ManyToOne
-    public Post getPost() {
-        return post;
-    }
-
-    public void setPost(Post post) {
-        this.post = post;
-    }
-
-    @ManyToOne
-    public User getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(User author) {
-        this.author = author;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    @Transient
-    @ComputedAttribute
-    public long getMe() {
-        return me;
-    }
-
-    public void setMe(long me) {
-        this.me = me;
-    }
-}
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Post.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Post.java
deleted file mode 100644
index 870aab918f..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Post.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-import com.yahoo.elide.annotation.ComputedAttribute;
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.Collection;
-
-/**
- * Model for Posts
- */
-@Entity
-@Table(name = "post")
-@Include(rootLevel = true)
-public class Post {
-    private long id;
-    private User author;
-    private String content;
-    private Collection<Comment> comments;
-    private long me;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @ManyToOne
-    public User getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(User author) {
-        this.author = author;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    @OneToMany(mappedBy = "post")
-    public Collection<Comment> getComments() {
-        return comments;
-    }
-
-    public void setComments(Collection<Comment> comments) {
-        this.comments = comments;
-    }
-
-    @Transient
-    @ComputedAttribute
-    public long getMe() {
-        return me;
-    }
-
-    public void setMe(long me) {
-        this.me = me;
-        System.out.println(me);
-    }
-}
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Role.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Role.java
deleted file mode 100644
index 1047e0ec10..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/Role.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-/**
- * User Role (Admin, Registered, Unregistered)
- */
-public enum Role {
-    Admin,
-    Registered,
-    Unregistered;
-}
diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/User.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/User.java
deleted file mode 100644
index 989b53ff0f..0000000000
--- a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/persistence/models/User.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * Model for Users (author of posts and author of comments).
- */
-@Entity
-@Table(name = "user")
-@Include(rootLevel = true)
-@SharePermission(any = { com.yahoo.elide.security.checks.prefab.Role.ALL.class})
-//@CreatePermission(expression = "Prefab.Role.All")
-public class User {
-    private long id;
-    private String name;
-    private Role role;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Role getRole() {
-        return role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
-}
diff --git a/elide-example/elide-blog-example/src/main/resources/META-INF/persistence.xml b/elide-example/elide-blog-example/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 0c2cd3fee5..0000000000
--- a/elide-example/elide-blog-example/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-    <persistence-unit name="com.yahoo.elide.example">
-        <class>com.yahoo.elide.example.persistence.models.User</class>
-        <class>com.yahoo.elide.example.persistence.models.Post</class>
-        <class>com.yahoo.elide.example.persistence.models.Comment</class>
-
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/elide" />
-            <property name="javax.persistence.jdbc.user" value="elide" />
-            <property name="javax.persistence.jdbc.password" value="elide123" />
-
-            <property name="hibernate.show_sql" value="true" />
-            <property name="hibernate.hbm2ddl.auto" value="create" />
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/elide-example/elide-blog-example/src/main/resources/log4j2.xml b/elide-example/elide-blog-example/src/main/resources/log4j2.xml
deleted file mode 100644
index 349654f4f4..0000000000
--- a/elide-example/elide-blog-example/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="DEBUG">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="debug">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/elide-example/elide-blog-example/src/main/scripts/load_blog.sh b/elide-example/elide-blog-example/src/main/scripts/load_blog.sh
deleted file mode 100755
index 2780a2c0ff..0000000000
--- a/elide-example/elide-blog-example/src/main/scripts/load_blog.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/bash
-# Example that exercises security features in Elide
-
-# Entities:
-# Post
-#
-# - Author (User)
-# - Date Posted
-# - Content (String)
-# - Comments (Collection)
-#
-# User
-#
-# - Name
-# - Email
-# - Type (Admin, Registered, Unregistered)
-#
-# Comment
-#
-# - Author (User)
-# - Date Posted
-# - Content (String)
-#
-# Relationships:
-# Post -1> User
-# Post -oo> Comment
-# Comment -1> User
-#
-# Security:
-#
-# - Admin User can:
-#     - Do anything
-# - Registered User can:
-#     - Create post
-#     - Edit their post
-#     - Comment on a post
-#     - Edit their comment
-#     - Delete their comment
-# - Registered User cannot:
-#     - Delete their post
-#     - Delete comments on their post
-#     - Edit other people’s comments
-#     - Delete other people’s comments
-# - Unregistered User can:
-#     - Read posts
-# - Unregistered User cannot:
-#     - Create posts
-#     - Create comments
-#     - Read comments
-#     - Delete anything
-#     - Edit anything
-
-# Allowed: Create user 1
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "user",
-    "attributes": {
-      "name": "Michael Admin",
-      "role": "Admin"
-    }
-  }
-}
-' -X POST http://localhost:4080/user
-
-# Allowed: Create user 2
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "user",
-    "attributes": {
-      "name": "Ken Registered",
-      "role": "Registered"
-    }
-  }
-}
-' -X POST http://localhost:4080/user
-
-# Allowed: Create user 3
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "user",
-    "attributes": {
-      "name": "Shad Unreg",
-      "role": "Unregistered"
-    }
-  }
-}
-' -X POST http://localhost:4080/user
-
-# Allowed: Create post 1 - admin (me=1) creates a post:
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "post",
-    "attributes": {
-      "content": "The greatest thing ever by Michael",
-      "me": "1"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post
-
-# Allowed: Create post 2 - registered user (me=2) creates a post:
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "post",
-    "attributes": {
-      "content": "The 2nd best thing ever by Ken",
-      "me": "2"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "2"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post
-
-# Not Allowed: Create post - registered user (me=2) creates a post that doesn't belong to me
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "post",
-    "attributes": {
-      "content": "Ken tries to put words into Shads mouth",
-      "me": "2"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "3"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post
-
-# Not Allowed: Create post - unregistered user (me=3) creates a post
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "post",
-    "attributes": {
-      "content": "Shad tries to post",
-      "me": "3"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "3"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post
-
-# Allowed: Michael Admin comments on Ken's Post
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "comment",
-    "attributes": {
-      "content": "That is truly the 2nd best post ever",
-      "me": "1"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post/2/comments
-
-# Not Allowed: Shad Unreg comments on Ken Reg's Post
-curl -H'Content-Type: application/vnd.api+json' \
-     -H'Accept: application/vnd.api+json' --data '
-{
-  "data": {
-    "type": "comment",
-    "attributes": {
-      "content": "I think this is the 3rd best post ever",
-      "me": "3"
-    },
-    "relationships": {
-      "author": {
-        "data": {
-          "type": "user",
-          "id": "3"
-        }
-      }
-    }
-  }
-}
-' -X POST http://localhost:4080/post/2/comments
diff --git a/elide-example/elide-hibernate3-mysql-example/pom.xml b/elide-example/elide-hibernate3-mysql-example/pom.xml
deleted file mode 100644
index c08388774b..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-hibernate3-mysql-example</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Example: Hibernate 3 API with MySQL</name>
-    <description>Elide example using Hibernate 3 and MySQL</description>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-example-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <mysql.data.directory>${project.build.directory}/mysql-data</mysql.data.directory>
-    </properties>
-
-    <dependencies>
-        <!-- Elide dependencies for example -->
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate3</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Jetty -->
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-        </dependency>
-        <!-- Jersey -->
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet-core</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-servlet</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.13</version>
-        </dependency>
-        <!-- Persistence -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>3.6.6.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>4.3.2.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.37</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- JSON -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.yahoo.elide.example.persistence.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- Do not deploy -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/ElideResourceConfig.java b/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/ElideResourceConfig.java
deleted file mode 100644
index 7a76de5240..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/ElideResourceConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.hibernate3;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.Slf4jLogger;
-import com.yahoo.elide.datastores.hibernate3.HibernateStore;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-
-/**
- * Example application for resource config
- */
-public class ElideResourceConfig extends ResourceConfig {
-    public ElideResourceConfig() {
-        register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                JsonApiEndpoint.DefaultOpaqueUserFunction noUserFn = v -> null;
-                bind(noUserFn).to(JsonApiEndpoint.DefaultOpaqueUserFunction.class).named("elideUserExtractionFunction");
-
-                SessionFactory sessionFactory = new Configuration().configure().buildSessionFactory();
-                Elide elide = new Elide.Builder(new Slf4jLogger(), new HibernateStore(sessionFactory)).build();
-                bind(elide).to(Elide.class).named("elide");
-            }
-        });
-    }
-}
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/Main.java b/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/Main.java
deleted file mode 100644
index f9b424036e..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/Main.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.hibernate3;
-
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.glassfish.jersey.servlet.ServletContainer;
-
-/**
- * Example backend using Elide library.
- */
-@Slf4j
-public class Main {
-    public static void main(String[] args) throws Exception {
-        final Server server = new Server(4080);
-        final ServletContextHandler servletContextHandler = new ServletContextHandler();
-        servletContextHandler.setContextPath("/");
-        server.setHandler(servletContextHandler);
-
-        final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
-        servletHolder.setInitOrder(1);
-        servletHolder.setInitParameter("jersey.config.server.provider.packages",
-                JsonApiEndpoint.class.getPackage().getName());
-        servletHolder.setInitParameter("javax.ws.rs.Application",
-                ElideResourceConfig.class.getCanonicalName());
-
-        log.info("Web service starting...");
-        server.start();
-
-        log.info("Web service running...");
-        server.join();
-        server.destroy();
-    }
-}
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Author.java b/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Author.java
deleted file mode 100644
index ca7da1571e..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Author.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.hibernate3.models;
-
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for authors
- */
-@Entity
-@Table(name = "author")
-@Include(rootLevel = true)
-public class Author {
-    private long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ManyToMany(mappedBy = "authors")
-    public Collection<Book> getBooks() {
-        return books;
-    }
-
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
-    }
-}
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Book.java b/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Book.java
deleted file mode 100644
index d190666a8c..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/java/com/yahoo/elide/example/hibernate3/models/Book.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.hibernate3.models;
-
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for books
- */
-@Entity
-@Table(name = "book")
-@Include(rootLevel = true)
-public class Book {
-    private long id;
-    private String title;
-    private String genre;
-    private String language;
-    private Collection<Author> authors = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    @ManyToMany
-    public Collection<Author> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(Collection<Author> authors) {
-        this.authors = authors;
-    }
-}
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/resources/hibernate.cfg.xml b/elide-example/elide-hibernate3-mysql-example/src/main/resources/hibernate.cfg.xml
deleted file mode 100644
index 73c3aa881e..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/resources/hibernate.cfg.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE hibernate-configuration PUBLIC
-        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-    <session-factory>
-        <!-- Database connection settings -->
-        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-        <property name="connection.url">jdbc:mysql://localhost/elide</property>
-        <property name="connection.username">elide</property>
-        <property name="connection.password">elide123</property>
-
-        <!-- Hibernate settings -->
-        <property name="dialect">org.hibernate.dialect.MySQL5Dialect</property>
-        <property name="show_sql">true</property>
-        <property name="hbm2ddl.auto">create</property>
-        <property name="hibernate.current_session_context_class">thread</property>
-
-        <!-- Names the annotated entity class -->
-        <mapping class="com.yahoo.elide.example.hibernate3.models.Author"/>
-        <mapping class="com.yahoo.elide.example.hibernate3.models.Book"/>
-    </session-factory>
-</hibernate-configuration>
diff --git a/elide-example/elide-hibernate3-mysql-example/src/main/resources/logback.xml b/elide-example/elide-hibernate3-mysql-example/src/main/resources/logback.xml
deleted file mode 100644
index 551f1bd871..0000000000
--- a/elide-example/elide-hibernate3-mysql-example/src/main/resources/logback.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2015, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}.%M\(%F:%L\) - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="error">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/elide-example/elide-persistence-mysql-example/README.md b/elide-example/elide-persistence-mysql-example/README.md
deleted file mode 100644
index 86836f0b9d..0000000000
--- a/elide-example/elide-persistence-mysql-example/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Elide Example
-
-## Usage
-
-1. Install and start a MySQL server
-
-2. Create ```elide``` database
-
-        mysql> create database elide;
-
-3. Create ```elide``` user with password ```elide123```
-
-        mysql> grant all on elide.* to 'elide'@'localhost' identified by 'elide123';
-
-4. Launch the example webservice
-
-        ~/elide $ mvn install
-        ~/elide $ cd elide-example/elide-persistence-mysql-example
-        ~/elide/elide-example/elide-persistence-mysql-example $ mvn exec:java -Dexec.mainClass="com.yahoo.elide.example.persistence.Main"
-
-5. Create an author
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "-",
-            "type": "author",
-            "attributes": {
-              "name": "Ernest Hemingway"
-            }
-          }
-        }' -X POST http://localhost:4080/author
-
-6. Create a book
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "-",
-            "type": "book",
-            "attributes": {
-              "title": "The Old Man and the Sea",
-              "genre": "Literary Fiction",
-              "language": "English"
-            }
-          }
-        }' -X POST http://localhost:4080/book
-
-7. Associate the author and book
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' --data '{
-          "data": {
-            "id": "1",
-            "type": "author"
-          }
-        }' -X PATCH http://localhost:4080/book/1/relationships/authors
-
-8. Get books
-
-        $ curl -H'Content-Type: application/vnd.api+json' -H'Accept: application/vnd.api+json' http://localhost:4080/book/
-
-You can also load some pre-configured authors and books using `load_elide.sh` in `src/main/scripts/`
diff --git a/elide-example/elide-persistence-mysql-example/pom.xml b/elide-example/elide-persistence-mysql-example/pom.xml
deleted file mode 100644
index bb3ef4a1cc..0000000000
--- a/elide-example/elide-persistence-mysql-example/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-persistence-mysql-example</artifactId>
-    <packaging>jar</packaging>
-    <name>Elide Example: Persistence API with MySQL</name>
-    <description>Elide example using javax.persistence and MySQL</description>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-example-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <mysql.data.directory>${project.build.directory}/mysql-data</mysql.data.directory>
-    </properties>
-
-    <dependencies>
-        <!-- Elide dependencies for example -->
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-core</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.elide</groupId>
-            <artifactId>elide-datastore-hibernate5</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Jetty -->
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-        </dependency>
-        <!-- Jersey -->
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet-core</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-servlet</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <!-- Persistence -->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.0.2.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.37</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- JSON -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>json-schema-validator</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.yahoo.elide.example.persistence.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- Do not deploy -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java b/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java
deleted file mode 100644
index aa0d1f6237..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/ElideResourceConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.Slf4jLogger;
-import com.yahoo.elide.datastores.hibernate5.PersistenceStore;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.server.ResourceConfig;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-/**
- * Example application for resource config
- */
-public class ElideResourceConfig extends ResourceConfig {
-    public ElideResourceConfig() {
-        register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                JsonApiEndpoint.DefaultOpaqueUserFunction noUserFn = v -> null;
-                bind(noUserFn)
-                        .to(JsonApiEndpoint.DefaultOpaqueUserFunction.class)
-                        .named("elideUserExtractionFunction");
-
-                EntityManagerFactory entityManagerFactory =
-                        Persistence.createEntityManagerFactory("com.yahoo.elide.example");
-                bind(new Elide.Builder(new Slf4jLogger(), new PersistenceStore(entityManagerFactory)).build())
-                        .to(Elide.class).named("elide");
-            }
-        });
-    }
-}
diff --git a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/Main.java b/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/Main.java
deleted file mode 100644
index aa19785010..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/Main.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence;
-
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.glassfish.jersey.servlet.ServletContainer;
-
-/**
- * Example backend using Elide library.
- */
-@Slf4j
-public class Main {
-    public static void main(String[] args) throws Exception {
-        final Server server = new Server(4080);
-        final ServletContextHandler servletContextHandler = new ServletContextHandler();
-        servletContextHandler.setContextPath("/");
-        server.setHandler(servletContextHandler);
-
-        final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
-        servletHolder.setInitOrder(1);
-        servletHolder.setInitParameter("jersey.config.server.provider.packages",
-                JsonApiEndpoint.class.getPackage().getName());
-        servletHolder.setInitParameter("javax.ws.rs.Application",
-                ElideResourceConfig.class.getCanonicalName());
-
-        log.info("Web service starting...");
-        server.start();
-
-        log.info("Web service running...");
-        server.join();
-        server.destroy();
-    }
-}
diff --git a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Author.java b/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Author.java
deleted file mode 100644
index 6a729eb413..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Author.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for authors
- */
-@Entity
-@SharePermission(any = {Role.ALL.class})
-@Table(name = "author")
-@Include(rootLevel = true)
-public class Author {
-    private long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ManyToMany(mappedBy = "authors")
-    public Collection<Book> getBooks() {
-        return books;
-    }
-
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
-    }
-}
diff --git a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Book.java b/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Book.java
deleted file mode 100644
index ed57a4fca2..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/java/com/yahoo/elide/example/persistence/models/Book.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.example.persistence.models;
-
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Model for books
- */
-@Entity
-@Table(name = "book")
-@Include(rootLevel = true)
-public class Book {
-    private long id;
-    private String title;
-    private String genre;
-    private String language;
-    private Collection<Author> authors = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    @ManyToMany
-    public Collection<Author> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(Collection<Author> authors) {
-        this.authors = authors;
-    }
-}
diff --git a/elide-example/elide-persistence-mysql-example/src/main/resources/META-INF/persistence.xml b/elide-example/elide-persistence-mysql-example/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 4261b7560e..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-    <persistence-unit name="com.yahoo.elide.example">
-        <class>com.yahoo.elide.example.persistence.models.Author</class>
-        <class>com.yahoo.elide.example.persistence.models.Book</class>
-
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/elide" />
-            <property name="javax.persistence.jdbc.user" value="elide" />
-            <property name="javax.persistence.jdbc.password" value="elide123" />
-
-            <property name="hibernate.show_sql" value="true" />
-            <property name="hibernate.hbm2ddl.auto" value="create" />
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/elide-example/elide-persistence-mysql-example/src/main/resources/log4j2.xml b/elide-example/elide-persistence-mysql-example/src/main/resources/log4j2.xml
deleted file mode 100644
index 349654f4f4..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="DEBUG">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="debug">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/elide-example/elide-persistence-mysql-example/src/main/scripts/load_elide.sh b/elide-example/elide-persistence-mysql-example/src/main/scripts/load_elide.sh
deleted file mode 100755
index fcbdb971d5..0000000000
--- a/elide-example/elide-persistence-mysql-example/src/main/scripts/load_elide.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-
-# Loads the locally running Elide instance with some books and authors
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345678-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Ernest Hemingway"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345678-1234-1234-1234-1234567890ac"
-            },
-            {
-              "type": "book",
-              "id": "12345678-1234-1234-1234-1234567890ad"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345678-1234-1234-1234-1234567890ac",
-      "attributes": {
-        "title": "The Old Man and the Sea",
-        "genre": "Literary Fiction",
-        "language": "English"
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345678-1234-1234-1234-1234567890ad",
-      "attributes": {
-        "title": "For Whom the Bell Tolls",
-        "genre": "Literary Fiction",
-        "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345679-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Orson Scott Card"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345679-1234-1234-1234-1234567890ac"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345679-1234-1234-1234-1234567890ac",
-      "attributes": {
-      "title": "Enders Game",
-      "genre": "Science Fiction",
-      "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
-
-curl -H'Content-Type: application/vnd.api+json; ext=jsonpatch' \
-     -H'Accept: application/vnd.api+json; ext=jsonpatch' --data '
-[
-  {
-    "op": "add",
-    "path": "/author",
-    "value": {
-      "id": "12345680-1234-1234-1234-1234567890ab",
-      "type": "author",
-      "attributes": {
-        "name": "Isaac Asimov"
-      },
-      "relationships": {
-        "books": {
-          "data": [
-            {
-              "type": "book",
-              "id": "12345680-1234-1234-1234-1234567890ac"
-            },
-            {
-              "type": "book",
-              "id": "12345680-1234-1234-1234-1234567890ad"
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345680-1234-1234-1234-1234567890ac",
-      "attributes": {
-      "title": "Foundation",
-      "genre": "Science Fiction",
-      "language": "English"
-      }
-    }
-  },
-  {
-    "op": "add",
-    "path": "/book",
-    "value": {
-      "type": "book",
-      "id": "12345680-1234-1234-1234-1234567890ad",
-      "attributes": {
-      "title": "The Roman Republic",
-      "genre": "History",
-      "language": "English"
-      }
-    }
-  }
-]
-' -X PATCH http://localhost:4080/
diff --git a/elide-example/pom.xml b/elide-example/pom.xml
deleted file mode 100644
index 24bb04a877..0000000000
--- a/elide-example/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
-  ~ Copyright 2016, Yahoo Inc.
-  ~ Licensed under the Apache License, Version 2.0
-  ~ See LICENSE file in project root for terms.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>elide-example-parent-pom</artifactId>
-    <packaging>pom</packaging>
-    <name>Elide Example: Parent Pom</name>
-    <description>Parent pom for various examples of Elide use</description>
-    <url>https://github.com/yahoo/elide</url>
-    <parent>
-        <groupId>com.yahoo.elide</groupId>
-        <artifactId>elide-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
-    </parent>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Yahoo Inc.</name>
-            <url>https://github.com/yahoo</url>
-        </developer>
-    </developers>
-
-    <scm>
-        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
-        <url>https://github.com/yahoo/elide.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
-        <version.log4j>2.4.1</version.log4j>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.yahoo.elide</groupId>
-                <artifactId>elide-core</artifactId>
-                <version>2.3.14-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>${version.log4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
-                <version>${version.log4j}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-        <module>elide-persistence-mysql-example</module>
-        <module>elide-hibernate3-mysql-example</module>
-        <module>elide-blog-example</module>
-        <module>dropwizard-elide-example</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <!-- Do not deploy -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/elide-graphql/README.md b/elide-graphql/README.md
new file mode 100644
index 0000000000..6e5a93bbc8
--- /dev/null
+++ b/elide-graphql/README.md
@@ -0,0 +1,2 @@
+elide-graphql
+=============
diff --git a/elide-graphql/pom.xml b/elide-graphql/pom.xml
new file mode 100644
index 0000000000..5faff5859f
--- /dev/null
+++ b/elide-graphql/pom.xml
@@ -0,0 +1,190 @@
+<!-- ~ Copyright 2017, Yahoo Inc. ~ Licensed under the Apache License, Version 
+    2.0 ~ See LICENSE file in project root for terms. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-graphql</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide: GraphQL</name>
+    <description>Elide GraphQL integration</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Yahoo! Inc.</name>
+        <url>http://www.yahoo.com</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-test-helpers</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java</artifactId>
+            <version>17.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java-extended-scalars</artifactId>
+            <version>17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <!-- Subscription serialization -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jms</groupId>
+            <artifactId>javax.jms-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+         <dependency>
+             <groupId>org.apache.ant</groupId>
+             <artifactId>ant</artifactId>
+             <version>1.10.12</version>
+            <scope>test</scope>
+         </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+                <version>${version.antlr4}</version>
+                <configuration>
+                    <visitor>true</visitor>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>antlr4</id>
+                        <goals>
+                            <goal>antlr4</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generateStubs</goal>
+                            <goal>compile</goal>
+                            <goal>generateTestStubs</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/DeferredId.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/DeferredId.java
new file mode 100644
index 0000000000..2186e1754a
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/DeferredId.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Getter;
+
+import java.io.IOException;
+
+/**
+ * The id for any given entity might be populated at transaction commit (as opposed to inline with the data fetch).
+ * This class wraps a {@link PersistentResource} object and allows deferred deserialization of the ID field until
+ * when it is populated and when the GraphQL response is generated.
+ */
+@JsonSerialize(using = SerializeId.class)
+public class DeferredId {
+    @Getter private PersistentResource resource;
+
+    public DeferredId(PersistentResource resource) {
+        this.resource = resource;
+    }
+}
+
+/**
+ * Serializer for the id value of a {@link DeferredId} object.
+ */
+class SerializeId extends JsonSerializer<DeferredId> {
+    @Override
+    public void serialize(DeferredId deferredId, JsonGenerator jsonGenerator,
+                          SerializerProvider serializerProvider) throws IOException {
+        jsonGenerator.writeObject(deferredId.getResource().getId());
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/Entity.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/Entity.java
new file mode 100644
index 0000000000..52fc8ba02d
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/Entity.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.Type;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Represents a GraphQL Input Object.
+ */
+public class Entity {
+    @Getter private Optional<Entity> parentResource;
+    private Map<String, Object> data;
+    @Getter private Type<?> entityClass;
+    @Getter private RequestScope requestScope;
+    @Getter private Set<Attribute> attributes;
+    @Getter private Set<Relationship> relationships;
+
+    /**
+     * Class constructor.
+     * @param parentResource parent entity
+     * @param data entity data
+     * @param entityClass entity class
+     * @param requestScope the request context object
+     */
+    public Entity(
+            Optional<Entity> parentResource,
+            Map<String, Object> data,
+            Type<?> entityClass,
+            RequestScope requestScope) {
+        this.parentResource = parentResource;
+        this.data = data;
+        this.entityClass = entityClass;
+        this.requestScope = requestScope;
+        setAttributes();
+        setRelationships();
+    }
+
+    @AllArgsConstructor
+    public class Attribute {
+        @Getter private String name;
+        @Getter private Object value;
+    }
+
+    @AllArgsConstructor
+    class Relationship {
+        @Getter private String name;
+        @Getter private Set<Entity> value;
+    }
+
+    /**
+     * Extract the attributes of the entity.
+     */
+    private void setAttributes() {
+        if (this.data != null) {
+            this.attributes = new LinkedHashSet<>();
+            EntityDictionary dictionary = this.requestScope.getDictionary();
+            String idFieldName = dictionary.getIdFieldName(this.entityClass);
+
+            for (Map.Entry<String, Object> entry : this.data.entrySet()) {
+                if (dictionary.isAttribute(this.entityClass, entry.getKey())) {
+                    this.attributes.add(new Attribute(entry.getKey(), entry.getValue()));
+                }
+                if (Objects.equals(entry.getKey(), idFieldName)) {
+                    this.attributes.add(new Attribute(entry.getKey(), entry.getValue()));
+                }
+            }
+        }
+    }
+
+    /**
+     * Extract the relationships of the entity.
+     */
+    private void setRelationships() {
+        if (this.data != null) {
+            this.relationships = new LinkedHashSet<>();
+            EntityDictionary dictionary = this.requestScope.getDictionary();
+
+            this.data.entrySet().stream()
+                    .filter(entry -> dictionary.isRelation(this.entityClass, entry.getKey()))
+                    .forEach(entry -> {
+                        String relationshipName = entry.getKey();
+                        Type<?> relationshipClass =
+                                dictionary.getParameterizedType(this.entityClass, relationshipName);
+
+                        Set<Entity> relationshipEntities = new LinkedHashSet<>();
+
+                        // if the relationship is ToOne, entry.getValue() should be a single map
+                        if (dictionary.getRelationshipType(this.entityClass, relationshipName).isToOne()) {
+                            relationshipEntities.add(new Entity(
+                                    Optional.of(this),
+                                    ((Map<String, Object>) entry.getValue()),
+                                    relationshipClass,
+                                    this.requestScope));
+                        } else {
+                            for (Map<String, Object> row : (List<Map<String, Object>>) entry.getValue()) {
+                                relationshipEntities.add(new Entity(
+                                        Optional.of(this),
+                                        row,
+                                        relationshipClass,
+                                        this.requestScope));
+                            }
+                        }
+                        this.relationships.add(new Relationship(relationshipName, relationshipEntities));
+                    });
+        }
+    }
+
+    /**
+     * Get the relationship with name.
+     * @param name Name of relationship
+     * @return Relationship
+     */
+    public Optional<Relationship> getRelationship(String name) {
+        Iterator<Relationship> it = this.relationships.iterator();
+        while (it.hasNext()) {
+            Relationship relationship = it.next();
+            if (relationship.getName().equals(name)) {
+                return Optional.of(relationship);
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Get an Attribute with name.
+     * @param name Name of attribute
+     * @return Attribute
+     */
+    public Optional<Attribute> getAttribute(String name) {
+        Iterator<Attribute> it = this.attributes.iterator();
+        while (it.hasNext()) {
+            Attribute attribute = it.next();
+            if (attribute.getName().equals(name)) {
+                return Optional.of(attribute);
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Get the id of the entity.
+     * @return the optional id
+     */
+    public Optional<String> getId() {
+        EntityDictionary dictionary = this.requestScope.getDictionary();
+        String idFieldName = dictionary.getIdFieldName(this.entityClass);
+        return this.attributes.stream()
+                .filter(entry -> idFieldName.equalsIgnoreCase(entry.name))
+                .map(e -> (String) e.value)
+                .findFirst();
+    }
+
+    /**
+     * Set the id of the entity if it doesn't have one already.
+     */
+    public void setId() {
+        if (!getId().isPresent()) {
+            EntityDictionary dictionary = this.requestScope.getDictionary();
+            String idFieldName = dictionary.getIdFieldName(this.entityClass);
+            String uuid = UUID.randomUUID().toString();
+            this.attributes.add(new Attribute(idFieldName, uuid));
+        }
+    }
+
+    /**
+     * Convert {@link Entity} to {@link PersistentResource} object.
+     * @return {@link PersistentResource} object
+     */
+    public PersistentResource toPersistentResource() {
+        return this.data == null
+                ? null
+                : PersistentResource.loadRecord(getProjection(), getId().orElse(null), this.requestScope);
+    }
+
+    /**
+     * Get a projection for this entity class. Used for querying inserted entities.
+     * @return {@link EntityProjection} object
+     */
+    public EntityProjection getProjection() {
+        return EntityProjection.builder().type(entityClass).build();
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/Environment.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/Environment.java
new file mode 100644
index 0000000000..adc2008d15
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/Environment.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.graphql.containers.GraphQLContainer;
+import com.yahoo.elide.graphql.containers.PersistentResourceContainer;
+import com.yahoo.elide.graphql.containers.RootContainer;
+import graphql.language.Field;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Encapsulates GraphQL's DataFetchingEnvironment.
+ */
+public class Environment {
+    public final GraphQLRequestScope requestScope;
+    public final Optional<List<String>> ids;
+    public final Optional<String> sort;
+    public final Optional<List<Map<String, Object>>> data;
+    public final Optional<String> filters;
+    public final Optional<String> offset;
+    public final Optional<String> first;
+    public final Object rawSource;
+    public final GraphQLContainer container;
+
+    public final PersistentResource parentResource;
+    public final GraphQLType parentType;
+    public final GraphQLType outputType;
+    public final Field field;
+    public final NonEntityDictionary nonEntityDictionary;
+
+    public Environment(DataFetchingEnvironment environment, NonEntityDictionary nonEntityDictionary) {
+        this.nonEntityDictionary = nonEntityDictionary;
+
+        Map<String, Object> args = environment.getArguments();
+
+        requestScope = environment.getLocalContext();
+
+        filters = Optional.ofNullable((String) args.get(ModelBuilder.ARGUMENT_FILTER));
+        offset = Optional.ofNullable((String) args.get(ModelBuilder.ARGUMENT_AFTER));
+        first = Optional.ofNullable((String) args.get(ModelBuilder.ARGUMENT_FIRST));
+        sort = Optional.ofNullable((String) args.get(ModelBuilder.ARGUMENT_SORT));
+
+        parentType = environment.getParentType();
+
+        outputType = environment.getFieldType();
+
+        rawSource = environment.getSource();
+        container = isRoot() ? new RootContainer() : (GraphQLContainer) rawSource;
+
+        if (isRoot()) {
+            // Flush (but don't commit) between root queries
+            requestScope.saveOrCreateObjects();
+            requestScope.getTransaction().flush(requestScope);
+        }
+
+        if (rawSource instanceof PersistentResourceContainer) {
+            parentResource = ((PersistentResourceContainer) rawSource).getPersistentResource();
+        } else {
+            parentResource = null;
+        }
+
+        field = environment.getMergedField().getFields().get(0);
+
+        this.ids = Optional.ofNullable((List<String>) args.get(ModelBuilder.ARGUMENT_IDS));
+
+        List<Map<String, Object>> data;
+        if (args.get(ModelBuilder.ARGUMENT_DATA) instanceof Map) {
+            data = Arrays.asList((Map<String, Object>) args.get(ModelBuilder.ARGUMENT_DATA));
+        } else {
+            data = (List<Map<String, Object>>) args.get(ModelBuilder.ARGUMENT_DATA);
+        }
+        this.data = Optional.ofNullable(data);
+    }
+
+    public boolean isRoot() {
+        return !(rawSource instanceof GraphQLContainer);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultDeserializer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultDeserializer.java
new file mode 100644
index 0000000000..8fe0b1913b
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultDeserializer.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import graphql.ExecutionResult;
+import graphql.ExecutionResultImpl;
+import graphql.GraphQLError;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Deserializes JSON into an Execution Result.
+ */
+@Slf4j
+public class ExecutionResultDeserializer extends StdDeserializer<ExecutionResult> {
+
+    ObjectMapper mapper;
+    GraphQLErrorDeserializer errorDeserializer;
+
+    public ExecutionResultDeserializer() {
+        super(ExecutionResult.class);
+        mapper = new ObjectMapper();
+        errorDeserializer = new GraphQLErrorDeserializer();
+    }
+
+    @Override
+    public ExecutionResult deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+        JsonNode root = parser.getCodec().readTree(parser);
+
+        JsonNode dataNode = root.get("data");
+        JsonNode errorsNode = root.get("errors");
+
+        List<GraphQLError> errors = null;
+
+        if (errorsNode != null) {
+            errors = new ArrayList<>();
+            Iterator<JsonNode> nodeIterator = errorsNode.iterator();
+            while (nodeIterator.hasNext()) {
+                JsonNode errorNode = nodeIterator.next();
+                errors.add(errorDeserializer.deserialize(errorNode.traverse(parser.getCodec()), context));
+            }
+        }
+
+        Map<String, Object> data = mapper.convertValue(dataNode, new TypeReference<>() { });
+
+        return ExecutionResultImpl.newExecutionResult()
+                .errors(errors)
+                .data(data).build();
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultSerializer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultSerializer.java
new file mode 100644
index 0000000000..9a1cd63b8c
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ExecutionResultSerializer.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Custom serializer used to generate response messages. Should closely mimic the
+ * {@link ExecutionResult#toSpecification()} function which specifies which fields should be present in the result of
+ * a GraphQL call. {@link GraphQLError} objects should be handed off to a {@link GraphQLErrorSerializer} to handle
+ * optional encoding of the error message.
+ */
+@Slf4j
+public class ExecutionResultSerializer extends StdSerializer<ExecutionResult> {
+    private final GraphQLErrorSerializer errorSerializer;
+
+    public ExecutionResultSerializer() {
+        this(new GraphQLErrorSerializer());
+    }
+
+    public ExecutionResultSerializer(GraphQLErrorSerializer errorSerializer) {
+        super(ExecutionResult.class);
+        this.errorSerializer = errorSerializer;
+    }
+
+    @Override
+    public void serialize(ExecutionResult value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        // mimic the ExecutionResult.toSpecification response
+        gen.writeStartObject();
+        Map<String, Object> spec = value.toSpecification();
+        if (spec.containsKey("data")) {
+            gen.writeObjectField("data", spec.get("data"));
+        }
+
+        if (spec.containsKey("errors")) {
+            List<GraphQLError> errors = value.getErrors();
+            gen.writeArrayFieldStart("errors");
+            for (GraphQLError error : errors) {
+                // includes start object and end object
+                errorSerializer.serialize(error, gen, provider);
+            }
+            gen.writeEndArray();
+        }
+
+        if (spec.containsKey("extensions")) {
+            gen.writeObjectField("extensions", spec.get("extensions"));
+        }
+
+        gen.writeEndObject();
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLConversionUtils.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLConversionUtils.java
new file mode 100644
index 0000000000..5462f8da47
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLConversionUtils.java
@@ -0,0 +1,542 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static graphql.schema.GraphQLArgument.newArgument;
+import static graphql.schema.GraphQLEnumType.newEnum;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
+import static graphql.schema.GraphQLInputObjectType.newInputObject;
+import static graphql.schema.GraphQLObjectType.newObject;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import graphql.Scalars;
+import graphql.scalars.java.JavaPrimitives;
+import graphql.schema.DataFetcher;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectField;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLScalarType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Contains methods that convert from a class to a GraphQL input or query type.
+ */
+@Slf4j
+public class GraphQLConversionUtils {
+    protected static final String KEY = "key";
+    protected static final String VALUE = "value";
+    protected static final String ERROR_MESSAGE = "Value should either be integer, String or float";
+
+    private final Map<Type<?>, GraphQLScalarType> scalarMap = new HashMap<>();
+
+    protected NonEntityDictionary nonEntityDictionary;
+    protected EntityDictionary entityDictionary;
+
+    private final Map<Type, GraphQLObjectType> outputConversions = new HashMap<>();
+    private final Map<Type, GraphQLInputObjectType> inputConversions = new HashMap<>();
+    private final Map<Type, GraphQLEnumType> enumConversions = new HashMap<>();
+    private final Map<String, GraphQLList> mapConversions = new HashMap<>();
+    private final GraphQLNameUtils nameUtils;
+
+    public GraphQLConversionUtils(
+            EntityDictionary entityDictionary,
+            NonEntityDictionary nonEntityDictionary
+    ) {
+        this.entityDictionary = entityDictionary;
+        this.nonEntityDictionary = nonEntityDictionary;
+        this.nameUtils = new GraphQLNameUtils(entityDictionary);
+        registerCustomScalars();
+    }
+
+    private void registerCustomScalars() {
+        CoerceUtil.getSerdes().forEach((type, serde) -> {
+            SerdeCoercing<?, ?> serdeCoercing = new SerdeCoercing<>(ERROR_MESSAGE, serde);
+            ElideTypeConverter elideTypeConverter = serde.getClass().getAnnotation(ElideTypeConverter.class);
+            String name = elideTypeConverter != null ? elideTypeConverter.name() : type.getSimpleName();
+            String description = elideTypeConverter != null ? elideTypeConverter.description() : type.getSimpleName();
+            scalarMap.put(ClassType.of(type), GraphQLScalarType.newScalar()
+                            .name(name)
+                            .description(description)
+                            .coercing(serdeCoercing)
+                            .build());
+
+        });
+    }
+
+    /**
+     * Converts any non-entity type to a GraphQLType.
+     * @param clazz - the non-entity type.
+     * @return the GraphQLType or null if there is a problem with the underlying model.
+     */
+    public GraphQLScalarType classToScalarType(Type<?> clazz) {
+        if (clazz.equals(ClassType.of(int.class)) || clazz.equals(ClassType.of(Integer.class))) {
+            return Scalars.GraphQLInt;
+        } else if (clazz.equals(ClassType.of(boolean.class)) || clazz.equals(ClassType.of(Boolean.class))) {
+            return Scalars.GraphQLBoolean;
+        } else if (clazz.equals(ClassType.of(long.class)) || clazz.equals(ClassType.of(Long.class))) {
+            return Scalars.GraphQLInt;
+        } else if (clazz.equals(ClassType.of(float.class)) || clazz.equals(ClassType.of(Float.class))) {
+            return Scalars.GraphQLFloat;
+        } else if (clazz.equals(ClassType.of(double.class)) || clazz.equals(ClassType.of(Double.class))) {
+            return Scalars.GraphQLFloat;
+        } else if (clazz.equals(ClassType.of(short.class)) || clazz.equals(ClassType.of(Short.class))) {
+            return Scalars.GraphQLInt;
+        } else if (clazz.equals(ClassType.of(String.class)) || clazz.equals(ClassType.of(Object.class))) {
+            return Scalars.GraphQLString;
+        } else if (clazz.equals(ClassType.of(BigDecimal.class))) {
+            return JavaPrimitives.GraphQLBigDecimal;
+        }
+        return otherClassToScalarType(clazz);
+    }
+
+    private GraphQLScalarType otherClassToScalarType(Type<?> clazz) {
+        if (scalarMap.containsKey(clazz)) {
+            return scalarMap.get(clazz);
+        }
+        if (ClassType.DATE_TYPE.isAssignableFrom(clazz)) {
+            return GraphQLScalars.GRAPHQL_DATE_TYPE;
+        }
+        return null;
+    }
+
+    /**
+     * Converts an enum to a GraphQLEnumType.
+     * @param enumClazz the Enum to convert
+     * @return A GraphQLEnum type for class.
+     */
+    public GraphQLEnumType classToEnumType(Type<?> enumClazz) {
+        if (enumConversions.containsKey(enumClazz)) {
+            return enumConversions.get(enumClazz);
+        }
+
+        Enum [] values = (Enum []) enumClazz.getEnumConstants();
+
+        GraphQLEnumType.Builder builder = newEnum().name(nameUtils.toOutputTypeName(enumClazz));
+
+        for (Enum value : values) {
+            builder.value(value.toString(), value);
+        }
+
+        GraphQLEnumType enumResult = builder.build();
+
+        enumConversions.put(enumClazz, enumResult);
+
+        return enumResult;
+    }
+
+    /**
+     * Creates a GraphQL Map Query type.  GraphQL doesn't support this natively.  We mimic
+     * maps by creating a list of key/value pairs.
+     * @param keyClazz The map key class
+     * @param valueClazz The map value class
+     * @param fetcher The Datafetcher to assign to the created GraphQL object.
+     * @return The created type.
+     */
+    public GraphQLList classToQueryMap(Type<?> keyClazz, Type<?> valueClazz, DataFetcher fetcher) {
+        String mapName = nameUtils.toMapEntryOutputName(keyClazz, valueClazz);
+
+        if (mapConversions.containsKey(mapName)) {
+            return mapConversions.get(mapName);
+        }
+
+        GraphQLOutputType keyType = fetchScalarOrObjectOutput(keyClazz, fetcher);
+        GraphQLOutputType valueType = fetchScalarOrObjectOutput(valueClazz, fetcher);
+
+        GraphQLObjectType mapType = newObject()
+                .name(mapName)
+                .field(newFieldDefinition()
+                        .name(KEY)
+                        .type(keyType))
+                .field(newFieldDefinition()
+                        .name(VALUE)
+                        .type(valueType))
+                .build();
+
+        GraphQLList outputMap = new GraphQLList(mapType);
+
+        mapConversions.put(mapName, outputMap);
+
+        return mapConversions.get(mapName);
+    }
+
+    /**
+     * Creates a GraphQL Map Input type.  GraphQL doesn't support this natively.  We mimic
+     * maps by creating a list of key/value pairs.
+     * @param keyClazz The map key class
+     * @param valueClazz The map value class
+     * @return The created type.
+     */
+    public GraphQLList classToInputMap(Type<?> keyClazz,
+                                       Type<?> valueClazz) {
+        String mapName = nameUtils.toMapEntryInputName(keyClazz, valueClazz);
+
+        if (mapConversions.containsKey(mapName)) {
+            return mapConversions.get(mapName);
+        }
+
+        GraphQLInputType keyType = fetchScalarOrObjectInput(keyClazz);
+        GraphQLInputType valueType = fetchScalarOrObjectInput(valueClazz);
+
+        GraphQLList inputMap = new GraphQLList(
+            newInputObject()
+                .name(mapName)
+                .field(newInputObjectField()
+                        .name(KEY)
+                        .type(keyType))
+                .field(newInputObjectField()
+                        .name(VALUE)
+                        .type(valueType))
+                .build()
+        );
+
+        mapConversions.put(mapName, inputMap);
+
+        return inputMap;
+    }
+
+    /**
+     * Converts an attribute of an Elide entity to a GraphQL Query Type.
+     * @param parentClass The elide entity class.
+     * @param attributeClass The attribute class.
+     * @param attribute The name of the attribute.
+     * @param fetcher The data fetcher to associated with the newly created GraphQL Query Type
+     * @return A newly created GraphQL Query Type or null if the underlying type cannot be converted.
+     */
+    public GraphQLOutputType attributeToQueryObject(Type<?> parentClass,
+                                                    Type<?> attributeClass,
+                                                    String attribute,
+                                                    DataFetcher fetcher) {
+        return attributeToQueryObject(
+                parentClass,
+                attributeClass,
+                attribute,
+                fetcher,
+                entityDictionary);
+    }
+
+    /**
+     * Helper function which converts an attribute of an entity to a GraphQL Query Type.
+     * @param parentClass The parent entity class (Can either be an elide entity or not).
+     * @param attributeClass The attribute class.
+     * @param attribute The name of the attribute.
+     * @param fetcher The data fetcher to associated with the newly created GraphQL Query Type
+     *
+     * @return A GraphQL Query Type (either newly created or singleton instance for class) or
+     *         null if the underlying type cannot be converted.
+     */
+    protected GraphQLOutputType attributeToQueryObject(Type<?> parentClass,
+                                                       Type<?> attributeClass,
+                                                       String attribute,
+                                                       DataFetcher fetcher,
+                                                       EntityDictionary dictionary) {
+
+        /* Determine if we've already processed this item. */
+        if (outputConversions.containsKey(attributeClass)) {
+            return outputConversions.get(attributeClass);
+        }
+
+        if (enumConversions.containsKey(attributeClass)) {
+            return enumConversions.get(attributeClass);
+        }
+
+        /* We don't support Class */
+        if (ClassType.CLASS_TYPE.isAssignableFrom(attributeClass)) {
+            return null;
+        }
+
+        /* If the attribute is a map */
+        if (ClassType.MAP_TYPE.isAssignableFrom(attributeClass)) {
+
+            /* Extract the key and value types */
+            Type<?> keyType = dictionary.getParameterizedType(parentClass, attribute, 0);
+            Type<?> valueType = dictionary.getParameterizedType(parentClass, attribute, 1);
+
+            return classToQueryMap(keyType, valueType, fetcher);
+
+        /* If the attribute is a collection */
+        } else if (ClassType.COLLECTION_TYPE.isAssignableFrom(attributeClass)) {
+            /* Extract the collection type */
+            Type<?> listType = dictionary.getParameterizedType(parentClass, attribute, 0);
+
+            // If this is a collection of a boxed type scalar, we want to unwrap it properly
+            return new GraphQLList(fetchScalarOrObjectOutput(listType, fetcher));
+        }
+        return fetchScalarOrObjectOutput(attributeClass, fetcher);
+    }
+
+    /**
+     * Converts an attribute of an Elide entity to a GraphQL Input Type.
+     * @param parentClass The elide entity class.
+     * @param attributeClass The attribute class.
+     * @param attribute The name of the attribute.
+     * @return A newly created GraphQL Input Type or null if the underlying type cannot be converted.
+     */
+    public GraphQLInputType attributeToInputObject(Type<?> parentClass,
+                                                   Type<?> attributeClass,
+                                                   String attribute) {
+        return attributeToInputObject(
+                parentClass,
+                attributeClass,
+                attribute,
+                entityDictionary);
+    }
+
+    /**
+     * Helper function which converts an attribute of an entity to a GraphQL Input Type.
+     * @param parentClass The parent entity class (Can either be an elide entity or not).
+     * @param attributeClass The attribute class.
+     * @param attribute The name of the attribute.
+     * @param dictionary The dictionary that contains the runtime type information for the parent class.
+     *
+     * @return A newly created GraphQL Input Type or null if the underlying type cannot be converted.
+     */
+    protected GraphQLInputType attributeToInputObject(Type<?> parentClass,
+                                                      Type<?> attributeClass,
+                                                      String attribute,
+                                                      EntityDictionary dictionary) {
+
+        /* Determine if we've already processed this attribute */
+        if (inputConversions.containsKey(attributeClass)) {
+            return inputConversions.get(attributeClass);
+        }
+
+        if (enumConversions.containsKey(attributeClass)) {
+            return enumConversions.get(attributeClass);
+        }
+
+        /* We don't support Class */
+        if (ClassType.CLASS_TYPE.isAssignableFrom(attributeClass)) {
+            return null;
+        }
+
+        /* If the attribute is a map */
+        if (ClassType.MAP_TYPE.isAssignableFrom(attributeClass)) {
+
+            /* Extract the key and value types */
+            Type<?> keyType = dictionary.getParameterizedType(parentClass, attribute, 0);
+            Type<?> valueType = dictionary.getParameterizedType(parentClass, attribute, 1);
+
+            return classToInputMap(keyType, valueType);
+
+        /* If the attribute is a collection */
+        } else if (ClassType.COLLECTION_TYPE.isAssignableFrom(attributeClass)) {
+
+            /* Extract the collection type */
+            Type<?> listType = dictionary.getParameterizedType(parentClass, attribute, 0);
+
+            return new GraphQLList(fetchScalarOrObjectInput(listType));
+        }
+        return fetchScalarOrObjectInput(attributeClass);
+    }
+
+    /**
+     * Converts a non Elide object into a GraphQL Query object.  Any attribute which cannot be converted is skipped.
+     * @param clazz The non Elide object class
+     * @param fetcher The data fetcher to assign the newly created GraphQL object
+     * @return A newly created GraphQL object.
+     */
+    public GraphQLObjectType classToQueryObject(
+            Type<?> clazz,
+            DataFetcher fetcher) {
+        log.info("Building query object for type: {}", clazz.getName());
+
+        if (!nonEntityDictionary.hasBinding(clazz)) {
+            nonEntityDictionary.bindEntity(clazz);
+        }
+
+        /* Check if we've already converted this */
+        if (outputConversions.containsKey(clazz)) {
+            return outputConversions.get(clazz);
+        }
+
+        GraphQLObjectType.Builder objectBuilder = newObject();
+        objectBuilder.name(nameUtils.toNonElideOutputTypeName(clazz));
+
+        for (String attribute : nonEntityDictionary.getAttributes(clazz)) {
+            Type<?> attributeClass = nonEntityDictionary.getType(clazz, attribute);
+
+            GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
+                    .name(attribute);
+
+            GraphQLOutputType attributeType =
+                    attributeToQueryObject(clazz,
+                            attributeClass, attribute, fetcher, nonEntityDictionary);
+            if (attributeType == null) {
+                continue;
+            }
+
+            fieldBuilder.type(attributeType);
+
+            objectBuilder.field(fieldBuilder);
+        }
+
+        GraphQLObjectType object = objectBuilder.build();
+        outputConversions.put(clazz, object);
+
+        return object;
+    }
+
+    /**
+     * Converts a non Elide object into a Input Query object.  Any attribute which cannot be converted is skipped.
+     * @param clazz The non Elide object class
+     * @return A newly created GraphQL object.
+     */
+    public GraphQLInputObjectType classToInputObject(Type<?> clazz) {
+        log.info("Building input object for type: {}", clazz.getName());
+
+        if (!nonEntityDictionary.hasBinding(clazz)) {
+            nonEntityDictionary.bindEntity(clazz);
+        }
+
+        /* Check if we've already converted this */
+        if (inputConversions.containsKey(clazz)) {
+            return inputConversions.get(clazz);
+        }
+
+        GraphQLInputObjectType.Builder objectBuilder = newInputObject();
+        objectBuilder.name(nameUtils.toNonElideInputTypeName(clazz));
+
+        for (String attribute : nonEntityDictionary.getAttributes(clazz)) {
+            log.info("Building input object attribute: {}", attribute);
+            Type<?> attributeClass = nonEntityDictionary.getType(clazz, attribute);
+
+            GraphQLInputObjectField.Builder fieldBuilder = newInputObjectField()
+                    .name(attribute);
+
+            GraphQLInputType attributeType =
+                    attributeToInputObject(clazz, attributeClass, attribute, nonEntityDictionary);
+
+            if (attributeType == null) {
+                continue;
+            }
+            fieldBuilder.type(attributeType);
+            objectBuilder.field(fieldBuilder);
+        }
+
+        GraphQLInputObjectType object = objectBuilder.build();
+
+        inputConversions.put(clazz, object);
+
+        return object;
+    }
+
+    /**
+     * Build an Argument list object for the given attribute.
+     * @param entityClass The Entity class to which this attribute belongs to.
+     * @param attribute The name of the attribute.
+     * @param fetcher The data fetcher to associated with the newly created GraphQL Query Type.
+     * @return Newly created GraphQLArgument Collection for the given attribute.
+     */
+    public List<GraphQLArgument> attributeArgumentToQueryObject(Type<?> entityClass,
+                                                                String attribute,
+                                                                DataFetcher fetcher) {
+        return attributeArgumentToQueryObject(entityClass, attribute, fetcher, entityDictionary);
+    }
+
+    /**
+     * Build an Argument list object for the given attribute.
+     * @param entityClass The Entity class to which this attribute belongs to.
+     * @param attribute The name of the attribute.
+     * @param fetcher The data fetcher to associated with the newly created GraphQL Query Type
+     * @param dictionary The dictionary that contains the runtime type information for the parent class.
+     * @return Newly created GraphQLArgument Collection for the given attribute
+     */
+    public List<GraphQLArgument> attributeArgumentToQueryObject(Type<?> entityClass,
+                                                                String attribute,
+                                                                DataFetcher fetcher,
+                                                                EntityDictionary dictionary) {
+        return dictionary.getAttributeArguments(entityClass, attribute)
+                .stream()
+                .map(argumentType -> newArgument()
+                        .name(argumentType.getName())
+                        .type(fetchScalarOrObjectInput(argumentType.getType()))
+                        .defaultValue(argumentType.getDefaultValue())
+                        .build())
+                .collect(Collectors.toList());
+
+    }
+
+    /**
+     * Build an Argument list object for the given entity.
+     * @param entityClass The Entity class to which this attribute belongs to.
+     * @param dictionary The dictionary that contains the runtime type information for the parent class.
+     * @return Newly created GraphQLArgument Collection for the given entity
+     */
+    public List<GraphQLArgument> entityArgumentToQueryObject(Type<?> entityClass,
+                                                                EntityDictionary dictionary) {
+        return dictionary.getEntityArguments(entityClass)
+                .stream()
+                .map(argumentType -> newArgument()
+                        .name(argumentType.getName())
+                        .type(fetchScalarOrObjectInput(argumentType.getType()))
+                        .defaultValue(argumentType.getDefaultValue())
+                        .build())
+                .collect(Collectors.toList());
+
+    }
+
+
+    private GraphQLOutputType fetchScalarOrObjectOutput(Type<?> conversionClass,
+                                                        DataFetcher fetcher) {
+        /* If class is enum, provide enum type */
+        if (conversionClass.isEnum()) {
+            return classToEnumType(conversionClass);
+        }
+
+        /* Attempt to convert a scalar type */
+        GraphQLOutputType outputType = classToScalarType(conversionClass);
+        if (outputType == null) {
+                /* Attempt to convert an object type */
+            outputType = classToQueryObject(conversionClass, fetcher);
+        }
+        return outputType;
+    }
+
+    private GraphQLInputType fetchScalarOrObjectInput(Type<?> conversionClass) {
+        /* If class is enum, provide enum type */
+        if (conversionClass.isEnum()) {
+            return classToEnumType(conversionClass);
+        }
+
+        /* Attempt to convert a scalar type */
+        GraphQLInputType inputType = classToScalarType(conversionClass);
+        if (inputType == null) {
+
+                /* Attempt to convert an object type */
+            inputType = classToInputObject(conversionClass);
+        }
+        return inputType;
+    }
+
+    public Set<GraphQLObjectType> getObjectTypes() {
+        Set<GraphQLObjectType> allObjects = mapConversions.values().stream()
+                .map(GraphQLList::getWrappedType)
+                .filter(type -> type instanceof GraphQLObjectType)
+                .map(GraphQLObjectType.class::cast)
+                .collect(Collectors.toSet());
+
+        allObjects.addAll(outputConversions.values());
+        return allObjects;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLEndpoint.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLEndpoint.java
new file mode 100644
index 0000000000..85406ff64e
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLEndpoint.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import static com.yahoo.elide.graphql.QueryRunner.buildErrorResponse;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.resources.SecurityContextUser;
+import com.yahoo.elide.utils.HeaderUtils;
+import com.yahoo.elide.utils.ResourceUtils;
+import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * Default endpoint/servlet for using Elide and JSONAPI.
+ */
+@Slf4j
+@Singleton
+@Produces(MediaType.APPLICATION_JSON)
+@Path("/")
+public class GraphQLEndpoint {
+    private final Map<String, QueryRunner> runners;
+    private final Elide elide;
+
+    @Inject
+    public GraphQLEndpoint(@Named("elide") Elide elide) {
+        log.debug("Started ~~");
+        this.elide = elide;
+        this.runners = new HashMap<>();
+        for (String apiVersion : elide.getElideSettings().getDictionary().getApiVersions()) {
+            runners.put(apiVersion, new QueryRunner(elide, apiVersion));
+        }
+    }
+
+    /**
+     * Create handler.
+     * @param uriInfo URI info
+     * @param headers the request headers
+     * @param securityContext security context
+     * @param graphQLDocument post data as jsonapi document
+     * @return response
+     */
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response post(
+            @Context UriInfo uriInfo,
+            @Context HttpHeaders headers,
+            @Context SecurityContext securityContext,
+            String graphQLDocument) {
+        String apiVersion = HeaderUtils.resolveApiVersion(headers.getRequestHeaders());
+        Map<String, List<String>> requestHeaders =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(headers.getRequestHeaders());
+        User user = new SecurityContextUser(securityContext);
+        QueryRunner runner = runners.getOrDefault(apiVersion, null);
+
+        ElideResponse response;
+        if (runner == null) {
+            response = buildErrorResponse(elide.getMapper().getObjectMapper(),
+                    new InvalidOperationException("Invalid API Version"), false);
+        } else {
+            response = runner.run(getBaseUrlEndpoint(uriInfo),
+                                  graphQLDocument, user, UUID.randomUUID(), requestHeaders);
+        }
+        return Response.status(response.getResponseCode()).entity(response.getBody()).build();
+    }
+
+    protected String getBaseUrlEndpoint(UriInfo uriInfo) {
+        String baseUrl = elide.getElideSettings().getBaseUrl();
+
+        if (StringUtils.isEmpty(baseUrl)) {
+            //UriInfo has full path appended here already.
+            baseUrl = ResourceUtils.resolveBaseUrl(uriInfo);
+        }
+
+        return baseUrl;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorDeserializer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorDeserializer.java
new file mode 100644
index 0000000000..ccc6e50305
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorDeserializer.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static graphql.ErrorType.ExecutionAborted;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import graphql.ErrorClassification;
+import graphql.GraphQLError;
+import graphql.language.SourceLocation;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Deserializes JSON into a GraphQLError.
+ */
+public class GraphQLErrorDeserializer extends StdDeserializer<GraphQLError> {
+
+    /**
+     * Constructor.
+     */
+    public GraphQLErrorDeserializer() {
+        super(GraphQLError.class);
+    }
+
+    @Override
+    public GraphQLError deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+        JsonNode root = parser.getCodec().readTree(parser);
+
+        JsonNode messageNode = root.get("message");
+        JsonNode pathNode = root.get("path");
+        JsonNode sourceLocations = root.get("locations");
+
+        GraphQLError error = new GraphQLError() {
+            @Override
+            public String toString() {
+                return String.format("{ \"message\": \"%s\", \"locations\": %s, \"path\": %s}",
+                        getMessage(),
+                        getLocations(),
+                        getPath());
+            }
+
+            @Override
+            public String getMessage() {
+                return messageNode == null ? null : messageNode.textValue();
+            }
+
+            @Override
+            public List<SourceLocation> getLocations() {
+                if (sourceLocations != null) {
+                    List<SourceLocation> result = new ArrayList<>();
+                    sourceLocations.forEach(sourceLocation -> {
+                        result.add(new SourceLocation(
+                                sourceLocation.get("line").asInt(),
+                                sourceLocation.get("column").asInt()
+                        ));
+                    });
+
+                    return result;
+                }
+                return null;
+            }
+
+            @Override
+            public ErrorClassification getErrorType() {
+                return ExecutionAborted;
+            }
+
+            @Override
+            public List<Object> getPath() {
+                if (pathNode != null) {
+                    List<Object> paths = new ArrayList<>();
+                    pathNode.forEach(path -> {
+                        paths.add(path.asText());
+                    });
+                    return paths;
+                }
+                return null;
+            }
+        };
+
+        return error;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorSerializer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorSerializer.java
new file mode 100644
index 0000000000..274579a670
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLErrorSerializer.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.owasp.encoder.Encode;
+import graphql.GraphQLError;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Custom serializer used to generate response messages from {@link GraphQLError} objects.
+ * Supports encoding of the error's message field, making it safe for display in HTML.
+ */
+public class GraphQLErrorSerializer extends StdSerializer<GraphQLError> {
+
+    /**
+     * Construct a new GraphQLErrorSerializer, optionally with error encoding enabled.
+     */
+    public GraphQLErrorSerializer() {
+        super(GraphQLError.class);
+    }
+
+    @Override
+    public void serialize(GraphQLError value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        Map<String, Object> errorSpec = value.toSpecification();
+        gen.writeStartObject();
+
+        gen.writeStringField("message", Encode.forHtml((String) errorSpec.get("message")));
+
+        if (errorSpec.containsKey("locations")) {
+            gen.writeFieldName("locations");
+            gen.writeObject(errorSpec.get("locations"));
+        }
+
+        if (errorSpec.containsKey("path")) {
+            gen.writeFieldName("path");
+            gen.writeObject(errorSpec.get("path"));
+        }
+
+        if (errorSpec.containsKey("extensions")) {
+            gen.writeFieldName("extensions");
+            gen.writeObject(errorSpec.get("extensions"));
+        }
+
+        gen.writeEndObject();
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLNameUtils.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLNameUtils.java
new file mode 100644
index 0000000000..8b1c792704
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLNameUtils.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import org.apache.commons.lang3.StringUtils;
+
+public class GraphQLNameUtils {
+    private static final String MAP_SUFFIX = "Map";
+    private static final String INPUT_SUFFIX = "Input";
+    private static final String CONNECTION_SUFFIX = "Connection";
+    private static final String EDGE_SUFFIX = "Edge";
+
+    private final EntityDictionary dictionary;
+
+    public GraphQLNameUtils(EntityDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    public String toOutputTypeName(Type<?> clazz) {
+        String typeName;
+        if (dictionary.hasBinding(clazz)) {
+            typeName = StringUtils.capitalize(dictionary.getJsonAliasFor(clazz));
+        } else {
+            typeName = clazz.getSimpleName();
+        }
+
+        //Namespace internal types so they don't conflict with client models.
+        if (clazz.getPackage().getName().startsWith("com.yahoo.elide")) {
+            typeName = "Elide" + typeName;
+        }
+
+        return typeName;
+    }
+
+    public String toInputTypeName(Type<?> clazz) {
+        return toOutputTypeName(clazz) + INPUT_SUFFIX;
+    }
+
+    public String toMapEntryOutputName(Type<?> keyClazz, Type<?> valueClazz) {
+        return toOutputTypeName(keyClazz) + toOutputTypeName(valueClazz) + MAP_SUFFIX;
+    }
+
+    public String toMapEntryInputName(Type<?> keyClazz, Type<?> valueClazz) {
+        return toMapEntryOutputName(keyClazz, valueClazz) + INPUT_SUFFIX;
+    }
+
+    public String toEdgesName(Type<?> clazz) {
+        return toOutputTypeName(clazz) + EDGE_SUFFIX;
+    }
+
+    public String toNodeName(Type<?> clazz) {
+        return toOutputTypeName(clazz);
+    }
+
+    public String toConnectionName(Type<?> clazz) {
+        return toOutputTypeName(clazz) + CONNECTION_SUFFIX;
+    }
+
+    public String toNonElideOutputTypeName(Type<?> clazz) {
+        return StringUtils.uncapitalize(toOutputTypeName(clazz));
+    }
+
+    public String toTopicName(Type<?> clazz) {
+        return toOutputTypeName(clazz) + "Topic";
+    }
+
+    public String toNonElideInputTypeName(Type<?> clazz) {
+        return StringUtils.uncapitalize(toInputTypeName(clazz));
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLRequestScope.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLRequestScope.java
new file mode 100644
index 0000000000..25dc555a3c
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLRequestScope.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.parser.GraphQLProjectionInfo;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+/**
+ * Persistent state across GraphQL requests. This object is stored in the environment context.
+ */
+public class GraphQLRequestScope extends RequestScope {
+    @Getter private final Map<String, Long> totalRecordCounts = new HashMap<>();
+
+    @Getter
+    private final GraphQLProjectionInfo projectionInfo;
+
+    public GraphQLRequestScope(
+            String baseUrlEndpoint,
+            DataStoreTransaction transaction,
+            User user,
+            String apiVersion,
+            ElideSettings elideSettings,
+            GraphQLProjectionInfo projectionInfo,
+            UUID requestId,
+            Map<String, List<String>> requestHeaders
+    ) {
+        // TODO: We're going to break out the two request scopes. `RequestScope` should become an interface and
+        // we should have a GraphQLRequestScope and a JSONAPIRequestScope.
+        // TODO: What should mutate multiple entity value be? There is a problem with this setting in practice.
+        // Namely, we don't filter or paginate in the data store.
+        super(baseUrlEndpoint, "/", apiVersion, null, transaction, user,
+                new MultivaluedHashMap<>(), requestHeaders, requestId, elideSettings);
+        this.projectionInfo = projectionInfo;
+
+        // Entity Projection is retrieved from projectionInfo.
+        this.setEntityProjection(null);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLScalars.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLScalars.java
new file mode 100644
index 0000000000..48360f1463
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/GraphQLScalars.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.Coercing;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.GraphQLScalarType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+/**
+ * Additional scalar/serializers for built-in graphql types.
+ */
+@Slf4j
+public class GraphQLScalars {
+    private static final String ERROR_BAD_EPOCH_TYPE = "Date must be provided as string or integral in epoch millis";
+
+    // TODO: Should we make this a class that can be configured? Should determine if there are other customizeable
+    // TODO: scalar types.
+    // NOTE: Non-final so it's overrideable if someone wants _different_ date representations.
+    public static GraphQLScalarType GRAPHQL_DATE_TYPE = GraphQLScalarType.newScalar()
+            .name("Date")
+            .description("Built-in date")
+            .coercing(new Coercing<Date, Object>() {
+                @Override
+                public Object serialize(Object o) {
+                    Serde<Object, Date> dateSerde = CoerceUtil.lookup(Date.class);
+
+                    return dateSerde.serialize((Date) o);
+                }
+
+                @Override
+                public Date parseValue(Object o) {
+                    Serde<Object, Date> dateSerde = CoerceUtil.lookup(Date.class);
+
+                    return dateSerde.deserialize(o);
+                }
+
+                @Override
+                public Date parseLiteral(Object o) {
+                    Object input;
+                    if (o instanceof IntValue) {
+                        input = ((IntValue) o).getValue().longValue();
+                    } else if (o instanceof StringValue) {
+                        input = ((StringValue) o).getValue();
+                    } else {
+                        throw new CoercingParseValueException(ERROR_BAD_EPOCH_TYPE);
+                    }
+                    return parseValue(input);
+                }
+            })
+            .build();
+
+    public static GraphQLScalarType GRAPHQL_DEFERRED_ID = GraphQLScalarType.newScalar()
+            .name("DeferredID")
+            .description("custom id type")
+            .coercing(new Coercing() {
+                @Override
+                public Object serialize(Object o) {
+                    return o;
+                }
+
+                @Override
+                public String parseValue(Object o) {
+                    return o.toString();
+                }
+
+                @Override
+                public String parseLiteral(Object o) {
+                    if (o instanceof StringValue) {
+                        return ((StringValue) o).getValue();
+                    }
+                    if (o instanceof IntValue) {
+                        return ((IntValue) o).getValue().toString();
+                    }
+                    // Unexpected object, try to use the toString.
+                    log.debug("Found unexpected object type: {}", o.getClass());
+                    return o.toString();
+                }
+            })
+            .build();
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/KeyWord.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/KeyWord.java
new file mode 100644
index 0000000000..b40ffc36ed
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/KeyWord.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.function.Function;
+
+/**
+ * Key words used in graphql parsing.
+ */
+public enum KeyWord {
+    NODE("node"),
+    EDGES("edges"),
+    PAGE_INFO("pageInfo"),
+    PAGE_INFO_HAS_NEXT_PAGE("hasNextPage"),
+    PAGE_INFO_START_CURSOR("startCursor"),
+    PAGE_INFO_END_CURSOR("endCursor"),
+    PAGE_INFO_TOTAL_RECORDS("totalRecords"),
+    TYPENAME("__typename"),
+    SCHEMA("__schema"),
+    TYPE("__type"),
+    UNKNOWN("unknown");
+
+    private static final ImmutableMap<String, KeyWord> NAME_MAP =
+            Arrays.stream(values()).collect(ImmutableMap.toImmutableMap(KeyWord::getName, Function.identity()));
+
+    @Getter
+    private final String name;
+
+    KeyWord(String name) {
+        this.name = name;
+    }
+
+    public boolean hasName(String name) {
+        return this.name.equals(name);
+    }
+
+    public static KeyWord byName(String value) {
+        return NAME_MAP.getOrDefault(value, UNKNOWN);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/ModelBuilder.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ModelBuilder.java
new file mode 100644
index 0000000000..298de721a8
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ModelBuilder.java
@@ -0,0 +1,442 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static graphql.schema.GraphQLArgument.newArgument;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
+import static graphql.schema.GraphQLObjectType.newObject;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import org.apache.commons.collections4.CollectionUtils;
+import graphql.Scalars;
+import graphql.schema.DataFetcher;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.GraphQLType;
+import graphql.schema.GraphQLTypeReference;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Constructs a GraphQL schema (query and mutation documents) from an Elide EntityDictionary.
+ */
+@Slf4j
+public class ModelBuilder {
+    public static final String ARGUMENT_DATA = "data";
+    public static final String ARGUMENT_IDS = "ids";
+    public static final String ARGUMENT_FILTER = "filter";
+    public static final String ARGUMENT_SORT = "sort";
+    public static final String ARGUMENT_FIRST = "first";
+    public static final String ARGUMENT_AFTER = "after";
+    public static final String ARGUMENT_OPERATION = "op";
+    public static final String OBJECT_PAGE_INFO = "PageInfo";
+    public static final String OBJECT_MUTATION = "Mutation";
+    public static final String OBJECT_QUERY = "Query";
+
+    private EntityDictionary entityDictionary;
+    private DataFetcher dataFetcher;
+    private GraphQLArgument relationshipOpArg;
+    private GraphQLArgument idArgument;
+    private GraphQLArgument filterArgument;
+    private GraphQLArgument pageOffsetArgument;
+    private GraphQLArgument pageFirstArgument;
+    private GraphQLArgument sortArgument;
+    private GraphQLConversionUtils generator;
+    private GraphQLNameUtils nameUtils;
+    private GraphQLObjectType pageInfoObject;
+    private final String apiVersion;
+
+    private Map<Type<?>, GraphQLInputObjectType> inputObjectRegistry;
+    private Map<Type<?>, GraphQLObjectType> queryObjectRegistry;
+    private Map<Type<?>, GraphQLObjectType> connectionObjectRegistry;
+    private Set<Type<?>> excludedEntities;
+    private Set<GraphQLObjectType> objectTypes;
+
+    /**
+     * Class constructor, constructs the custom arguments to handle mutations.
+     * @param entityDictionary elide entity dictionary
+     * @param nonEntityDictionary elide non-entity dictionary
+     * @param dataFetcher graphQL data fetcher
+     */
+    public ModelBuilder(EntityDictionary entityDictionary,
+                        NonEntityDictionary nonEntityDictionary,
+                        DataFetcher dataFetcher, String apiVersion) {
+        objectTypes = new HashSet<>();
+        this.generator = new GraphQLConversionUtils(entityDictionary, nonEntityDictionary);
+
+        this.entityDictionary = entityDictionary;
+        this.nameUtils = new GraphQLNameUtils(entityDictionary);
+        this.dataFetcher = dataFetcher;
+        this.apiVersion = apiVersion;
+
+        relationshipOpArg = newArgument()
+                .name(ARGUMENT_OPERATION)
+                .type(generator.classToEnumType(ClassType.of(RelationshipOp.class)))
+                .defaultValue(RelationshipOp.FETCH)
+                .build();
+
+        idArgument = newArgument()
+                .name(ARGUMENT_IDS)
+                .type(new GraphQLList(Scalars.GraphQLString))
+                .build();
+
+        filterArgument = newArgument()
+                .name(ARGUMENT_FILTER)
+                .type(Scalars.GraphQLString)
+                .build();
+
+        sortArgument = newArgument()
+                .name(ARGUMENT_SORT)
+                .type(Scalars.GraphQLString)
+                .build();
+
+        pageFirstArgument = newArgument()
+                .name(ARGUMENT_FIRST)
+                .type(Scalars.GraphQLString)
+                .build();
+
+        pageOffsetArgument = newArgument()
+                .name(ARGUMENT_AFTER)
+                .type(Scalars.GraphQLString)
+                .build();
+
+        pageInfoObject = newObject()
+                .name(OBJECT_PAGE_INFO)
+                .field(newFieldDefinition()
+                        .name("hasNextPage")
+                        .type(Scalars.GraphQLBoolean))
+                .field(newFieldDefinition()
+                        .name("startCursor")
+                        .type(Scalars.GraphQLString))
+                .field(newFieldDefinition()
+                        .name("endCursor")
+                        .type(Scalars.GraphQLString))
+                .field(newFieldDefinition()
+                        .name("totalRecords")
+                        .type(Scalars.GraphQLInt))
+                .build();
+
+        objectTypes.add(pageInfoObject);
+
+        inputObjectRegistry = new HashMap<>();
+        queryObjectRegistry = new HashMap<>();
+        connectionObjectRegistry = new HashMap<>();
+        excludedEntities = new HashSet<>();
+    }
+
+    public void withExcludedEntities(Set<Type<?>> excludedEntities) {
+        this.excludedEntities = excludedEntities;
+    }
+
+    /**
+     * Builds a GraphQL schema.
+     * @return The built schema.
+     */
+    public GraphQLSchema build() {
+        Set<Type<?>> allClasses = entityDictionary.getBoundClassesByVersion(apiVersion);
+
+        if (allClasses.isEmpty()) {
+            throw new IllegalArgumentException("None of the provided classes are exported by Elide");
+        }
+
+        Set<Type<?>> rootClasses =  allClasses.stream().filter(entityDictionary::isRoot).collect(Collectors.toSet());
+
+        /*
+         * Walk the object graph (avoiding cycles) and construct the GraphQL input object types.
+         */
+        entityDictionary.walkEntityGraph(rootClasses, this::buildInputObjectStub);
+
+        /* Construct root object */
+        GraphQLObjectType.Builder root = newObject().name(OBJECT_QUERY);
+        for (Type<?> clazz : rootClasses) {
+            String entityName = entityDictionary.getJsonAliasFor(clazz);
+            root.field(newFieldDefinition()
+                    .name(entityName)
+                    .description(EntityDictionary.getEntityDescription(clazz))
+                    .argument(relationshipOpArg)
+                    .argument(idArgument)
+                    .argument(filterArgument)
+                    .argument(sortArgument)
+                    .argument(pageFirstArgument)
+                    .argument(pageOffsetArgument)
+                    .argument(buildInputObjectArgument(clazz, true))
+                    .arguments(generator.entityArgumentToQueryObject(clazz, entityDictionary))
+                    .type(buildConnectionObject(clazz)));
+        }
+
+
+        GraphQLObjectType queryRoot = root.build();
+        GraphQLObjectType mutationRoot = root.name(OBJECT_MUTATION).build();
+
+        objectTypes.add(queryRoot);
+        objectTypes.add(mutationRoot);
+
+        /*
+         * Walk the object graph (avoiding cycles) and construct the GraphQL output object types.
+         */
+        entityDictionary.walkEntityGraph(rootClasses, this::buildConnectionObject);
+
+        GraphQLCodeRegistry.Builder codeRegistry = GraphQLCodeRegistry.newCodeRegistry();
+
+        objectTypes.addAll(generator.getObjectTypes());
+        for (GraphQLObjectType objectType : objectTypes) {
+            String objectName = objectType.getName();
+            for (GraphQLFieldDefinition fieldDefinition : objectType.getFieldDefinitions()) {
+                codeRegistry.dataFetcher(
+                        FieldCoordinates.coordinates(objectName, fieldDefinition.getName()),
+                        dataFetcher);
+            }
+        }
+
+        /* Construct the schema */
+        GraphQLSchema schema = GraphQLSchema.newSchema()
+                .query(queryRoot)
+                .mutation(mutationRoot)
+                .codeRegistry(codeRegistry.build())
+                .additionalTypes(new HashSet<>(CollectionUtils.union(
+                                connectionObjectRegistry.values(),
+                                inputObjectRegistry.values())))
+                .build();
+
+        return schema;
+    }
+
+    /**
+     * Builds a GraphQL connection object from an entity class.
+     *
+     * @param entityClass The class to use to construct the output object
+     * @return The GraphQL object.
+     */
+    private GraphQLObjectType buildConnectionObject(Type<?> entityClass) {
+        if (connectionObjectRegistry.containsKey(entityClass)) {
+            return connectionObjectRegistry.get(entityClass);
+        }
+
+        String entityName = nameUtils.toConnectionName(entityClass);
+
+        GraphQLObjectType connectionObject = newObject()
+                .name(entityName)
+                .field(newFieldDefinition()
+                        .name("edges")
+                        .type(buildEdgesObject(entityClass, buildQueryObject(entityClass))))
+                .field(newFieldDefinition()
+                        .name("pageInfo")
+                        .type(pageInfoObject))
+                .build();
+
+        objectTypes.add(connectionObject);
+
+        connectionObjectRegistry.put(entityClass, connectionObject);
+
+        return connectionObject;
+    }
+
+    /**
+     * Builds a graphQL output object from an entity class.
+     * @param entityClass The class to use to construct the output object.
+     * @return The graphQL object
+     */
+    private GraphQLObjectType buildQueryObject(Type<?> entityClass) {
+        if (queryObjectRegistry.containsKey(entityClass)) {
+            return queryObjectRegistry.get(entityClass);
+        }
+
+        log.trace("Building query object for {}", entityClass.getName());
+
+        GraphQLObjectType.Builder builder = newObject()
+                .name(nameUtils.toNodeName(entityClass))
+                .description(EntityDictionary.getEntityDescription(entityClass));
+
+        String id = entityDictionary.getIdFieldName(entityClass);
+
+        /* our id types are DeferredId objects (not Scalars.GraphQLID) */
+        builder.field(newFieldDefinition()
+                .name(id)
+                .type(GraphQLScalars.GRAPHQL_DEFERRED_ID));
+
+        for (String attribute : entityDictionary.getAttributes(entityClass)) {
+            Type<?> attributeClass = entityDictionary.getType(entityClass, attribute);
+            if (excludedEntities.contains(attributeClass)) {
+                continue;
+            }
+
+            log.trace("Building query attribute {} {} with arguments {} for entity {}",
+                    attribute,
+                    attributeClass.getName(),
+                    entityDictionary.getAttributeArguments(attributeClass, attribute).toString(),
+                    entityClass.getName());
+
+            GraphQLType attributeType =
+                    generator.attributeToQueryObject(entityClass, attributeClass, attribute, dataFetcher);
+
+            if (attributeType == null) {
+                continue;
+            }
+
+            builder.field(newFieldDefinition()
+                    .name(attribute)
+                    .arguments(generator.attributeArgumentToQueryObject(entityClass, attribute, dataFetcher))
+                    .type((GraphQLOutputType) attributeType)
+            );
+        }
+
+        for (String relationship : entityDictionary.getElideBoundRelationships(entityClass)) {
+            Type<?> relationshipClass = entityDictionary.getParameterizedType(entityClass, relationship);
+            if (excludedEntities.contains(relationshipClass)) {
+                continue;
+            }
+
+            String relationshipEntityName = nameUtils.toConnectionName(relationshipClass);
+            RelationshipType type = entityDictionary.getRelationshipType(entityClass, relationship);
+
+            if (type.isToOne()) {
+                builder.field(newFieldDefinition()
+                                .name(relationship)
+                                .argument(relationshipOpArg)
+                                .argument(buildInputObjectArgument(relationshipClass, false))
+                                .arguments(generator.entityArgumentToQueryObject(relationshipClass, entityDictionary))
+                                .type(new GraphQLTypeReference(relationshipEntityName))
+                );
+            } else {
+                builder.field(newFieldDefinition()
+                                .name(relationship)
+                                .argument(relationshipOpArg)
+                                .argument(filterArgument)
+                                .argument(sortArgument)
+                                .argument(pageOffsetArgument)
+                                .argument(pageFirstArgument)
+                                .argument(idArgument)
+                                .argument(buildInputObjectArgument(relationshipClass, true))
+                                .arguments(generator.entityArgumentToQueryObject(relationshipClass, entityDictionary))
+                                .type(new GraphQLTypeReference(relationshipEntityName))
+                );
+            }
+        }
+
+        GraphQLObjectType queryObject = builder.build();
+
+        objectTypes.add(queryObject);
+
+        queryObjectRegistry.put(entityClass, queryObject);
+        return queryObject;
+    }
+
+    private GraphQLList buildEdgesObject(Type<?> relationClass, GraphQLOutputType entityType) {
+        GraphQLObjectType edgesObject = newObject()
+                .name(nameUtils.toEdgesName(relationClass))
+                .field(newFieldDefinition()
+                        .name("node")
+                        .type(entityType))
+                .build();
+
+        objectTypes.add(edgesObject);
+
+        return new GraphQLList(edgesObject);
+    }
+
+    /**
+     * Wraps a constructed GraphQL Input Object in an argument.
+     * @param entityClass - The class to construct the input object from.
+     * @param asList Whether or not the argument is a single instance or a list.
+     * @return The constructed argument.
+     */
+    private GraphQLArgument buildInputObjectArgument(Type<?> entityClass, boolean asList) {
+        GraphQLInputType argumentType = inputObjectRegistry.get(entityClass);
+
+        if (asList) {
+            return newArgument()
+                .name(ARGUMENT_DATA)
+                .type(new GraphQLList(argumentType))
+                .build();
+        }
+        return newArgument()
+            .name(ARGUMENT_DATA)
+            .type(argumentType)
+            .build();
+    }
+
+    /**
+     * Constructs a stub of an input objects with no relationships resolved.
+     * @param clazz The class to translate into an input object.
+     * @return The constructed input object stub.
+     */
+    private GraphQLInputType buildInputObjectStub(Type<?> clazz) {
+        log.trace("Building input object for {}", clazz.getName());
+
+        GraphQLInputObjectType.Builder builder = GraphQLInputObjectType.newInputObject();
+        builder.name(nameUtils.toInputTypeName(clazz));
+
+        String id = entityDictionary.getIdFieldName(clazz);
+        if (id != null) {
+            builder.field(newInputObjectField()
+                    .name(id)
+                    .type(Scalars.GraphQLID));
+        }
+
+        for (String attribute : entityDictionary.getAttributes(clazz)) {
+            Type<?> attributeClass = entityDictionary.getType(clazz, attribute);
+
+            if (excludedEntities.contains(attributeClass)) {
+                continue;
+            }
+
+            log.trace("Building input attribute {} {} for entity {}",
+                    attribute,
+                    attributeClass.getName(),
+                    clazz.getName());
+
+            GraphQLInputType attributeType = generator.attributeToInputObject(clazz, attributeClass, attribute);
+
+            builder.field(newInputObjectField()
+                .name(attribute)
+                .type(attributeType)
+            );
+        }
+        for (String relationship : entityDictionary.getElideBoundRelationships(clazz)) {
+            log.trace("Resolving relationship {} for {}", relationship, clazz.getName());
+            Type<?> relationshipClass = entityDictionary.getParameterizedType(clazz, relationship);
+            if (excludedEntities.contains(relationshipClass)) {
+                continue;
+            }
+
+            RelationshipType type = entityDictionary.getRelationshipType(clazz, relationship);
+            String relationshipEntityName = nameUtils.toInputTypeName(relationshipClass);
+
+            if (type.isToOne()) {
+                builder.field(newInputObjectField()
+                        .name(relationship)
+                        .type(new GraphQLTypeReference(relationshipEntityName))
+                        .build());
+            } else {
+                builder.field(newInputObjectField()
+                        .name(relationship)
+                        .type(new GraphQLList(new GraphQLTypeReference(relationshipEntityName)))
+                        .build());
+            }
+        }
+
+        GraphQLInputObjectType constructed = builder.build();
+        inputObjectRegistry.put(clazz, constructed);
+        return constructed;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/NonEntityDictionary.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/NonEntityDictionary.java
new file mode 100644
index 0000000000..5a934451ac
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/NonEntityDictionary.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.DuplicateMappingException;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Collections;
+import java.util.function.Function;
+
+/**
+ * A set of reflection utilities for non-Elide entities.
+ */
+@Slf4j
+public class NonEntityDictionary extends EntityDictionary {
+
+    public NonEntityDictionary(ClassScanner scanner, Function<Class, Serde> serdeLookup) {
+        super(
+                Collections.emptyMap(), //Checks
+                Collections.emptyMap(), //Role checks
+                DEFAULT_INJECTOR,
+                serdeLookup,
+                Collections.emptySet(), //Entity excludes
+                scanner);
+    }
+
+    /**
+     * Add given class to dictionary.
+     *
+     * @param cls Entity bean class
+     */
+    @Override
+    public void bindEntity(Type<?> cls) {
+        String type = WordUtils.uncapitalize(cls.getSimpleName());
+
+        Type<?> duplicate = bindJsonApiToEntity.put(Pair.of(type, NO_VERSION), cls);
+
+        if (duplicate != null && !duplicate.equals(cls)) {
+            log.error("Duplicate binding {} for {}, {}", type, cls, duplicate);
+            throw new DuplicateMappingException(type + " " + cls.getName() + ":" + duplicate.getName());
+        }
+
+        entityBindings.put(cls, new EntityBinding(getInjector(), cls, type));
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/PersistentResourceFetcher.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/PersistentResourceFetcher.java
new file mode 100644
index 0000000000..8fe0f900f2
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/PersistentResourceFetcher.java
@@ -0,0 +1,550 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static com.yahoo.elide.graphql.ModelBuilder.ARGUMENT_OPERATION;
+import static com.yahoo.elide.graphql.RelationshipOp.FETCH;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidObjectIdentifierException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.containers.ConnectionContainer;
+import com.yahoo.elide.graphql.containers.GraphQLContainer;
+import com.yahoo.elide.graphql.containers.MapEntryContainer;
+import com.google.common.collect.Sets;
+import graphql.language.OperationDefinition;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import io.reactivex.Observable;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Invoked by GraphQL Java to fetch/mutate data from Elide.
+ */
+@Slf4j
+public class PersistentResourceFetcher implements DataFetcher<Object>, QueryLogger {
+    private final NonEntityDictionary nonEntityDictionary;
+
+    public PersistentResourceFetcher(NonEntityDictionary nonEntityDictionary) {
+        this.nonEntityDictionary = nonEntityDictionary;
+    }
+
+    /**
+     * Override graphql-java's {@link DataFetcher} get method to execute
+     * the mutation and return some sensible output values.
+     * @param environment Graphql-java's execution environment
+     * @return a collection of {@link PersistentResource} objects
+     */
+    @Override
+    public Object get(DataFetchingEnvironment environment) {
+        /* fetch arguments in mutation/query */
+        Map<String, Object> args = environment.getArguments();
+
+        /* fetch current operation */
+        RelationshipOp operation = (RelationshipOp) args.getOrDefault(ARGUMENT_OPERATION, FETCH);
+
+        /* build environment object, extracts required fields */
+        Environment context = new Environment(environment, nonEntityDictionary);
+
+        /* safe enable debugging */
+        if (log.isDebugEnabled()) {
+            logContext(log, operation, context);
+        }
+
+        if (operation != FETCH) {
+            /* Don't allow write operations in a non-mutation request. */
+            if (environment.getOperationDefinition().getOperation() != OperationDefinition.Operation.MUTATION) {
+                throw new BadRequestException("Data model writes are only allowed in mutations");
+            }
+            /* sanity check for pagination/filtering/sorting arguments w any operation other than FETCH */
+            filterSortPaginateSanityCheck(context);
+        }
+
+        GraphQLContainer container;
+
+        /* delegate request */
+        switch (operation) {
+            case FETCH: {
+                return fetchObjects(context);
+            }
+            case UPSERT: {
+                container = upsertObjects(context);
+                break;
+            }
+            case UPDATE: {
+                container = updateObjects(context);
+                break;
+            }
+            case DELETE: {
+                container = deleteObjects(context);
+                break;
+            }
+            case REMOVE: {
+                container = removeObjects(context);
+                break;
+            }
+            case REPLACE: {
+                container = replaceObjects(context);
+                break;
+            }
+
+            default:
+                throw new UnsupportedOperationException("Unknown operation: " + operation);
+        }
+
+        if (operation != FETCH) {
+            context.requestScope.runQueuedPreSecurityTriggers();
+            context.requestScope.runQueuedPreFlushTriggers();
+        }
+
+        return container;
+    }
+
+    /**
+     * Checks whether sort/filter/pagination params are passed w unsupported operation.
+     * @param environment Environment encapsulating graphQL's request environment
+     */
+    private void filterSortPaginateSanityCheck(Environment environment) {
+        if (environment.filters.isPresent() || environment.sort.isPresent() || environment.offset.isPresent()
+                || environment.first.isPresent()) {
+            throw new BadRequestException("Pagination/Filtering/Sorting is only supported with FETCH operation");
+        }
+    }
+
+    /**
+     * handle FETCH operation.
+     * @param context Environment encapsulating graphQL's request environment
+     * @return list of {@link PersistentResource} objects
+     */
+    private Object fetchObjects(Environment context) {
+        /* sanity check for data argument w FETCH */
+        if (context.data.isPresent()) {
+            throw new BadRequestException("FETCH must not include data");
+        }
+
+        // Process fetch object for this container
+        return context.container.processFetch(context);
+    }
+
+    /**
+     * Fetches a root-level entity.
+     * @param requestScope Request scope
+     * @param projection constructed entityProjection for a class
+     * @param ids List of ids (can be NULL)
+     * @return {@link PersistentResource} object(s)
+     */
+    public static ConnectionContainer fetchObject(
+            RequestScope requestScope,
+            EntityProjection projection,
+            Optional<List<String>> ids
+    ) {
+        EntityDictionary dictionary = requestScope.getDictionary();
+        String typeName = dictionary.getJsonAliasFor(projection.getType());
+
+        /* fetching a collection */
+        Observable<PersistentResource> records = ids.map((idList) -> {
+            /* handle empty list of ids */
+            if (idList.isEmpty()) {
+                throw new BadRequestException("Empty list passed to ids");
+            }
+
+            return PersistentResource.loadRecords(projection, idList, requestScope);
+        }).orElseGet(() -> PersistentResource.loadRecords(projection, new ArrayList<>(), requestScope));
+
+        return new ConnectionContainer(records.toList(LinkedHashSet::new).blockingGet(),
+                Optional.ofNullable(projection.getPagination()), typeName);
+    }
+
+    /**
+     * Fetches a relationship for a top-level entity.
+     *
+     * @param parentResource Parent object
+     * @param relationship constructed relationship object with entityProjection
+     * @param ids List of ids
+     * @return persistence resource object(s)
+     */
+    public static ConnectionContainer fetchRelationship(
+            PersistentResource<?> parentResource,
+            @NotNull Relationship relationship,
+            Optional<List<String>> ids
+    ) {
+        EntityDictionary dictionary = parentResource.getRequestScope().getDictionary();
+        Type relationshipClass = dictionary.getParameterizedType(parentResource.getObject(), relationship.getName());
+        String relationshipType = dictionary.getJsonAliasFor(relationshipClass);
+
+        Set<PersistentResource> relationResources;
+        if (ids.isPresent()) {
+            relationResources =
+                    parentResource.getRelation(ids.get(), relationship).toList(LinkedHashSet::new).blockingGet();
+        } else {
+            relationResources =
+                    parentResource.getRelationCheckedFiltered(relationship).toList(LinkedHashSet::new).blockingGet();
+        }
+
+        return new ConnectionContainer(
+                relationResources,
+                Optional.ofNullable(relationship.getProjection().getPagination()),
+                relationshipType);
+    }
+
+    private ConnectionContainer upsertObjects(Environment context) {
+        return upsertOrUpdateObjects(
+                context,
+                this::upsertObject,
+                RelationshipOp.UPSERT);
+    }
+
+    private ConnectionContainer updateObjects(Environment context) {
+        return upsertOrUpdateObjects(
+                context,
+                this::updateObject,
+                RelationshipOp.UPDATE);
+    }
+
+    /**
+     * handle UPSERT or UPDATE operation.
+     * @param context Environment encapsulating graphQL's request environment
+     * @param updateFunc controls the behavior of how the update (or upsert) is performed.
+     * @return Connection object.
+     */
+
+    private ConnectionContainer upsertOrUpdateObjects(
+            Environment context,
+            Executor<?> updateFunc,
+            RelationshipOp operation
+    ) {
+        /* sanity check for id and data argument w UPSERT/UPDATE */
+        if (context.ids.isPresent()) {
+            throw new BadRequestException(operation + " must not include ids");
+        }
+
+        if (!context.data.isPresent()) {
+            throw new BadRequestException(operation + " must include data argument");
+        }
+
+        Type<?> entityClass;
+        EntityDictionary dictionary = context.requestScope.getDictionary();
+        if (context.isRoot()) {
+            entityClass = dictionary.getEntityClass(context.field.getName(), context.requestScope.getApiVersion());
+        } else {
+            assert context.parentResource != null;
+            entityClass = dictionary.getParameterizedType(
+                    context.parentResource.getResourceType(),
+                    context.field.getName());
+        }
+
+        /* form entities */
+        Optional<Entity> parentEntity;
+        if (!context.isRoot()) {
+            assert context.parentResource != null;
+            parentEntity = Optional.of(new Entity(
+                    Optional.empty(),
+                    null,
+                    context.parentResource.getResourceType(),
+                    context.requestScope));
+        } else {
+            parentEntity = Optional.empty();
+        }
+        LinkedHashSet<Entity> entitySet = new LinkedHashSet<>();
+        for (Map<String, Object> input : context.data.orElseThrow(IllegalStateException::new)) {
+            entitySet.add(new Entity(parentEntity, input, entityClass, context.requestScope));
+        }
+
+        /* apply function to upsert/update the object */
+        for (Entity entity : entitySet) {
+            graphWalker(entity, updateFunc, context);
+        }
+
+        /* fixup relationships */
+        for (Entity entity : entitySet) {
+            graphWalker(entity, this::updateRelationship, context);
+            PersistentResource<?> childResource = entity.toPersistentResource();
+            if (!context.isRoot()) {
+                /* add relation between parent and nested entity */
+                assert context.parentResource != null;
+                context.parentResource.addRelation(context.field.getName(), childResource);
+            }
+        }
+
+        String entityName = dictionary.getJsonAliasFor(entityClass);
+
+        Set<PersistentResource> resources = entitySet.stream()
+                .map(Entity::toPersistentResource)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        return new ConnectionContainer(resources, Optional.empty(), entityName);
+    }
+
+    /**
+     * A function to handle upserting (update/create) objects.
+     * @param <T> The return type of the function.
+     */
+    @FunctionalInterface
+    private interface Executor<T> {
+        /**
+         * Execute a function on the current entity with the current context.
+         * @param entity The current entity.
+         * @param context The request context.
+         * @return Depends on the function.
+         */
+        T execute(Entity entity, Environment context);
+    }
+
+    /**
+     * Forms the graph from data {@param input} and executes a function {@param function} on all the nodes.
+     * @param entity Resource entity
+     * @param function Function to process nodes
+     * @param context the request context
+     * @return set of {@link PersistentResource} objects
+     */
+    private void graphWalker(Entity entity, Executor<?> function, Environment context) {
+        Queue<Entity> toVisit = new ArrayDeque<>();
+        Set<Entity> visited = new LinkedHashSet<>();
+        toVisit.add(entity);
+
+        while (!toVisit.isEmpty()) {
+            Entity currentEntity = toVisit.remove();
+            if (visited.contains(currentEntity)) {
+                continue;
+            }
+            visited.add(currentEntity);
+            function.execute(currentEntity, context);
+            Set<Entity.Relationship> relationshipEntities = currentEntity.getRelationships();
+            /* loop over relationships */
+            for (Entity.Relationship relationship : relationshipEntities) {
+                toVisit.addAll(relationship.getValue());
+            }
+        }
+    }
+
+    /**
+     * update the relationship between {@param parent} and the resource loaded by given {@param id}.
+     * @param entity Resource entity
+     * @return {@link PersistentResource} object
+     */
+    private PersistentResource<?> updateRelationship(Entity entity, Environment context) {
+        Set<Entity.Relationship> relationshipEntities = entity.getRelationships();
+        PersistentResource<?> resource = entity.toPersistentResource();
+        Set<PersistentResource> toUpdate;
+
+        /* loop over each relationship */
+        for (Entity.Relationship relationship : relationshipEntities) {
+            toUpdate = new LinkedHashSet<>();
+            for (Entity relation : relationship.getValue()) {
+                toUpdate.add(relation.toPersistentResource());
+            }
+            resource.updateRelation(relationship.getName(), toUpdate);
+        }
+        return resource;
+    }
+
+    /**
+     * updates or creates existing/new entities.
+     * @param entity Resource entity
+     * @param context The request context
+     * @return {@link PersistentResource} object
+     */
+    private PersistentResource upsertObject(Entity entity, Environment context) {
+        Set<Entity.Attribute> attributes = entity.getAttributes();
+        Optional<String> id = entity.getId();
+        RequestScope requestScope = entity.getRequestScope();
+        PersistentResource upsertedResource;
+        EntityDictionary dictionary = requestScope.getDictionary();
+
+        PersistentResource parentResource = entity.getParentResource().map(Entity::toPersistentResource).orElse(null);
+
+        if (!id.isPresent()) {
+            //If the ID is generated, it is safe to assign a temporary UUID.  Otherwise the client must provide one.
+            if (dictionary.isIdGenerated(entity.getEntityClass())) {
+                entity.setId(); //Assign a temporary UUID.
+                id = entity.getId();
+            }
+
+            upsertedResource = PersistentResource.createObject(
+                    parentResource,
+                    context.field.getName(),
+                    entity.getEntityClass(),
+                    requestScope, id);
+        } else {
+            try {
+                Set<PersistentResource> loadedResource = fetchObject(
+                        requestScope,
+                        entity.getProjection(),
+                        Optional.of(Collections.singletonList(id.get()))
+                ).getPersistentResources();
+                upsertedResource = loadedResource.iterator().next();
+
+            // The ID doesn't exist yet.  Let's create the object.
+            } catch (InvalidObjectIdentifierException | InvalidValueException e) {
+                upsertedResource = PersistentResource.createObject(
+                        parentResource,
+                        context.field.getName(),
+                        entity.getEntityClass(), requestScope, id);
+            }
+        }
+
+        return updateAttributes(upsertedResource, entity, attributes);
+    }
+
+    private PersistentResource updateObject(Entity entity, Environment context) {
+        Set<Entity.Attribute> attributes = entity.getAttributes();
+        Optional<String> id = entity.getId();
+        RequestScope requestScope = entity.getRequestScope();
+        PersistentResource<?> updatedResource;
+
+        if (!id.isPresent()) {
+            throw new BadRequestException("UPDATE data objects must include ids");
+        }
+        Set<PersistentResource> loadedResource = fetchObject(
+                requestScope,
+                entity.getProjection(),
+                Optional.of(Collections.singletonList(id.get()))
+        ).getPersistentResources();
+        updatedResource = loadedResource.iterator().next();
+
+        return updateAttributes(updatedResource, entity, attributes);
+    }
+
+    /**
+     * Updates an object.
+     * @param toUpdate Entities to update
+     * @param entity Resource entity
+     * @param attributes Set of entity attributes
+     * @return Persistence Resource object
+     */
+    private PersistentResource<?> updateAttributes(PersistentResource<?> toUpdate,
+            Entity entity,
+            Set<Entity.Attribute> attributes) {
+        EntityDictionary dictionary = entity.getRequestScope().getDictionary();
+        Type<?> entityClass = entity.getEntityClass();
+        String idFieldName = dictionary.getIdFieldName(entityClass);
+
+        /* iterate through each attribute provided */
+        for (Entity.Attribute attribute : attributes) {
+            if (dictionary.isAttribute(entityClass, attribute.getName())) {
+                Type<?> attributeType = dictionary.getType(entityClass, attribute.getName());
+                Object attributeValue;
+                if (ClassType.MAP_TYPE.isAssignableFrom(attributeType)) {
+                    attributeValue = MapEntryContainer.translateFromGraphQLMap(attribute);
+                } else {
+                    attributeValue = attribute.getValue();
+                }
+                toUpdate.updateAttribute(attribute.getName(), attributeValue);
+            } else if (!Objects.equals(attribute.getName(), idFieldName)) {
+                throw new IllegalStateException("Unrecognized attribute passed to 'data': " + attribute.getName());
+            }
+        }
+
+        return toUpdate;
+    }
+
+    /**
+     * Deletes a resource.
+     * @param context Environment encapsulating graphQL's request environment
+     * @return set of deleted {@link PersistentResource} object(s)
+     */
+    private ConnectionContainer deleteObjects(Environment context) {
+        /* sanity check for id and data argument w DELETE */
+        if (context.data.isPresent()) {
+            throw new BadRequestException("DELETE must not include data argument");
+        }
+
+        if (!context.ids.isPresent()) {
+            throw new BadRequestException("DELETE must include ids argument");
+        }
+
+        ConnectionContainer connection = (ConnectionContainer) fetchObjects(context);
+        Set<PersistentResource> toDelete = connection.getPersistentResources();
+        toDelete.forEach(PersistentResource::deleteResource);
+
+        return new ConnectionContainer(
+                Collections.emptySet(),
+                Optional.empty(),
+                connection.getTypeName()
+        );
+    }
+
+    /**
+     * Removes a relationship, or deletes a root level resource.
+     * @param context Environment encapsulating graphQL's request environment
+     * @return set of removed {@link PersistentResource} object(s)
+     */
+    private ConnectionContainer removeObjects(Environment context) {
+        /* sanity check for id and data argument w REPLACE */
+        if (context.data.isPresent()) {
+            throw new BadRequestException("REPLACE must not include data argument");
+        }
+
+        if (!context.ids.isPresent()) {
+            throw new BadRequestException("REPLACE must include ids argument");
+        }
+
+
+        ConnectionContainer connection = (ConnectionContainer) fetchObjects(context);
+        Set<PersistentResource> toRemove = connection.getPersistentResources();
+        if (!context.isRoot()) { /* has parent */
+            toRemove.forEach(item -> context.parentResource.removeRelation(context.field.getName(), item));
+        } else { /* is root */
+            toRemove.forEach(PersistentResource::deleteResource);
+        }
+
+        return new ConnectionContainer(
+                Collections.emptySet(),
+                Optional.empty(),
+                connection.getTypeName()
+        );
+    }
+
+    /**
+     * Replaces a resource, updates given resource and deletes the rest
+     * belonging to the the same type/relationship family.
+     * @param context Environment encapsulating graphQL's request environment
+     * @return set of replaced {@link PersistentResource} object(s)
+     */
+    private ConnectionContainer replaceObjects(Environment context) {
+        /* sanity check for id and data argument w REPLACE */
+        if (!context.data.isPresent()) {
+            throw new BadRequestException("REPLACE must include data argument");
+        }
+
+        if (context.ids.isPresent()) {
+            throw new BadRequestException("REPLACE must not include ids argument");
+        }
+
+        ConnectionContainer existingObjects =
+                (ConnectionContainer) context.container.processFetch(context);
+        ConnectionContainer upsertedObjects = upsertObjects(context);
+        Set<PersistentResource> toDelete =
+                Sets.difference(existingObjects.getPersistentResources(), upsertedObjects.getPersistentResources());
+
+        if (!context.isRoot()) { /* has parent */
+            toDelete.forEach(item -> context.parentResource.removeRelation(context.field.getName(), item));
+        } else { /* is root */
+            toDelete.forEach(PersistentResource::deleteResource);
+        }
+        return upsertedObjects;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryLogger.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryLogger.java
new file mode 100644
index 0000000000..f3c7f3b3ea
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryLogger.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import graphql.language.Field;
+import graphql.language.FragmentSpread;
+import graphql.schema.GraphQLNamedType;
+import graphql.schema.GraphQLType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Logs an incoming GraphQL query.
+ */
+public interface QueryLogger {
+    /**
+     * log current context for debugging.
+     * @param operation Current operation
+     * @param environment Environment encapsulating graphQL's request environment
+     */
+    default void logContext(Logger log, RelationshipOp operation, Environment environment) {
+        List<?> children = (environment.field.getSelectionSet() != null)
+                ? (List) environment.field.getSelectionSet().getChildren()
+                : new ArrayList<>();
+        List<String> fieldName = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(children)) {
+            children.stream().forEach(i -> {
+                if (i.getClass().equals(Field.class)) {
+                    fieldName.add(((Field) i).getName());
+                } else if (i.getClass().equals(FragmentSpread.class)) {
+                    fieldName.add(((FragmentSpread) i).getName());
+                } else {
+                    log.debug("A new type of Selection, other than Field and FragmentSpread was encountered, {}",
+                            i.getClass());
+                }
+            });
+        }
+
+        String requestedFields = environment.field.getName() + fieldName;
+
+        GraphQLType parent = environment.parentType;
+        if (log.isDebugEnabled()) {
+            String typeName = (parent instanceof GraphQLNamedType)
+                    ? ((GraphQLNamedType) parent).getName()
+                    : parent.toString();
+            log.debug("{} {} fields with parent {}<{}>", operation, requestedFields,
+                    EntityDictionary.getSimpleName(EntityDictionary.getType(parent)), typeName);
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunner.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunner.java
new file mode 100644
index 0000000000..26f04a3473
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunner.java
@@ -0,0 +1,451 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.CustomErrorException;
+import com.yahoo.elide.core.exceptions.ErrorObjects;
+import com.yahoo.elide.core.exceptions.ForbiddenAccessException;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.exceptions.HttpStatusException;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.exceptions.TransactionException;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.parser.GraphQLEntityProjectionMaker;
+import com.yahoo.elide.graphql.parser.GraphQLProjectionInfo;
+import com.yahoo.elide.graphql.parser.GraphQLQuery;
+import com.yahoo.elide.graphql.parser.QueryParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import org.apache.commons.lang3.tuple.Pair;
+import org.owasp.encoder.Encode;
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.GraphQLError;
+import graphql.execution.AsyncSerialExecutionStrategy;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+/**
+ * Entry point for REST endpoints to execute GraphQL queries.
+ */
+@Slf4j
+public class QueryRunner {
+
+    @Getter
+    private final Elide elide;
+    private GraphQL api;
+    private ObjectMapper mapper;
+
+    @Getter
+    private String apiVersion;
+
+    private static final String QUERY = "query";
+    private static final String OPERATION_NAME = "operationName";
+    private static final String VARIABLES = "variables";
+    private static final String MUTATION = "mutation";
+
+    /**
+     * Builds a new query runner.
+     * @param elide The singular elide instance for this service.
+     */
+    public QueryRunner(Elide elide, String apiVersion) {
+        this.elide = elide;
+        this.apiVersion = apiVersion;
+        this.mapper = elide.getMapper().getObjectMapper();
+
+        EntityDictionary dictionary = elide.getElideSettings().getDictionary();
+
+        NonEntityDictionary nonEntityDictionary = new NonEntityDictionary(
+                dictionary.getScanner(),
+                dictionary.getSerdeLookup());
+
+        PersistentResourceFetcher fetcher = new PersistentResourceFetcher(nonEntityDictionary);
+        ModelBuilder builder = new ModelBuilder(elide.getElideSettings().getDictionary(),
+                nonEntityDictionary, fetcher, apiVersion);
+
+        api = GraphQL.newGraphQL(builder.build())
+                .queryExecutionStrategy(new AsyncSerialExecutionStrategy())
+                .build();
+
+        // TODO - add serializers to allow for custom handling of ExecutionResult and GraphQLError objects
+        GraphQLErrorSerializer errorSerializer = new GraphQLErrorSerializer();
+        SimpleModule module = new SimpleModule("ExecutionResultSerializer", Version.unknownVersion());
+        module.addSerializer(ExecutionResult.class, new ExecutionResultSerializer(errorSerializer));
+        module.addSerializer(GraphQLError.class, errorSerializer);
+        elide.getElideSettings().getMapper().getObjectMapper().registerModule(module);
+    }
+
+    /**
+     * Execute a GraphQL query and return the response.
+     * @param baseUrlEndPoint base URL with prefix endpoint
+     * @param graphQLDocument The graphQL document (wrapped in JSON payload).
+     * @param user The user who issued the query.
+     * @return The response.
+     */
+    public ElideResponse run(String baseUrlEndPoint, String graphQLDocument, User user) {
+        return run(baseUrlEndPoint, graphQLDocument, user, UUID.randomUUID());
+    }
+
+    /**
+     * Check if a query string is mutation.
+     * @param query The graphQL Query to verify.
+     * @return is a mutation.
+     */
+    public static boolean isMutation(String query) {
+        if (query == null) {
+            return false;
+        }
+
+        String[] lines = query.split("\n");
+
+        StringBuilder withoutComments = new StringBuilder();
+
+        for (String line : lines) {
+            //Remove GraphiQL comment lines....
+            if (line.matches("^(\\s*)#.*")) {
+                continue;
+            }
+            withoutComments.append(line);
+            withoutComments.append("\n");
+        }
+
+        query = withoutComments.toString().trim();
+
+        return query.startsWith(MUTATION);
+    }
+
+    /**
+     * Extracts the top level JsonNode from GraphQL document.
+     * @param mapper ObjectMapper instance.
+     * @param graphQLDocument The graphQL document (wrapped in JSON payload).
+     * @return The JsonNode after parsing graphQLDocument.
+     * @throws IOException IOException
+     */
+    public static JsonNode getTopLevelNode(ObjectMapper mapper, String graphQLDocument) throws IOException {
+        return mapper.readTree(graphQLDocument);
+    }
+
+    /**
+     * Execute a GraphQL query and return the response.
+     * @param graphQLDocument The graphQL document (wrapped in JSON payload).
+     * @param user The user who issued the query.
+     * @param requestId the Request ID.
+     * @return The response.
+     */
+    public ElideResponse run(String baseUrlEndPoint, String graphQLDocument, User user, UUID requestId) {
+        return run(baseUrlEndPoint, graphQLDocument, user, requestId, null);
+    }
+
+    /**
+     * Execute a GraphQL query and return the response.
+     * @param graphQLDocument The graphQL document (wrapped in JSON payload).
+     * @param user The user who issued the query.
+     * @param requestId the Request ID.
+     * @return The response.
+     */
+    public ElideResponse run(String baseUrlEndPoint, String graphQLDocument, User user, UUID requestId,
+                             Map<String, List<String>> requestHeaders) {
+        ObjectMapper mapper = elide.getMapper().getObjectMapper();
+
+        List<GraphQLQuery> queries;
+        try {
+            queries = new QueryParser() {
+            }.parseDocument(graphQLDocument, mapper);
+        } catch (IOException e) {
+            log.debug("Invalid json body provided to GraphQL", e);
+            // NOTE: Can't get at isVerbose setting here for hardcoding to false. If necessary, we can refactor
+            // so this can be set appropriately.
+            return buildErrorResponse(mapper, new InvalidEntityBodyException(graphQLDocument), false);
+        }
+
+        List<ElideResponse> responses = new ArrayList<>();
+        for (GraphQLQuery query : queries) {
+            responses.add(executeGraphQLRequest(baseUrlEndPoint, mapper, user,
+                    graphQLDocument, query, requestId, requestHeaders));
+        }
+
+        if (responses.size() == 1) {
+            return responses.get(0);
+        }
+
+        //Convert the list of responses into a single JSON Array.
+        ArrayNode result = responses.stream()
+                .map(response -> {
+                    try {
+                        return mapper.readTree(response.getBody());
+                    } catch (IOException e) {
+                        log.debug("Caught an IO exception while trying to read response body");
+                        return JsonNodeFactory.instance.objectNode();
+                    }
+                })
+                .reduce(JsonNodeFactory.instance.arrayNode(),
+                        (arrayNode, node) -> arrayNode.add(node),
+                        (left, right) -> left.addAll(right));
+
+        try {
+
+            //Build and elide response from the array of responses.
+            return ElideResponse.builder()
+                    .responseCode(HttpStatus.SC_OK)
+                    .body(mapper.writeValueAsString(result))
+                    .build();
+        } catch (IOException e) {
+            log.error("An unexpected error occurred trying to serialize array response.", e);
+            return ElideResponse.builder()
+                    .responseCode(HttpStatus.SC_INTERNAL_SERVER_ERROR)
+                    .build();
+        }
+    }
+
+    /**
+     * Extracts the executable query from Json Node.
+     * @param jsonDocument The JsonNode object.
+     * @return query to execute.
+     */
+    public static String extractQuery(JsonNode jsonDocument) {
+        return jsonDocument.has(QUERY) ? jsonDocument.get(QUERY).asText() : null;
+    }
+
+    /**
+     * Extracts the variables for the query from Json Node.
+     * @param mapper ObjectMapper instance.
+     * @param jsonDocument The JsonNode object.
+     * @return variables to pass.
+     */
+    public static Map<String, Object> extractVariables(ObjectMapper mapper, JsonNode jsonDocument) {
+        // get variables from request for constructing entityProjections
+        Map<String, Object> variables = new HashMap<>();
+        if (jsonDocument.has(VARIABLES) && !jsonDocument.get(VARIABLES).isNull()) {
+            variables = mapper.convertValue(jsonDocument.get(VARIABLES), Map.class);
+        }
+
+        return variables;
+    }
+
+    /**
+     * Extracts the operation name from Json Node.
+     * @param jsonDocument The JsonNode object.
+     * @return variables to pass.
+     */
+    public static String extractOperation(JsonNode jsonDocument) {
+        if (jsonDocument.has(OPERATION_NAME) && !jsonDocument.get(OPERATION_NAME).isNull()) {
+            return jsonDocument.get(OPERATION_NAME).asText();
+        }
+
+        return null;
+    }
+
+    private ElideResponse executeGraphQLRequest(String baseUrlEndPoint, ObjectMapper mapper, User principal,
+                                                String graphQLDocument, GraphQLQuery query, UUID requestId,
+                                                Map<String, List<String>> requestHeaders) {
+        boolean isVerbose = false;
+        String queryText = query.getQuery();
+        boolean isMutation = isMutation(queryText);
+
+        try (DataStoreTransaction tx = isMutation
+                ? elide.getDataStore().beginTransaction()
+                : elide.getDataStore().beginReadTransaction()) {
+
+            elide.getTransactionRegistry().addRunningTransaction(requestId, tx);
+            if (query.getQuery() == null || query.getQuery().isEmpty()) {
+                return ElideResponse.builder().responseCode(HttpStatus.SC_BAD_REQUEST)
+                        .body("A `query` key is required.").build();
+            }
+
+            // get variables from request for constructing entityProjections
+            Map<String, Object> variables = query.getVariables();
+
+            //TODO - get API version.
+            GraphQLProjectionInfo projectionInfo = new GraphQLEntityProjectionMaker(elide.getElideSettings(), variables,
+                    apiVersion).make(queryText);
+            GraphQLRequestScope requestScope = new GraphQLRequestScope(baseUrlEndPoint, tx, principal, apiVersion,
+                    elide.getElideSettings(), projectionInfo, requestId, requestHeaders);
+
+            isVerbose = requestScope.getPermissionExecutor().isVerbose();
+
+            // Logging all queries. It is recommended to put any private information that shouldn't be logged into
+            // the "variables" section of your query. Variable values are not logged.
+            log.info("Processing GraphQL query:\n{}", queryText);
+
+            ExecutionInput.Builder executionInput = new ExecutionInput.Builder()
+                    .localContext(requestScope)
+                    .query(queryText);
+
+            if (query.getOperationName() != null) {
+                executionInput.operationName(query.getOperationName());
+            }
+            executionInput.variables(variables);
+
+            ExecutionResult result = api.execute(executionInput);
+
+            tx.preCommit(requestScope);
+            requestScope.getPermissionExecutor().executeCommitChecks();
+            if (isMutation) {
+                if (!result.getErrors().isEmpty()) {
+                    HashMap<String, Object> abortedResponseObject = new HashMap<>();
+                    abortedResponseObject.put("errors", result.getErrors());
+                    abortedResponseObject.put("data", null);
+                    // Do not commit. Throw OK response to process tx.close correctly.
+                    throw new WebApplicationException(
+                            Response.ok(mapper.writeValueAsString(abortedResponseObject)).build());
+                }
+                requestScope.saveOrCreateObjects();
+            }
+
+            tx.flush(requestScope);
+
+            requestScope.runQueuedPreCommitTriggers();
+            elide.getAuditLogger().commit();
+            tx.commit(requestScope);
+            requestScope.runQueuedPostCommitTriggers();
+
+            if (log.isTraceEnabled()) {
+                requestScope.getPermissionExecutor().logCheckStats();
+            }
+
+            return ElideResponse.builder().responseCode(HttpStatus.SC_OK).body(mapper.writeValueAsString(result))
+                    .build();
+        } catch (JsonProcessingException e) {
+            log.debug("Invalid json body provided to GraphQL", e);
+            return buildErrorResponse(mapper, new InvalidEntityBodyException(graphQLDocument), isVerbose);
+        } catch (IOException e) {
+            log.error("Uncaught IO Exception by Elide in GraphQL", e);
+            return buildErrorResponse(mapper, new TransactionException(e), isVerbose);
+        } catch (RuntimeException e) {
+            return handleRuntimeException(elide, e, isVerbose);
+        } finally {
+            elide.getTransactionRegistry().removeRunningTransaction(requestId);
+            elide.getAuditLogger().clear();
+        }
+    }
+
+    public static ElideResponse handleRuntimeException(Elide elide, RuntimeException error, boolean isVerbose) {
+        CustomErrorException mappedException = elide.mapError(error);
+        ObjectMapper mapper = elide.getMapper().getObjectMapper();
+
+        if (mappedException != null) {
+            return buildErrorResponse(mapper, mappedException, isVerbose);
+        }
+
+        if (error instanceof WebApplicationException) {
+            WebApplicationException e = (WebApplicationException) error;
+            log.debug("WebApplicationException", e);
+            String body = e.getResponse().getEntity() != null ? e.getResponse().getEntity().toString() : e.getMessage();
+            return ElideResponse.builder().responseCode(e.getResponse().getStatus()).body(body).build();
+        }
+
+        if (error instanceof HttpStatusException) {
+            HttpStatusException e = (HttpStatusException) error;
+
+            if (e instanceof ForbiddenAccessException) {
+                if (log.isDebugEnabled()) {
+                    log.debug("{}", ((ForbiddenAccessException) e).getLoggedMessage());
+                }
+            } else {
+                log.debug("Caught HTTP status exception {}", e.getStatus(), e);
+            }
+
+            return buildErrorResponse(mapper, new HttpStatusException(200, e.getMessage()) {
+                @Override
+                public int getStatus() {
+                    return 200;
+                }
+
+                @Override
+                public Pair<Integer, JsonNode> getErrorResponse() {
+                    return e.getErrorResponse();
+                }
+
+                @Override
+                public Pair<Integer, JsonNode> getVerboseErrorResponse() {
+                    return e.getVerboseErrorResponse();
+                }
+
+                @Override
+                public String getVerboseMessage() {
+                    return e.getVerboseMessage();
+                }
+
+                @Override
+                public String toString() {
+                    return e.toString();
+                }
+            }, isVerbose);
+        }
+
+        if (error instanceof ConstraintViolationException) {
+            ConstraintViolationException e = (ConstraintViolationException) error;
+            log.debug("Constraint violation exception caught", e);
+            String message = "Constraint violation";
+            final ErrorObjects.ErrorObjectsBuilder errorObjectsBuilder = ErrorObjects.builder();
+            for (ConstraintViolation<?> constraintViolation : e.getConstraintViolations()) {
+                errorObjectsBuilder.addError()
+                        .withDetail(constraintViolation.getMessage());
+                final String propertyPathString = constraintViolation.getPropertyPath().toString();
+                if (!propertyPathString.isEmpty()) {
+                    Map<String, Object> source = new HashMap<>(1);
+                    source.put("property", propertyPathString);
+                    errorObjectsBuilder.with("source", source);
+                }
+            }
+            return buildErrorResponse(
+                    mapper,
+                    new CustomErrorException(HttpStatus.SC_OK, message, errorObjectsBuilder.build()),
+                    isVerbose
+            );
+        }
+
+        log.error("Error or exception uncaught by Elide", error);
+        throw new RuntimeException(error);
+    }
+
+    public static ElideResponse buildErrorResponse(ObjectMapper mapper, HttpStatusException error, boolean isVerbose) {
+        JsonNode errorNode;
+        if (!(error instanceof CustomErrorException)) {
+            // get the error message and optionally encode it
+            String errorMessage = isVerbose ? error.getVerboseMessage() : error.getMessage();
+            errorMessage = Encode.forHtml(errorMessage);
+            ErrorObjects errors = ErrorObjects.builder().addError()
+                    .with("message", errorMessage).build();
+            errorNode = mapper.convertValue(errors, JsonNode.class);
+        } else {
+            errorNode = isVerbose
+                    ? error.getVerboseErrorResponse().getRight()
+                    : error.getErrorResponse().getRight();
+        }
+        String errorBody;
+        try {
+            errorBody = mapper.writeValueAsString(errorNode);
+        } catch (JsonProcessingException e) {
+            errorBody = errorNode.toString();
+        }
+        return ElideResponse.builder()
+                .responseCode(error.getStatus())
+                .body(errorBody)
+                .build();
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunners.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunners.java
new file mode 100644
index 0000000000..cf978253e4
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/QueryRunners.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.RefreshableElide;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Maps API version to a GraphQL query runner.  This class is hot reloadable and must be restricted to a single
+ * access method.
+ */
+public class QueryRunners {
+    private final Map<String, QueryRunner> runners;
+
+    /**
+     * Constructor.
+     * @param refreshableElide A hot reloadable Elide instance.
+     */
+    public QueryRunners(RefreshableElide refreshableElide) {
+        this.runners = new HashMap<>();
+        Elide elide = refreshableElide.getElide();
+
+        for (String apiVersion : elide.getElideSettings().getDictionary().getApiVersions()) {
+            runners.put(apiVersion, new QueryRunner(elide, apiVersion));
+        }
+    }
+
+    /**
+     * Gets a runner for a given API version.  This is the ONLY access method for this class to
+     * eliminate state issues across reloads.
+     * @param apiVersion The api version.
+     * @return The associated query runner.
+     */
+    public QueryRunner getRunner(String apiVersion) {
+        return runners.get(apiVersion);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/RelationshipOp.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/RelationshipOp.java
new file mode 100644
index 0000000000..558d714318
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/RelationshipOp.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+/**
+ * Specifies how a relationship should be modified.
+ */
+public enum RelationshipOp {
+    FETCH,
+    DELETE,
+    UPSERT,
+    REPLACE,
+    REMOVE,
+    UPDATE
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/SerdeCoercing.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/SerdeCoercing.java
new file mode 100644
index 0000000000..542b477bce
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/SerdeCoercing.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import graphql.language.FloatValue;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.Coercing;
+import graphql.schema.CoercingParseValueException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SerdeCoercing<I, O> implements Coercing<I, O> {
+    private String errorMessage;
+    private Serde<O, I> serde;
+
+    @Override
+    public O serialize(Object dataFetcherResult) {
+        return serde.serialize((I) dataFetcherResult);
+    }
+
+    @Override
+    public I parseValue(Object input) {
+        return serde.deserialize((O) input);
+    }
+
+    public I parseLiteral(Object o) {
+        Object input;
+        if (o instanceof IntValue) {
+            input = ((IntValue) o).getValue().longValue();
+        } else if (o instanceof StringValue) {
+            input = ((StringValue) o).getValue();
+        } else if (o instanceof FloatValue) {
+            input = ((FloatValue) o).getValue().floatValue();
+        } else {
+            throw new CoercingParseValueException(errorMessage);
+        }
+        return parseValue(input);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/ConnectionContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/ConnectionContainer.java
new file mode 100644
index 0000000000..6510eda701
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/ConnectionContainer.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.KeyWord;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Container representing a GraphQL "connection" object.
+ */
+@AllArgsConstructor
+public class ConnectionContainer implements GraphQLContainer {
+    @Getter private final Set<PersistentResource> persistentResources;
+    @Getter private final Optional<Pagination> pagination;
+    // Refers to the type of persistentResources
+    @Getter private final String typeName;
+
+    @Override
+    public Object processFetch(Environment context) {
+        String fieldName = context.field.getName();
+
+        switch (KeyWord.byName(fieldName)) {
+            case EDGES:
+                return getPersistentResources().stream()
+                        .map(EdgesContainer::new)
+                        .collect(Collectors.toList());
+            case PAGE_INFO:
+                return new PageInfoContainer(this);
+            default:
+                break;
+        }
+
+        throw new BadRequestException("Invalid request. Looking for field: " + fieldName + " in a connection object.");
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/EdgesContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/EdgesContainer.java
new file mode 100644
index 0000000000..e8d1f2672a
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/EdgesContainer.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import static com.yahoo.elide.graphql.KeyWord.NODE;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.graphql.Environment;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Container for edges.
+ */
+@AllArgsConstructor
+public class EdgesContainer implements PersistentResourceContainer, GraphQLContainer<NodeContainer> {
+    @Getter private final PersistentResource persistentResource;
+
+    @Override
+    public NodeContainer processFetch(Environment context) {
+        String fieldName = context.field.getName();
+
+        // TODO: Cursor
+        if (NODE.hasName(fieldName)) {
+            return new NodeContainer(context.parentResource);
+        }
+
+        throw new BadRequestException("Invalid request. Looking for field: " + fieldName + " in an edges object.");
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/GraphQLContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/GraphQLContainer.java
new file mode 100644
index 0000000000..e627313f1f
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/GraphQLContainer.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.graphql.Environment;
+
+/**
+ * Interface describing how to process GraphQL request at each step.
+ * @param <T> The type returned by the container.
+ */
+public interface GraphQLContainer<T> {
+    T processFetch(Environment context);
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/MapEntryContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/MapEntryContainer.java
new file mode 100644
index 0000000000..b023fe7328
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/MapEntryContainer.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.graphql.Entity;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Return values for a Map (i.e. entry set).
+ */
+public class MapEntryContainer implements GraphQLContainer {
+    private static final String KEY = "key";
+    private static final String VALUE = "value";
+
+    private final Map.Entry entry;
+
+    /**
+     * Constructor.
+     *
+     * @param entry Entry to contain.
+     */
+    public MapEntryContainer(Map.Entry entry) {
+        this.entry = entry;
+    }
+
+    @Override
+    public Object processFetch(Environment context) {
+        NonEntityDictionary nonEntityDictionary = context.nonEntityDictionary;
+        String fieldName = context.field.getName();
+
+        Object returnObject;
+        if (KEY.equalsIgnoreCase(fieldName)) {
+            returnObject = entry.getKey();
+
+        } else if (VALUE.equalsIgnoreCase(fieldName)) {
+            returnObject = entry.getValue();
+        } else {
+            throw new BadRequestException("Invalid field: '" + fieldName
+                    + "'. Maps only contain fields 'key' and 'value'");
+        }
+
+        if (nonEntityDictionary.hasBinding(EntityDictionary.getType(returnObject))) {
+            return new NonEntityContainer(returnObject);
+        }
+        return returnObject;
+    }
+
+    /**
+     * Converts an attribute which is a list of maps - each containing a KEY and a VALUE
+     * into a HashMap with the value of KEY as key and the value of VALUE as the value.
+     * @param attribute The attribute to convert.
+     * @return The converted map.
+     */
+    public static Map translateFromGraphQLMap(Entity.Attribute attribute) {
+        Map returnMap = new HashMap();
+        Object collection = attribute.getValue();
+
+        if (collection == null) {
+            return null;
+        }
+
+        if (! (collection instanceof Collection)) {
+            throw new BadRequestException("Invalid map format for GraphQL request");
+        }
+
+        ((Collection) collection).stream().forEach((entry -> {
+            if (! (entry instanceof Map)) {
+                throw new BadRequestException("Invalid map format for GraphQL request");
+            }
+
+            if (! ((Map) entry).containsKey(KEY) && ((Map) entry).containsKey(VALUE)) {
+                throw new BadRequestException("Invalid map format for GraphQL request");
+            }
+
+            returnMap.put(((Map) entry).get(KEY), ((Map) entry).get(VALUE));
+        }));
+
+        return returnMap;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NodeContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NodeContainer.java
new file mode 100644
index 0000000000..adc4952adf
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NodeContainer.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.DeferredId;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import com.yahoo.elide.graphql.PersistentResourceFetcher;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Container for nodes.
+ */
+@AllArgsConstructor
+public class NodeContainer implements PersistentResourceContainer, GraphQLContainer {
+    @Getter protected final PersistentResource persistentResource;
+
+    @Override
+    public Object processFetch(Environment context) {
+        EntityDictionary entityDictionary = context.requestScope.getDictionary();
+        NonEntityDictionary nonEntityDictionary = context.nonEntityDictionary;
+
+        Type parentClass = context.parentResource.getResourceType();
+        String fieldName = context.field.getName();
+        String idFieldName = entityDictionary.getIdFieldName(parentClass);
+
+        if (entityDictionary.isAttribute(parentClass, fieldName)) { /* fetch attribute properties */
+            Attribute requested = context.requestScope.getProjectionInfo()
+                    .getAttributeMap().getOrDefault(context.field.getSourceLocation(), null);
+            Object attribute = context.parentResource.getAttribute(requested);
+
+            if (attribute != null && nonEntityDictionary.hasBinding(EntityDictionary.getType(attribute))) {
+                return new NonEntityContainer(attribute);
+            }
+
+            if (attribute instanceof Map) {
+                return ((Map<Object, Object>) attribute).entrySet().stream()
+                        .map(MapEntryContainer::new)
+                        .collect(Collectors.toList());
+            }
+
+            if (attribute instanceof Collection) {
+                Type<?> innerType = entityDictionary.getParameterizedType(parentClass, fieldName);
+
+                if (nonEntityDictionary.hasBinding(innerType)) {
+                    return ((Collection) attribute).stream()
+                            .map(NonEntityContainer::new)
+                            .collect(Collectors.toList());
+                }
+            }
+
+            return attribute;
+        }
+        if (entityDictionary.isRelation(parentClass, fieldName)) { /* fetch relationship properties */
+            // get the relationship from constructed projections
+            Relationship relationship = context.requestScope
+                    .getProjectionInfo()
+                    .getRelationshipMap()
+                    .getOrDefault(context.field.getSourceLocation(), null);
+
+            if (relationship == null) {
+                throw new BadRequestException("Relationship doesn't have projection "
+                                + context.parentResource.getTypeName() + "." + fieldName);
+            }
+
+            return fetchRelationship(context, relationship);
+        }
+        if (Objects.equals(idFieldName, fieldName)) {
+            return new DeferredId(context.parentResource);
+        }
+        throw new BadRequestException("Unrecognized object: " + fieldName + " for: "
+                + parentClass.getName() + " in node");
+    }
+
+    protected Object fetchRelationship(Environment context, Relationship relationship) {
+        return PersistentResourceFetcher.fetchRelationship(context.parentResource, relationship, context.ids);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NonEntityContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NonEntityContainer.java
new file mode 100644
index 0000000000..43d61875f6
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/NonEntityContainer.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Container for models not managed by Elide.
+ */
+@AllArgsConstructor
+public class NonEntityContainer implements GraphQLContainer {
+    @Getter private final Object nonEntity;
+
+    @Override
+    public Object processFetch(Environment context) {
+        NonEntityDictionary nonEntityDictionary = context.nonEntityDictionary;
+
+        String fieldName = context.field.getName();
+
+        //There is no Elide security for models not managed by Elide.
+        Object object = nonEntityDictionary.getValue(nonEntity, fieldName, context.requestScope);
+
+        if (object == null) {
+            return null;
+        }
+
+        if (nonEntityDictionary.hasBinding(EntityDictionary.getType(object))) {
+            return new NonEntityContainer(object);
+        }
+
+        if (object instanceof Map) {
+            return ((Map<Object, Object>) object).entrySet().stream()
+                    .map(MapEntryContainer::new)
+                    .collect(Collectors.toList());
+        }
+
+        if (object instanceof Collection) {
+            Type<?> innerType = nonEntityDictionary.getParameterizedType(nonEntity.getClass(), fieldName);
+
+            if (nonEntityDictionary.hasBinding(innerType)) {
+                return ((Collection) object).stream()
+                        .map(NonEntityContainer::new)
+                        .collect(Collectors.toList());
+            }
+        }
+
+        return object;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PageInfoContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PageInfoContainer.java
new file mode 100644
index 0000000000..36b7f804ad
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PageInfoContainer.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.KeyWord;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Container for nodes.
+ */
+public class PageInfoContainer implements GraphQLContainer {
+    @Getter private final ConnectionContainer connectionContainer;
+
+    public PageInfoContainer(ConnectionContainer connectionContainer) {
+        this.connectionContainer = connectionContainer;
+    }
+
+    @Override
+    public Object processFetch(Environment context) {
+        String fieldName = context.field.getName();
+        ConnectionContainer connectionContainer = getConnectionContainer();
+        Optional<Pagination> pagination = connectionContainer.getPagination();
+
+        List<String> ids = connectionContainer.getPersistentResources().stream()
+                .map(PersistentResource::getId)
+                .sorted()
+                .collect(Collectors.toList());
+
+        return pagination.map(pageValue -> {
+            switch (KeyWord.byName(fieldName)) {
+                case PAGE_INFO_HAS_NEXT_PAGE: {
+                    int numResults = ids.size();
+                    int nextOffset = numResults + pageValue.getOffset();
+                    return nextOffset < pageValue.getPageTotals();
+                }
+                case PAGE_INFO_START_CURSOR:
+                    return pageValue.getOffset();
+                case PAGE_INFO_END_CURSOR:
+                    return pageValue.getOffset() + ids.size();
+                case PAGE_INFO_TOTAL_RECORDS:
+                    return pageValue.getPageTotals();
+                default:
+                    break;
+            }
+            throw new BadRequestException("Invalid request. Looking for field: "
+                    + fieldName + " in an pageInfo object.");
+        }).orElseThrow(() -> new BadRequestException("Could not generate pagination information for type: "
+                + connectionContainer.getTypeName()));
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PersistentResourceContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PersistentResourceContainer.java
new file mode 100644
index 0000000000..57a44818c1
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/PersistentResourceContainer.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.core.PersistentResource;
+
+/**
+ * Interface describing containers that hold PersistentResources.
+ */
+public interface PersistentResourceContainer {
+    PersistentResource getPersistentResource();
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/RootContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/RootContainer.java
new file mode 100644
index 0000000000..b0e9ee52c3
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/containers/RootContainer.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.containers;
+
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.PersistentResourceFetcher;
+
+/**
+ * Root container for GraphQL requests.
+ */
+public class RootContainer implements GraphQLContainer {
+
+    @Override
+    public GraphQLContainer processFetch(Environment context) {
+        String entityName = context.field.getName();
+        String aliasName = context.field.getAlias();
+
+        return PersistentResourceFetcher.fetchObject(
+                context.requestScope,
+                context.requestScope
+                        .getProjectionInfo()
+                        .getProjection(aliasName, entityName), // root-level projection
+                context.ids
+        );
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/FragmentResolver.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/FragmentResolver.java
new file mode 100644
index 0000000000..bd3aa5efa6
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/FragmentResolver.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import graphql.language.Document;
+import graphql.language.Field;
+import graphql.language.FragmentDefinition;
+import graphql.language.FragmentSpread;
+import graphql.language.Selection;
+import graphql.language.SelectionSet;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Class that fetch {@link FragmentDefinition}s from graphQL {@link Document} and store them for future reference.
+ */
+public class FragmentResolver {
+    private final Map<String, FragmentDefinition> fragmentMap = new HashMap<>();
+
+    public boolean contains(String fragmentName) {
+        return fragmentMap.containsKey(fragmentName);
+    }
+
+    public FragmentDefinition get(String fragmentName) {
+        return fragmentMap.get(fragmentName);
+    }
+
+    /**
+     * Fetch fragments from documents. Only fragment definitions would be processed.
+     *
+     * @param document graphql document
+     */
+    public void addFragments(Document document) {
+        addFragments(document.getDefinitions().stream()
+                .filter(definition -> definition instanceof FragmentDefinition)
+                .map(definition -> (FragmentDefinition) definition)
+                .collect(Collectors.toList()));
+    }
+
+    /**
+     * Make sure there is not fragment loop in in-coming definitions and store those fragments.
+     *
+     * @param fragments fragments to add
+     */
+    private void addFragments(List<FragmentDefinition> fragments) {
+        final Map<String, FragmentDefinition> newFragments = fragments.stream()
+                .collect(Collectors.toMap(FragmentDefinition::getName, Function.identity()));
+
+        // make sure there is no fragment loop and undefined fragments in fragment definitions
+        final Set<String> fragmentNames = new HashSet<>();
+        fragments.forEach(fragmentDefinition -> validateFragment(newFragments, fragmentDefinition, fragmentNames));
+
+        this.fragmentMap.putAll(newFragments);
+    }
+
+    /**
+     * Recursive DFS to validate that there is not reference loop in a fragment and there is not un-defined
+     * fragments.
+     *
+     * @param fragmentDefinition fragment to be checked
+     * @param fragmentNames fragment names appear in the current check path
+     */
+    private static void validateFragment(
+            Map<String, FragmentDefinition> fragmentMap,
+            FragmentDefinition fragmentDefinition,
+            Set<String> fragmentNames
+    ) {
+        String fragmentName = fragmentDefinition.getName();
+        if (fragmentNames.contains(fragmentName)) {
+            throw new InvalidEntityBodyException("There is a fragment definition loop in: {"
+                    + String.join(",", fragmentNames) + "} with " + fragmentName + " duplicated.");
+        }
+
+        fragmentNames.add(fragmentName);
+
+        getNestedFragments(fragmentDefinition.getSelectionSet()).stream()
+                .map(FragmentSpread::getName)
+                .distinct()
+                .forEach(name -> {
+                    if (!fragmentMap.containsKey(name)) {
+                        throw new InvalidEntityBodyException(String.format("Unknown fragment {%s}.", name));
+                    }
+                    validateFragment(fragmentMap, fragmentMap.get(name), fragmentNames);
+                });
+
+        fragmentNames.remove(fragmentName);
+    }
+
+    /**
+     * Get nested fragments from a selection set, skip other graphQL {@link Field}s.
+     * This is only for fragment loop validation.
+     *
+     * @param selectionSet graphql selection set
+     * @return nested fragments in the selection set
+     */
+    private static List<FragmentSpread> getNestedFragments(SelectionSet selectionSet) {
+        return selectionSet.getSelections().stream()
+                .map(FragmentResolver::getNestedFragments)
+                .reduce(new ArrayList<>(), (a, b) -> {
+                    a.addAll(b);
+                    return a;
+                });
+    }
+
+    /**
+     * Get nested fragments from a field, skip other graphQL {@link Field}s.
+     * This is only for fragment loop validation.
+     *
+     * @param selection graphql selection
+     * @return nested fragments in the selection set of this selection
+     */
+    private static List<FragmentSpread> getNestedFragments(Selection selection) {
+        if (selection instanceof Field) {
+            return ((Field) selection).getSelectionSet() == null
+                    || ((Field) selection).getSelectionSet().getSelections().isEmpty()
+                    ? new ArrayList<>()
+                    : getNestedFragments(((Field) selection).getSelectionSet());
+        }
+        if (selection instanceof FragmentSpread) {
+            return Collections.singletonList((FragmentSpread) selection);
+        }
+        // TODO: support inline fragment
+        throw new BadRequestException("Unsupported graphQL selection type: " + selection.getClass());
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectionMaker.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectionMaker.java
new file mode 100644
index 0000000000..1a64dcfd81
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectionMaker.java
@@ -0,0 +1,598 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.graphql.KeyWord.EDGES;
+import static com.yahoo.elide.graphql.KeyWord.NODE;
+import static com.yahoo.elide.graphql.KeyWord.PAGE_INFO;
+import static com.yahoo.elide.graphql.KeyWord.PAGE_INFO_TOTAL_RECORDS;
+import static com.yahoo.elide.graphql.KeyWord.SCHEMA;
+import static com.yahoo.elide.graphql.KeyWord.TYPE;
+import static com.yahoo.elide.graphql.KeyWord.TYPENAME;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.filter.dialect.ParseException;
+import com.yahoo.elide.core.filter.dialect.graphql.FilterDialect;
+import com.yahoo.elide.core.filter.expression.AndFilterExpression;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.EntityProjection.EntityProjectionBuilder;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.sort.SortingImpl;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.GraphQLNameUtils;
+import com.yahoo.elide.graphql.ModelBuilder;
+import graphql.language.Argument;
+import graphql.language.Document;
+import graphql.language.Field;
+import graphql.language.FragmentDefinition;
+import graphql.language.FragmentSpread;
+import graphql.language.OperationDefinition;
+import graphql.language.Selection;
+import graphql.language.SelectionSet;
+import graphql.language.SourceLocation;
+import graphql.parser.Parser;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * This class converts a GraphQL query string into an Elide {@link EntityProjection} using.
+ * {@link #make(String)} method.
+ */
+@Slf4j
+public class GraphQLEntityProjectionMaker {
+    protected final ElideSettings elideSettings;
+    protected final EntityDictionary entityDictionary;
+    protected final FilterDialect filterDialect;
+
+    protected final VariableResolver variableResolver;
+    protected final FragmentResolver fragmentResolver;
+
+    protected final Map<SourceLocation, Relationship> relationshipMap = new HashMap<>();
+    protected final Map<String, EntityProjection> rootProjections = new HashMap<>();
+    protected final Map<SourceLocation, Attribute> attributeMap = new HashMap<>();
+
+    protected final GraphQLNameUtils nameUtils;
+    protected final String apiVersion;
+
+    /**
+     * Constructor.
+     *
+     * @param elideSettings settings of current Elide instance
+     * @param variables variables provided in the request
+     * @param apiVersion The client requested API version.
+     */
+    public GraphQLEntityProjectionMaker(ElideSettings elideSettings, Map<String, Object> variables, String apiVersion) {
+        this.elideSettings = elideSettings;
+        this.entityDictionary = elideSettings.getDictionary();
+        this.filterDialect = elideSettings.getGraphqlDialect();
+
+        this.variableResolver = new VariableResolver(variables);
+        this.fragmentResolver = new FragmentResolver();
+        this.nameUtils = new GraphQLNameUtils(entityDictionary);
+        this.apiVersion = apiVersion;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param elideSettings settings of current Elide instance
+     */
+    public GraphQLEntityProjectionMaker(ElideSettings elideSettings) {
+        this(elideSettings, new HashMap<>(), NO_VERSION);
+    }
+
+    /**
+     * Convert a GraphQL query string into a collection of Elide {@link EntityProjection}s.
+     *
+     * @param query GraphQL query
+     * @return all projections in the query
+     */
+    public GraphQLProjectionInfo make(String query) {
+        Parser parser = new Parser();
+        Document parsedDocument;
+        try {
+            parsedDocument = parser.parseDocument(query);
+        } catch (Exception e) {
+            throw new InvalidEntityBodyException("Can't parse query: " + query);
+        }
+
+        // resolve fragment definitions
+        fragmentResolver.addFragments(parsedDocument);
+
+        // resolve operation definitions
+        parsedDocument.getDefinitions().forEach(definition -> {
+            if (definition instanceof OperationDefinition) {
+                // Operations would be converted into EntityProjection tree
+                OperationDefinition operationDefinition = (OperationDefinition) definition;
+
+                //Only allow supported operations.
+                if (! supportsOperationType(operationDefinition.getOperation())) {
+                    return;
+                }
+
+                // resolve variable definitions in this operation
+                variableResolver.newScope(operationDefinition);
+
+                addRootProjection(operationDefinition.getSelectionSet());
+            } else if (!(definition instanceof FragmentDefinition)) {
+                throw new InvalidEntityBodyException(
+                        String.format("Unsupported definition type {%s}.", definition.getClass()));
+            }
+        });
+
+        return new GraphQLProjectionInfo(rootProjections, relationshipMap, attributeMap);
+    }
+
+    /**
+     * Root projection would be an operation applied on an single entity class.
+     * The EntityProjection tree would be constructed recursively to add all child projections.
+     *
+     * @param selectionSet a root-level selection set
+     */
+    private void addRootProjection(SelectionSet selectionSet) {
+        List<Selection> selections = selectionSet.getSelections();
+
+        selections.stream().forEach(rootSelection -> {
+            if (!(rootSelection instanceof Field)) {
+                throw new InvalidEntityBodyException("Entity selection must be a graphQL field.");
+            }
+            Field rootSelectionField = (Field) rootSelection;
+            String entityName = rootSelectionField.getName();
+            String aliasName = rootSelectionField.getAlias();
+            if (SCHEMA.hasName(entityName) || TYPE.hasName(entityName)) {
+                // '__schema' and '__type' would not be handled by entity projection
+                return;
+            }
+            Type<?> entityType = getRootEntity(rootSelectionField.getName(), apiVersion);
+            if (entityType == null) {
+                throw new InvalidEntityBodyException(String.format("Unknown entity {%s}.",
+                        rootSelectionField.getName()));
+            }
+
+            String keyName = GraphQLProjectionInfo.computeProjectionKey(aliasName, entityName);
+            if (rootProjections.containsKey(keyName)) {
+                throw  new InvalidEntityBodyException(
+                        String.format("Found two root level query for Entity {%s} with same alias name",
+                                entityName));
+            }
+            rootProjections.put(keyName,
+                    createProjection(entityType, rootSelectionField));
+        });
+
+    }
+
+    /**
+     * Construct an {@link EntityProjection} from a GraphQL {@link Field} for an entity type.
+     *
+     * @param entityType type of entity to be projected
+     * @param entityField graphQL field definition
+     * @return constructed {@link EntityProjection}
+     */
+    private EntityProjection createProjection(Type<?> entityType, Field entityField) {
+        final EntityProjectionBuilder projectionBuilder = EntityProjection.builder()
+                .type(entityType)
+                .pagination(getDefaultPagination(entityType));
+
+        // Add the Entity Arguments to the Projection
+        projectionBuilder.arguments(new HashSet<>(
+                getArguments(entityField, entityDictionary.getEntityArguments(entityType))
+                ));
+
+        if (entityField.getSelectionSet() != null) {
+            entityField.getSelectionSet().getSelections().forEach(
+                    selection -> addSelection(selection, projectionBuilder));
+        }
+
+        if (entityField.getArguments() != null) {
+            entityField.getArguments().forEach(argument -> addArgument(argument, projectionBuilder));
+        }
+
+        return projectionBuilder.build();
+    }
+
+    /**
+     * Add a graphQL {@link Selection} to an {@link EntityProjection}.
+     *
+     * @param fieldSelection field/fragment to add
+     * @param projectionBuilder projection that is being built
+     */
+    private void addSelection(Selection fieldSelection, final EntityProjectionBuilder projectionBuilder) {
+        if (fieldSelection instanceof FragmentSpread) {
+            addFragment((FragmentSpread) fieldSelection, projectionBuilder);
+        } else if (fieldSelection instanceof Field) {
+            if (EDGES.hasName(((Field) fieldSelection).getName())
+                    || NODE.hasName(((Field) fieldSelection).getName())) {
+                // if this graphql field is 'edges' or 'node', go one level deeper in the graphql document
+                ((Field) fieldSelection).getSelectionSet().getSelections().forEach(
+                        selection -> addSelection(selection, projectionBuilder));
+            } else {
+                addField((Field) fieldSelection, projectionBuilder);
+            }
+        } else {
+            throw new InvalidEntityBodyException(
+                    String.format("Unsupported selection type {%s}.", fieldSelection.getClass()));
+        }
+    }
+
+    /**
+     * Resolve a graphQL {@link FragmentSpread} into {@link Selection}s and add them to an {@link EntityProjection}.
+     *
+     * @param fragment graphQL fragment
+     * @param projectionBuilder projection that is being built
+     */
+    private void addFragment(FragmentSpread fragment, EntityProjectionBuilder projectionBuilder) {
+        String fragmentName = fragment.getName();
+
+        FragmentDefinition fragmentDefinition = fragmentResolver.get(fragmentName);
+
+        String fragmentTypeName = fragmentDefinition.getTypeCondition().getName();
+        // type name in type condition of the Fragment must match the entity projection type name
+        if (fragmentTypeName.equals(nameUtils.toConnectionName(projectionBuilder.getType()))
+                || fragmentTypeName.equals(nameUtils.toEdgesName(projectionBuilder.getType()))
+                || fragmentTypeName.equals(nameUtils.toNodeName(projectionBuilder.getType()))) {
+            fragmentDefinition.getSelectionSet().getSelections()
+                    .forEach(selection -> addSelection(selection, projectionBuilder));
+        }
+    }
+
+    /**
+     * Add a new graphQL {@link Field} into an {@link EntityProjection}.
+     *
+     * @param field graphQL field
+     * @param projectionBuilder projection that is being built
+     */
+    private void addField(Field field, EntityProjectionBuilder projectionBuilder) {
+        Type<?> parentType = projectionBuilder.getType();
+        String fieldName = field.getName();
+
+        // this field would either be a relationship field or an attribute field
+        if (entityDictionary.getRelationshipType(parentType, fieldName) != RelationshipType.NONE) {
+            // handle the case of a relationship field
+            addRelationship(field, projectionBuilder);
+        } else if (TYPENAME.hasName(fieldName)) {
+            // '__typename' would not be handled by entityProjection
+        } else if (PAGE_INFO.hasName(fieldName)) {
+            // only 'totalRecords' needs to be added into the projection's pagination
+            if (field.getSelectionSet().getSelections().stream()
+                    .anyMatch(selection -> selection instanceof Field
+                            && PAGE_INFO_TOTAL_RECORDS.hasName(((Field) selection).getName()))) {
+                addPageTotal(projectionBuilder);
+            }
+        } else {
+            addAttributeField(field, projectionBuilder);
+        }
+    }
+
+    /**
+     * Create a relationship with projection and add it to the parent projection.
+     *
+     * @param relationshipField graphQL field for a relationship
+     * @param projectionBuilder projection that is being built
+     */
+    private void addRelationship(Field relationshipField, EntityProjectionBuilder projectionBuilder) {
+        Type<?> parentType = projectionBuilder.getType();
+        String relationshipName = relationshipField.getName();
+        String relationshipAlias =
+                relationshipField.getAlias() == null ? relationshipName : relationshipField.getAlias();
+
+        final Type<?> relationshipType = entityDictionary.getParameterizedType(parentType, relationshipName);
+
+        // build new entity projection with only entity type and entity dictionary
+        EntityProjection relationshipProjection = createProjection(relationshipType, relationshipField);
+        Relationship relationship = Relationship.builder()
+                .name(relationshipName)
+                .alias(relationshipAlias)
+                .projection(relationshipProjection)
+                .build();
+
+        relationshipMap.put(relationshipField.getSourceLocation(), relationship);
+
+        // add this relationship projection to its parent projection
+        projectionBuilder.relationship(relationship);
+    }
+
+    /**
+     * Add an attribute to an entity projection.
+     *
+     * @param attributeField graphQL field for an attribute
+     * @param projectionBuilder projection that is being built
+     */
+    private void addAttributeField(Field attributeField, EntityProjectionBuilder projectionBuilder) {
+        Type<?> parentType = projectionBuilder.getType();
+        String attributeName = attributeField.getName();
+        String attributeAlias = attributeField.getAlias() == null ? attributeName : attributeField.getAlias();
+
+        Type<?> attributeType = entityDictionary.getType(parentType, attributeName);
+        if (attributeType != null) {
+            Attribute attribute = Attribute.builder()
+                    .type(attributeType)
+                    .name(attributeName)
+                    .alias(attributeAlias)
+                    .arguments(getArguments(attributeField,
+                            entityDictionary.getAttributeArguments(parentType, attributeName)))
+                    .build();
+
+            projectionBuilder.attribute(attribute);
+            attributeMap.put(attributeField.getSourceLocation(), attribute);
+        } else {
+            throw new InvalidEntityBodyException(String.format(
+                            "Unknown attribute field {%s.%s}.",
+                            entityDictionary.getJsonAliasFor(projectionBuilder.getType()),
+                            attributeName));
+        }
+    }
+
+    /**
+     * Construct Elide {@link Pagination}, {@link Sorting}, {@link Attribute} from GraphQL {@link Argument} and
+     * add it to the {@link EntityProjection}.
+     *
+     * @param argument graphQL argument
+     * @param projectionBuilder projection that is being built
+     */
+    private void addArgument(Argument argument, EntityProjectionBuilder projectionBuilder) {
+        String argumentName = argument.getName();
+
+        if (isPaginationArgument(argumentName)) {
+            addPagination(argument, projectionBuilder);
+        } else if (isSortingArgument(argumentName)) {
+            addSorting(argument, projectionBuilder);
+        } else if (ModelBuilder.ARGUMENT_FILTER.equals(argumentName)) {
+            addFilter(argument, projectionBuilder);
+        } else if (!ModelBuilder.ARGUMENT_OPERATION.equals(argumentName)
+                && !(ModelBuilder.ARGUMENT_IDS.equals(argumentName))
+                && !(ModelBuilder.ARGUMENT_DATA.equals(argumentName))
+                && !isEntityArgument(argumentName, entityDictionary, projectionBuilder.getType())) {
+            Type<?> entityType = projectionBuilder.getType();
+            Type<?> attributeType = entityDictionary.getType(entityType, argumentName);
+            if (attributeType == null) {
+                throw new InvalidEntityBodyException(
+                        String.format("Invalid attribute field/alias for argument: {%s}.{%s}",
+                                entityType,
+                                argumentName)
+                );
+            }
+        }
+    }
+
+    /**
+     * Returns whether or not a GraphQL argument name corresponding to a Entity argument.
+     *
+     * @param argumentName Name key of the GraphQL argument
+     * @param dictionary Instance of EntityDictionary
+     * @param cls Entity Type Class
+     *
+     * @return {@code true} if the name equals to any Entity Argument
+     */
+    private static boolean isEntityArgument(String argumentName, EntityDictionary dictionary, Type<?> cls) {
+        return dictionary.getEntityArguments(cls)
+                .stream()
+                .anyMatch(a -> a.getName().equals(argumentName));
+    }
+
+    /**
+     * Returns whether or not a GraphQL argument name corresponding to a pagination argument.
+     *
+     * @param argumentName Name key of the GraphQL argument
+     *
+     * @return {@code true} if the name equals to {@link ModelBuilder#ARGUMENT_FIRST} or
+     * {@link ModelBuilder#ARGUMENT_AFTER}
+     */
+    private static boolean isPaginationArgument(String argumentName) {
+        return ModelBuilder.ARGUMENT_FIRST.equals(argumentName) || ModelBuilder.ARGUMENT_AFTER.equals(argumentName);
+    }
+
+    /**
+     * Create a {@link Pagination} object from pagination GraphQL argument and attach it to the building
+     * {@link EntityProjection}.
+     *
+     * @param argument graphQL argument
+     * @param projectionBuilder projection that is being built
+     */
+    private void addPagination(Argument argument, EntityProjectionBuilder projectionBuilder) {
+        Pagination pagination = projectionBuilder.getPagination() == null
+                ? PaginationImpl.getDefaultPagination(projectionBuilder.getType(), elideSettings)
+                : projectionBuilder.getPagination();
+
+        Object argumentValue = variableResolver.resolveValue(argument.getValue());
+        int value = argumentValue instanceof BigInteger
+                ? ((BigInteger) argumentValue).intValue()
+                : Integer.parseInt((String) argumentValue);
+        if (ModelBuilder.ARGUMENT_FIRST.equals(argument.getName())) {
+            pagination = new PaginationImpl(
+                    projectionBuilder.getType(),
+                    pagination.getOffset(),
+                    value,
+                    elideSettings.getDefaultPageSize(),
+                    elideSettings.getDefaultMaxPageSize(),
+                    pagination.returnPageTotals(),
+                    false);
+        } else if (ModelBuilder.ARGUMENT_AFTER.equals(argument.getName())) {
+            pagination = new PaginationImpl(
+                    projectionBuilder.getType(),
+                    value,
+                    pagination.getLimit(),
+                    elideSettings.getDefaultPageSize(),
+                    elideSettings.getDefaultMaxPageSize(),
+                    pagination.returnPageTotals(),
+                    false);
+        }
+
+        projectionBuilder.pagination(pagination);
+    }
+
+    /**
+     * Make projection return page total records.
+     * If the projection already has a pagination, use limit and offset from the existing pagination,
+     * else use the default pagination vales.
+     *
+     * @param projectionBuilder projection that is being built
+     */
+    private void addPageTotal(EntityProjectionBuilder projectionBuilder) {
+        PaginationImpl pagination;
+        if (projectionBuilder.getPagination() == null) {
+            pagination = new PaginationImpl(
+                    projectionBuilder.getType(),
+                    null,
+                    null,
+                    elideSettings.getDefaultPageSize(),
+                    elideSettings.getDefaultMaxPageSize(),
+                    true,
+                    false);
+
+        } else {
+            pagination = new PaginationImpl(
+                    projectionBuilder.getType(),
+                    projectionBuilder.getPagination().getOffset(),
+                    projectionBuilder.getPagination().getLimit(),
+                    elideSettings.getDefaultPageSize(),
+                    elideSettings.getDefaultMaxPageSize(),
+                    true,
+                    false);
+        }
+        projectionBuilder.pagination(pagination);
+    }
+
+    /**
+     * Returns whether or not a GraphQL argument name corresponding to a sorting argument.
+     *
+     * @param argumentName Name key of the GraphQL argument
+     *
+     * @return {@code true} if the name equals to {@link ModelBuilder#ARGUMENT_SORT}
+     */
+    private static boolean isSortingArgument(String argumentName) {
+        return ModelBuilder.ARGUMENT_SORT.equals(argumentName);
+    }
+
+    /**
+     * Creates a {@link Sorting} object from sorting GraphQL argument value and attaches it to the entity sorted
+     * according to the newly created {@link Sorting} object.
+     *
+     * @param argument An argument that contains the value of sorting spec
+     * @param projectionBuilder projection that is being built
+     */
+    private void addSorting(Argument argument, EntityProjectionBuilder projectionBuilder) {
+        String sortRule = (String) variableResolver.resolveValue(argument.getValue());
+
+        try {
+            Sorting sorting = SortingImpl.parseSortRule(sortRule, projectionBuilder.getType(),
+                    projectionBuilder.getAttributes(), entityDictionary);
+            projectionBuilder.sorting(sorting);
+        } catch (InvalidValueException e) {
+            throw new BadRequestException("Invalid sorting clause " + sortRule
+                    + " for type " + entityDictionary.getJsonAliasFor(projectionBuilder.getType()));
+        }
+
+    }
+
+    /**
+     * Add a new filter expression to the entityProjection.
+     *
+     * @param argument filter argument
+     * @param projectionBuilder projection that is being built
+     */
+    private void addFilter(Argument argument, EntityProjectionBuilder projectionBuilder) {
+        FilterExpression filter = buildFilter(
+                projectionBuilder,
+                entityDictionary.getJsonAliasFor(projectionBuilder.getType()),
+                variableResolver.resolveValue(argument.getValue()));
+
+        if (projectionBuilder.getFilterExpression() != null) {
+            projectionBuilder.filterExpression(
+                    new AndFilterExpression(projectionBuilder.getFilterExpression(), filter));
+        } else {
+            projectionBuilder.filterExpression(filter);
+        }
+    }
+
+    /**
+     * Construct a filter expression from a string.
+     *
+     * @param builder entity projection under construction that is being filtered.
+     * @param typeName class type name to apply this filter
+     * @param filterString Elide filter in string format
+     * @return constructed filter expression
+     */
+    private FilterExpression buildFilter(EntityProjectionBuilder builder, String typeName, Object filterString) {
+        if (!(filterString instanceof String)) {
+            throw new BadRequestException("Filter of type " + typeName + " is not StringValue.");
+        }
+
+        try {
+            return filterDialect.parse(builder.getType(), builder.getAttributes(), (String) filterString, apiVersion);
+        } catch (ParseException e) {
+            throw new BadRequestException(e.getMessage() + "\n" + e.getMessage());
+        }
+    }
+
+    private List<com.yahoo.elide.core.request.Argument> getArguments(Field attributeField,
+                                                                     Set<ArgumentType> availableArguments) {
+        List<com.yahoo.elide.core.request.Argument> arguments = new ArrayList<>();
+
+        //Loop through all the arguments available for this field.
+        availableArguments.forEach((argumentType -> {
+
+            //Search to see if the client provided a matching argument.
+            Optional<Argument> clientArgument = attributeField.getArguments().stream()
+                    .filter(arg -> arg.getName().equals(argumentType.getName()))
+                    .findFirst();
+
+            //If so, use it.
+            if (clientArgument.isPresent()) {
+                arguments.add(com.yahoo.elide.core.request.Argument.builder()
+                        .name(clientArgument.get().getName())
+                        .value(
+                                variableResolver.resolveValue(
+                                        clientArgument.get().getValue(),
+                                        Optional.of(argumentType.getType())
+                                ))
+                        .build());
+
+            //If not, check if there is a default value for this argument.
+            } else if (argumentType.getDefaultValue() != null) {
+                arguments.add(com.yahoo.elide.core.request.Argument.builder()
+                        .name(argumentType.getName())
+                        .value(argumentType.getDefaultValue())
+                        .build());
+            }
+        }));
+        return arguments;
+    }
+
+    protected Type<?> getRootEntity(String entityName, String apiVersion) {
+        return entityDictionary.getEntityClass(entityName, apiVersion);
+    }
+
+    protected boolean supportsOperationType(OperationDefinition.Operation operation) {
+        if (operation != OperationDefinition.Operation.SUBSCRIPTION) {
+            return true;
+        }
+        return false;
+    }
+
+    protected Pagination getDefaultPagination(Type<?> entityType) {
+        return PaginationImpl.getDefaultPagination(entityType, elideSettings);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLProjectionInfo.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLProjectionInfo.java
new file mode 100644
index 0000000000..9110d40033
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLProjectionInfo.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Relationship;
+import graphql.language.SourceLocation;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Map;
+
+/**
+ * A helper class that contains a collection of root-level entity projections and relationship map constructed from
+ * a {@link graphql.language.Document}.
+ */
+@AllArgsConstructor
+public class GraphQLProjectionInfo {
+    @Getter private final Map<String, EntityProjection> projections;
+
+    @Getter private final Map<SourceLocation, Relationship> relationshipMap;
+
+    @Getter private final Map<SourceLocation, Attribute> attributeMap;
+
+    public EntityProjection getProjection(String aliasName, String entityName) {
+        return projections.get(computeProjectionKey(aliasName, entityName));
+    }
+
+    public static String computeProjectionKey(String aliasName, String entityName) {
+        return (aliasName == null ? "" : aliasName) + ":" + entityName;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLQuery.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLQuery.java
new file mode 100644
index 0000000000..634fda8ca7
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/GraphQLQuery.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.Map;
+
+/**
+ * Represents a complete GraphQL query including its envelope.
+ */
+@Value
+@Builder
+public class GraphQLQuery {
+    private String query;
+    private String operationName;
+    private Map<String, Object> variables;
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/QueryParser.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/QueryParser.java
new file mode 100644
index 0000000000..5691ffb917
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/QueryParser.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Utility functions to parse the envelope that wraps every GraphQL query.
+ */
+public interface QueryParser {
+
+    static final String QUERY = "query";
+    static final String OPERATION_NAME = "operationName";
+    static final String VARIABLES = "variables";
+
+    /**
+     * Parse a document which could consist of 1 or more GraphQL queries.
+     * @param message The document to parse.
+     * @param mapper An object mapper to do JSON parsing.
+     * @return A list of 1 or more parsed GraphQL queries.
+     * @throws IOException If there is a JSON processing error.
+     */
+    default List<GraphQLQuery> parseDocument(String message, ObjectMapper mapper) throws IOException {
+        List<GraphQLQuery> results = new ArrayList<>();
+        JsonNode topLevel = mapper.readTree(message);
+
+        if (topLevel.isArray()) {
+            Iterator<JsonNode> nodeIterator = topLevel.iterator();
+
+            while (nodeIterator.hasNext()) {
+                JsonNode document = nodeIterator.next();
+
+                results.add(parseQuery(document, mapper));
+            }
+        } else {
+            results.add(parseQuery(topLevel, mapper));
+        }
+
+        return results;
+    }
+
+    /**
+     * Parse a GraphQL query.
+     * @param topLevel The query JsonNode to further parse.
+     * @param mapper An object mapper to do JSON parsing.
+     * @return A parsed GraphQL queries.
+     * @throws IOException If there is a JSON processing error.
+     */
+    default GraphQLQuery parseQuery(JsonNode topLevel, ObjectMapper mapper) throws IOException {
+        String query = topLevel.has(QUERY) ? topLevel.get(QUERY).asText() : null;
+        String operationName = "";
+
+        Map<String, Object> variables = new HashMap<>();
+        if (topLevel.has(VARIABLES) && !topLevel.get(VARIABLES).isNull()) {
+            variables = mapper.convertValue(topLevel.get(VARIABLES), Map.class);
+        }
+
+        if (topLevel.has(OPERATION_NAME) && !topLevel.get(OPERATION_NAME).isNull()) {
+            operationName = topLevel.get(OPERATION_NAME).asText();
+        }
+
+        return new GraphQLQuery(query, operationName, variables);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/SubscriptionEntityProjectionMaker.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/SubscriptionEntityProjectionMaker.java
new file mode 100644
index 0000000000..e4457bf55b
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/SubscriptionEntityProjectionMaker.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.core.type.Type;
+import graphql.language.OperationDefinition;
+
+import java.util.Map;
+
+public class SubscriptionEntityProjectionMaker extends GraphQLEntityProjectionMaker {
+    public SubscriptionEntityProjectionMaker(
+            ElideSettings elideSettings,
+            Map<String, Object> variables,
+            String apiVersion) {
+        super(elideSettings, variables, apiVersion);
+    }
+
+    @Override
+    protected boolean supportsOperationType(OperationDefinition.Operation operation) {
+        if (operation == OperationDefinition.Operation.SUBSCRIPTION) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected Pagination getDefaultPagination(Type<?> entityType) {
+        return null;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/VariableResolver.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/VariableResolver.java
new file mode 100644
index 0000000000..436e46ecc5
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/parser/VariableResolver.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.parser;
+
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import graphql.language.ArrayValue;
+import graphql.language.BooleanValue;
+import graphql.language.EnumValue;
+import graphql.language.FloatValue;
+import graphql.language.IntValue;
+import graphql.language.NonNullType;
+import graphql.language.NullValue;
+import graphql.language.ObjectField;
+import graphql.language.ObjectValue;
+import graphql.language.OperationDefinition;
+import graphql.language.StringValue;
+import graphql.language.Type;
+import graphql.language.Value;
+import graphql.language.VariableDefinition;
+import graphql.language.VariableReference;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Class that contains variables provided in graphql request and can resolve variables based on
+ * {@link graphql.language.OperationDefinition} scope.
+ * 1. variables defined in request is global
+ * 2. variables defined in each operation is operation-scoped
+ */
+class VariableResolver {
+    private final Map<String, Object> requestVariables;
+    private final Map<String, Object> scopeVariables = new HashMap<>();
+
+    VariableResolver(Map<String, Object> variables) {
+        this.requestVariables = new HashMap<>(variables);
+    }
+
+    /**
+     * Start a new variable scope for operation, clear all variables in the previous scope and add request variables
+     * into every new scope.
+     *
+     * @param operation operation definition
+     */
+    public void newScope(OperationDefinition operation) {
+        this.scopeVariables.clear();
+        this.scopeVariables.putAll(requestVariables);
+        operation.getVariableDefinitions().forEach(this::addVariable);
+    }
+
+    /**
+     * Resolve {@link VariableDefinition} and store result in the variable map.
+     * We don't need to worry about resolving graphql {@link graphql.language.TypeName} here because Elide-core
+     * knows the correct type of each field/argument.
+     *
+     * @param definition definition to resolve
+     */
+    private void addVariable(VariableDefinition definition) {
+        Type variableType = definition.getType();
+        String variableName = definition.getName();
+        Value defaultValue = definition.getDefaultValue();
+
+        if (defaultValue == null) {
+            if (variableType instanceof NonNullType && scopeVariables.get(variableName) == null) {
+                // value of non-null variable must be resolvable
+                throw new BadRequestException("Undefined non-null variable " + variableName);
+            }
+            // this would put 'null' for this variable if it is not stored in the map
+            scopeVariables.put(variableName, scopeVariables.get(variableName));
+        } else {
+            if (!scopeVariables.containsKey(variableName)) {
+                // create a new variable with default value
+                scopeVariables.put(variableName, resolveValue(defaultValue));
+            }
+        }
+    }
+
+    /**
+     * Resolve the real value of a GraphQL {@link Value} object. Use variables in request if necessary.
+     *
+     * @param value requested variable value
+     * @return resolved value of given variable
+     */
+    public Object resolveValue(Value value) {
+        return resolveValue(value, Optional.empty());
+    }
+
+    /**
+     * Resolve the real value of a GraphQL {@link Value} object. Use variables in request if necessary.
+     *
+     * @param value requested variable value
+     * @param resolveTo the Elide type to resolve to
+     * @return resolved value of given variable
+     */
+    public Object resolveValue(Value value, Optional<com.yahoo.elide.core.type.Type<?>> resolveTo) {
+        if (value instanceof BooleanValue) {
+            return ((BooleanValue) value).isValue();
+        }
+        if (value instanceof EnumValue) {
+            if (resolveTo.isPresent()) {
+                return CoerceUtil.coerce(((EnumValue) value).getName().toUpperCase(Locale.ROOT), resolveTo.get());
+            }
+            throw new BadRequestException("Enum value is not supported.");
+        }
+        if (value instanceof FloatValue) {
+            return ((FloatValue) value).getValue();
+        }
+        if (value instanceof IntValue) {
+            return ((IntValue) value).getValue();
+        }
+        if (value instanceof NullValue) {
+            return null;
+        }
+        if (value instanceof StringValue) {
+            return ((StringValue) value).getValue();
+        }
+        if (value instanceof ObjectValue) {
+            return ((ObjectValue) value).getObjectFields().stream()
+                    .collect(Collectors.toMap(ObjectField::getName, ObjectField::getValue));
+        }
+        if (value instanceof ArrayValue) {
+            return ((ArrayValue) value).getValues().stream()
+                    .map(this::resolveValue)
+                    .collect(Collectors.toList());
+        }
+        if (value instanceof VariableReference) {
+            String variableName = ((VariableReference) value).getName();
+            if (!scopeVariables.containsKey(variableName)) {
+                throw new BadRequestException("Can't resolve variable reference " + variableName);
+            }
+
+            return scopeVariables.get(variableName);
+        }
+        throw new BadRequestException("Unknown variable value type " + value.getClass());
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcher.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcher.java
new file mode 100644
index 0000000000..5c84d04219
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcher.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.exceptions.InvalidEntityBodyException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import com.yahoo.elide.graphql.QueryLogger;
+import com.yahoo.elide.graphql.RelationshipOp;
+import com.yahoo.elide.graphql.subscriptions.containers.SubscriptionNodeContainer;
+import graphql.language.OperationDefinition;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+
+/**
+ * Data Fetcher which fetches Elide subscription models.
+ */
+@Slf4j
+public class SubscriptionDataFetcher implements DataFetcher<Object>, QueryLogger {
+
+    private final NonEntityDictionary nonEntityDictionary;
+    private final Integer bufferSize;
+
+    /**
+     * Constructor.
+     * @param nonEntityDictionary Entity dictionary for types that are not Elide models.
+     */
+    public SubscriptionDataFetcher(NonEntityDictionary nonEntityDictionary) {
+        this(nonEntityDictionary, 100);
+    }
+
+    /**
+     * Constructor.
+     * @param nonEntityDictionary Entity dictionary for types that are not Elide models.
+     * @param bufferSize Internal buffer for reactive streams.
+     */
+    public SubscriptionDataFetcher(NonEntityDictionary nonEntityDictionary, int bufferSize) {
+        this.nonEntityDictionary = nonEntityDictionary;
+        this.bufferSize = bufferSize;
+    }
+
+    @Override
+    public Object get(DataFetchingEnvironment environment) throws Exception {
+        OperationDefinition.Operation op = environment.getOperationDefinition().getOperation();
+        if (op != OperationDefinition.Operation.SUBSCRIPTION) {
+            throw new InvalidEntityBodyException(String.format("%s not supported for subscription models.", op));
+        }
+
+        /* build environment object, extracts required fields */
+        Environment context = new Environment(environment, nonEntityDictionary);
+
+
+        /* safe enable debugging */
+        if (log.isDebugEnabled()) {
+            logContext(log, RelationshipOp.FETCH, context);
+        }
+
+        if (context.isRoot()) {
+            String entityName = context.field.getName();
+            String aliasName = context.field.getAlias();
+            EntityProjection projection = context.requestScope
+                    .getProjectionInfo()
+                    .getProjection(aliasName, entityName);
+
+            Flowable<PersistentResource> recordPublisher =
+                    PersistentResource.loadRecords(projection, new ArrayList<>(), context.requestScope)
+                            .toFlowable(BackpressureStrategy.BUFFER)
+                            .onBackpressureBuffer(bufferSize, true, false);
+
+            return recordPublisher.map(SubscriptionNodeContainer::new);
+        }
+
+        //If this is not the root, instead of returning a reactive publisher, we process same
+        //as the PersistentResourceFetcher.
+        return context.container.processFetch(context);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilder.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilder.java
new file mode 100644
index 0000000000..a001a7b546
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilder.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions;
+
+import static graphql.schema.GraphQLArgument.newArgument;
+import static graphql.schema.GraphQLEnumType.newEnum;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.GraphQLConversionUtils;
+import com.yahoo.elide.graphql.GraphQLNameUtils;
+import com.yahoo.elide.graphql.GraphQLScalars;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+import com.google.common.collect.Sets;
+import graphql.Scalars;
+import graphql.language.EnumTypeDefinition;
+import graphql.schema.DataFetcher;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.GraphQLType;
+import graphql.schema.GraphQLTypeReference;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Builds a GraphQL schema for subscriptions.
+ */
+@Slf4j
+public class SubscriptionModelBuilder {
+    private Map<Type<?>, GraphQLObjectType> queryObjectRegistry;  //Cache of models we've already processed.
+    private final String apiVersion;            //apiVersion we are generating a schema for.
+    private GraphQLConversionUtils generator;   //Converts attributes (non Elide models) to GraphQL types.
+    private GraphQLNameUtils nameUtils;         //Generates type names
+    private EntityDictionary entityDictionary;  //Client provided model dictionary
+    private DataFetcher dataFetcher;        //Client provided data fetcher
+    private GraphQLArgument filterArgument;
+    private Set<Type<?>> excludedEntities;  //Client controlled models to skip.
+    private Set<Type<?>> relationshipTypes; //Keeps track of which relationship models need to be built.
+
+    public static final String TOPIC_ARGUMENT = "topic";
+
+    /**
+     * Class constructor, constructs the custom arguments to handle mutations.
+     * @param entityDictionary elide entity dictionary
+     * @param nonEntityDictionary elide non-entity dictionary
+     * @param dataFetcher graphQL data fetcher
+     */
+    public SubscriptionModelBuilder(EntityDictionary entityDictionary,
+                        NonEntityDictionary nonEntityDictionary,
+                        DataFetcher dataFetcher, String apiVersion) {
+        this.generator = new GraphQLConversionUtils(entityDictionary, nonEntityDictionary);
+        this.entityDictionary = entityDictionary;
+        this.nameUtils = new GraphQLNameUtils(entityDictionary);
+        this.dataFetcher = dataFetcher;
+        this.apiVersion = apiVersion;
+        excludedEntities = new HashSet<>();
+        queryObjectRegistry = new HashMap<>();
+        relationshipTypes = new HashSet<>();
+
+        filterArgument = newArgument()
+                .name("filter")
+                .type(Scalars.GraphQLString)
+                .build();
+    }
+
+    public void withExcludedEntities(Set<Type<?>> excludedEntities) {
+        this.excludedEntities = excludedEntities;
+    }
+
+    /**
+     * Builds a GraphQL schema.
+     * @return The built schema.
+     */
+    public GraphQLSchema build() {
+        Set<Type<?>> allClasses = entityDictionary.getBoundClassesByVersion(apiVersion);
+
+        if (allClasses.isEmpty()) {
+            throw new IllegalArgumentException("None of the provided classes are exported by Elide");
+        }
+
+        Set<Type<?>> subscriptionClasses =  allClasses.stream()
+                .filter((cls) -> entityDictionary.getAnnotation(cls, Subscription.class) != null)
+                .collect(Collectors.toSet());
+
+        /* Construct root object */
+        GraphQLObjectType.Builder root = newObject().name("Subscription");
+
+        for (Type<?> clazz : subscriptionClasses) {
+            Subscription subscription = entityDictionary.getAnnotation(clazz, Subscription.class);
+            if (subscription == null) {
+                continue;
+            }
+
+            GraphQLObjectType subscriptionType = buildQueryObject(clazz);
+            String entityName = entityDictionary.getJsonAliasFor(clazz);
+
+            GraphQLFieldDefinition.Builder rootFieldDefinitionBuilder = newFieldDefinition()
+                    .name(entityName)
+                    .description(EntityDictionary.getEntityDescription(clazz))
+                    .argument(filterArgument)
+                    .type(subscriptionType);
+
+            if (subscription.operations() != null && subscription.operations().length > 0) {
+                GraphQLEnumType.Builder topicTypeBuilder = newEnum().name(nameUtils.toTopicName(clazz));
+
+                for (Subscription.Operation operation : subscription.operations()) {
+                    TopicType topicType = TopicType.fromOperation(operation);
+                    topicTypeBuilder.value(topicType.name(), topicType);
+                }
+                topicTypeBuilder.definition(EnumTypeDefinition.newEnumTypeDefinition().build());
+                rootFieldDefinitionBuilder.argument(
+                        GraphQLArgument.newArgument().name(TOPIC_ARGUMENT).type(topicTypeBuilder.build()).build());
+            }
+
+            root.field(rootFieldDefinitionBuilder.build());
+        }
+
+        GraphQLObjectType queryRoot = root.build();
+
+        for (Type<?> relationshipType : relationshipTypes) {
+            this.buildQueryObject(relationshipType);
+        }
+
+        // Attach the client provided dataFetcher to all of the GraphQL subscription objects.
+        GraphQLCodeRegistry.Builder codeRegistry = GraphQLCodeRegistry.newCodeRegistry();
+
+        Set<GraphQLObjectType> objectsThatNeedAFetcher = new HashSet<>(queryObjectRegistry.values());
+        objectsThatNeedAFetcher.addAll(generator.getObjectTypes());
+        objectsThatNeedAFetcher.add(queryRoot);
+
+        for (GraphQLObjectType objectType : objectsThatNeedAFetcher) {
+            String objectName = objectType.getName();
+            for (GraphQLFieldDefinition fieldDefinition : objectType.getFieldDefinitions()) {
+                codeRegistry.dataFetcher(
+                        FieldCoordinates.coordinates(objectName, fieldDefinition.getName()),
+                        dataFetcher);
+            }
+        }
+
+        /* Construct the schema */
+        GraphQLSchema schema = GraphQLSchema.newSchema()
+                .subscription(queryRoot)
+                .query(queryRoot)
+                .codeRegistry(codeRegistry.build())
+                .additionalTypes(Sets.newHashSet(queryObjectRegistry.values()))
+                .build();
+
+        return schema;
+    }
+
+    /**
+     * Builds a graphQL output object from an entity class.
+     * @param entityClass The class to use to construct the output object.
+     * @return The graphQL object
+     */
+    private GraphQLObjectType buildQueryObject(Type<?> entityClass) {
+        if (queryObjectRegistry.containsKey(entityClass)) {
+            return queryObjectRegistry.get(entityClass);
+        }
+
+        log.debug("Building subscription object for {}", entityClass.getName());
+
+        GraphQLObjectType.Builder builder = newObject()
+                .name(nameUtils.toOutputTypeName(entityClass))
+                .description(EntityDictionary.getEntityDescription(entityClass));
+
+        String id = entityDictionary.getIdFieldName(entityClass);
+
+        builder.field(newFieldDefinition()
+                .name(id)
+                .type(GraphQLScalars.GRAPHQL_DEFERRED_ID));
+
+        for (String attribute : entityDictionary.getAttributes(entityClass)) {
+            Type<?> attributeClass = entityDictionary.getType(entityClass, attribute);
+            if (excludedEntities.contains(attributeClass)
+                    || entityDictionary.getAttributeOrRelationAnnotation(entityClass,
+                    SubscriptionField.class, attribute) == null) {
+                continue;
+            }
+
+            log.debug("Building subscription attribute {} {} with arguments {} for entity {}",
+                    attribute,
+                    attributeClass.getName(),
+                    entityDictionary.getAttributeArguments(attributeClass, attribute).toString(),
+                    entityClass.getName());
+
+            GraphQLType attributeType =
+                    generator.attributeToQueryObject(entityClass, attributeClass, attribute, dataFetcher);
+
+            if (attributeType == null) {
+                continue;
+            }
+
+            builder.field(newFieldDefinition()
+                    .name(attribute)
+                    .arguments(generator.attributeArgumentToQueryObject(entityClass, attribute, dataFetcher))
+                    .type((GraphQLOutputType) attributeType)
+            );
+        }
+
+        for (String relationship : entityDictionary.getElideBoundRelationships(entityClass)) {
+            log.debug("Resolving relationship {} for {}", relationship, entityClass.getName());
+            Type<?> relationshipClass = entityDictionary.getParameterizedType(entityClass, relationship);
+            if (excludedEntities.contains(relationshipClass)
+                    || entityDictionary.getAttributeOrRelationAnnotation(entityClass,
+                    SubscriptionField.class, relationship) == null) {
+                continue;
+            }
+
+            relationshipTypes.add(relationshipClass);
+
+            RelationshipType type = entityDictionary.getRelationshipType(entityClass, relationship);
+            String relationshipEntityName = nameUtils.toOutputTypeName(relationshipClass);
+
+            if (type.isToOne()) {
+                builder.field(newFieldDefinition()
+                        .name(relationship)
+                        .type(new GraphQLTypeReference(relationshipEntityName))
+                        .build());
+            } else {
+                builder.field(newFieldDefinition()
+                        .name(relationship)
+                        .type(new GraphQLList(new GraphQLTypeReference(relationshipEntityName)))
+                        .build());
+            }
+        }
+
+        GraphQLObjectType queryObject = builder.build();
+        queryObjectRegistry.put(entityClass, queryObject);
+        return queryObject;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/Subscription.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/Subscription.java
new file mode 100644
index 0000000000..3dca62618e
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/Subscription.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions.annotations;
+
+import static com.yahoo.elide.graphql.subscriptions.annotations.Subscription.Operation.CREATE;
+import static com.yahoo.elide.graphql.subscriptions.annotations.Subscription.Operation.DELETE;
+import static com.yahoo.elide.graphql.subscriptions.annotations.Subscription.Operation.UPDATE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks an Elide model as a root level subscription topic.
+ */
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface Subscription {
+    enum Operation {
+        CREATE,
+        UPDATE,
+        DELETE
+    };
+
+    /**
+     * Notify subscribers whenever a model is manipulated by the given operations.
+     * @return operation topics to post on.
+     */
+    Operation[] operations() default { CREATE, UPDATE, DELETE };
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/SubscriptionField.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/SubscriptionField.java
new file mode 100644
index 0000000000..1bc09fa8bd
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/annotations/SubscriptionField.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Includes a particular model field in a subscription.
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface SubscriptionField {
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/containers/SubscriptionNodeContainer.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/containers/SubscriptionNodeContainer.java
new file mode 100644
index 0000000000..53ae8bf05d
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/containers/SubscriptionNodeContainer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions.containers;
+
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.request.Relationship;
+import com.yahoo.elide.graphql.Environment;
+import com.yahoo.elide.graphql.containers.NodeContainer;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Container for subscription nodes.
+ */
+public class SubscriptionNodeContainer extends NodeContainer {
+
+    public SubscriptionNodeContainer(PersistentResource persistentResource) {
+        super(persistentResource);
+    }
+
+    @Override
+    protected Object fetchRelationship(Environment context, Relationship relationship) {
+        RelationshipType type = context.parentResource.getRelationshipType(relationship.getName());
+
+        if (type.isToOne()) {
+            Set<PersistentResource> resources = (Set<PersistentResource>) context.parentResource
+                    .getRelationCheckedFiltered(relationship)
+                    .toList(LinkedHashSet::new).blockingGet();
+            if (resources.size() > 0) {
+                return new SubscriptionNodeContainer(resources.iterator().next());
+            } else {
+                return null;
+            }
+        } else {
+            Set<PersistentResource> resources = (Set<PersistentResource>) context.parentResource
+                    .getRelationCheckedFiltered(relationship)
+                    .toList(LinkedHashSet::new).blockingGet();
+
+            return resources.stream()
+                    .map(SubscriptionNodeContainer::new)
+                    .collect(Collectors.toList());
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHook.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHook.java
new file mode 100644
index 0000000000..6c7fa08ea6
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHook.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.lifecycle.CRUDEvent;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.type.Type;
+import com.google.gson.Gson;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Optional;
+import java.util.function.Function;
+import javax.inject.Inject;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSContext;
+import javax.jms.JMSProducer;
+
+/**
+ * Life cycle hook that sends serialized model events to a JMS topic.
+ * This will be registered automatically by Elide for all models that have the Subscription annotation.
+ *
+ * @param <T> The model type.
+ */
+@Slf4j
+@NoArgsConstructor  //For injection
+public class NotifyTopicLifeCycleHook<T> implements LifeCycleHook<T> {
+
+    @Inject
+    private ConnectionFactory connectionFactory;
+
+    @Inject
+    private Function<JMSContext, JMSProducer> createProducer;
+
+    private Gson gson;
+
+    public NotifyTopicLifeCycleHook(
+            ConnectionFactory connectionFactory,
+            Function<JMSContext, JMSProducer> createProducer,
+            Gson gson
+    ) {
+        this.connectionFactory = connectionFactory;
+        this.createProducer = createProducer;
+        this.gson = gson;
+    }
+
+    @Override
+    public void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            CRUDEvent event) {
+
+        PersistentResource<T> resource = (PersistentResource<T>) event.getResource();
+
+        Type<?> modelType = resource.getResourceType();
+        TopicType topicType = TopicType.fromOperation(operation);
+        String topicName = topicType.toTopicName(modelType, resource.getDictionary());
+
+        publish(resource.getObject(), topicName);
+    }
+
+    @Override
+    public void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            T elideEntity,
+            RequestScope requestScope,
+            Optional<ChangeSpec> changes) {
+        //NOOP
+    }
+
+    /**
+     * Publishes an object to a JMS topic.
+     * @param object The object to publish.
+     * @param topicName The topic name to publish to.
+     */
+    public void publish(T object, String topicName) {
+        try (JMSContext context = connectionFactory.createContext()) {
+
+            JMSProducer producer = createProducer.apply(context);
+            Destination destination = context.createTopic(topicName);
+
+            String message = gson.toJson(object);
+            log.debug("Serializing {}", message);
+            producer.send(destination, message);
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionExclusionStrategy.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionExclusionStrategy.java
new file mode 100644
index 0000000000..8a6ccbe7a8
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionExclusionStrategy.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import com.yahoo.elide.core.dictionary.EntityBinding;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Gson exclusion strategy that only serializes ID fields and fields annotated
+ * with SubscriptionField.
+ */
+public class SubscriptionExclusionStrategy implements ExclusionStrategy {
+
+    @Override
+    public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+
+        if (fieldAttributes.getAnnotation(SubscriptionField.class) != null) {
+            return false;
+        }
+
+        for (Class<? extends Annotation> idAnnotation : EntityBinding.ID_ANNOTATIONS) {
+            if (fieldAttributes.getAnnotation(idAnnotation) != null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean shouldSkipClass(Class<?> aClass) {
+        return false;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionFieldSerde.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionFieldSerde.java
new file mode 100644
index 0000000000..6e28ca4339
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionFieldSerde.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+/**
+ * Custom GSON serializer and deserializer that uses an Elide serde to convert a subscription field
+ * to and from a primitive type.  The Serde must support deserialization from a String.
+ * @param <T> The object type being serialized or deserialized.
+ */
+public class SubscriptionFieldSerde<T> implements JsonSerializer<T>, JsonDeserializer<T> {
+    Serde<Object, T> elideSerde;
+
+    public SubscriptionFieldSerde(Serde<Object, T> elideSerde) {
+        this.elideSerde = elideSerde;
+    }
+
+    @Override
+    public JsonElement serialize(T t, Type type, JsonSerializationContext jsonSerializationContext) {
+        if (t == null) {
+            return JsonNull.INSTANCE;
+        }
+        return new JsonPrimitive(String.valueOf(elideSerde.serialize(t)));
+    }
+
+    @Override
+    public T deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext)
+            throws JsonParseException {
+        if (jsonElement.isJsonNull()) {
+            return null;
+        }
+
+        if (jsonElement.isJsonPrimitive()) {
+            JsonPrimitive primitive = jsonElement.getAsJsonPrimitive();
+            if (primitive.isString()) {
+                return elideSerde.deserialize(primitive.getAsString());
+            }
+        }
+
+        throw new UnsupportedOperationException("Cannot deserialization subscription field: "
+                + jsonElement.getAsString());
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScanner.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScanner.java
new file mode 100644
index 0000000000..804ce439a9
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScanner.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import com.google.common.base.Preconditions;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.Builder;
+
+import java.util.function.Function;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSContext;
+import javax.jms.JMSProducer;
+import javax.jms.Message;
+
+/**
+ * Scans for subscription annotations and registers lifecycle hooks to update JMS topics.
+ */
+@Builder
+public class SubscriptionScanner {
+    private ConnectionFactory connectionFactory;
+    private EntityDictionary dictionary;
+    private ClassScanner scanner;
+
+    @Builder.Default
+    private long timeToLive = Message.DEFAULT_TIME_TO_LIVE;
+    @Builder.Default
+    private int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
+    @Builder.Default
+    private long deliveryDelay = Message.DEFAULT_DELIVERY_DELAY;
+    @Builder.Default
+    private int messagePriority = Message.DEFAULT_PRIORITY;
+
+    public void bindLifecycleHooks() {
+
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        CoerceUtil.getSerdes().forEach((cls, serde) -> {
+            gsonBuilder.registerTypeAdapter(cls, new SubscriptionFieldSerde(serde));
+        });
+        gsonBuilder.addSerializationExclusionStrategy(new SubscriptionExclusionStrategy()).serializeNulls();
+
+        Gson gson = gsonBuilder.create();
+
+        Function<JMSContext, JMSProducer> producerFactory = (context) -> {
+            JMSProducer producer = context.createProducer();
+            producer.setTimeToLive(timeToLive);
+            producer.setDeliveryMode(deliveryMode);
+            producer.setDeliveryDelay(deliveryDelay);
+            producer.setPriority(messagePriority);
+            return producer;
+        };
+
+        scanner.getAnnotatedClasses(Subscription.class).forEach(modelType -> {
+            Subscription subscription = modelType.getAnnotation(Subscription.class);
+            Preconditions.checkNotNull(subscription);
+
+            Subscription.Operation[] operations = subscription.operations();
+
+            for (Subscription.Operation operation : operations) {
+                switch (operation) {
+                    case UPDATE: {
+                        addUpdateHooks(ClassType.of(modelType), dictionary, producerFactory, gson);
+                        break;
+                    }
+                    case DELETE: {
+                        dictionary.bindTrigger(
+                                modelType,
+                                LifeCycleHookBinding.Operation.DELETE,
+                                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                                new NotifyTopicLifeCycleHook(connectionFactory, producerFactory, gson),
+                                false
+                        );
+                        break;
+                    }
+                    case CREATE: {
+                        dictionary.bindTrigger(
+                                modelType,
+                                LifeCycleHookBinding.Operation.CREATE,
+                                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                                new NotifyTopicLifeCycleHook(connectionFactory, producerFactory, gson),
+                                false
+                        );
+                        break;
+                    }
+                }
+            }
+        });
+    }
+
+    protected void addUpdateHooks(
+            Type<?> model,
+            EntityDictionary dictionary,
+            Function<JMSContext, JMSProducer> producerFactory,
+            Gson gson
+    ) {
+        dictionary.getAllExposedFields(model).stream().forEach(fieldName -> {
+            SubscriptionField subscriptionField =
+                    dictionary.getAttributeOrRelationAnnotation(model, SubscriptionField.class, fieldName);
+
+            if (subscriptionField != null) {
+                dictionary.bindTrigger(
+                        model,
+                        fieldName,
+                        LifeCycleHookBinding.Operation.UPDATE,
+                        LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                        new NotifyTopicLifeCycleHook(connectionFactory, producerFactory, gson)
+                );
+            }
+        });
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/TopicType.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/TopicType.java
new file mode 100644
index 0000000000..c9a9c4d996
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/hooks/TopicType.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.DELETE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import lombok.Getter;
+
+/**
+ * JMS Topic Names.
+ */
+@Getter
+public enum TopicType {
+    ADDED("Added", CREATE),
+    DELETED("Deleted", DELETE),
+    UPDATED("Updated", UPDATE),
+    CUSTOM("", null);
+
+    private final String topicSuffix;
+    private final LifeCycleHookBinding.Operation operation;
+
+    /**
+     * Constructor.
+     * @param topicSuffix The suffix of the topic name.
+     */
+    TopicType(String topicSuffix, LifeCycleHookBinding.Operation operation) {
+        this.topicSuffix = topicSuffix;
+        this.operation = operation;
+    }
+
+    /**
+     * Converts a TopicType to a JMS topic name.
+     * @param type Elide model type.
+     * @param dictionary Elide entity dictionary.
+     * @return a JMS topic name.
+     */
+    public String toTopicName(Type<?> type, EntityDictionary dictionary) {
+        return dictionary.getJsonAliasFor(type) + topicSuffix;
+    }
+
+    /**
+     * Converts a LifeCycleHookBinding to a topic type.
+     * @param op The lifecyle operation
+     * @return The corresponding topic type.
+     */
+    public static TopicType fromOperation(LifeCycleHookBinding.Operation op) {
+        switch (op) {
+            case CREATE: {
+                return ADDED;
+            }
+            case DELETE: {
+                return DELETED;
+            }
+            default : {
+                return UPDATED;
+            }
+        }
+    }
+
+    /**
+     * Converts a LifeCycleHookBinding to a topic type.
+     * @param op The lifecyle operation
+     * @return The corresponding topic type.
+     */
+    public static TopicType fromOperation(Subscription.Operation op) {
+        switch (op) {
+            case CREATE: {
+                return ADDED;
+            }
+            case DELETE: {
+                return DELETED;
+            }
+            default : {
+                return UPDATED;
+            }
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/ConnectionInfo.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/ConnectionInfo.java
new file mode 100644
index 0000000000..70cf1bf71d
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/ConnectionInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket;
+
+import com.yahoo.elide.core.security.User;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Information about the sessions/connection passed to the request handler.
+ */
+@Value
+@Builder
+public class ConnectionInfo {
+    /**
+     * Return a Elide user object for the session.
+     * @return Elide user.
+     */
+    private User user;
+
+
+    /**
+     * Return the URL path for this request.
+     * @return URL path.
+     */
+    private String baseUrl;
+
+    /**
+     * Get a map of parameters for the session.
+     * @return map of parameters.
+     */
+    private Map<String, List<String>> parameters;
+
+    /**
+     * Gets the API version associated with this websocket.
+     */
+    private String getApiVersion;
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/RequestHandler.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/RequestHandler.java
new file mode 100644
index 0000000000..689e864ea9
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/RequestHandler.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.graphql.GraphQLRequestScope;
+import com.yahoo.elide.graphql.QueryRunner;
+import com.yahoo.elide.graphql.parser.GraphQLProjectionInfo;
+import com.yahoo.elide.graphql.parser.SubscriptionEntityProjectionMaker;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Complete;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Error;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Next;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Ping;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Subscribe;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import graphql.ErrorClassification;
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.GraphQLError;
+import graphql.language.SourceLocation;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Handles either a single GraphQL schema request or a subscription request.
+ */
+@Slf4j
+public class RequestHandler implements Closeable {
+    protected DataStore topicStore;
+    protected DataStoreTransaction transaction;
+    protected Elide elide;
+    protected GraphQL api;
+    protected UUID requestID;
+    protected String protocolID;
+    protected SessionHandler sessionHandler;
+    protected ConnectionInfo connectionInfo;
+    protected boolean sendPingOnSubscribe;
+    protected AtomicBoolean isOpen = new AtomicBoolean(true);
+    protected boolean verboseErrors = false;
+
+    /**
+     * Constructor.
+     * @param sessionHandler Handles all requests for the given session.
+     * @param topicStore The JMS data store.
+     * @param elide Elide instance.
+     * @param api GraphQL api.
+     * @param protocolID The graphql-ws protocol message ID this request.
+     * @param requestID The Elide request UUID for this request.
+     * @param connectionInfo Meta info about the session.
+     */
+    public RequestHandler(
+            SessionHandler sessionHandler,
+            DataStore topicStore,
+            Elide elide,
+            GraphQL api,
+            String protocolID,
+            UUID requestID,
+            ConnectionInfo connectionInfo,
+            boolean sendPingOnSubscribe,
+            boolean verboseErrors) {
+        this.sessionHandler = sessionHandler;
+        this.topicStore = topicStore;
+        this.elide = elide;
+        this.api = api;
+        this.requestID = requestID;
+        this.protocolID = protocolID;
+        this.connectionInfo = connectionInfo;
+        this.transaction = null;
+        this.sendPingOnSubscribe = sendPingOnSubscribe;
+        this.verboseErrors = verboseErrors;
+    }
+
+    /**
+     * Close this session.  Synchronized to protect transaction.
+     * @throws IOException If there is a problem closing the underlying transaction.
+     */
+    public synchronized void close() throws IOException {
+        if (! isOpen.compareAndExchange(true, false)) {
+            return;
+        }
+        if (transaction != null) {
+            transaction.close();
+            elide.getTransactionRegistry().removeRunningTransaction(requestID);
+        }
+
+        sessionHandler.close(protocolID);
+        log.debug("Closed Request Handler");
+    }
+
+    /**
+     * Handles an incoming GraphQL query.
+     * @param subscribeRequest The GraphQL query.
+     */
+    public void handleRequest(Subscribe subscribeRequest) {
+        ExecutionResult executionResult = null;
+        try {
+           executionResult = executeRequest(subscribeRequest);
+            //This would be a subscription creation error.
+        } catch (RuntimeException e) {
+            log.error("UNEXPECTED RuntimeException: {}", e.getMessage());
+            ElideResponse response = QueryRunner.handleRuntimeException(elide, e, verboseErrors);
+            safeSendError(response.getBody());
+            safeClose();
+        }
+
+        //GraphQL schema requests or other queries will take this route.
+        if (!(executionResult.getData() instanceof Publisher)) {
+            safeSendNext(executionResult);
+            safeSendComplete();
+            safeClose();
+            return;
+        }
+
+        Publisher<ExecutionResult> resultPublisher = executionResult.getData();
+
+        //This would be a subscription creation error.
+        if (resultPublisher == null) {
+            safeSendError(executionResult.getErrors().toArray(GraphQLError[]::new));
+            safeClose();
+            return;
+        }
+
+        //This would be a subscription creation success.
+        resultPublisher.subscribe(new ExecutionResultSubscriber());
+    }
+
+    public synchronized ExecutionResult executeRequest(Subscribe subscribeRequest) {
+        if (transaction != null) {
+            throw new IllegalStateException("Already handling an active request.");
+        }
+
+        transaction = topicStore.beginReadTransaction();
+        elide.getTransactionRegistry().addRunningTransaction(requestID, transaction);
+
+        ElideSettings settings = elide.getElideSettings();
+
+        GraphQLProjectionInfo projectionInfo =
+            new SubscriptionEntityProjectionMaker(settings,
+                                subscribeRequest.getPayload().getVariables(),
+                                connectionInfo.getGetApiVersion()).make(subscribeRequest.getPayload().getQuery());
+
+        GraphQLRequestScope requestScope = new GraphQLRequestScope(
+                connectionInfo.getBaseUrl(),
+                transaction,
+                connectionInfo.getUser(),
+                connectionInfo.getGetApiVersion(),
+                settings,
+                projectionInfo,
+                requestID,
+                connectionInfo.getParameters());
+
+        ExecutionInput executionInput = ExecutionInput.newExecutionInput()
+                .query(subscribeRequest.getPayload().getQuery())
+                .operationName(subscribeRequest.getPayload().getOperationName())
+                .variables(subscribeRequest.getPayload().getVariables())
+                .localContext(requestScope)
+                .build();
+
+        log.info("Processing GraphQL query:\n{}", subscribeRequest.getPayload().getQuery());
+
+        return api.execute(executionInput);
+    }
+
+    protected void sendMessage(String message) {
+        if (isOpen.get()) {
+            sessionHandler.sendMessage(message);
+            return;
+        }
+        log.debug("UNEXPECTED Sending message on closed handler: {}", message);
+    }
+
+    protected void safeSendPing() {
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        Ping ping = new Ping();
+
+        try {
+            sendMessage(mapper.writeValueAsString(ping));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose();
+        }
+    }
+
+    protected void safeSendNext(ExecutionResult result) {
+        log.debug("Sending Next {}", result);
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        Next next = Next.builder()
+                .result(result)
+                .id(protocolID)
+                .build();
+        try {
+            sendMessage(mapper.writeValueAsString(next));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose();
+        }
+    }
+
+    protected void safeSendComplete() {
+        log.debug("Sending Complete");
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        Complete complete = Complete.builder()
+                .id(protocolID)
+                .build();
+        try {
+            sendMessage(mapper.writeValueAsString(complete));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose();
+        }
+    }
+
+    protected void safeSendError(GraphQLError[] errors) {
+        log.debug("Sending Error {}", errors);
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        Error error = Error.builder()
+                .id(protocolID)
+                .payload(errors)
+                .build();
+        try {
+            sendMessage(mapper.writeValueAsString(error));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose();
+        }
+    }
+
+
+    protected void safeSendError(String message) {
+        GraphQLError error = new GraphQLError() {
+            @Override
+            public String getMessage() {
+                return message;
+            }
+
+            @Override
+            public List<SourceLocation> getLocations() {
+                return null;
+            }
+
+            @Override
+            public ErrorClassification getErrorType() {
+                return null;
+            }
+        };
+
+        GraphQLError[] errors = new GraphQLError[1];
+        errors[0] = error;
+        safeSendError(errors);
+    }
+
+    protected void safeClose() {
+        try {
+            close();
+        } catch (Exception e) {
+            log.error("UNEXPECTED Exception during close {}", e.getMessage());
+        }
+    }
+
+    /**
+     * Reactive subscriber for GraphQL results.
+     */
+    private class ExecutionResultSubscriber implements Subscriber<ExecutionResult> {
+
+        AtomicReference<Subscription> subscriptionRef = new AtomicReference<>();
+
+        @Override
+        public void onSubscribe(Subscription subscription) {
+            subscriptionRef.set(subscription);
+
+            if (sendPingOnSubscribe) {
+                safeSendPing();
+            }
+            subscription.request(1);
+        }
+
+        @Override
+        public void onNext(ExecutionResult executionResult) {
+            log.debug("Next Result");
+            safeSendNext(executionResult);
+            subscriptionRef.get().request(1);
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            log.error("UNEXPECTED Topic Error {}", t.getMessage());
+            safeSendError(t.getMessage());
+            safeClose();
+        }
+
+        @Override
+        public void onComplete() {
+            log.debug("Topic was terminated");
+            safeSendComplete();
+            safeClose();
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SessionHandler.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SessionHandler.java
new file mode 100644
index 0000000000..aa1b7e4c2d
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SessionHandler.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket;
+
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.CONNECTION_TIMEOUT;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.CloseCode.DUPLICATE_ID;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.INTERNAL_ERROR;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.INVALID_MESSAGE;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.MAX_SUBSCRIPTIONS;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.MULTIPLE_INIT;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.UNAUTHORIZED;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Complete;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.ConnectionAck;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.MessageType;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Pong;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Subscribe;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+import graphql.GraphQL;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.websocket.CloseReason;
+import javax.websocket.Session;
+
+/**
+ * Implements the graphql-ws protocol (https://github.com/enisdenjo/graphql-ws/blob/master/PROTOCOL.md)
+ * over Elide subscriptions.
+ */
+@Slf4j
+public class SessionHandler {
+    protected DataStore topicStore;
+    protected Elide elide;
+    protected GraphQL api;
+    protected Session wrappedSession;
+    protected Map<String, RequestHandler> activeRequests;
+    protected ConnectionInfo connectionInfo;
+    protected ObjectMapper mapper;
+    protected int connectionTimeoutMs;
+    protected int maxSubscriptions;
+    protected Thread timeoutThread;
+    protected boolean initialized = false;
+    protected boolean sendPingOnSubscribe = false;
+    protected boolean verboseErrors = false;
+    protected ExecutorService executorService;
+    protected boolean isOpen = true;
+
+    /**
+     * Constructor.
+     * @param wrappedSession The underlying platform session object.
+     * @param topicStore The JMS data store.
+     * @param elide Elide instance.
+     * @param api GraphQL api.
+     * @param connectionTimeoutMs Connection timeout in milliseconds.
+     * @param maxSubscriptions Max number of outstanding subscriptions per web socket.
+     * @param connectionInfo Connection metadata.
+     * @param sendPingOnSubscribe Sends a ping on subscribe message (to aid with testing).
+     * @param verboseErrors Send verbose error messages.
+     * @param executorService Executor Service to launch threads.
+     */
+    public SessionHandler(
+            Session wrappedSession,
+            DataStore topicStore,
+            Elide elide,
+            GraphQL api,
+            int connectionTimeoutMs,
+            int maxSubscriptions,
+            ConnectionInfo connectionInfo,
+            boolean sendPingOnSubscribe,
+            boolean verboseErrors,
+            ExecutorService executorService) {
+        Preconditions.checkState(maxSubscriptions > 0);
+        this.wrappedSession = wrappedSession;
+        this.topicStore = topicStore;
+        this.elide = elide;
+        this.api = api;
+        this.connectionInfo = connectionInfo;
+        this.mapper = elide.getMapper().getObjectMapper();
+        this.activeRequests = new ConcurrentHashMap<>();
+        this.connectionTimeoutMs = connectionTimeoutMs;
+        this.maxSubscriptions = maxSubscriptions;
+        this.sendPingOnSubscribe = sendPingOnSubscribe;
+        this.verboseErrors = verboseErrors;
+        if (executorService == null) {
+            this.executorService = Executors.newFixedThreadPool(maxSubscriptions);
+        } else {
+            this.executorService = executorService;
+        }
+        this.timeoutThread = new Thread(new ConnectionTimer());
+        this.timeoutThread.start();
+    }
+
+    /**
+     * Close this session.
+     * @throws IOException If closing the session causes an error.
+     */
+    public synchronized void close(CloseReason reason) throws IOException {
+
+        log.debug("SessionHandler closing");
+
+        isOpen = false;
+
+        //Iterator here to avoid concurrent modification exceptions.
+        Iterator<Map.Entry<String, RequestHandler>> iterator = activeRequests.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, RequestHandler> item = iterator.next();
+            RequestHandler handler = item.getValue();
+            handler.safeClose();
+
+        }
+        wrappedSession.close(reason);
+
+        executorService.shutdownNow();
+        log.debug("SessionHandler closed");
+    }
+
+    protected void close(String protocolID) {
+        activeRequests.remove(protocolID);
+    }
+
+    /**
+     * Handles an incoming graphql-ws protocol message.
+     * @param message The protocol message.
+     */
+    public void handleRequest(String message) {
+        log.debug("Received Message: {} {}", wrappedSession.getId(), message);
+        try {
+            JsonNode type = mapper.readTree(message).get("type");
+
+            if (type == null) {
+                safeClose(INVALID_MESSAGE);
+                return;
+            }
+
+            MessageType messageType;
+            try {
+                messageType = MessageType.valueOf(type.textValue().toUpperCase(Locale.ROOT));
+            } catch (IllegalArgumentException e) {
+                safeClose(INVALID_MESSAGE);
+                return;
+            }
+
+            switch (messageType) {
+                case PING: {
+                    handlePing();
+                    return;
+                }
+                case PONG: {
+                    //Ignore
+                    return;
+                }
+                case CONNECTION_INIT: {
+                    handleConnectionInit();
+                    return;
+                }
+                case COMPLETE: {
+                    Complete complete = mapper.readValue(message, Complete.class);
+                    handleComplete(complete);
+                    return;
+                }
+                case SUBSCRIBE: {
+                    Subscribe subscribe = mapper.readValue(message, Subscribe.class);
+                    handleSubscribe(subscribe);
+                    return;
+                } default: {
+                    safeClose(INVALID_MESSAGE);
+                    return;
+                }
+            }
+        } catch (JsonProcessingException e) {
+            safeClose(INVALID_MESSAGE);
+        }
+    }
+
+    protected void handlePing() {
+        safeSendPong();
+    }
+
+    protected void handleConnectionInit() {
+        if (initialized) {
+            safeClose(MULTIPLE_INIT);
+            return;
+        }
+
+        timeoutThread.interrupt();
+
+        safeSendConnectionAck();
+        initialized = true;
+    }
+
+    protected void handleSubscribe(Subscribe subscribe) {
+        if (!initialized) {
+            safeClose(UNAUTHORIZED);
+            return;
+        }
+
+        String protocolID = subscribe.getId();
+
+        if (activeRequests.containsKey(protocolID)) {
+            safeClose(new CloseReason(WebSocketCloseReasons.createCloseCode(DUPLICATE_ID.getCode()),
+                    "Subscriber for " + protocolID + " already exists"));
+            return;
+        }
+
+        if (activeRequests.size() >= maxSubscriptions) {
+            safeClose(MAX_SUBSCRIPTIONS);
+            return;
+        }
+
+        RequestHandler requestHandler = new RequestHandler(this,
+                topicStore, elide, api, protocolID, UUID.randomUUID(),
+                connectionInfo, sendPingOnSubscribe, verboseErrors);
+
+        activeRequests.put(protocolID, requestHandler);
+
+        executorService.submit(new Runnable() {
+            @Override
+            public void run() {
+                requestHandler.handleRequest(subscribe);
+            }
+        });
+    }
+
+    protected void handleComplete(Complete complete) {
+        String protocolID = complete.getId();
+        RequestHandler handler = activeRequests.remove(protocolID);
+
+        if (handler != null) {
+            handler.safeClose();
+        }
+
+        //Ignore otherwise
+    }
+
+    protected void safeSendConnectionAck() {
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        ConnectionAck ack = new ConnectionAck();
+
+        try {
+            sendMessage(mapper.writeValueAsString(ack));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose(INTERNAL_ERROR);
+        }
+    }
+
+    protected void safeSendPong() {
+        ObjectMapper mapper = elide.getElideSettings().getMapper().getObjectMapper();
+        Pong pong = new Pong();
+
+        try {
+            sendMessage(mapper.writeValueAsString(pong));
+        } catch (JsonProcessingException e) {
+            log.error("UNEXPECTED Json Serialization Error {}", e.getMessage());
+            safeClose(INTERNAL_ERROR);
+        }
+    }
+
+    protected void safeClose(CloseReason reason) {
+        log.debug("Closing session handler: {} {}", wrappedSession.getId(), reason);
+        try {
+            close(reason);
+        } catch (Exception e) {
+            log.error("UNEXPECTED: Closing {} failed for {}", wrappedSession.getId(), e.getMessage());
+        }
+    }
+
+    /**
+     * Send a text message on the native session.  Synchronized to protect session and isOpen
+     * (which has dubious thread safety - even when async).
+     * @param message The message to send.
+     */
+    public synchronized void sendMessage(String message) {
+
+        //JSR 356 session is thread safe.
+        if (isOpen) {
+            try {
+                wrappedSession.getAsyncRemote().sendText(message);
+                return;
+            } catch (Exception e) {
+                log.debug("UNEXPECTED: Sending message {} failed for {}", message, e.getMessage());
+                safeClose(INTERNAL_ERROR);
+            }
+        }
+        log.debug("UNEXPECTED: Sending message {} on closed session", message);
+    }
+
+    /**
+     * Closes the socket if SUBSCRIBE has not been received in the allotted time.
+     */
+    private class ConnectionTimer implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                Thread.sleep(connectionTimeoutMs);
+                if (activeRequests.size() == 0) {
+                   safeClose(CONNECTION_TIMEOUT);
+               }
+            } catch (InterruptedException e) {
+                log.debug("UNEXPECTED: Timeout thread interrupted: " + e.getMessage());
+            }
+        }
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SubscriptionWebSocket.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SubscriptionWebSocket.java
new file mode 100644
index 0000000000..c4430420d4
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/SubscriptionWebSocket.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import com.yahoo.elide.graphql.subscriptions.SubscriptionDataFetcher;
+import com.yahoo.elide.graphql.subscriptions.SubscriptionModelBuilder;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons;
+import graphql.GraphQL;
+import graphql.execution.AsyncSerialExecutionStrategy;
+import graphql.execution.SubscriptionExecutionStrategy;
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+/**
+ * JSR-356 Implementation of a web socket endpoint for GraphQL subscriptions.  JSR-356 should allow
+ * cross-platform use for Spring, Quarkus, and other containers.
+ */
+@Slf4j
+@ServerEndpoint(value = "/", subprotocols = { "graphql-transport-ws" })
+@Builder
+public class SubscriptionWebSocket {
+    private Elide elide;
+    private ExecutorService executorService;
+
+    @Builder.Default
+    private int connectTimeoutMs = 5000;
+
+    @Builder.Default
+    private int maxSubscriptions = 30;
+
+    @Builder.Default
+    private UserFactory userFactory = DEFAULT_USER_FACTORY;
+
+    @Builder.Default
+    private long maxIdleTimeoutMs = 300000;
+
+    @Builder.Default
+    private int maxMessageSize = 10000;
+
+    @Builder.Default
+    private boolean sendPingOnSubscribe = false;
+
+    @Builder.Default
+    private boolean verboseErrors = false;
+
+    private final Map<String, GraphQL> apis = new HashMap<>();
+    private final ConcurrentMap<Session, SessionHandler> openSessions = new ConcurrentHashMap<>();
+
+    public static final UserFactory DEFAULT_USER_FACTORY = session -> new User(session.getUserPrincipal());
+
+    /**
+     * There is no standard for authentication for web sockets.  This interface delegates
+     * Elide user creation to the developer.  This assumes authentication happens during the web socket handshake
+     * and not after during message exchange.
+     */
+    @FunctionalInterface
+    public interface UserFactory {
+        User create(Session session);
+    }
+
+    /**
+     * Constructor.
+     * @param elide Elide instance.
+     * @param executorService Thread pool for all websockets. If null each session will make its own.
+     * @param connectTimeoutMs Connection timeout.
+     * @param maxSubscriptions The maximum number of concurrent subscriptions per socket.
+     * @param userFactory A function which creates an Elide user given a session object.
+     * @param maxIdleTimeoutMs Max idle time on the websocket before disconnect.
+     * @param maxMessageSize Maximum message size allowed on this websocket.
+     * @param sendPingOnSubscribe testing option to ping the client when subscribe is ready.
+     * @param verboseErrors whether or not to send verbose errors.
+     */
+    protected SubscriptionWebSocket(
+            Elide elide,
+            ExecutorService executorService,
+            int connectTimeoutMs,
+            int maxSubscriptions,
+            UserFactory userFactory,
+            long maxIdleTimeoutMs,
+            int maxMessageSize,
+            boolean sendPingOnSubscribe,
+            boolean verboseErrors
+    ) {
+        this.elide = elide;
+        this.executorService = executorService;
+        this.connectTimeoutMs = connectTimeoutMs;
+        this.maxSubscriptions = maxSubscriptions;
+        this.userFactory = userFactory;
+        this.sendPingOnSubscribe = sendPingOnSubscribe;
+        this.maxIdleTimeoutMs = maxIdleTimeoutMs;
+        this.maxMessageSize = maxMessageSize;
+        this.verboseErrors = verboseErrors;
+
+        EntityDictionary dictionary = elide.getElideSettings().getDictionary();
+        for (String apiVersion : dictionary.getApiVersions()) {
+            NonEntityDictionary nonEntityDictionary =
+                    new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup);
+
+            SubscriptionModelBuilder builder = new SubscriptionModelBuilder(dictionary, nonEntityDictionary,
+                    new SubscriptionDataFetcher(nonEntityDictionary), NO_VERSION);
+
+            GraphQL api = GraphQL.newGraphQL(builder.build())
+                    .queryExecutionStrategy(new AsyncSerialExecutionStrategy())
+                    .subscriptionExecutionStrategy(new SubscriptionExecutionStrategy())
+                    .build();
+
+            apis.put(apiVersion, api);
+        }
+    }
+
+    /**
+     * Called on session open.
+     * @param session The platform specific session object.
+     * @throws IOException If there is an underlying error.
+     */
+    @OnOpen
+    public void onOpen(Session session) throws IOException {
+        log.debug("Session Opening: {}", session.getId());
+        SessionHandler subscriptionSession = createSessionHandler(session);
+
+        session.setMaxIdleTimeout(maxIdleTimeoutMs);
+        session.setMaxTextMessageBufferSize(maxMessageSize);
+        session.setMaxBinaryMessageBufferSize(maxMessageSize);
+
+        openSessions.put(session, subscriptionSession);
+    }
+
+    /**
+     * Called on a new web socket message.
+     * @param session The platform specific session object.
+     * @param message The new message.
+     * @throws IOException If there is an underlying error.
+     */
+    @OnMessage
+    public void onMessage(Session session, String message) throws IOException {
+        log.debug("Session Message: {} {}", session.getId(), message);
+
+        SessionHandler handler = findSession(session);
+        if (handler != null) {
+            handler.handleRequest(message);
+        } else {
+            throw new IllegalStateException("Cannot locate session: " + session.getId());
+        }
+    }
+
+    /**
+     * Called on session close.
+     * @param session The platform specific session object.
+     * @throws IOException If there is an underlying error.
+     */
+    @OnClose
+    public void onClose(Session session) throws IOException {
+        log.debug("Session Closing: {}", session.getId());
+        SessionHandler handler = findSession(session);
+
+        if (handler != null) {
+            handler.safeClose(WebSocketCloseReasons.NORMAL_CLOSE);
+            openSessions.remove(session);
+        }
+    }
+
+    /**
+     * Called on a session error.
+     * @param session The platform specific session object.
+     * @param throwable The error that occurred.
+     */
+    @OnError
+    public void onError(Session session, Throwable throwable) {
+        log.error("Session Error: {} {}", session.getId(), throwable.getMessage());
+        SessionHandler handler = findSession(session);
+
+        if (handler != null) {
+            handler.safeClose(WebSocketCloseReasons.INTERNAL_ERROR);
+            openSessions.remove(session);
+        }
+    }
+
+    private SessionHandler findSession(Session wrappedSession) {
+        SessionHandler sessionHandler = openSessions.getOrDefault(wrappedSession, null);
+
+        String message = "Unable to locate active session: " + wrappedSession.getId();
+        if (sessionHandler == null) {
+            log.error(message);
+        }
+        return sessionHandler;
+    }
+
+    protected SessionHandler createSessionHandler(Session session) {
+        String apiVersion = session.getRequestParameterMap().getOrDefault("ApiVersion",
+                List.of(NO_VERSION)).get(0);
+
+        User user = userFactory.create(session);
+
+        return new SessionHandler(session, elide.getDataStore(), elide, apis.get(apiVersion),
+                connectTimeoutMs, maxSubscriptions,
+                ConnectionInfo.builder()
+                        .user(user)
+                        .baseUrl(session.getRequestURI().getPath())
+                        .parameters(session.getRequestParameterMap())
+                        .getApiVersion(apiVersion).build(),
+                sendPingOnSubscribe,
+                verboseErrors,
+                executorService);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessage.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessage.java
new file mode 100644
index 0000000000..8550b8eb9a
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessage.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Base class of all graphql-ws protocol messages.
+ */
+@AllArgsConstructor
+@Getter
+public abstract class AbstractProtocolMessage {
+
+    @JsonProperty(required = true)
+    final MessageType type;
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessageWithID.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessageWithID.java
new file mode 100644
index 0000000000..0def79d13d
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/AbstractProtocolMessageWithID.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+
+/**
+ * Base class of all graphql-ws messages that take an ID field.
+ */
+@Getter
+public abstract class AbstractProtocolMessageWithID extends AbstractProtocolMessage {
+
+    @JsonProperty(required = true)
+    final String id;
+
+    public AbstractProtocolMessageWithID(String id, MessageType type) {
+        super(type);
+        this.id = id;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Complete.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Complete.java
new file mode 100644
index 0000000000..32afd67cbf
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Complete.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Builder;
+
+/**
+ * Send on subscription completion (bidirectional).
+ */
+@JsonPropertyOrder({"type", "id"})
+public class Complete extends AbstractProtocolMessageWithID {
+
+    @Builder
+    @JsonCreator
+    public Complete(
+            @JsonProperty(value = "id", required = true) String id
+    ) {
+        super(id, MessageType.COMPLETE);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionAck.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionAck.java
new file mode 100644
index 0000000000..7893b70d48
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionAck.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+/**
+ * Acknowledge an incoming connection (server to client).
+ */
+public class ConnectionAck extends AbstractProtocolMessage {
+    public ConnectionAck() {
+        super(MessageType.CONNECTION_ACK);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionInit.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionInit.java
new file mode 100644
index 0000000000..9ea4edac8f
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/ConnectionInit.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Start an incoming connection (client to server).
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ConnectionInit extends AbstractProtocolMessage {
+    //Will contain authentication credentials.
+    Map<String, Object> payload = new HashMap<>();
+
+    public ConnectionInit() {
+        super(MessageType.CONNECTION_INIT);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Error.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Error.java
new file mode 100644
index 0000000000..b4bc3b09c7
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Error.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.yahoo.elide.graphql.GraphQLErrorDeserializer;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import graphql.GraphQLError;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+/**
+ * Error occurred during setup of the subscription (server to client).
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+@JsonPropertyOrder({ "type", "id", "payload"})
+public class Error extends AbstractProtocolMessageWithID {
+
+    @JsonProperty(required = true)
+    @JsonDeserialize(contentAs = GraphQLError.class, contentUsing = GraphQLErrorDeserializer.class)
+    GraphQLError[] payload;
+
+    @Builder
+    @JsonCreator
+    public Error(
+            @JsonProperty(value = "id", required = true) String id,
+            @JsonProperty(value = "payload", required = true) GraphQLError[] payload
+    ) {
+        super(id, MessageType.ERROR);
+        this.payload = payload;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/MessageType.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/MessageType.java
new file mode 100644
index 0000000000..b2e3dd441e
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/MessageType.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * All the message names of the graphql-ws protocol.
+ */
+public enum MessageType {
+    CONNECTION_INIT("connection_init"),
+    CONNECTION_ACK("connection_ack"),
+    PING("ping"),
+    PONG("pong"),
+    SUBSCRIBE("subscribe"),
+    NEXT("next"),
+    ERROR("error"),
+    COMPLETE("complete");
+
+    private String name;
+
+    @JsonValue
+    public String getName() {
+        return name;
+    }
+
+    MessageType(String name) {
+        this.name = name;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Next.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Next.java
new file mode 100644
index 0000000000..1c253819b1
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Next.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.yahoo.elide.graphql.ExecutionResultDeserializer;
+import com.yahoo.elide.graphql.ExecutionResultSerializer;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import graphql.ExecutionResult;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+/**
+ * Next subscription message (server to client).
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+@JsonPropertyOrder({ "type", "id", "payload"})
+public class Next extends AbstractProtocolMessageWithID {
+    @JsonProperty(required = true)
+    @JsonDeserialize(as = ExecutionResult.class, using = ExecutionResultDeserializer.class)
+    @JsonSerialize(as = ExecutionResult.class, using = ExecutionResultSerializer.class)
+    ExecutionResult payload;
+
+    @Builder
+    @JsonCreator
+    public Next(
+            @JsonProperty(value = "id", required = true) String id,
+            @JsonProperty(value = "payload", required = true) ExecutionResult result
+    ) {
+        super(id, MessageType.NEXT);
+
+        this.payload = result;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Ping.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Ping.java
new file mode 100644
index 0000000000..275795cea8
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Ping.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+/**
+ * Ping/Pong telemetry messaging (bidirectional).
+ */
+public class Ping extends AbstractProtocolMessage {
+    public Ping() {
+        super(MessageType.PING);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Pong.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Pong.java
new file mode 100644
index 0000000000..961e439ac3
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Pong.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+/**
+ * Ping/Pong telemetry messaging (bidirectional).
+ */
+public class Pong extends AbstractProtocolMessage {
+    public Pong() {
+        super(MessageType.PONG);
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Subscribe.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Subscribe.java
new file mode 100644
index 0000000000..825a1b5216
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/Subscribe.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Create a subscription (client to server).
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+@JsonPropertyOrder({"type", "id", "payload"})
+public class Subscribe extends AbstractProtocolMessageWithID {
+
+    Payload payload;
+
+    @Value
+    @EqualsAndHashCode
+    @JsonPropertyOrder({"operationName", "query", "variables"})
+    public static class Payload {
+        String operationName;
+
+        @JsonProperty(required = true)
+        String query;
+
+        Map<String, Object> variables;
+
+        @Builder
+        @JsonCreator
+        public Payload(
+                @JsonProperty("operationName") String operationName,
+                @JsonProperty(value = "query", required = true) String query,
+                @JsonProperty("variables") Map<String, Object> variables) {
+            this.operationName = operationName;
+            this.query = query;
+            if (variables == null) {
+                this.variables = new HashMap<>();
+            } else {
+                this.variables = variables;
+            }
+        }
+    }
+
+    @Builder
+    @JsonCreator
+    public Subscribe(
+            @JsonProperty(value = "id", required = true) String id,
+            @JsonProperty(value = "payload", required = true) Payload payload) {
+        super(id, MessageType.SUBSCRIBE);
+        this.payload = payload;
+    }
+}
diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/WebSocketCloseReasons.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/WebSocketCloseReasons.java
new file mode 100644
index 0000000000..a003737b3b
--- /dev/null
+++ b/elide-graphql/src/main/java/com/yahoo/elide/graphql/subscriptions/websocket/protocol/WebSocketCloseReasons.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.websocket.protocol;
+
+import lombok.Getter;
+
+import javax.websocket.CloseReason;
+
+/**
+ * Reasons the server will disconnect the web socket.
+ * See (graphql-ws) protocol.
+ */
+public class WebSocketCloseReasons {
+    public enum CloseCode {
+        CONNECTION_TIMEOUT(4408),
+        MULTIPLE_INIT(4429),
+        UNAUTHORIZED(4401),
+        INVALID_MESSAGE(4400),
+        MAX_SUBSCRIPTIONS(4300),  //This is our own message (not part of the protocol)
+        DUPLICATE_ID(4409);
+
+        @Getter
+        private int code;
+
+        CloseCode(int code) {
+            this.code = code;
+        }
+
+        public CloseReason toReason(String reason) {
+            return new CloseReason(createCloseCode(code), reason);
+        }
+
+    }
+
+    public static final CloseReason CONNECTION_TIMEOUT =
+            CloseCode.CONNECTION_TIMEOUT.toReason("Connection initialisation timeout");
+
+    public static final CloseReason MULTIPLE_INIT =
+            CloseCode.MULTIPLE_INIT.toReason("Too many initialisation requests");
+
+    public static final CloseReason UNAUTHORIZED =
+            CloseCode.UNAUTHORIZED.toReason("Unauthorized");
+
+    public static final CloseReason INVALID_MESSAGE =
+            CloseCode.INVALID_MESSAGE.toReason("Invalid message");
+
+    public static final CloseReason INTERNAL_ERROR =
+            new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Internal Error");
+
+    public static final CloseReason NORMAL_CLOSE =
+            new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "Normal Closure");
+
+    public static final CloseReason MAX_SUBSCRIPTIONS =
+            CloseCode.MAX_SUBSCRIPTIONS.toReason("Exceeded max subscriptions");
+
+    public static CloseReason.CloseCode createCloseCode(final int code) {
+        return new CloseReason.CloseCode() {
+            @Override
+            public int getCode() {
+                return code;
+            }
+        };
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/ExecutionResultDeserializerTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/ExecutionResultDeserializerTest.java
new file mode 100644
index 0000000000..c90a94ae0d
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/ExecutionResultDeserializerTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import graphql.language.SourceLocation;
+
+import java.util.Map;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ExecutionResultDeserializerTest {
+    private ObjectMapper mapper;
+
+    @BeforeAll
+    public void init() {
+        mapper = new ObjectMapper();
+        mapper.registerModule(new SimpleModule("ExecutionResult")
+                .addDeserializer(GraphQLError.class, new GraphQLErrorDeserializer())
+                .addDeserializer(ExecutionResult.class, new ExecutionResultDeserializer())
+        );
+    }
+
+    @Test
+    public void testDeserialization() throws Exception {
+        String resultText = "{\"data\":{\"book\":{\"id\":\"1\",\"title\":null}},\"errors\":[{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]}}";
+
+        ExecutionResult result = mapper.readValue(resultText, ExecutionResult.class);
+
+        Map<String, Object> data = result.getData();
+        Map<String, Object> book = (Map<String, Object>) data.get("book");
+
+        assertEquals("1", book.get("id"));
+        assertEquals(null, book.get("title"));
+
+        GraphQLError error = result.getErrors().get(0);
+
+        assertEquals(1, error.getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error.getLocations().get(0));
+        assertEquals(2, error.getPath().size());
+        assertEquals("book", error.getPath().get(0));
+        assertEquals("title", error.getPath().get(1));
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error.getMessage());
+    }
+
+    @Test
+    public void testDeserializationWithMissingData() throws Exception {
+        String resultText = "{\"errors\":[{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]}}";
+
+        ExecutionResult result = mapper.readValue(resultText, ExecutionResult.class);
+
+        assertNull(result.getData());
+
+        GraphQLError error = result.getErrors().get(0);
+
+        assertEquals(1, error.getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error.getLocations().get(0));
+        assertEquals(2, error.getPath().size());
+        assertEquals("book", error.getPath().get(0));
+        assertEquals("title", error.getPath().get(1));
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error.getMessage());
+    }
+
+    @Test
+    public void testDeserializationWithMissingErrors() throws Exception {
+        String resultText = "{\"data\":{\"book\":{\"id\":\"1\",\"title\":null}}}";
+
+        ExecutionResult result = mapper.readValue(resultText, ExecutionResult.class);
+
+        Map<String, Object> data = result.getData();
+        Map<String, Object> book = (Map<String, Object>) data.get("book");
+
+        assertEquals("1", book.get("id"));
+        assertEquals(null, book.get("title"));
+        assertTrue(result.getErrors().isEmpty());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherDeleteTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherDeleteTest.java
new file mode 100644
index 0000000000..411874ef49
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherDeleteTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test the Delete operation.
+ */
+public class FetcherDeleteTest extends PersistentResourceFetcherTest {
+    @Test
+    public void testRootBadInput() throws Exception {
+        String graphQLRequest = "mutation { "
+                    + "author(op:DELETE) { "
+                    + "edges { node { id } } "
+                    + "} "
+                    + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testRootIdNoData() throws Exception {
+        // Part1: Delete the object
+        runComparisonTest("rootIdNoDataPt1");
+
+        // Part2: Make sure it's really gone
+        String graphQLRequest = "{\n"
+                + "  author(ids: [\"1\"]) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        name\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testRootIdWithBadData() throws Exception {
+        String graphQLRequest = "mutation { "
+                    + "author(op:DELETE, ids: [\"1\"], data: {id: \"2\"}) { "
+                    + "edges { node { id } } "
+                    + "} "
+                    + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testRootCollection() throws Exception {
+        // Part 1: Delete the objects
+        runComparisonTest("rootCollectionPt1");
+
+        // Part 2: Make sure objects are really gone
+        String graphQLRequest = "{\n"
+                + "  book(ids: [\"1\", \"2\"]) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        title\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testNestedBadInput() throws Exception {
+        String graphQLRequest = "mutation { "
+                + "author(id: \"1\") { "
+                + "books(op:DELETE) { "
+                + "edges { node { id } } "
+                + "} "
+                + "} "
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testBadArgument() {
+        String graphQLRequest = "mutation { "
+                + "author(unknown: \"1\") { "
+                + "books(op:DELETE) { "
+                + "edges { node { id } } "
+                + "} "
+                + "} "
+                + "}";
+        assertParsingFails(graphQLRequest);
+    }
+
+    @Test
+    public void testNestedSingleId() throws Exception {
+        // Part 1: Delete the objects
+        runComparisonTest("nestedSingleId");
+
+        // Part 2: Make sure objects are really gone. Should fail with an "unknown identifier" error for books 1
+        String graphQLFetchRequest = "mutation { "
+                + "author(ids: [\"1\"]) { "
+                + "edges { node { books(ids: [\"1\"]) { "
+                + "edges { node { title } } "
+                + "} }"
+                + "} "
+                + "} "
+                + "}";
+
+        assertQueryFails(graphQLFetchRequest);
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        // Part 1: Delete the objects
+        runComparisonTest("nestedCollectionPt1");
+
+        // Part 2: Make sure objects are really gone
+        runComparisonTest("nestedCollectionPt2");
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        super.runComparisonTest("delete/" + testName);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherFetchTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherFetchTest.java
new file mode 100644
index 0000000000..6850f070f3
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherFetchTest.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.ElideResponse;
+import org.junit.jupiter.api.Test;
+import java.util.HashMap;
+
+/**
+ * Test the Fetch operation.
+ *
+ * NOTE: Resource files for request/response for `runComparisonTest` are found in the
+ *   /resources/graphql/{requests,responses}/fetch directory, respectively.
+ */
+public class FetcherFetchTest extends PersistentResourceFetcherTest {
+
+    private final String baseUrl = "http://localhost:8080/graphql";
+
+    @Test
+    public void testMutationInQueryThrowsError() throws Exception {
+        String query = "query {\n"
+                + "  book(op: UPSERT, data: {title: \"Book Numero Dos\", publicationDate: \"1984-12-25T00:00Z\"} ) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        title\n"
+                + "        publicationDate\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+
+        assertQueryFailsWith(query, "Exception while fetching data (/book) : Data model writes are only allowed in mutations");
+    }
+
+    @Test
+    public void testSubscriptionThrowsError() throws Exception {
+        String query = "subscription {\n"
+                + "  book(ids: [\"1\"]) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        title\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+
+        assertQueryFailsWith(query, "Schema is not configured for subscriptions.");
+    }
+
+    @Test
+    public void testRootSingle() throws Exception {
+        runComparisonTest("rootSingle");
+    }
+
+    @Test
+    public void testRootUnknownField() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/rootUnknownField.graphql"));
+    }
+
+    @Test
+    public void testRootMultipleIds() throws Exception {
+        runComparisonTest("rootMultipleIds");
+    }
+
+    @Test
+    public void testRootCollection() throws Exception {
+        runComparisonTest("rootCollection");
+    }
+
+    @Test
+    public void testComplexAttribute() throws Exception {
+        runComparisonTest("complexAttribute");
+    }
+
+    @Test
+    public void testComplexAttributeList() throws Exception {
+        runComparisonTest("complexAttributeList");
+    }
+
+    @Test
+    public void testComplexAttributeMap() throws Exception {
+        runComparisonTest("complexAttributeMap");
+    }
+
+    @Test
+    public void testNestedSingle() throws Exception {
+        runComparisonTest("nestedSingle");
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        runComparisonTest("nestedCollection");
+    }
+
+    @Test
+    public void testRootCollectionSort() throws Exception {
+        runComparisonTest("rootCollectionSort");
+    }
+
+    @Test
+    public void testRootCollectionInvalidSort() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/rootCollectionInvalidSort.graphql"));
+    }
+
+    @Test
+    public void testRootCollectionMultiSort() throws Exception {
+        runComparisonTest("rootCollectionMultiSort");
+    }
+
+    @Test
+    public void testNestedCollectionSort() throws Exception {
+        runComparisonTest("nestedCollectionSort");
+    }
+
+    @Test
+    public void testRootCollectionPaginateWithoutOffset() throws Exception {
+        runComparisonTest("rootCollectionPaginateWithoutOffset");
+    }
+
+    @Test
+    public void testRootCollectionPaginateWithOffset() throws Exception {
+        runComparisonTest("rootCollectionPaginateWithOffset");
+    }
+
+    @Test
+    public void testNestedCollectionPaginate() throws Exception {
+        runComparisonTest("nestedCollectionPaginate");
+    }
+
+    @Test
+    public void testNestedCollectionFilter() throws Exception {
+        runComparisonTest("nestedCollectionFilter");
+    }
+
+    @Test
+    public void testFilterByAlias() throws Exception {
+        runComparisonTest("filterByAlias");
+    }
+
+    @Test
+    public void sortByAlias() throws Exception {
+        runComparisonTest("sortByAlias");
+    }
+
+    @Test
+    public void testRootCollectionFilter() throws Exception {
+        runComparisonTest("rootCollectionFilter");
+    }
+
+    @Test
+    public void testDateGreaterThanFilter() throws Exception {
+        runComparisonTest("rootCollectionDateGTFilter");
+    }
+
+    @Test
+    public void testDateLessThanFilter() throws Exception {
+        runComparisonTest("rootCollectionDateLTFilter");
+    }
+
+    @Test
+    public void testFailuresWithBody() {
+        String graphQLRequest = "{ "
+                + "book(ids: [\"1\"], data: [{\"id\": \"1\"}]) { "
+                + "edges { node { "
+                + "id "
+                + "title "
+                + "}}"
+                + "} "
+                + "}";
+
+        assertParsingFails(graphQLRequest);
+    }
+
+    @Test
+    public void testPageTotalsRoot() throws Exception {
+        runComparisonTest("pageTotalsRoot");
+    }
+
+    @Test
+    public void testPageTotalsRootWithFilter() throws Exception {
+        runComparisonTest("pageTotalsRootWithFilter");
+    }
+
+    @Test
+    public void testPageTotalsRootWithPagination() throws Exception {
+        runComparisonTest("pageTotalsRootWithPagination");
+    }
+
+    @Test
+    public void testPageTotalsRootWithIds() throws Exception {
+        runComparisonTest("pageTotalsRootWithIds");
+    }
+
+    @Test
+    public void testPageTotalsRelationship() throws Exception {
+        runComparisonTest("pageTotalsRelationship");
+    }
+
+    @Test
+    public void testComputedAttributes() throws Exception {
+        runComparisonTest("computedAttributes");
+    }
+
+    @Test
+    public void testFragmentOnNode() throws Exception {
+        runComparisonTest("fragmentOnNode");
+    }
+
+    @Test
+    public void testFragmentOnConnection() throws Exception {
+        runComparisonTest("fragmentOnConnection");
+    }
+
+    @Test
+    public void testFragmentOnEdges() throws Exception {
+        runComparisonTest("fragmentOnEdges");
+    }
+
+    @Test
+    public void testFragmentLoop() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/fragmentLoop.graphql"));
+    }
+
+    @Test
+    public void testFragmentInline() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/fragmentInline.graphql"));
+    }
+
+    @Test
+    public void testFragmentUnknown() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/fragmentUnknown.graphql"));
+    }
+
+    @Test
+    public void testVariableDefinition() throws Exception {
+        runComparisonTest("variableDefinition");
+    }
+
+    @Test
+    public void testVariableUnknownReference() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/variableUnknownReference.graphql"));
+    }
+
+    @Test
+    public void testVariableInvalidNonNull() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/variableInvalidNonNull.graphql"));
+    }
+
+    @Test
+    public void testAliasAttribute() throws Exception {
+        runComparisonTest("aliasAttribute");
+    }
+
+    @Test
+    public void testAliasRelationship() throws Exception {
+        runComparisonTest("aliasRelationship");
+    }
+
+    @Test
+    public void testAliasSameRelationship() throws Exception {
+        runComparisonTest("aliasSameRelationship");
+    }
+
+    @Test
+    public void testAliasAmbiguous() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/aliasAmbiguous.graphql"));
+    }
+
+    @Test
+    public void testAliasPartialQueryAmbiguous() throws Exception {
+        assertParsingFails(loadGraphQLRequest("fetch/aliasPartialQueryAmbiguous.graphql"));
+    }
+
+    @Test
+    public void testSchemaIntrospection() throws Exception {
+        String graphQLRequest = "{"
+                + "__schema {"
+                + "types {"
+                + "   name"
+                + "}"
+                + "}"
+                + "}";
+
+        ElideResponse response = runGraphQLRequest(graphQLRequest, new HashMap<>());
+
+        assertTrue(! response.getBody().contains("errors"));
+    }
+
+    @Test
+    public void testTypeIntrospection() throws Exception {
+        String graphQLRequest = "{"
+            + "__type(name: \"Author\") {"
+            + "   name"
+            + "   fields {"
+            + "     name"
+            + "     type { name }"
+            + "   }"
+            + "}"
+            + "}";
+
+        ElideResponse response = runGraphQLRequest(graphQLRequest, new HashMap<>());
+
+        assertTrue(! response.getBody().contains("errors"));
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        // Preface with "fetch" directory:
+        super.runComparisonTest("fetch/" + testName);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherRemoveTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherRemoveTest.java
new file mode 100644
index 0000000000..9eb194e088
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherRemoveTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test the Delete operation.
+ */
+public class FetcherRemoveTest extends PersistentResourceFetcherTest {
+    @Test
+    public void testRootBadInput() throws Exception {
+        String graphQLRequest = "mutation { "
+                    + "author(op:REMOVE) { "
+                    + "edges { node { id } } "
+                    + "} "
+                    + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+
+    @Test
+    public void testRootIdWithBadData() throws Exception {
+        String graphQLRequest = "mutation { "
+                    + "author(op:REMOVE, ids: [\"1\"], data: {id: \"2\"}) { "
+                    + "edges { node { id } } "
+                    + "} "
+                    + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+
+    public void testRootCollectionNothingToRemove() throws Exception {
+        String graphQLRequest = "mutation { "
+                + "book(op:REMOVE, ids: [\"4\"]) { "
+                + "edges { node { id } } "
+                + "}"
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testNestedBadInput() throws Exception {
+        String graphQLRequest = "mutation { "
+                + "author(id: \"1\") { "
+                + "books(op:REMOVE) { "
+                + "edges { node { id } } "
+                + "} "
+                + "} "
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testBadArgument() {
+        String graphQLRequest = "mutation { "
+                + "author(unknown: \"1\") { "
+                + "books(op:REMOVE) { "
+                + "edges { node { id } } "
+                + "} "
+                + "} "
+                + "}";
+        assertParsingFails(graphQLRequest);
+    }
+
+    @Test
+    public void testRootCollection() throws Exception {
+        // Part 1: Delete the objects
+        runComparisonTest("rootCollectionPt1");
+
+        // Part 2: Make sure objects are really gone
+        String graphQLRequest = "{\n"
+                + "  book(ids: [\"1\", \"2\"]) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        title\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        // Part 1: Delete the objects
+        runComparisonTest("nestedCollectionPt1");
+
+        // Part 2: Make sure objects are really gone from the relationship
+        runComparisonTest("nestedCollectionPt2");
+
+        // Part 3: Make sure objects are not deleted
+        runComparisonTest("nestedCollectionPt3");
+    }
+
+    @Test
+    public void testNestedCollectionNothingToRemove() throws Exception {
+        String graphQLRequest = "mutation { "
+                + "author(ids: [\"1\"]) { "
+                + "edges { node {"
+                + "books(op:REMOVE, ids: [\"4\"]) { "
+                + "edges { node { id } } "
+                + "} } }"
+                + "}"
+                + "}";
+        assertQueryFails(graphQLRequest);
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        super.runComparisonTest("remove/" + testName);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherReplaceTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherReplaceTest.java
new file mode 100644
index 0000000000..5258026ad7
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherReplaceTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import org.junit.jupiter.api.Test;
+
+public class FetcherReplaceTest extends PersistentResourceFetcherTest {
+
+    @Test
+    public void testReplaceAttributeRoot() throws Exception {
+        runComparisonTest("replaceRootCollection");
+    }
+
+    @Test
+    public void testReplaceNestedCollection() throws Exception {
+        runComparisonTest("replaceNestedCollection");
+    }
+
+    @Test
+    public void testReplaceEmptyCollections() throws Exception {
+        runComparisonTest("replaceEmptyCollections");
+    }
+
+    @Test
+    public void testReplaceWithIdsFails() throws Exception {
+        String expectedMessage = "Exception while fetching data (/book) : REPLACE must not include ids argument";
+        runErrorComparisonTest("replaceWithIdsFails", expectedMessage);
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        super.runComparisonTest("replace/" + testName);
+    }
+
+    @Override
+    public void runErrorComparisonTest(String testName, String expectedMessage) throws Exception {
+        super.runErrorComparisonTest("replace/" + testName, expectedMessage);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpdateTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpdateTest.java
new file mode 100644
index 0000000000..e6651c9040
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpdateTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test the Add operation.
+ */
+public class FetcherUpdateTest extends PersistentResourceFetcherTest {
+
+    @Test
+    public void testRootSingleWithId() throws Exception {
+        //author 1 already exist, should update
+        runComparisonTest("rootSingleWithId");
+    }
+
+    @Test
+    public void testRootSingleWithList() throws Exception {
+        //book 1 and 2 already exist, should update
+        runComparisonTest("rootSingleWithList");
+    }
+
+    @Test
+    public void testUpdateComplexAttribute() throws Exception {
+        //book 1 and 2 already exist, should update
+        runComparisonTest("updateComplexAttribute");
+    }
+
+    @Test
+    public void testUpdateComplexAttributeList() throws Exception {
+        //book 1 and 2 already exist, should update
+        runComparisonTest("updateComplexAttributeList");
+    }
+
+    @Test
+    public void testUpdateComplexAttributeMap() throws Exception {
+        //book 1 and 2 already exist, should update
+        runComparisonTest("updateComplexAttributeMap");
+    }
+
+    @Test
+    public void testRootCollectionInvalidIds() throws Exception {
+        // Update 1, create for id 42, create new book with title "abc"
+        String expectedMessage = "Exception while fetching data (/book) : Unknown identifier [42] for book";
+        runErrorComparisonTest("rootCollectionInvalidIds", expectedMessage);
+    }
+
+    @Test
+    public void testRootCollectionMissingIds() throws Exception {
+        // Update 1, create for id 42, create new book with title "abc"
+        String expectedMessage = "Exception while fetching data (/book) : UPDATE data objects must include ids";
+        runErrorComparisonTest("rootCollectionMissingIds", expectedMessage);
+    }
+
+    @Test
+    public void testNestedSingleUpdate() throws Exception {
+        runComparisonTest("nestedSingleUpdate");
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        runComparisonTest("nestedCollection");
+    }
+
+    @Test
+    public void testNestedCollectionMissingIds() throws Exception {
+        String expectedMessage = "Exception while fetching data (/author) : UPDATE data objects must include ids";
+        runErrorComparisonTest("nestedCollectionMissingIds", expectedMessage);
+    }
+
+    @Test
+    public void testCrossCyclicRelationships() throws Exception {
+        runComparisonTest("crossCyclicRelationships");
+    }
+
+    @Test
+    public void testNestedUpdates() throws Exception {
+        runComparisonTest("nestedUpdates");
+    }
+
+    @Test
+    public void testUpdateComplexGraph() throws Exception {
+        runComparisonTest("updateComplexGraph");
+    }
+
+    // TODO: Reeanble when supporting arguments into computed attributes.
+    @Disabled
+    public void testSetComputedAttribute() throws Exception {
+        runComparisonTest("setComputedAttribute");
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        super.runComparisonTest("update/" + testName);
+    }
+
+    @Override
+    public void runErrorComparisonTest(String testName, String expectedMessage) throws Exception {
+        super.runErrorComparisonTest("update/" + testName, expectedMessage);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpsertTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpsertTest.java
new file mode 100644
index 0000000000..aaea97f4f6
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherUpsertTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test the Add operation.
+ */
+public class FetcherUpsertTest extends PersistentResourceFetcherTest {
+    /* ==================== */
+    /* CREATING NEW OBJECTS */
+    /* ==================== */
+    @Test
+    public void testCreateRootSingle() throws Exception {
+        runComparisonTest("createRootSingle");
+    }
+
+    @Test
+    public void testCreateRootCollection() throws Exception {
+        runComparisonTest("createRootCollection");
+    }
+
+    @Test
+    public void testCreateComplextAttribute() throws Exception {
+        runComparisonTest("createComplexAttribute");
+    }
+
+    @Test
+    public void testCreateNestedSingle() throws Exception {
+        runComparisonTest("createNestedSingle");
+    }
+
+    @Test
+    public void testCreateNestedSingleUnshareable() throws Exception {
+        runComparisonTest("createNestedSingleUnshareable");
+    }
+
+
+    @Test
+    public void testCreateNestedCollection() throws Exception {
+        runComparisonTest("createNestedCollection");
+    }
+
+    /* ========================= */
+    /* UPDATING EXISTING OBJECTS */
+    /* ========================= */
+    @Test
+    public void testRootSingleWithId() throws Exception {
+        //author 1 already exist, should update
+        runComparisonTest("rootSingleWithId");
+    }
+
+    @Test
+    public void testRootSingleWithList() throws Exception {
+        //book 1 and 2 already exist, should update
+        runComparisonTest("rootSingleWithList");
+
+    }
+
+    @Test
+    public void testRootCollectionMixedIds() throws Exception {
+        // Update 1, create for id 42, create new book with title "abc"
+        runComparisonTest("rootCollectionMixedIds");
+    }
+
+    @Test
+    public void testNestedSingleUpdate() throws Exception {
+        runComparisonTest("nestedSingleUpdate");
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        runComparisonTest("nestedCollection");
+    }
+
+    @Test
+    public void testUpsertOnCollection() throws Exception {
+        runComparisonTest("uspertOnCollection");
+    }
+
+    @Test
+    public void testNonCreatedIdReferenceCollection() throws Exception {
+        runComparisonTest("nonCreatedIdReferenceCollection");
+    }
+
+    @Test
+    public void testCrossCyclicRelationships() throws Exception {
+        runComparisonTest("crossCyclicRelationships");
+    }
+
+    @Test
+    public void testNestedUpserts() throws Exception {
+        runComparisonTest("nestedUpserts");
+    }
+
+    @Test
+    public void testNonCreatedIdOnlyRequest2Back() throws Exception {
+        runComparisonTest("nonCreatedIdOnlyRequest2Back");
+    }
+
+    // TODO: Reeanble when supporting arguments into computed attributes.
+    @Disabled
+    public void testSetComputedAttribute() throws Exception {
+        runComparisonTest("setComputedAttribute");
+    }
+
+    @Test
+    public void testCreateWithVariables() throws Exception {
+        super.runComparisonTestWithVariables("upsert/createWithVariables", ImmutableMap.of(
+                "title", "My new book title from variable!",
+                "publicationDate", "1985-12-25T00:00Z",
+                "publisherId", "b9aa44b2-8193-4fb3-84ed-613ef104e7c3",
+                "publisherName", "my new publisher"));
+    }
+
+    @Override
+    public void runComparisonTest(String testName) throws Exception {
+        super.runComparisonTest("upsert/" + testName);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLConversionUtilsTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLConversionUtilsTest.java
new file mode 100644
index 0000000000..966cfb8dd1
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLConversionUtilsTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.OffsetDateTimeSerde;
+import com.yahoo.elide.core.utils.coerce.converters.TimeZoneSerde;
+import org.junit.jupiter.api.Test;
+import graphql.schema.GraphQLScalarType;
+
+import java.time.OffsetDateTime;
+import java.util.TimeZone;
+
+public class GraphQLConversionUtilsTest {
+
+    @Test
+    public void testGraphQLConversionUtilsOffsetDateTimeToScalarType() {
+        CoerceUtil.register(OffsetDateTime.class, new OffsetDateTimeSerde());
+        GraphQLConversionUtils graphQLConversionUtils =
+                new GraphQLConversionUtils(EntityDictionary.builder().build(),
+                        new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup));
+        GraphQLScalarType offsetDateTimeType = graphQLConversionUtils.classToScalarType(ClassType.of(OffsetDateTime.class));
+        assertNotNull(offsetDateTimeType);
+        String expected = "OffsetDateTime";
+        assertEquals(expected, offsetDateTimeType.getName());
+    }
+    @Test
+    public void testGraphQLConversionUtilsTimeZoneToScalarType() {
+        CoerceUtil.register(TimeZone.class, new TimeZoneSerde());
+        GraphQLConversionUtils graphQLConversionUtils =
+                new GraphQLConversionUtils(EntityDictionary.builder().build(),
+                        new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup));
+        GraphQLScalarType timeZoneType = graphQLConversionUtils.classToScalarType(ClassType.of(TimeZone.class));
+        assertNotNull(timeZoneType);
+        String expectedTimezone = "TimeZone";
+        assertEquals(expectedTimezone, timeZoneType.getName());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLEndpointTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLEndpointTest.java
new file mode 100644
index 0000000000..b1dd651d16
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLEndpointTest.java
@@ -0,0 +1,1100 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import static com.yahoo.elide.test.graphql.GraphQLDSL.UNQUOTED_VALUE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.query;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.toJson;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.variableDefinition;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.variableDefinitions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Sets;
+import org.json.JSONException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.mockito.Mockito;
+import org.skyscreamer.jsonassert.JSONAssert;
+import graphqlEndpointTestModels.Author;
+import graphqlEndpointTestModels.Book;
+import graphqlEndpointTestModels.DisallowTransfer;
+import graphqlEndpointTestModels.Incident;
+import graphqlEndpointTestModels.security.CommitChecks;
+import graphqlEndpointTestModels.security.UserChecks;
+
+import java.io.IOException;
+import java.net.URI;
+import java.security.Principal;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * GraphQL endpoint tests tested against the in-memory store.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GraphQLEndpointTest {
+
+    private GraphQLEndpoint endpoint;
+    private final SecurityContext user1 = Mockito.mock(SecurityContext.class);
+    private final SecurityContext user2 = Mockito.mock(SecurityContext.class);
+    private final SecurityContext user3 = Mockito.mock(SecurityContext.class);
+    private final AuditLogger audit = Mockito.mock(AuditLogger.class);
+    private final UriInfo uriInfo = Mockito.mock(UriInfo.class);
+    private final HttpHeaders requestHeaders = Mockito.mock(HttpHeaders.class);
+
+    private Elide elide;
+
+    public static class User implements Principal {
+        String log = "";
+        String name;
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        public User withName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public void appendLog(String stmt) {
+            log = log + stmt;
+        }
+
+        public String getLog() {
+            return log;
+        }
+
+        @Override
+        public String toString() {
+            return getLog();
+        }
+    }
+
+    @BeforeAll
+    public void setup() {
+        Mockito.when(user1.getUserPrincipal()).thenReturn(new User().withName("1"));
+        Mockito.when(user2.getUserPrincipal()).thenReturn(new User().withName("2"));
+        Mockito.when(user3.getUserPrincipal()).thenReturn(new User().withName("3"));
+        Mockito.when(uriInfo.getBaseUri()).thenReturn(URI.create("http://localhost:8080/graphql"));
+        Mockito.when(requestHeaders.getRequestHeaders()).thenReturn(new MultivaluedHashMap<>());
+    }
+
+    @BeforeEach
+    public void setupTest() throws Exception {
+        HashMapDataStore inMemoryStore = new HashMapDataStore(DefaultClassScanner.getInstance(),
+                Book.class.getPackage());
+        Map<String, Class<? extends Check>> checkMappings = new HashMap<>();
+
+        checkMappings.put(UserChecks.IS_USER_1, UserChecks.IsUserId.One.class);
+        checkMappings.put(UserChecks.IS_USER_2, UserChecks.IsUserId.Two.class);
+        checkMappings.put(CommitChecks.IS_NOT_USER_3, CommitChecks.IsNotUser3.class);
+
+        elide = spy(
+                new Elide(
+                    new ElideSettingsBuilder(inMemoryStore)
+                            .withEntityDictionary(EntityDictionary.builder().checks(checkMappings).build())
+                            .withAuditLogger(audit)
+                            .build())
+
+                );
+
+        elide.doScans();
+        endpoint = new GraphQLEndpoint(elide);
+
+        DataStoreTransaction tx = inMemoryStore.beginTransaction();
+
+        // Initial data
+        Book book1 = new Book();
+        Author author1 = new Author();
+        Author author2 = new Author();
+        DisallowTransfer noShare = new DisallowTransfer();
+
+        book1.setId(1L);
+        book1.setTitle("My first book");
+        book1.setAuthors(Sets.newHashSet(author1));
+
+        author1.setId(1L);
+        author1.setName("Ricky Carmichael");
+        author1.setBooks(Sets.newHashSet(book1));
+        author1.setBookTitlesAndAwards(
+                Stream.of(
+                        new AbstractMap.SimpleImmutableEntry<>("Bookz", "Pulitzer Prize"),
+                        new AbstractMap.SimpleImmutableEntry<>("Lost in the Data", "PEN/Faulkner Award")
+                ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
+        );
+
+        author2.setId(2L);
+        author2.setName("The Silent Author");
+        author2.setBookTitlesAndAwards(
+                Stream.of(
+                        new AbstractMap.SimpleImmutableEntry<>("Working Hard or Hardly Working", "Booker Prize")
+                ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
+        );
+
+        noShare.setId(1L);
+
+        tx.createObject(book1, null);
+        tx.createObject(author1, null);
+        tx.createObject(author2, null);
+        tx.createObject(noShare, null);
+
+        tx.save(book1, null);
+        tx.save(author1, null);
+        tx.save(author2, null);
+        tx.save(noShare, null);
+
+        tx.commit(null);
+    }
+
+    @Test
+    public void testValidFetch() throws JSONException {
+        String graphQLRequest = document(
+                selections(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field("name")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String graphQLResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "My first book"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field("name", "Ricky Carmichael")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    @Test
+    void testValidFetchWithVariables() throws JSONException {
+        String graphQLRequest = document(
+                query(
+                        "myQuery",
+                        variableDefinitions(
+                                variableDefinition("bookId", "[String]")
+                        ),
+                        selections(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("ids", "$bookId")
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title"),
+                                                field(
+                                                        "authors",
+                                                        selection(
+                                                                field("name")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String graphQLResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "My first book"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field("name", "Ricky Carmichael")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Map<String, String> variables = new HashMap<>();
+        variables.put("bookId", "1");
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest, variables));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    @Test
+    void testCanReadRestrictedFieldWithAppropriateAccess() throws JSONException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selection(
+                                        field("user1SecretField")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String graphQLResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selection(
+                                        field("user1SecretField", "this is a secret for user 1 only1")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    @Test
+    void testCannotReadRestrictedField() throws JSONException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selection(
+                                        field("user1SecretField")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        //Empty response because the collection is skipped because of failed user check.
+        String expected = "{\"data\":{\"book\":{\"edges\":[]}}}";
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user2, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+    }
+
+
+    @Test
+    void testPartialResponse() throws IOException, JSONException {
+        String graphQLRequest = document(
+                selections(
+                        field(
+                                "book",
+                                selection(
+                                        field("user1SecretField")
+                                )
+                        ),
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user2, graphQLRequestToJSON(graphQLRequest));
+        assertHasErrors(response);
+        verify(elide).mapError(any());
+    }
+
+    @Test
+    void testCrypticErrorOnUpsert() throws IOException, JSONException {
+        Incident incident = new Incident();
+
+        String graphQLRequest = document(
+           mutation(
+               selection(
+                   field(
+                       "incidents",
+                       arguments(
+                           argument("op", "UPSERT"),
+                           argument("data", incident)
+                       ),
+                       selections(
+                           field("id"),
+                           field("name")
+                       )
+                   )
+               )
+           )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user2, graphQLRequestToJSON(graphQLRequest));
+        JsonNode node = extract200Response(response);
+        Iterator<JsonNode> errors = node.get("errors").elements();
+        assertTrue(errors.hasNext());
+        assertTrue(errors.next().get("message").asText().contains("No id provided, cannot persist incidents"));
+        verify(elide).mapError(any());
+    }
+
+    @Test
+    void testFailedMutationAndRead() throws IOException, JSONException {
+        Author author = new Author();
+        author.setId(2L);
+
+        Book book = new Book();
+        book.setId(1);
+        book.setTitle("my new book!");
+        book.setAuthors(Sets.newHashSet(author));
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("op", "UPSERT"),
+                                        argument("data", book)
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user2, graphQLRequestToJSON(graphQLRequest));
+        assertHasErrors(response);
+
+        graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                               selections(
+                                       field("id", "1"),
+                                       field("title", "My first book")
+                               )
+                        )
+                )
+        ).toResponse();
+
+        response = endpoint.post(uriInfo, requestHeaders, user2, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+    }
+
+    @Test
+    void testNonShareable() throws IOException, JSONException {
+        DisallowTransfer noShare = new DisallowTransfer();
+        noShare.setId(1L);
+
+        Author author = new Author();
+        author.setId(123L);
+        author.setName("my new author");
+        author.setNoShare(noShare);
+
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        selections(
+                                                field("id"),
+                                                field(
+                                                        "authors",
+                                                        arguments(
+                                                                argument("op", "UPSERT"),
+                                                                argument("data", author)
+                                                        ),
+                                                        selections(
+                                                                field("id"),
+                                                                field("name"),
+                                                                field(
+                                                                        "noShare",
+                                                                        selection(
+                                                                                field("id")
+                                                                        )
+                                                                )
+                                                        )
+                                                        )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+
+        assertHasErrors(response);
+
+        graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id"),
+                                                        field("name"),
+                                                        field(
+                                                                "noShare",
+                                                                selection(
+                                                                        field("id")
+                                                                )
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "1"),
+                                                        field("name", "Ricky Carmichael"),
+                                                        field("noShare", "", false)
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+    }
+
+    @Test
+    void testLifeCycleHooks () throws Exception {
+        /* Separate user 1 so it doesn't interfere */
+        SecurityContext user = Mockito.mock(SecurityContext.class);
+        User principal = new User().withName("1");
+        Mockito.when(user.getUserPrincipal()).thenReturn(principal);
+
+        Book book = new Book();
+        book.setId(1);
+        book.setTitle("my new book!");
+
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "my new book!")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+
+        String expectedLog = "On Title Update Pre Security\nOn Title Update Pre Commit\nOn Title Update Post Commit\n";
+
+        assertEquals(principal.getLog(), expectedLog);
+    }
+
+    @Test
+    void testAuditLogging() throws IOException {
+        Mockito.reset(audit);
+
+        Book book = new Book();
+        book.setTitle("my new book!");
+
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+
+        verify(audit, Mockito.times(1)).log(Mockito.any());
+        verify(audit, Mockito.times(1)).commit();
+        verify(audit, Mockito.times(1)).clear();
+    }
+
+    @Test
+    void testSuccessfulMutation() throws JSONException {
+        Author author = new Author();
+        author.setId(2L);
+
+        Book book = new Book();
+        book.setId(123);
+        book.setTitle("my new book!");
+        book.setAuthors(Sets.newHashSet(author));
+
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title"),
+                                                field("user1SecretField")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "my new book!"),
+                                        field("user1SecretField", "this is a secret for user 1 only1")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+
+        graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id"),
+                                                        field("name")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "My first book"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "1"),
+                                                        field("name", "Ricky Carmichael")
+                                                )
+                                        )
+                                ),
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "my new book!"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "2"),
+                                                        field("name", "The Silent Author")
+                                                )
+                                        )
+                                )
+
+                        )
+                )
+        ).toResponse();
+
+        response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+    }
+
+    @Test
+    void testFailedCommitCheck() throws IOException {
+        Book book = new Book();
+        book.setId(1);
+        book.setTitle("update title");
+
+        // NOTE: User 3 cannot update books.
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user3, graphQLRequestToJSON(graphQLRequest));
+        assertHasErrors(response);
+        verify(elide).mapError(any());
+    }
+
+    @Test
+    void testQueryAMap() throws JSONException {
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        selections(
+                                                field("id"),
+                                                field(
+                                                        "authors",
+                                                        selection(
+                                                                field("bookTitlesAndAwards {key value}")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Map<String, String> first = new HashMap<>();
+        first.put("key", "Lost in the Data");
+        first.put("value", "PEN/Faulkner Award");
+
+        Map<String, String> second = new HashMap<>();
+        second.put("key", "Bookz");
+        second.put("value", "Pulitzer Prize");
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field(
+                                                                "bookTitlesAndAwards",
+                                                                toJson(Arrays.asList(first, second)),
+                                                                UNQUOTED_VALUE
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, expected);
+    }
+
+    @Test
+    void testQueryAMapWithBadFields() throws IOException {
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        selections(
+                                                field("id"),
+                                                field(
+                                                        "authors",
+                                                         selection(
+                                                                field("bookTitlesAndAwards {key value Bookz}")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assertHasErrors(response);
+        verify(elide).mapError(any());
+    }
+
+
+    @Test
+    public void testMultipleRoot() throws JSONException {
+        String graphQLRequest = document(
+                selections(
+                        field(
+                                "author",
+                                selections(
+                                        field("id"),
+                                        field("name"),
+                                        field(
+                                                "books",
+                                                selection(
+                                                        field("title")
+                                                )
+                                        )
+                                )
+                        ),
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field("name")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String graphQLResponse = document(
+                selections(
+                        field(
+                                "author",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "Ricky Carmichael"),
+                                        field(
+                                                "books",
+                                                selections(
+                                                        field("title", "My first book")
+                                                )
+                                        )
+                                ),
+                                selections(
+                                        field("id", "2"),
+                                        field("name", "The Silent Author"),
+                                        field(
+                                                "books", "", false
+                                        )
+                                )
+                        ),
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "My first book"),
+                                        field(
+                                                "authors",
+                                                selection(
+                                                        field("name", "Ricky Carmichael")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    @Test
+    public void testMultipleQueryWithAlias() throws JSONException {
+        String graphQLRequest = document(
+                selections(
+                        field(
+                                "AuthorBook",
+                                "author",
+                                selections(
+                                        field("id"),
+                                        field(
+                                                "books",
+                                                selection(
+                                                        field("title")
+                                                )
+                                        )
+                                )
+                        ),
+                        field(
+                                "AuthorName",
+                                "author",
+                                selections(
+                                        field("id"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+        String graphQLResponse = document(
+                selections(
+                        field(
+                                "AuthorBook",
+                                selections(
+                                        field("id", "1"),
+                                        field(
+                                                "books",
+                                                selections(
+                                                        field("title", "My first book")
+                                                )
+                                        )
+                                ),
+                                selections(
+                                        field("id", "2"),
+                                        field(
+                                                "books", "", false
+                                        )
+                                )
+                        ),
+                        field(
+                                "AuthorName",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "Ricky Carmichael")
+                                ),
+                                selections(
+                                        field("id", "2"),
+                                        field("name", "The Silent Author")
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    @Test
+    public void testMultipleQueryWithAliasAndArguments() throws JSONException {
+        String graphQLRequest = document(
+                query(
+                        "myQuery",
+                        variableDefinitions(
+                                variableDefinition("author1", "[String]"),
+                                variableDefinition("author2", "[String]")
+                        ),
+                        selections(
+                                field(
+                                        "Author_1",
+                                        "author",
+                                        arguments(
+                                                argument("ids", "$author1")
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("name"),
+                                                field(
+                                                        "books",
+                                                        selection(
+                                                                field("title")
+                                                        )
+                                                )
+                                        )
+                                ),
+                                field(
+                                        "Author_2",
+                                        "author",
+                                        arguments(
+                                                argument("ids", "$author2")
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("name"),
+                                                field(
+                                                        "books",
+                                                        selection(
+                                                                field("title")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+        String graphQLResponse = document(
+                selections(
+                        field(
+                                "Author_1",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "Ricky Carmichael"),
+                                        field(
+                                                "books",
+                                                selections(
+                                                        field("title", "My first book")
+                                                )
+                                        )
+                                )
+                        ),
+                        field(
+                                "Author_2",
+                                selections(
+                                        field("id", "2"),
+                                        field("name", "The Silent Author"),
+                                        field(
+                                                "books", "", false
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+
+        Map<String, String> variables = new HashMap<>();
+        variables.put("author1", "1");
+        variables.put("author2", "2");
+
+        Response response = endpoint.post(uriInfo, requestHeaders, user1, graphQLRequestToJSON(graphQLRequest, variables));
+        assert200EqualBody(response, graphQLResponse);
+    }
+
+    private static String graphQLRequestToJSON(String request) {
+        return graphQLRequestToJSON(request, new HashMap<>());
+    }
+
+    private static String graphQLRequestToJSON(String request, Map<String, String> variables) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = JsonNodeFactory.instance.objectNode();
+
+        ((ObjectNode) node).put("query", request);
+        ((ObjectNode) node).set("variables", variables == null ? null : mapper.valueToTree(variables));
+        return node.toString();
+    }
+
+    private static JsonNode extract200Response(Response response) throws IOException {
+        return new ObjectMapper().readTree(extract200ResponseString(response));
+    }
+
+    private static String extract200ResponseString(Response response) {
+        assertEquals(200, response.getStatus());
+        return (String) response.getEntity();
+    }
+
+    private static void assert200EqualBody(Response response, String expected) throws JSONException {
+        String actual = extract200ResponseString(response);
+        JSONAssert.assertEquals(expected, actual, true);
+    }
+
+    private static void assert200DataEqual(Response response, String expected) throws IOException, JSONException {
+        JsonNode actualNode = extract200Response(response);
+
+        Iterator<Map.Entry<String, JsonNode>> iterator = actualNode.fields();
+
+        // get json node that has "data" key
+        String actual = null;
+        while (iterator.hasNext()) {
+            Map.Entry<String, JsonNode> next = iterator.next();
+            if (next.getKey() == "data") {
+                actual = new ObjectMapper().writeValueAsString(next);
+            }
+        }
+
+        JSONAssert.assertEquals(expected, actual, true);
+    }
+
+    private static void assertHasErrors(Response response) throws IOException {
+        JsonNode node = extract200Response(response);
+        assertTrue(node.get("errors").elements().hasNext());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLErrorDeserializerTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLErrorDeserializerTest.java
new file mode 100644
index 0000000000..8f5d0559b0
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLErrorDeserializerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import graphql.GraphQLError;
+import graphql.language.SourceLocation;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GraphQLErrorDeserializerTest {
+    private ObjectMapper mapper;
+
+    @BeforeAll
+    public void init() {
+        mapper = new ObjectMapper();
+        mapper.registerModule(new SimpleModule("GraphQLError")
+                .addDeserializer(GraphQLError.class, new GraphQLErrorDeserializer()));
+
+    }
+
+    @Test
+    public void testDeserialization() throws Exception {
+        String errorText = "{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}";
+
+        GraphQLError error = mapper.readValue(errorText, GraphQLError.class);
+
+        assertEquals(1, error.getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error.getLocations().get(0));
+        assertEquals(2, error.getPath().size());
+        assertEquals("book", error.getPath().get(0));
+        assertEquals("title", error.getPath().get(1));
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error.getMessage());
+    }
+
+    @Test
+    public void testDeserializationArray() throws Exception {
+        String errorText = "[{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]";
+
+        GraphQLError[] error = mapper.readValue(errorText, GraphQLError[].class);
+
+        assertEquals(1, error[0].getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error[0].getLocations().get(0));
+        assertEquals(2, error[0].getPath().size());
+        assertEquals("book", error[0].getPath().get(0));
+        assertEquals("title", error[0].getPath().get(1));
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error[0].getMessage());
+    }
+
+    @Test
+    public void testDeserializationWithMissingPath() throws Exception {
+        String errorText = "{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}]}";
+
+        GraphQLError error = mapper.readValue(errorText, GraphQLError.class);
+
+        assertEquals(1, error.getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error.getLocations().get(0));
+        assertNull(error.getPath());
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error.getMessage());
+    }
+
+    @Test
+    public void testDeserializationWithMissingMessage() throws Exception {
+        String errorText = "{\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}";
+
+        GraphQLError error = mapper.readValue(errorText, GraphQLError.class);
+
+        assertEquals(1, error.getLocations().size());
+        assertEquals(new SourceLocation(1, 38), error.getLocations().get(0));
+        assertEquals(2, error.getPath().size());
+        assertEquals("book", error.getPath().get(0));
+        assertEquals("title", error.getPath().get(1));
+        assertNull(error.getMessage());
+    }
+
+    @Test
+    public void testDeserializationWithMissingLocation() throws Exception {
+        String errorText = "{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}";
+
+        GraphQLError error = mapper.readValue(errorText, GraphQLError.class);
+
+        assertNull(error.getLocations());
+        assertEquals(2, error.getPath().size());
+        assertEquals("book", error.getPath().get(0));
+        assertEquals("title", error.getPath().get(1));
+        assertEquals("Exception while fetching data (/book/title) : Bad Request", error.getMessage());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLScalarsTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLScalarsTest.java
new file mode 100644
index 0000000000..52e11b667c
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLScalarsTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.core.utils.coerce.converters.OffsetDateTimeSerde;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+import com.yahoo.elide.core.utils.coerce.converters.TimeZoneSerde;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+
+import java.math.BigInteger;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.Date;
+import java.util.TimeZone;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GraphQLScalarsTest {
+
+    private Serde oldSerde;
+
+    @BeforeAll
+    public void init() {
+
+        oldSerde = CoerceUtil.lookup(Date.class);
+
+        CoerceUtil.register(Date.class, new ISO8601DateSerde(
+                "yyyy-MM-dd'T'HH:mm'Z'",
+                TimeZone.getTimeZone("UTC"),
+                java.sql.Date.class));
+
+        CoerceUtil.register(OffsetDateTime.class, new OffsetDateTimeSerde());
+    }
+
+    @AfterAll
+    public void cleanup() {
+        CoerceUtil.register(Date.class, oldSerde);
+    }
+
+    @Test
+    public void testGraphQLDateParseValue() {
+        Date date = new Date(0L);
+        assertEquals(GraphQLScalars.GRAPHQL_DATE_TYPE.getCoercing().parseValue("1970-01-01T00:00Z"), date);
+    }
+
+    @Test
+    public void testGraphQLDateParseLiteral() {
+        Date expectedDate = new Date(0L);
+        Object actualDate = GraphQLScalars.GRAPHQL_DATE_TYPE.getCoercing().parseLiteral(new StringValue("1970-01-01T00:00Z"));
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testGraphQLDateSerialize() {
+        Date date = new Date(0L);
+        Object actual = GraphQLScalars.GRAPHQL_DATE_TYPE.getCoercing().serialize(date);
+        String expected = "1970-01-01T00:00Z";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testGraphQLOffsetDateTimeDeserialize() {
+        OffsetDateTime expectedDate =
+                OffsetDateTime.of(1995, 11, 2,
+                        16, 45, 4, 56,
+                        ZoneOffset.ofHoursMinutes(5, 30));
+        String input = "1995-11-02T16:45:04.000000056+05:30";
+        OffsetDateTimeSerde offsetDateTimeSerde = new OffsetDateTimeSerde();
+        SerdeCoercing serdeCoercing =
+                new SerdeCoercing("", offsetDateTimeSerde);
+        Object actualDate = serdeCoercing.parseLiteral(new StringValue(input));
+        assertEquals(expectedDate, actualDate);
+    }
+
+    @Test
+    public void testGraphQLTimeZoneDeserialize() {
+        TimeZone expectedTz = TimeZone.getTimeZone("EST");
+        String input = "EST";
+        TimeZoneSerde timeZoneSerde = new TimeZoneSerde();
+        SerdeCoercing serdeCoercing =
+                new SerdeCoercing("", timeZoneSerde);
+        Object actualTz = serdeCoercing.parseLiteral(new StringValue(input));
+        assertEquals(expectedTz, actualTz);
+    }
+    @Test
+    public void testGraphQLDeferredIdSerialize() {
+        assertEquals(123L, GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().serialize(123L));
+        assertEquals("123", GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().serialize("123"));
+    }
+
+    @Test
+    public void testGraphQLDeferredIdParseLiteral() {
+        assertEquals("123", GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().parseLiteral(new IntValue(new BigInteger("123"))));
+        assertEquals("123", GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().parseLiteral(new StringValue("123")));
+    }
+
+    @Test
+    public void testGraphQLDeferredIdParseValue() {
+        assertEquals("123", GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().parseValue("123"));
+        assertEquals("123", GraphQLScalars.GRAPHQL_DEFERRED_ID.getCoercing().parseValue(123L));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLTest.java
new file mode 100644
index 0000000000..22ea49fd7f
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/GraphQLTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.type.ClassType;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.ParameterizedExample;
+import example.Pseudonym;
+import example.Publisher;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Bootstrap for GraphQL tests.
+ */
+public abstract class GraphQLTest {
+    protected EntityDictionary dictionary;
+    protected Injector injector;
+
+    public GraphQLTest() {
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+        checks.put("Prefab.Role.All", com.yahoo.elide.core.security.checks.prefab.Role.ALL.class);
+        injector = mock(Injector.class);
+        when(injector.instantiate(any())).thenCallRealMethod();
+
+        dictionary = EntityDictionary.builder()
+                .injector(injector)
+                .checks(checks).build();
+
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Pseudonym.class);
+        dictionary.bindEntity(Address.class);
+        dictionary.bindEntity(ParameterizedExample.class);
+
+        dictionary.addArgumentToAttribute(ClassType.of(ParameterizedExample.class), "attribute",
+                new ArgumentType("argument", ClassType.STRING_TYPE, "defaultValue"));
+        dictionary.addArgumentToEntity(ClassType.of(ParameterizedExample.class),
+                new ArgumentType("entityArgument", ClassType.STRING_TYPE, "defaultArgValue"));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/LifecycleHookTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/LifecycleHookTest.java
new file mode 100644
index 0000000000..90f45c1602
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/LifecycleHookTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import example.Job;
+import org.junit.jupiter.api.Test;
+import hooks.JobLifeCycleHook;
+
+/**
+ * Test lifecycle hooks.
+ */
+public class LifecycleHookTest extends PersistentResourceFetcherTest {
+
+    protected JobLifeCycleHook.JobService jobService = mock(JobLifeCycleHook.JobService.class);
+
+    @Test
+    public void testCreate() throws Exception {
+        String query = "mutation {\n"
+                + "  job(op: UPSERT, data: {id: 1} ) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        status\n"
+                + "        result\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+
+        assertQueryEquals(query, "{\"job\":{\"edges\":[{\"node\":{\"id\":\"1\",\"status\":1,\"result\":\"Pending\"}}]}}");
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        testCreate();
+
+        String query = "mutation {\n"
+                + "  job(op: UPDATE, data: { id: \"1\", result: \"Done\" } ) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        status\n"
+                + "        result\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+
+        assertQueryEquals(query,
+                "{\"job\":{\"edges\":[{\"node\":{\"id\":\"1\",\"status\":2, \"result\":\"Done\"}}]}}");
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        testCreate();
+
+        String query = "mutation {\n"
+                + "  job(op: DELETE, ids: [\"1\"]) {\n"
+                + "    edges {\n"
+                + "      node {\n"
+                + "        id\n"
+                + "        status\n"
+                + "      }\n"
+                + "    }\n"
+                + "  }\n"
+                + "}";
+
+        assertQueryEquals(query, "{\"job\":{\"edges\":[]}}");
+        verify(jobService, times(1)).jobDeleted(any(Job.class));
+    }
+
+    @Override
+    protected void initializeMocks() {
+        super.initializeMocks();
+        doAnswer(invocation -> {
+            Object[] args = invocation.getArguments();
+            Object entity = args[0];
+
+            ((JobLifeCycleHook) entity).setJobService(jobService);
+
+            //void method so return null
+            return null;
+        }).when(injector).inject(any(JobLifeCycleHook.class));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/ModelBuilderTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/ModelBuilderTest.java
new file mode 100644
index 0000000000..d94a54fdc5
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/ModelBuilderTest.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static graphql.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.request.Sorting;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.Publisher;
+import org.junit.jupiter.api.Test;
+import graphql.Scalars;
+import graphql.scalars.java.JavaPrimitives;
+import graphql.schema.DataFetcher;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLEnumValueDefinition;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.GraphQLType;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class ModelBuilderTest {
+    private EntityDictionary dictionary;
+
+    private static final String DATA = "data";
+    private static final String FILTER = "filter";
+    private static final String SORT = "sort";
+    private static final String FIRST = "first";
+    private static final String AFTER = "after";
+    private static final String TYPE = "type";
+
+    // Connection fields
+    private static final String EDGES = "edges";
+    private static final String NODE = "node";
+
+    // Meta fields
+    private static final String PAGE_INFO = "pageInfo";
+
+    private static final String TYPE_QUERY = "Query";
+    private static final String TYPE_BOOK_CONNECTION = "BookConnection";
+    private static final String TYPE_BOOK_INPUT = "BookInput";
+    private static final String TYPE_BOOK = "Book";
+    private static final String TYPE_AUTHOR_CONNECTION = "AuthorConnection";
+    private static final String TYPE_AUTHOR_INPUT = "AuthorInput";
+
+    private static final String FIELD_BOOK = "book";
+    private static final String FIELD_BOOKS = "books";
+    private static final String FIELD_NAME = "name";
+    private static final String FIELD_AUTHORS = "authors";
+    private static final String FIELD_TITLE = "title";
+    private static final String FIELD_PUBLISH_DATE = "publishDate";
+    private static final String FIELD_GENRE = "genre";
+    private static final String FIELD_LANGUAGE = "language";
+    private static final String FIELD_WEIGHT_LBS = "weightLbs";
+    private static final String FIELD_PUBLISHER = "publisher";
+
+    // TODO: We need more tests. I've updated the models to contain all of the situations below, but we should _esnure_
+    // the generated result is exactly correct:
+    //
+    //   * Duplicate enums in same objects
+    //   * Duplicate Set<Enum> across objects
+    //   * Duplicate types across objects
+    //   * Enum as map keys
+    //   * Enum as map values
+    //   * Duplicate maps of the same type
+    //
+    // This is all important for ensuring we don't duplicate typenames which is a requirement in the latest graphql-java
+
+    public ModelBuilderTest() {
+        dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(com.yahoo.elide.models.Book.class);
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Address.class);
+    }
+
+    @Test
+    public void testInternalModelConflict() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        GraphQLType internalBookConnection = schema.getType("ElideInternalBookConnection");
+        assertNotNull(internalBookConnection);
+
+        GraphQLType internalBook = schema.getType("ElideInternalBook");
+        assertNotNull(internalBook);
+
+        GraphQLType internalBookEdge = schema.getType("ElideInternalBookEdge");
+        assertNotNull(internalBookEdge);
+
+        GraphQLType internalBookInput = schema.getType("ElideInternalBookInput");
+        assertNotNull(internalBookInput);
+    }
+
+
+    @Test
+    public void testPageInfoObject() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        GraphQLObjectType bookType = (GraphQLObjectType) schema.getType(TYPE_BOOK_CONNECTION);
+        assertNotNull(bookType.getFieldDefinition(PAGE_INFO));
+    }
+
+    @Test
+    public void testRelationshipParameters() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+        GraphQLObjectType root = schema.getQueryType();
+        assertNotNull(root);
+        assertNotNull(root.getFieldDefinition(FIELD_BOOK));
+
+        /* The root 'book' should have all query parameters defined */
+        GraphQLFieldDefinition bookField = root.getFieldDefinition(FIELD_BOOK);
+        assertNotNull(bookField.getArgument(DATA));
+        assertNotNull(bookField.getArgument(FILTER));
+        assertNotNull(bookField.getArgument(SORT));
+        assertNotNull(bookField.getArgument(FIRST));
+        assertNotNull(bookField.getArgument(AFTER));
+
+        /* book.publisher is a 'to one' relationship so it should be missing all but the data parameter */
+        GraphQLObjectType bookType = (GraphQLObjectType) schema.getType(TYPE_BOOK);
+        GraphQLFieldDefinition publisherField = bookType.getFieldDefinition(FIELD_PUBLISHER);
+        assertNotNull(publisherField.getArgument(DATA));
+        assertNull(publisherField.getArgument(FILTER));
+        assertNull(publisherField.getArgument(SORT));
+        assertNull(publisherField.getArgument(FIRST));
+        assertNull(publisherField.getArgument(AFTER));
+
+        /* book.authors is a 'to many' relationship so it should have all query parameters defined */
+        GraphQLFieldDefinition authorField = bookType.getFieldDefinition(FIELD_AUTHORS);
+        assertNotNull(authorField.getArgument(DATA));
+        assertNotNull(authorField.getArgument(FILTER));
+        assertNotNull(authorField.getArgument(SORT));
+        assertNotNull(authorField.getArgument(FIRST));
+        assertNotNull(authorField.getArgument(AFTER));
+    }
+
+    @Test
+    public void testBuild() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        assertNotNull(schema.getType(TYPE_AUTHOR_CONNECTION));
+        assertNotNull(schema.getType(TYPE_BOOK_CONNECTION));
+        assertNotNull(schema.getType(TYPE_AUTHOR_INPUT));
+        assertNotNull(schema.getType(TYPE_BOOK_INPUT));
+        assertNotNull(schema.getType(TYPE_QUERY));
+
+        GraphQLObjectType bookType = getConnectedType((GraphQLObjectType) schema.getType(TYPE_BOOK_CONNECTION), null);
+        GraphQLObjectType authorType = getConnectedType((GraphQLObjectType) schema.getType(TYPE_AUTHOR_CONNECTION), null);
+        GraphQLObjectType publisherConnectionType = (GraphQLObjectType) bookType.getFieldDefinition(FIELD_PUBLISHER)
+                .getType();
+        GraphQLList publisherEdgesType = (GraphQLList) publisherConnectionType.getFieldDefinition(EDGES)
+                .getType();
+
+        GraphQLObjectType publisherType = (GraphQLObjectType) ((GraphQLObjectType) publisherEdgesType.getWrappedType())
+                .getFieldDefinition(NODE)
+                .getType();
+
+        //Test root type description fields.
+        assertEquals("A GraphQL Book", bookType.getDescription());
+        assertNull(authorType.getDescription());
+
+        //Test non-root type description fields.
+        assertEquals("A book publisher", publisherType.getDescription());
+
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_TITLE).getType());
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_GENRE).getType());
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_LANGUAGE).getType());
+        assertEquals(Scalars.GraphQLInt, bookType.getFieldDefinition(FIELD_PUBLISH_DATE).getType());
+        assertEquals(JavaPrimitives.GraphQLBigDecimal, bookType.getFieldDefinition(FIELD_WEIGHT_LBS).getType());
+
+        GraphQLObjectType addressType = (GraphQLObjectType) authorType.getFieldDefinition("homeAddress").getType();
+        assertEquals(Scalars.GraphQLString, addressType.getFieldDefinition("street1").getType());
+        assertEquals(Scalars.GraphQLString, addressType.getFieldDefinition("street2").getType());
+
+        GraphQLObjectType authorsType = (GraphQLObjectType) bookType.getFieldDefinition(FIELD_AUTHORS).getType();
+        GraphQLObjectType authorsNodeType = getConnectedType(authorsType, null);
+
+        assertEquals(authorType, authorsNodeType);
+
+        assertEquals(Scalars.GraphQLString, authorType.getFieldDefinition(FIELD_NAME).getType());
+
+        assertTrue(validateEnum(Author.AuthorType.class,
+                (GraphQLEnumType) authorType.getFieldDefinition(TYPE).getType()));
+
+        // Node type != connection type
+        GraphQLObjectType booksNodeType = (GraphQLObjectType) authorType.getFieldDefinition(FIELD_BOOKS).getType();
+        assertFalse(booksNodeType.equals(bookType));
+
+        GraphQLInputObjectType bookInputType = (GraphQLInputObjectType) schema.getType(TYPE_BOOK_INPUT);
+        GraphQLInputObjectType authorInputType = (GraphQLInputObjectType) schema.getType(TYPE_AUTHOR_INPUT);
+
+        assertEquals(Scalars.GraphQLString, bookInputType.getField(FIELD_TITLE).getType());
+        assertEquals(Scalars.GraphQLString, bookInputType.getField(FIELD_GENRE).getType());
+        assertEquals(Scalars.GraphQLString, bookInputType.getField(FIELD_LANGUAGE).getType());
+        assertEquals(Scalars.GraphQLInt, bookInputType.getField(FIELD_PUBLISH_DATE).getType());
+
+        GraphQLList authorsInputType = (GraphQLList) bookInputType.getField(FIELD_AUTHORS).getType();
+        assertEquals(authorInputType, authorsInputType.getWrappedType());
+
+        assertEquals(Scalars.GraphQLString, authorInputType.getField(FIELD_NAME).getType());
+
+        GraphQLList booksInputType = (GraphQLList) authorInputType.getField(FIELD_BOOKS).getType();
+        assertEquals(bookInputType, booksInputType.getWrappedType());
+    }
+
+    @Test
+    public void checkAttributeArguments() {
+        Set<ArgumentType> arguments = new HashSet<>();
+        arguments.add(new ArgumentType(SORT, ClassType.of(Sorting.SortOrder.class)));
+        arguments.add(new ArgumentType(TYPE, ClassType.STRING_TYPE));
+        dictionary.addArgumentsToAttribute(ClassType.of(Book.class), FIELD_PUBLISH_DATE, arguments);
+
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        GraphQLObjectType bookType = getConnectedType((GraphQLObjectType) schema.getType(TYPE_BOOK_CONNECTION), null);
+        assertEquals(2, bookType.getFieldDefinition(FIELD_PUBLISH_DATE).getArguments().size());
+        assertTrue(bookType.getFieldDefinition(FIELD_PUBLISH_DATE).getArgument(SORT).getType() instanceof GraphQLEnumType);
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_PUBLISH_DATE).getArgument(TYPE).getType());
+    }
+
+    @Test
+    public void checkModelArguments() {
+        // Add test arguments to entities
+        dictionary.addArgumentToEntity(ClassType.of(Book.class), new ArgumentType("filterBook", ClassType.STRING_TYPE));
+        dictionary.addArgumentToEntity(ClassType.of(Publisher.class), new ArgumentType("filterPublisher", ClassType.STRING_TYPE));
+        dictionary.addArgumentToEntity(ClassType.of(Author.class), new ArgumentType("filterAuthor", ClassType.STRING_TYPE));
+
+        DataFetcher fetcher = mock(DataFetcher.class);
+        ModelBuilder builder = new ModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        GraphQLObjectType root = schema.getQueryType();
+        assertNotNull(root);
+        assertNotNull(root.getFieldDefinition(FIELD_BOOK));
+
+        /* The root 'book' should have the "filterBook" argument defined */
+        GraphQLFieldDefinition bookField = root.getFieldDefinition(FIELD_BOOK);
+        assertNotNull(bookField.getArgument("filterBook"));
+
+        /* book.publisher is a "toOne" relationship and has the argument "filterPublisher" defined */
+        GraphQLObjectType bookType = (GraphQLObjectType) schema.getType(TYPE_BOOK);
+        GraphQLFieldDefinition publisherField = bookType.getFieldDefinition(FIELD_PUBLISHER);
+        assertNotNull(publisherField.getArgument("filterPublisher"));
+
+        /* book.authors is a 'to many' relationship and has the argument "filterAuthor" defined */
+        GraphQLFieldDefinition authorField = bookType.getFieldDefinition(FIELD_AUTHORS);
+        assertNotNull(authorField.getArgument("filterAuthor"));
+    }
+
+    private GraphQLObjectType getConnectedType(GraphQLObjectType root, String connectionName) {
+        GraphQLList edgesType = (GraphQLList) root.getFieldDefinition(EDGES).getType();
+        GraphQLObjectType rootType =  (GraphQLObjectType)
+                ((GraphQLObjectType) edgesType.getWrappedType()).getFieldDefinition(NODE).getType();
+        if (connectionName == null) {
+            return rootType;
+        }
+        return getConnectedType((GraphQLObjectType) rootType.getFieldDefinition(connectionName).getType(), null);
+    }
+
+    public static boolean validateEnum(Class<?> expected, GraphQLEnumType actual) {
+        Enum [] values = (Enum []) expected.getEnumConstants();
+        Set<String> enumNames = actual.getValues().stream()
+                .map(GraphQLEnumValueDefinition::getName)
+                .collect(Collectors.toSet());
+
+        return Arrays.stream(values).allMatch(value -> enumNames.contains(value.name()));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/PersistentResourceFetcherTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/PersistentResourceFetcherTest.java
new file mode 100644
index 0000000000..5c7640323c
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/PersistentResourceFetcherTest.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.parser.GraphQLEntityProjectionMaker;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import example.Author;
+import example.Book;
+import example.Price;
+import example.Pseudonym;
+import example.Publisher;
+import org.apache.tools.ant.util.FileUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import graphql.GraphQL;
+import graphql.GraphQLError;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Currency;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
+
+/**
+ * Base functionality required to test the PersistentResourceFetcher.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public abstract class PersistentResourceFetcherTest extends GraphQLTest {
+    protected ObjectMapper mapper = new ObjectMapper();
+    protected QueryRunner runner;
+    private static final Logger LOG = LoggerFactory.getLogger(GraphQL.class);
+    private final String baseUrl = "http://localhost:8080/graphql";
+    protected User user = mock(User.class);
+
+    protected HashMapDataStore hashMapDataStore;
+    protected ElideSettings settings;
+
+    @BeforeAll
+    public void initializeQueryRunner() {
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        hashMapDataStore = new HashMapDataStore(DefaultClassScanner.getInstance(), Author.class.getPackage());
+
+        settings = new ElideSettingsBuilder(hashMapDataStore)
+                .withEntityDictionary(dictionary)
+                .withJoinFilterDialect(filterDialect)
+                .withSubqueryFilterDialect(filterDialect)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .build();
+
+        settings.getSerdes().forEach(CoerceUtil::register);
+
+        initializeMocks();
+        Elide elide = new Elide(settings);
+        elide.doScans();
+
+        runner = new QueryRunner(elide, NO_VERSION);
+    }
+
+    protected void initializeMocks() {
+        //NOOP;
+    }
+
+    @AfterEach
+    public void clearTestData() {
+        hashMapDataStore.cleanseTestData();
+    }
+
+    @BeforeEach
+    public void initTestData() {
+        DataStoreTransaction tx = hashMapDataStore.beginTransaction();
+
+        Publisher publisher1 = new Publisher();
+        publisher1.setId(1L);
+        publisher1.setName("The Guy");
+
+        Publisher publisher2 = new Publisher();
+        publisher2.setId(2L);
+        publisher2.setName("The Other Guy");
+
+        Author author1 = new Author();
+        author1.setId(1L);
+        author1.setName("Mark Twain");
+        author1.setType(Author.AuthorType.EXCLUSIVE);
+
+        Pseudonym authorOne = new Pseudonym();
+        authorOne.setId(1L);
+        authorOne.setName("The People's Author");
+
+        Book book1 = new Book();
+        book1.setId(1L);
+        book1.setTitle("Libro Uno");
+        book1.setAuthors(new ArrayList<>(Collections.singletonList(author1)));
+        book1.setPublisher(publisher1);
+        book1.setPublicationDate(new Date(1514397817135L));
+        book1.setPrice(new Price(new BigDecimal(123), Currency.getInstance("USD")));
+
+        Book book2 = new Book();
+        book2.setId(2L);
+        book2.setTitle("Libro Dos");
+        book2.setAuthors(new ArrayList<>(Collections.singletonList(author1)));
+        book2.setPublisher(publisher1);
+        book2.setPublicationDate(new Date(0L));
+        book2.setPrice(null);
+
+        Price book2Price1 = new Price(new BigDecimal(200), Currency.getInstance("USD"));
+        Price book2Price2 = new Price(new BigDecimal(210), Currency.getInstance("USD"));
+        book2.setPriceHistory(Arrays.asList(
+                book2Price1,
+                book2Price2));
+
+        book2.setPriceRevisions(new HashMap<>());
+        book2.getPriceRevisions().put(new Date(1590187582000L), book2Price1);
+        book2.getPriceRevisions().put(new Date(1590187682000L), book2Price2);
+
+        author1.setPenName(authorOne);
+        author1.setBooks(new ArrayList<>(Arrays.asList(book1, book2)));
+        authorOne.setAuthor(author1);
+
+        Author author2 = new Author();
+        author2.setId(2L);
+        author2.setName("Boris Pasternak");
+        author2.setType(Author.AuthorType.EXCLUSIVE);
+
+        Book book3 = new Book();
+        book3.setId(3L);
+        book3.setTitle("Doctor Zhivago");
+        book3.setAuthors(new ArrayList<>(Collections.singletonList(author2)));
+        book3.setPublisher(publisher2);
+        book3.setPriceHistory(new ArrayList<>());
+
+        author2.setBooks(new ArrayList<>(Collections.singletonList(book3)));
+
+        publisher1.setBooks(new HashSet<>(Arrays.asList(book1, book2)));
+        publisher2.setBooks(new HashSet<>(Arrays.asList(book3)));
+
+        tx.save(author1, null);
+        tx.save(authorOne, null);
+        tx.save(author2, null);
+        tx.save(book1, null);
+        tx.save(book2, null);
+        tx.save(book3, null);
+        tx.save(publisher1, null);
+        tx.save(publisher2, null);
+        tx.commit(null);
+    }
+
+    protected void assertQueryEquals(String graphQLRequest, String expectedResponse) throws Exception {
+        assertQueryEquals(graphQLRequest, expectedResponse, Collections.emptyMap());
+    }
+
+    protected void assertQueryEquals(String graphQLRequest, String expectedResponse, Map<String, Object> variables)
+            throws Exception {
+        ElideResponse response = runGraphQLRequest(graphQLRequest, variables);
+
+        JsonNode data = mapper.readTree(response.getBody()).get("data");
+        assertNotNull(data);
+
+        assertEquals(
+                mapper.readTree(expectedResponse),
+                mapper.readTree(data.toString())
+        );
+    }
+
+    protected void assertQueryFailsWith(String graphQLRequest, String expectedMessage) throws Exception {
+        ElideResponse response = runGraphQLRequest(graphQLRequest, new HashMap<>());
+
+        JsonNode errors = mapper.readTree(response.getBody()).get("errors");
+        assertNotNull(errors);
+        assertTrue(errors.size() > 0);
+        JsonNode message = errors.get(0).get("message");
+        assertNotNull(message);
+
+        assertEquals('"' + expectedMessage + '"', message.toString());
+    }
+
+    protected void assertQueryFails(String graphQLRequest) throws IOException {
+        ElideResponse result = runGraphQLRequest(graphQLRequest, new HashMap<>());
+
+        assertTrue(result.getBody().contains("errors"));
+    }
+
+    protected void assertParsingFails(String graphQLRequest) {
+        assertThrows(Exception.class, () -> new GraphQLEntityProjectionMaker(settings).make(graphQLRequest));
+    }
+
+    protected ElideResponse runGraphQLRequest(String graphQLRequest, Map<String, Object> variables)
+            throws IOException {
+        String requestWithEnvelope = toGraphQLQuery(graphQLRequest, variables);
+
+        return runner.run(baseUrl, requestWithEnvelope, user);
+    }
+
+    protected String errorsToString(List<GraphQLError> errors) {
+        return errors.stream()
+                .map(GraphQLError::getMessage)
+                .collect(Collectors.joining(", "));
+    }
+
+    public String loadGraphQLRequest(String fileName) throws IOException {
+        try (InputStream in = PersistentResourceFetcherTest.class.getResourceAsStream("/graphql/requests/" + fileName)) {
+            return FileUtils.readFully(new InputStreamReader(in));
+        }
+    }
+
+    public String loadGraphQLResponse(String fileName) throws IOException {
+        try (InputStream in = PersistentResourceFetcherTest.class.getResourceAsStream("/graphql/responses/" + fileName)) {
+            return FileUtils.readFully(new InputStreamReader(in));
+        }
+    }
+
+    public void runComparisonTest(String testName) throws Exception {
+        runComparisonTest(testName, this::assertQueryEquals);
+    }
+
+    public void runComparisonTestWithVariables(String testName, Map<String, Object> variables) throws Exception {
+        String graphQLRequest = loadGraphQLRequest(testName + ".graphql");
+        String graphQLResponse = loadGraphQLResponse(testName + ".json");
+        assertQueryEquals(graphQLRequest, graphQLResponse, variables);
+    }
+
+    public void runErrorComparisonTest(String testName, String expectedMessage) throws Exception {
+        String graphQLRequest = loadGraphQLRequest(testName + ".graphql");
+        assertQueryFailsWith(graphQLRequest, expectedMessage);
+    }
+
+    protected void runComparisonTest(String testName, EvaluationFunction evalFn) throws Exception {
+        String graphQLRequest = loadGraphQLRequest(testName + ".graphql");
+        String graphQLResponse = loadGraphQLResponse(testName + ".json");
+        evalFn.evaluate(graphQLRequest, graphQLResponse);
+    }
+
+    protected String toGraphQLQuery(String query, Map<String, Object> variables) throws IOException {
+        ObjectNode graphqlNode = JsonNodeFactory.instance.objectNode();
+        graphqlNode.put("query", query);
+        if (variables != null) {
+            graphqlNode.set("variables", mapper.valueToTree(variables));
+        }
+        return mapper.writeValueAsString(graphqlNode);
+    }
+
+    @FunctionalInterface
+    protected interface EvaluationFunction {
+        void evaluate(String graphQLRequest, String graphQLResponse) throws Exception;
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/QueryRunnerTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/QueryRunnerTest.java
new file mode 100644
index 0000000000..696f941337
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/QueryRunnerTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class QueryRunnerTest {
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "#abcd\nmutation",
+            "#abcd\n\nmutation",
+            "   #abcd\n\nmutation",
+            "#abcd\n  #befd\n mutation",
+            "mutation"
+    })
+    public void testIsMutation(String input) {
+        assertTrue(QueryRunner.isMutation(input));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "#abcd\n  #befd\n query",
+            "query",
+            "QUERY",
+            "MUTATION",
+            ""
+    })
+    public void testIsNotMutation(String input) {
+        assertFalse(QueryRunner.isMutation(input));
+    }
+
+    @Test
+    public void testNullMutation() {
+        assertFalse(QueryRunner.isMutation(null));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectMakerTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectMakerTest.java
new file mode 100644
index 0000000000..8b7f165ec8
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/parser/GraphQLEntityProjectMakerTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.parser;
+
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.request.Argument;
+import com.yahoo.elide.core.request.Attribute;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.request.Pagination;
+import com.yahoo.elide.graphql.PersistentResourceFetcherTest;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+public class GraphQLEntityProjectMakerTest extends PersistentResourceFetcherTest {
+
+     @Test
+     public void testDefaultPagination() throws IOException {
+         String graphQLRequest = loadGraphQLRequest("fetch/rootSingle" + ".graphql");
+         GraphQLEntityProjectionMaker projectionMaker = new GraphQLEntityProjectionMaker(settings);
+         GraphQLProjectionInfo projectionInfo = projectionMaker.make(graphQLRequest);
+         assertEquals(1, projectionInfo.getProjections().size());
+         assertTrue(projectionInfo.getProjections().entrySet().iterator().next().getValue().getPagination().isDefaultInstance());
+     }
+
+     @Test
+     public void testLimitPagination() throws IOException {
+         String graphQLRequest = loadGraphQLRequest("fetch/rootCollectionPaginateWithOffset" + ".graphql");
+         GraphQLEntityProjectionMaker projectionMaker = new GraphQLEntityProjectionMaker(settings);
+         GraphQLProjectionInfo projectionInfo = projectionMaker.make(graphQLRequest);
+         assertEquals(1, projectionInfo.getProjections().size());
+         Pagination page = projectionInfo.getProjections().entrySet().iterator().next().getValue().getPagination();
+         assertFalse(page.isDefaultInstance());
+         assertEquals(1, page.getLimit());
+     }
+
+     @Test
+     public void testParameterizedAttribute() {
+         String graphQLRequest = document(
+                 selection(
+                         field(
+                                 "parameterizedExample", arguments(
+                                         argument("entityArgument", "xyz", true)
+                                         ),
+                                 selections(
+                                         field("attribute", arguments(
+                                                 argument("argument", "abc", true)
+                                         ))
+                                 )
+                         )
+                 )
+         ).toQuery();
+
+         GraphQLEntityProjectionMaker projectionMaker = new GraphQLEntityProjectionMaker(settings);
+         GraphQLProjectionInfo projectionInfo = projectionMaker.make(graphQLRequest);
+         assertEquals(1, projectionInfo.getProjections().size());
+
+         EntityProjection projection = projectionInfo.getProjections().values().iterator().next();
+
+         // Verify Entity Argument
+         assertEquals(1, projection.getArguments().size());
+
+         Argument entityArgument = projection.getArguments().iterator().next();
+
+         assertEquals("entityArgument", entityArgument.getName());
+         assertEquals(String.class, entityArgument.getType());
+         assertEquals("xyz", entityArgument.getValue());
+
+         // Verify Attribute Argument
+         assertEquals(1, projection.getAttributes().size());
+
+         Attribute attribute = projection.getAttributes().iterator().next();
+
+         assertEquals(1, attribute.getArguments().size());
+
+         Argument argument = attribute.getArguments().iterator().next();
+
+         assertEquals("argument", argument.getName());
+         assertEquals(String.class, argument.getType());
+         assertEquals("abc", argument.getValue());
+     }
+
+    @Test
+    public void testParameterizedAttributeDefaultValue() {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "parameterizedExample",
+                                selections(
+                                        field("attribute")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        GraphQLEntityProjectionMaker projectionMaker = new GraphQLEntityProjectionMaker(settings);
+        GraphQLProjectionInfo projectionInfo = projectionMaker.make(graphQLRequest);
+        assertEquals(1, projectionInfo.getProjections().size());
+
+        EntityProjection projection = projectionInfo.getProjections().values().iterator().next();
+
+        // Verify Entity Argument
+        assertEquals(1, projection.getArguments().size());
+
+        Argument entityArgument = projection.getArguments().iterator().next();
+
+        assertEquals("entityArgument", entityArgument.getName());
+        assertEquals(String.class, entityArgument.getType());
+        assertEquals("defaultArgValue", entityArgument.getValue());
+
+        // Verify Attribute Argument
+        assertEquals(1, projection.getAttributes().size());
+
+        Attribute attribute = projection.getAttributes().iterator().next();
+
+        assertEquals(1, attribute.getArguments().size());
+
+        Argument argument = attribute.getArguments().iterator().next();
+
+        assertEquals("argument", argument.getName());
+        assertEquals(String.class, argument.getType());
+        assertEquals("defaultValue", argument.getValue());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcherTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcherTest.java
new file mode 100644
index 0000000000..4f1f18e911
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionDataFetcherTest.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.inmemory.InMemoryDataStore;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.GraphQLRequestScope;
+import com.yahoo.elide.graphql.GraphQLTest;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import com.yahoo.elide.graphql.parser.GraphQLProjectionInfo;
+import com.yahoo.elide.graphql.parser.SubscriptionEntityProjectionMaker;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import example.Address;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.execution.AsyncSerialExecutionStrategy;
+import graphql.execution.SubscriptionExecutionStrategy;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Base functionality required to test the PersistentResourceFetcher.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class SubscriptionDataFetcherTest extends GraphQLTest {
+    protected GraphQL api;
+    protected ObjectMapper mapper = new ObjectMapper();
+    private static final Logger LOG = LoggerFactory.getLogger(GraphQL.class);
+    private final String baseUrl = "http://localhost:8080/graphql";
+
+    protected DataStore dataStore;
+    protected DataStoreTransaction dataStoreTransaction;
+    protected ElideSettings settings;
+
+    public SubscriptionDataFetcherTest() {
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        dataStore = mock(DataStore.class);
+        dataStoreTransaction = mock(DataStoreTransaction.class);
+
+        //This will be done by the JMS data store.
+        dictionary.addArgumentToEntity(ClassType.of(Book.class), ArgumentType
+                .builder()
+                        .name("topic")
+                        .type(ClassType.of(TopicType.class))
+                .build());
+
+        dictionary.addArgumentToEntity(ClassType.of(Author.class), ArgumentType
+                .builder()
+                .name("topic")
+                .type(ClassType.of(TopicType.class))
+                .build());
+
+        settings = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withJoinFilterDialect(filterDialect)
+                .withSubqueryFilterDialect(filterDialect)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .build();
+
+        settings.getSerdes().forEach(CoerceUtil::register);
+
+        NonEntityDictionary nonEntityDictionary =
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup);
+
+        SubscriptionModelBuilder builder = new SubscriptionModelBuilder(dictionary, nonEntityDictionary,
+                new SubscriptionDataFetcher(nonEntityDictionary), NO_VERSION);
+
+        api = GraphQL.newGraphQL(builder.build())
+                .queryExecutionStrategy(new AsyncSerialExecutionStrategy())
+                .subscriptionExecutionStrategy(new SubscriptionExecutionStrategy())
+                .build();
+    }
+
+    @BeforeEach
+    public void resetMocks() {
+        reset(dataStore);
+        reset(dataStoreTransaction);
+        when(dataStore.beginTransaction()).thenReturn(dataStoreTransaction);
+        when(dataStore.beginReadTransaction()).thenReturn(dataStoreTransaction);
+        when(dataStoreTransaction.getAttribute(any(), any(), any())).thenCallRealMethod();
+        when(dataStoreTransaction.getToManyRelation(any(), any(), any(), any())).thenCallRealMethod();
+    }
+
+    @Test
+    void testRootSubscription() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        List<String> responses = List.of(
+                "{\"book\":{\"id\":\"1\",\"title\":\"Book 1\"}}",
+                "{\"book\":{\"id\":\"2\",\"title\":\"Book 2\"}}"
+        );
+
+        String graphQLRequest = "subscription {book(topic: ADDED) {id title}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses);
+    }
+
+    @Test
+    void testRootNonSchemaQuery() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        List<String> responses = List.of("{\"book\":null}");
+        List<String> errors = List.of("QUERY not supported for subscription models");
+
+        String graphQLRequest = "query {book(topic: ADDED) {id title}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses, errors);
+    }
+
+    @Test
+    void testRootSubscriptionWithFilter() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder<>(List.of(book1, book2)).allInMemory().build());
+
+        List<String> responses = List.of(
+                "{\"book\":{\"id\":\"1\",\"title\":\"Book 1\"}}"
+        );
+
+        String graphQLRequest = "subscription {book(topic: ADDED, filter: \"title==*1*\") {id title}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses);
+    }
+
+    @Test
+    void testComplexAttribute() {
+        Author author1 = new Author();
+        author1.setId(1L);
+        author1.setHomeAddress(new Address());
+
+        Author author2 = new Author();
+        author2.setId(2L);
+        Address address = new Address();
+        address.setStreet1("123");
+        address.setStreet2("XYZ");
+        author2.setHomeAddress(address);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(author1, author2)).build());
+
+        List<String> responses = List.of(
+                "{\"author\":{\"id\":\"1\",\"homeAddress\":{\"street1\":null,\"street2\":null}}}",
+                "{\"author\":{\"id\":\"2\",\"homeAddress\":{\"street1\":\"123\",\"street2\":\"XYZ\"}}}"
+        );
+
+        String graphQLRequest = "subscription {author(topic: UPDATED) {id homeAddress { street1 street2 }}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses);
+    }
+
+    @Test
+    void testRelationshipSubscription() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+        Author author1 = new Author();
+        author1.setName("John Doe");
+
+        Author author2 = new Author();
+        author1.setName("Jane Doe");
+        book1.setAuthors(List.of(author1, author2));
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        List<String> responses = List.of(
+                "{\"bookAdded\":{\"id\":\"1\",\"title\":\"Book 1\",\"authors\":[{\"name\":\"Jane Doe\"},{\"name\":null}]}}",
+                "{\"bookAdded\":{\"id\":\"2\",\"title\":\"Book 2\",\"authors\":[]}}"
+        );
+
+        String graphQLRequest = "subscription {bookAdded: book(topic:ADDED) {id title authors { name }}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses);
+    }
+
+    @Test
+    void testSchemaSubscription() {
+        String graphQLRequest =
+                "{"
+                        + "__schema {"
+                        + "types {"
+                        + "   name"
+                        + "}"
+                        + "}"
+                        + "}";
+
+        assertSubscriptionEquals(graphQLRequest, List.of("{\"__schema\":{\"types\":[{\"name\":\"Author\"},{\"name\":\"AuthorTopic\"},{\"name\":\"AuthorType\"},{\"name\":\"Book\"},{\"name\":\"BookTopic\"},{\"name\":\"Boolean\"},{\"name\":\"DeferredID\"},{\"name\":\"String\"},{\"name\":\"Subscription\"},{\"name\":\"__Directive\"},{\"name\":\"__DirectiveLocation\"},{\"name\":\"__EnumValue\"},{\"name\":\"__Field\"},{\"name\":\"__InputValue\"},{\"name\":\"__Schema\"},{\"name\":\"__Type\"},{\"name\":\"__TypeKind\"},{\"name\":\"address\"}]}}\n"));
+    }
+
+    @Test
+    void testErrorInSubscriptionStream() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        reset(dataStoreTransaction);
+        when(dataStoreTransaction.getAttribute(any(), any(), any())).thenThrow(new BadRequestException("Bad Request"));
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        List<String> responses = List.of(
+                "{\"book\":{\"id\":\"1\",\"title\":null}}",
+                "{\"book\":{\"id\":\"2\",\"title\":null}}"
+        );
+
+        List<String> errors = List.of("Bad Request", "Bad Request");
+
+        String graphQLRequest = "subscription {book(topic: ADDED) {id title}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses, errors);
+    }
+
+    @Test
+    void testErrorBeforeStream() {
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any())).thenThrow(new BadRequestException("Bad Request"));
+
+        List<String> responses = List.of("null");
+        List<String> errors = List.of("Bad Request");
+
+        String graphQLRequest = "subscription {book(topic:ADDED) {id title}}";
+
+        assertSubscriptionEquals(graphQLRequest, responses, errors);
+    }
+
+    protected void assertSubscriptionEquals(String graphQLRequest, List<String> expectedResponses) {
+        assertSubscriptionEquals(graphQLRequest, expectedResponses, new ArrayList<>());
+    }
+
+    protected void assertSubscriptionEquals(
+            String graphQLRequest,
+            List<String> expectedResponses,
+            List<String> expectedErrors) {
+            List<ExecutionResult> results = runSubscription(graphQLRequest);
+
+        assertEquals(expectedResponses.size(), results.size());
+
+        for (int i = 0; i < expectedResponses.size(); i++) {
+            String expectedResponse = expectedResponses.get(i);
+            String expectedError = "[]";
+            if (!expectedErrors.isEmpty()) {
+                    expectedError = expectedErrors.get(i);
+            }
+            ExecutionResult actualResponse = results.get(i);
+
+            try {
+                LOG.info(mapper.writeValueAsString(actualResponse));
+                assertEquals(
+                        mapper.readTree(expectedResponse),
+                        mapper.readTree(mapper.writeValueAsString(actualResponse.getData()))
+                );
+
+                assertTrue(actualResponse.getErrors().toString().contains(expectedError));
+            } catch (JsonProcessingException e) {
+                fail("JSON parsing exception", e);
+            }
+        }
+    }
+
+    /**
+     * Run a subscription.
+     * @param request The subscription query.
+     * @return A discrete list of results returned from the subscription.
+     */
+    protected List<ExecutionResult> runSubscription(String request) {
+        InMemoryDataStore inMemoryDataStore = new InMemoryDataStore(dataStore);
+        DataStoreTransaction tx = inMemoryDataStore.beginTransaction();
+
+        GraphQLProjectionInfo projectionInfo =
+                new SubscriptionEntityProjectionMaker(settings, new HashMap<>(), NO_VERSION).make(request);
+        GraphQLRequestScope requestScope = new GraphQLRequestScope(baseUrl, tx, null, NO_VERSION, settings, projectionInfo, UUID.randomUUID(), null);
+
+        ExecutionInput executionInput = ExecutionInput.newExecutionInput()
+                .query(request)
+                .localContext(requestScope)
+                .build();
+
+        ExecutionResult executionResult = api.execute(executionInput);
+
+        if (! (executionResult.getData() instanceof Publisher)) {
+            return List.of(executionResult);
+        }
+
+        Publisher<ExecutionResult> resultPublisher = executionResult.getData();
+
+        requestScope.getTransaction().commit(requestScope);
+
+        if (resultPublisher == null) {
+            return List.of(executionResult);
+        }
+
+        List<ExecutionResult> results = new ArrayList<>();
+        AtomicReference<Subscription> subscriptionRef = new AtomicReference<>();
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+
+        resultPublisher.subscribe(new Subscriber<ExecutionResult>() {
+            @Override
+            public void onSubscribe(Subscription subscription) {
+                subscriptionRef.set(subscription);
+                subscription.request(1);
+            }
+
+            @Override
+            public void onNext(ExecutionResult executionResult) {
+                results.add(executionResult);
+                subscriptionRef.get().request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                errorRef.set(t);
+            }
+
+            @Override
+            public void onComplete() {
+                //NOOP
+            }
+        });
+
+        return results;
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilderTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilderTest.java
new file mode 100644
index 0000000000..e67feadd99
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionModelBuilderTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.graphql.ModelBuilderTest.validateEnum;
+import static graphql.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.graphql.GraphQLScalars;
+import com.yahoo.elide.graphql.NonEntityDictionary;
+import example.Address;
+import example.Author;
+import example.Book;
+import example.Preview;
+import example.Publisher;
+import org.junit.jupiter.api.Test;
+import graphql.Scalars;
+import graphql.schema.DataFetcher;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+
+public class SubscriptionModelBuilderTest {
+    private EntityDictionary dictionary;
+
+    private static final String FILTER = "filter";
+
+    private static final String BOOK = "book";
+    private static final String AUTHOR = "author";
+    private static final String PREVIEW = "preview";
+    private static final String TOPIC = "topic";
+
+    private static final String SUBSCRIPTION = "Subscription";
+    private static final String TYPE_BOOK = "Book";
+    private static final String TYPE_AUTHOR = "Author";
+    private static final String TYPE_PREVIEW = "Preview";
+    private static final String FIELD_ID = "id";
+    private static final String FIELD_TITLE = "title";
+    private static final String FIELD_GENRE = "genre";
+    private static final String FIELD_LANGUAGE = "language";
+    private static final String FIELD_PUBLISH_DATE = "publishDate";
+    private static final String FIELD_AUTHORS = "authors";
+    private static final String FIELD_NAME = "name";
+    private static final String FIELD_TYPE = "type";
+
+    public SubscriptionModelBuilderTest() {
+        dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        dictionary.bindEntity(Address.class);
+        dictionary.bindEntity(Preview.class);
+    }
+
+    @Test
+    public void testRootType() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        SubscriptionModelBuilder builder = new SubscriptionModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+        GraphQLObjectType subscriptionType = (GraphQLObjectType) schema.getType("Subscription");
+
+        //Book Type
+        GraphQLObjectType bookType = (GraphQLObjectType) schema.getType(TYPE_BOOK);
+
+        GraphQLFieldDefinition bookField = subscriptionType.getFieldDefinition(BOOK);
+        GraphQLEnumType bookTopicType = (GraphQLEnumType) bookField.getArgument(TOPIC).getType();
+        assertEquals("BookTopic", bookTopicType.getName());
+        assertNotNull(bookTopicType.getValue("ADDED"));
+        assertNotNull(bookTopicType.getValue("UPDATED"));
+        assertNull(bookTopicType.getValue("DELETED"));
+
+        assertEquals(bookType, subscriptionType.getFieldDefinition(BOOK).getType());
+        assertNotNull(subscriptionType.getFieldDefinition(BOOK).getArgument(FILTER));
+
+        //Author Type
+        GraphQLObjectType authorType = (GraphQLObjectType) schema.getType(TYPE_AUTHOR);
+        assertEquals(authorType, subscriptionType.getFieldDefinition(AUTHOR).getType());
+        assertNotNull(subscriptionType.getFieldDefinition(AUTHOR).getArgument(FILTER));
+
+        GraphQLFieldDefinition authorField = subscriptionType.getFieldDefinition(AUTHOR);
+        GraphQLEnumType authorTopicType = (GraphQLEnumType) authorField.getArgument(TOPIC).getType();
+        assertEquals("AuthorTopic", authorTopicType.getName());
+        assertNotNull(authorTopicType.getValue("ADDED"));
+        assertNotNull(authorTopicType.getValue("UPDATED"));
+        assertNotNull(authorTopicType.getValue("DELETED"));
+
+        //Publisher Type
+        assertNull(subscriptionType.getFieldDefinition("publisher"));
+
+        //Preview Type (Custom Subscription)
+        GraphQLObjectType previewType = (GraphQLObjectType) schema.getType(TYPE_PREVIEW);
+        GraphQLFieldDefinition previewField = subscriptionType.getFieldDefinition(PREVIEW);
+        assertEquals(previewType, previewField.getType());
+        assertNull(previewField.getArgument(TOPIC));
+    }
+
+    @Test
+    public void testModelTypes() {
+        DataFetcher fetcher = mock(DataFetcher.class);
+        SubscriptionModelBuilder builder = new SubscriptionModelBuilder(dictionary,
+                new NonEntityDictionary(DefaultClassScanner.getInstance(), CoerceUtil::lookup), fetcher, NO_VERSION);
+
+        GraphQLSchema schema = builder.build();
+
+        GraphQLObjectType bookType = (GraphQLObjectType) schema.getType(TYPE_BOOK);
+        GraphQLObjectType authorType = (GraphQLObjectType) schema.getType(TYPE_AUTHOR);
+        GraphQLObjectType previewType = (GraphQLObjectType) schema.getType(TYPE_PREVIEW);
+        GraphQLObjectType publisherType = (GraphQLObjectType) schema.getType("publisher");
+
+        assertNotNull(bookType);
+        assertNotNull(authorType);
+        assertNotNull(previewType);
+        assertNull(publisherType);
+        assertNotNull(schema.getType(SUBSCRIPTION));
+
+        //Test root type description fields.
+        assertEquals("A GraphQL Book", bookType.getDescription());
+        assertNull(authorType.getDescription());
+
+        //Verify Book Fields
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_TITLE).getType());
+        assertEquals(Scalars.GraphQLString, bookType.getFieldDefinition(FIELD_GENRE).getType());
+        assertEquals(GraphQLScalars.GRAPHQL_DEFERRED_ID, previewType.getFieldDefinition(FIELD_ID).getType());
+        assertEquals(previewType,
+                ((GraphQLList) bookType.getFieldDefinition("previews").getType()).getWrappedType());
+        assertEquals(authorType,
+                ((GraphQLList) bookType.getFieldDefinition(FIELD_AUTHORS).getType()).getWrappedType());
+        assertEquals(5, bookType.getFieldDefinitions().size());
+
+        //Verify fields without SubscriptionField are missing.
+        assertNull(bookType.getFieldDefinition(FIELD_LANGUAGE));
+        assertNull(bookType.getFieldDefinition(FIELD_PUBLISH_DATE));
+        assertNull(bookType.getFieldDefinition("publisher"));
+
+        //Verify Author Fields
+        assertEquals(GraphQLScalars.GRAPHQL_DEFERRED_ID, authorType.getFieldDefinition(FIELD_ID).getType());
+        GraphQLObjectType addressType = (GraphQLObjectType) authorType.getFieldDefinition("homeAddress").getType();
+        assertEquals(Scalars.GraphQLString, addressType.getFieldDefinition("street1").getType());
+        assertEquals(Scalars.GraphQLString, addressType.getFieldDefinition("street2").getType());
+        assertEquals(Scalars.GraphQLString, authorType.getFieldDefinition(FIELD_NAME).getType());
+        assertTrue(validateEnum(Author.AuthorType.class,
+                (GraphQLEnumType) authorType.getFieldDefinition(FIELD_TYPE).getType()));
+        assertEquals(4, authorType.getFieldDefinitions().size());
+
+        //Verify fields without SubscriptionField are missing.
+        assertNull(bookType.getFieldDefinition("books"));
+
+        //Verify Preview Fields
+        assertEquals(GraphQLScalars.GRAPHQL_DEFERRED_ID, previewType.getFieldDefinition(FIELD_ID).getType());
+        assertEquals(2, previewType.getFieldDefinitions().size());
+
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionSerdeTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionSerdeTest.java
new file mode 100644
index 0000000000..e783862cb8
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionSerdeTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.utils.coerce.converters.ISO8601DateSerde;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionExclusionStrategy;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionFieldSerde;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.junit.jupiter.api.Test;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.TimeZone;
+import javax.persistence.Id;
+
+public class SubscriptionSerdeTest {
+
+    private Gson gson;
+
+    public SubscriptionSerdeTest() {
+        ISO8601DateSerde serde = new ISO8601DateSerde("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"));
+
+        gson = new GsonBuilder()
+                .addSerializationExclusionStrategy(new SubscriptionExclusionStrategy())
+                .registerTypeAdapter(Date.class, new SubscriptionFieldSerde<>(serde))
+                .serializeNulls().create();
+    }
+
+    @Data
+    public static class TestModel {
+        @Id
+        long id;
+
+        @SubscriptionField
+        String stringField;
+
+        @SubscriptionField
+        Date date;
+
+        String notSerialized;
+    }
+
+    @Test
+    public void testSerialization() {
+        TestModel testModel = new TestModel();
+        testModel.setId(1);
+        testModel.setDate(new Date(0));
+        testModel.setNotSerialized("should not be present");
+        testModel.setStringField("foo");
+
+        String output = gson.toJson(testModel);
+        assertEquals("{\"id\":1,\"stringField\":\"foo\",\"date\":\"1970-01-01T00:00Z\"}", output);
+    }
+
+    @Test
+    public void testSerializationWithNull() {
+        TestModel testModel = new TestModel();
+        testModel.setId(1);
+        testModel.setDate(null);
+        testModel.setNotSerialized("should not be present");
+        testModel.setStringField("foo");
+
+        String output = gson.toJson(testModel);
+        assertEquals("{\"id\":1,\"stringField\":\"foo\",\"date\":null}", output);
+    }
+
+    @Test
+    public void testDeserialization() {
+        TestModel testModel = new TestModel();
+        testModel.setId(1);
+        testModel.setDate(new Date(0));
+        testModel.setNotSerialized("should not be present");
+        testModel.setStringField("foo");
+
+        String output = gson.toJson(testModel);
+
+        TestModel deserialized = gson.fromJson(output, TestModel.class);
+
+        testModel.setNotSerialized(null);
+        assertEquals(testModel, deserialized);
+    }
+
+    @Test
+    public void testDeserializationWithNull() {
+        TestModel testModel = new TestModel();
+        testModel.setId(1);
+        testModel.setDate(null);
+        testModel.setNotSerialized("should not be present");
+        testModel.setStringField("foo");
+
+        String output = gson.toJson(testModel);
+
+        TestModel deserialized = gson.fromJson(output, TestModel.class);
+
+        testModel.setNotSerialized(null);
+        assertEquals(testModel, deserialized);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionWebSocketTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionWebSocketTest.java
new file mode 100644
index 0000000000..60072e6da7
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/SubscriptionWebSocketTest.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.graphql.subscriptions;
+
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.CONNECTION_TIMEOUT;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.INVALID_MESSAGE;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.MULTIPLE_INIT;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.NORMAL_CLOSE;
+import static com.yahoo.elide.graphql.subscriptions.websocket.protocol.WebSocketCloseReasons.UNAUTHORIZED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.ArgumentType;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.graphql.ExecutionResultDeserializer;
+import com.yahoo.elide.graphql.ExecutionResultSerializer;
+import com.yahoo.elide.graphql.GraphQLErrorDeserializer;
+import com.yahoo.elide.graphql.GraphQLErrorSerializer;
+import com.yahoo.elide.graphql.GraphQLTest;
+import com.yahoo.elide.graphql.subscriptions.hooks.TopicType;
+import com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Complete;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.ConnectionInit;
+import com.yahoo.elide.graphql.subscriptions.websocket.protocol.Subscribe;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.common.util.concurrent.MoreExecutors;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.mockito.ArgumentCaptor;
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import javax.websocket.CloseReason;
+import javax.websocket.RemoteEndpoint;
+import javax.websocket.Session;
+
+/**
+ * Base functionality required to test the PersistentResourceFetcher.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+@Slf4j
+public class SubscriptionWebSocketTest extends GraphQLTest {
+    protected ObjectMapper mapper = new ObjectMapper();
+
+    protected DataStore dataStore;
+    protected DataStoreTransaction dataStoreTransaction;
+    protected ElideSettings settings;
+    protected Session session;
+    protected RemoteEndpoint.Async remote;
+    protected Elide elide;
+    protected ExecutorService executorService = MoreExecutors.newDirectExecutorService();
+
+    public SubscriptionWebSocketTest() {
+        RSQLFilterDialect filterDialect = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+        //This will be done by the JMS data store.
+        dictionary.addArgumentToEntity(ClassType.of(Book.class), ArgumentType
+                .builder()
+                .name("topic")
+                .type(ClassType.of(TopicType.class))
+                .build());
+
+        dictionary.addArgumentToEntity(ClassType.of(Author.class), ArgumentType
+                .builder()
+                .name("topic")
+                .type(ClassType.of(TopicType.class))
+                .build());
+
+        dataStore = mock(DataStore.class);
+        dataStoreTransaction = mock(DataStoreTransaction.class);
+        session = mock(Session.class);
+        remote = mock(RemoteEndpoint.Async.class);
+
+        settings = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withJoinFilterDialect(filterDialect)
+                .withSubqueryFilterDialect(filterDialect)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .build();
+
+        elide = new Elide(settings);
+
+        elide.getMapper().getObjectMapper().registerModule(new SimpleModule("Test")
+                .addSerializer(ExecutionResult.class, new ExecutionResultSerializer(new GraphQLErrorSerializer()))
+                .addSerializer(GraphQLError.class, new GraphQLErrorSerializer())
+                .addDeserializer(ExecutionResult.class, new ExecutionResultDeserializer())
+                .addDeserializer(GraphQLError.class, new GraphQLErrorDeserializer())
+        );
+    }
+
+    @BeforeEach
+    public void resetMocks() throws Exception {
+        reset(dataStore);
+        reset(dataStoreTransaction);
+        reset(session);
+        when(session.getRequestURI()).thenReturn(new URI("http://localhost:1234/subscription"));
+        when(session.getAsyncRemote()).thenReturn(remote);
+        when(dataStore.beginTransaction()).thenReturn(dataStoreTransaction);
+        when(dataStore.beginReadTransaction()).thenReturn(dataStoreTransaction);
+        when(dataStoreTransaction.getAttribute(any(), any(), any())).thenCallRealMethod();
+        when(dataStoreTransaction.getToManyRelation(any(), any(), any(), any())).thenCallRealMethod();
+    }
+
+    @Test
+    void testConnectionSetupAndTeardown() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+
+        endpoint.onClose(session);
+
+        verify(remote, times(1)).sendText(message.capture());
+        assertEquals("{\"type\":\"connection_ack\"}", message.getAllValues().get(0));
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(NORMAL_CLOSE, closeReason.getValue());
+    }
+
+    @Test
+    void testMissingType() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        String invalid = "{ \"id\": 123 }";
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, invalid);
+
+        verify(remote, never()).sendText(any());
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(INVALID_MESSAGE, closeReason.getValue());
+    }
+
+    @Test
+    void testInvalidType() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        String invalid = "{ \"type\": \"foo\", \"id\": 123 }";
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, invalid);
+
+        verify(remote, never()).sendText(any());
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(INVALID_MESSAGE, closeReason.getValue());
+    }
+
+    @Test
+    void testInvalidJson() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        //Missing payload field
+        String invalid = "{ \"type\": \"subscribe\"}";
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+        endpoint.onMessage(session, invalid);
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+
+        verify(remote, times(1)).sendText(message.capture());
+        assertEquals("{\"type\":\"connection_ack\"}", message.getAllValues().get(0));
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(INVALID_MESSAGE, closeReason.getValue());
+    }
+
+    @Test
+    void testConnectionTimeout() throws Exception {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .connectTimeoutMs(0).elide(elide).build();
+
+        endpoint.onOpen(session);
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, timeout(1000).times(1)).close(closeReason.capture());
+        assertEquals(CONNECTION_TIMEOUT, closeReason.getValue());
+    }
+
+    @Test
+    void testDoubleInit() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+
+        verify(remote, times(1)).sendText(message.capture());
+        assertEquals("{\"type\":\"connection_ack\"}", message.getAllValues().get(0));
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(MULTIPLE_INIT, closeReason.getValue());
+    }
+
+    @Test
+    void testSubscribeBeforeInit() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        endpoint.onOpen(session);
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        verify(remote, never()).sendText(any());
+
+        ArgumentCaptor<CloseReason> closeReason = ArgumentCaptor.forClass(CloseReason.class);
+        verify(session, times(1)).close(closeReason.capture());
+        assertEquals(UNAUTHORIZED, closeReason.getValue());
+    }
+
+    @Test
+    void testSubscribeUnsubscribeSubscribe() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        Complete complete = Complete.builder().id("1").build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(complete));
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        List<String> expected = List.of(
+                "{\"type\":\"connection_ack\"}",
+                "{\"type\":\"complete\",\"id\":\"1\"}",
+                "{\"type\":\"complete\",\"id\":\"1\"}"
+        );
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+        verify(remote, times(3)).sendText(message.capture());
+        assertEquals(expected, message.getAllValues());
+    }
+
+    @Test
+    void testErrorInStream() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        reset(dataStoreTransaction);
+        when(dataStoreTransaction.getAttribute(any(), any(), any())).thenThrow(new BadRequestException("Bad Request"));
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        List<String> expected = List.of(
+                "{\"type\":\"connection_ack\"}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":{\"book\":{\"id\":\"1\",\"title\":null}},\"errors\":[{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]}}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":{\"book\":{\"id\":\"2\",\"title\":null}},\"errors\":[{\"message\":\"Exception while fetching data (/book/title) : Bad Request\",\"locations\":[{\"line\":1,\"column\":38}],\"path\":[\"book\",\"title\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]}}",
+                "{\"type\":\"complete\",\"id\":\"1\"}"
+        );
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+        verify(remote, times(4)).sendText(message.capture());
+        assertEquals(expected, message.getAllValues());
+    }
+
+    @Test
+    void testErrorPriorToStream() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        reset(dataStoreTransaction);
+        when(dataStoreTransaction.loadObjects(any(), any())).thenThrow(new BadRequestException("Bad Request"));
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        List<String> expected = List.of(
+                "{\"type\":\"connection_ack\"}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":null,\"errors\":[{\"message\":\"Exception while fetching data (/book) : Bad Request\",\"locations\":[{\"line\":1,\"column\":15}],\"path\":[\"book\"],\"extensions\":{\"classification\":\"DataFetchingException\"}}]}}",
+                "{\"type\":\"complete\",\"id\":\"1\"}"
+        );
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+        verify(remote, times(3)).sendText(message.capture());
+        assertEquals(expected, message.getAllValues());
+    }
+
+    @Test
+    void testRootSubscription() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        Book book1 = new Book();
+        book1.setTitle("Book 1");
+        book1.setId(1);
+
+        Book book2 = new Book();
+        book2.setTitle("Book 2");
+        book2.setId(2);
+
+        when(dataStoreTransaction.loadObjects(any(), any()))
+                .thenReturn(new DataStoreIterableBuilder(List.of(book1, book2)).build());
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        List<String> expected = List.of(
+                "{\"type\":\"connection_ack\"}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":{\"book\":{\"id\":\"1\",\"title\":\"Book 1\"}}}}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":{\"book\":{\"id\":\"2\",\"title\":\"Book 2\"}}}}",
+                "{\"type\":\"complete\",\"id\":\"1\"}"
+        );
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+        verify(remote, times(4)).sendText(message.capture());
+        assertEquals(expected, message.getAllValues());
+    }
+
+    @Test
+    void testSchemaQuery() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        String graphQLRequest =
+                "{"
+                        + "__schema {"
+                        + "types {"
+                        + "   name"
+                        + "}"
+                        + "}"
+                        + "__type(name: \"Author\") {"
+                        + "   name"
+                        + "   fields {"
+                        + "     name"
+                        + "     type { name }"
+                        + "   }"
+                        + "}"
+                        + "}";
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query(graphQLRequest)
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        List<String> expected = List.of(
+                "{\"type\":\"connection_ack\"}",
+                "{\"type\":\"next\",\"id\":\"1\",\"payload\":{\"data\":{\"__schema\":{\"types\":[{\"name\":\"Author\"},{\"name\":\"AuthorTopic\"},{\"name\":\"AuthorType\"},{\"name\":\"Book\"},{\"name\":\"BookTopic\"},{\"name\":\"Boolean\"},{\"name\":\"DeferredID\"},{\"name\":\"String\"},{\"name\":\"Subscription\"},{\"name\":\"__Directive\"},{\"name\":\"__DirectiveLocation\"},{\"name\":\"__EnumValue\"},{\"name\":\"__Field\"},{\"name\":\"__InputValue\"},{\"name\":\"__Schema\"},{\"name\":\"__Type\"},{\"name\":\"__TypeKind\"},{\"name\":\"address\"}]},\"__type\":{\"name\":\"Author\",\"fields\":[{\"name\":\"id\",\"type\":{\"name\":\"DeferredID\"}},{\"name\":\"homeAddress\",\"type\":{\"name\":\"address\"}},{\"name\":\"name\",\"type\":{\"name\":\"String\"}},{\"name\":\"type\",\"type\":{\"name\":\"AuthorType\"}}]}}}}",
+                "{\"type\":\"complete\",\"id\":\"1\"}"
+        );
+
+        ArgumentCaptor<String> message = ArgumentCaptor.forClass(String.class);
+        verify(remote, times(3)).sendText(message.capture());
+        assertEquals(expected, message.getAllValues());
+    }
+
+    @Test
+    void testActualComplete() throws IOException {
+        SubscriptionWebSocket endpoint = SubscriptionWebSocket.builder()
+                .executorService(executorService)
+                .elide(elide).build();
+
+        ConnectionInit init = new ConnectionInit();
+        endpoint.onOpen(session);
+        endpoint.onMessage(session, mapper.writeValueAsString(init));
+
+        Subscribe subscribe = Subscribe.builder()
+                .id("1")
+                .payload(Subscribe.Payload.builder()
+                        .query("subscription {book(topic: ADDED) {id title}}")
+                        .build())
+                .build();
+
+        endpoint.onMessage(session, mapper.writeValueAsString(subscribe));
+
+        String complete = "{\"id\":\"5d585eff-ed05-48c2-8af7-ad662930ba74\",\"type\":\"complete\"}";
+
+        endpoint.onMessage(session, complete);
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHookTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHookTest.java
new file mode 100644
index 0000000000..b7da4786ed
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/NotifyTopicLifeCycleHookTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.lifecycle.CRUDEvent;
+import com.google.gson.GsonBuilder;
+import example.Book;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Optional;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSContext;
+import javax.jms.JMSProducer;
+import javax.jms.Topic;
+
+public class NotifyTopicLifeCycleHookTest {
+
+    private ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
+    private JMSContext context = mock(JMSContext.class);
+    private JMSProducer producer = mock(JMSProducer.class);
+    private RequestScope scope = mock(RequestScope.class);
+
+    @BeforeEach
+    public void setup() {
+        EntityDictionary dictionary;
+        dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+
+        Topic destination = mock(Topic.class);
+        reset(scope);
+        reset(connectionFactory);
+        reset(producer);
+        when(connectionFactory.createContext()).thenReturn(context);
+        when(context.createProducer()).thenReturn(producer);
+        when(context.createTopic(any())).thenReturn(destination);
+        when(scope.getDictionary()).thenReturn(dictionary);
+    }
+
+    @Test
+    public void testManagedModelNotification() {
+
+        NotifyTopicLifeCycleHook<Book> bookHook = new NotifyTopicLifeCycleHook<Book>(
+                connectionFactory,
+                JMSContext::createProducer, new GsonBuilder().create());
+
+        Book book = new Book();
+        PersistentResource<Book> resource = new PersistentResource<>(book, "123", scope);
+
+        bookHook.execute(LifeCycleHookBinding.Operation.CREATE, LifeCycleHookBinding.TransactionPhase.PRECOMMIT,
+                new CRUDEvent(
+                        LifeCycleHookBinding.Operation.CREATE,
+                        resource,
+                        "",
+                        Optional.empty()
+                ));
+
+        ArgumentCaptor<String> topicCaptor = ArgumentCaptor.forClass(String.class);
+        verify(context).createTopic(topicCaptor.capture());
+        assertEquals("bookAdded", topicCaptor.getValue());
+        verify(producer, times(1)).send(isA(Destination.class), isA(String.class));
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScannerTest.java b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScannerTest.java
new file mode 100644
index 0000000000..8424ca146f
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/graphql/subscriptions/hooks/SubscriptionScannerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.graphql.subscriptions.hooks;
+
+import static com.yahoo.elide.core.PersistentResource.CLASS_NO_FIELD;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import example.Author;
+import example.Book;
+import org.junit.jupiter.api.Test;
+
+import javax.jms.ConnectionFactory;
+
+public class SubscriptionScannerTest {
+
+    @Test
+    public void testLifeCycleHookBindings() {
+        ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
+        ClassScanner classScanner = DefaultClassScanner.getInstance();
+        EntityDictionary dictionary = EntityDictionary.builder().scanner(classScanner).build();
+
+        SubscriptionScanner subscriptionScanner = SubscriptionScanner.builder()
+                .connectionFactory(connectionFactory)
+                .dictionary(dictionary)
+                .scanner(classScanner)
+                .build();
+
+        subscriptionScanner.bindLifecycleHooks();
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.CREATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                CLASS_NO_FIELD).size());
+
+        assertEquals(0, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.DELETE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                CLASS_NO_FIELD).size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "title").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "genre").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "authors").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "previews").size());
+
+        assertEquals(0, dictionary.getTriggers(ClassType.of(Book.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "price").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.CREATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                CLASS_NO_FIELD).size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.DELETE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                CLASS_NO_FIELD).size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "name").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "type").size());
+
+        assertEquals(1, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "homeAddress").size());
+
+        assertEquals(0, dictionary.getTriggers(ClassType.of(Author.class),
+                LifeCycleHookBinding.Operation.UPDATE,
+                LifeCycleHookBinding.TransactionPhase.POSTCOMMIT,
+                "birthDate").size());
+    }
+}
diff --git a/elide-graphql/src/test/java/com/yahoo/elide/models/Book.java b/elide-graphql/src/test/java/com/yahoo/elide/models/Book.java
new file mode 100644
index 0000000000..24b5818c6f
--- /dev/null
+++ b/elide-graphql/src/test/java/com/yahoo/elide/models/Book.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.models;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * Model for books.  Should not break GraphQL schema for example.Book.
+ */
+@Entity
+@Table(name = "book")
+@Include(name = "internalBook", description = "A GraphQL Book")
+
+public class Book {
+    @Id
+    private long id;
+    private String title;
+}
diff --git a/elide-graphql/src/test/java/example/Address.java b/elide-graphql/src/test/java/example/Address.java
new file mode 100644
index 0000000000..5139f2d4eb
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Address.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Entity;
+
+@Include(rootLevel = false)
+@Entity
+public class Address {
+    @Getter @Setter
+    private String street1;
+
+    @Getter @Setter
+    private String street2;
+
+}
diff --git a/elide-graphql/src/test/java/example/Author.java b/elide-graphql/src/test/java/example/Author.java
new file mode 100644
index 0000000000..3bd6b8de4c
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Author.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import lombok.Builder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * Model for authors.
+ * <p>
+ * <b>CAUTION: DO NOT DECORATE IT WITH {@link Builder}, which hides its no-args constructor. This will result in
+ * runtime error at places such as {@code entityClass.newInstance();}</b>
+ */
+@Entity
+@Table(name = "author")
+@Include
+@Audit(action = Audit.Action.CREATE,
+        operation = 10,
+        logStatement = "{0}",
+        logExpressions = {"${author.name}"})
+@Subscription
+public class Author {
+    public enum AuthorType {
+        EXCLUSIVE,
+        CONTRACTED,
+        FREELANCE
+    }
+
+    private Long id;
+    private Pseudonym penName;
+    private Collection<Book> books = new ArrayList<>();
+    private String name;
+    private AuthorType type;
+    private AuthorType secondaryType;
+    private Address homeAddress;
+    private String prefix = "default_";
+    private Date birthDate = null;
+    private Set<PublicationFormat> publicationFormats = new HashSet<>();
+    private Map<Book, PublicationFormat> publishedBookFormats = new HashMap<>();
+    private Map<Book, PublicationFormat> favoriteBookFormats = new HashMap<>();
+    private Object obj = "foo";
+    private Map<PublicationFormat, Integer> booksPublishedByFormat = new HashMap<>();
+
+    @SubscriptionField
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setObj(Object obj) {
+        this.obj = obj;
+    }
+
+    public Object getObj() {
+        return obj;
+    }
+
+    @SubscriptionField
+    public AuthorType getType() {
+        return type;
+    }
+
+    public void setType(AuthorType type) {
+        this.type = type;
+    }
+
+    public AuthorType getSecondaryType() {
+        return secondaryType;
+    }
+
+    public void setSecondaryType(AuthorType secondaryType) {
+        this.secondaryType = secondaryType;
+    }
+
+    @SubscriptionField
+    public Address getHomeAddress() {
+        return homeAddress;
+    }
+
+    public void setHomeAddress(Address homeAddress) {
+        this.homeAddress = homeAddress;
+    }
+
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @ManyToMany(mappedBy = "authors")
+    public Collection<Book> getBooks() {
+        return books;
+    }
+    public void setBooks(Collection<Book> books) {
+        this.books = books;
+    }
+
+    @OneToOne(mappedBy = "author")
+    public Pseudonym getPenName() {
+        return penName;
+    }
+    public void setPenName(Pseudonym penName) {
+        this.penName = penName;
+    }
+
+    // TODO: Eventually we should support multiple argument computed attributes to be used as API _functions_
+    @ComputedAttribute
+    @Transient
+    public List<String> getBookTitlesWithPrefix() {
+        if (getBooks() == null) {
+            return Collections.emptyList();
+        }
+        return getBooks().stream()
+                .map(book -> getPrefix() + book.getTitle())
+                .collect(Collectors.toList());
+    }
+
+    public void setBookTitlesWithPrefix(List<String> unused) {
+        // Do nothing
+        System.out.println("hm");
+    }
+
+    @Transient
+    @ComputedAttribute
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        if (prefix != null) {
+            this.prefix = prefix;
+        }
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public Set<PublicationFormat> getPublicationFormats() {
+        return publicationFormats;
+    }
+
+    public void setPublicationFormats(Set<PublicationFormat> publicationFormats) {
+        this.publicationFormats = publicationFormats;
+    }
+
+    public Map<Book, PublicationFormat> getPublishedBookFormats() {
+        return publishedBookFormats;
+    }
+
+    public void setPublishedBookFormats(Map<Book, PublicationFormat> publishedBookFormats) {
+        this.publishedBookFormats = publishedBookFormats;
+    }
+
+    public Map<PublicationFormat, Integer> getBooksPublishedByFormat() {
+        return booksPublishedByFormat;
+    }
+
+    public void setBooksPublishedByFormat(Map<PublicationFormat, Integer> booksPublishedByFormat) {
+        this.booksPublishedByFormat = booksPublishedByFormat;
+    }
+
+    public Map<Book, PublicationFormat> getFavoriteBookFormats() {
+        return favoriteBookFormats;
+    }
+
+    public void setFavoriteBookFormats(Map<Book, PublicationFormat> favoriteBookFormats) {
+        this.favoriteBookFormats = favoriteBookFormats;
+    }
+
+    @Override
+    public String toString() {
+        return "Author{id=" + id + ", name='" + name + "\'}";
+    }
+}
diff --git a/elide-graphql/src/test/java/example/Book.java b/elide-graphql/src/test/java/example/Book.java
new file mode 100644
index 0000000000..1e68efe38d
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Book.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Builder;
+import lombok.Singular;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * Model for books.
+ * <p>
+ * <b>CAUTION: DO NOT DECORATE IT WITH {@link Builder}, which hides its no-args constructor. This will result in
+ * runtime error at places such as {@code entityClass.newInstance();}</b>
+ */
+@Entity
+@Table(name = "book")
+@Include(description = "A GraphQL Book")
+@Audit(action = Audit.Action.CREATE,
+        operation = 10,
+        logStatement = "{0}",
+        logExpressions = {"${book.title}"})
+@Subscription(operations = { Subscription.Operation.CREATE, Subscription.Operation.UPDATE})
+public class Book {
+
+    private long id;
+    private String title;
+    private String genre;
+    private String language;
+    @JsonIgnore
+    private long publishDate = 0;
+    @Singular private Collection<Author> authors = new ArrayList<>();
+    private Publisher publisher = null;
+    private Date publicationDate = null;
+
+    private Date lastPurchasedDate = null;
+    private Author.AuthorType authorTypeAtTimeOfPublication;
+    private Set<PublicationFormat> publicationFormats = new HashSet<>();
+    private Set<Preview> previews = new HashSet<>();
+    private BigDecimal weightLbs;
+    private Price price;
+    private List<Price> priceHistory;
+    private Map<Date, Price> priceRevisions;
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @SubscriptionField
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @SubscriptionField
+    public String getGenre() {
+        return genre;
+    }
+
+    public void setGenre(String genre) {
+        this.genre = genre;
+    }
+
+    public Price getPrice() {
+        return price;
+    }
+
+    public void setPriceHistory(List<Price> priceHistory) {
+        this.priceHistory = priceHistory;
+    }
+
+    public List<Price> getPriceHistory() {
+        return priceHistory;
+    }
+
+    public void setPriceRevisions(Map<Date, Price> priceRevisions) {
+        this.priceRevisions = priceRevisions;
+    }
+
+    public Map<Date, Price> getPriceRevisions() {
+        return priceRevisions;
+    }
+
+    public void setPrice(Price price) {
+        this.price = price;
+    }
+
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public void setPublishDate(final long publishDate) {
+        this.publishDate = publishDate;
+    }
+
+    public long getPublishDate() {
+        return this.publishDate;
+    }
+
+    public void setWeightLbs(BigDecimal weight) {
+        this.weightLbs = weight;
+    }
+
+    public BigDecimal getWeightLbs() {
+        return this.weightLbs;
+    }
+
+    @SubscriptionField
+    @ManyToMany
+    public Collection<Author> getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(Collection<Author> authors) {
+        this.authors = authors;
+    }
+
+    @SubscriptionField
+    @OneToMany(mappedBy = "book")
+    public Collection<Preview> getPreviews() {
+        return previews;
+    }
+
+    public void setPreviews(Set<Preview> previews) {
+        this.previews = previews;
+    }
+
+    @OneToOne
+    public Publisher getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(Publisher publisher) {
+        this.publisher = publisher;
+    }
+
+    public Date getPublicationDate() {
+        return publicationDate;
+    }
+
+    public void setPublicationDate(Date publicationDate) {
+        this.publicationDate = publicationDate;
+    }
+
+    public Date getLastPurchasedDate() {
+        return lastPurchasedDate;
+    }
+
+    public void setLastPurchasedDate(Date lastPurchasedDate) {
+        this.lastPurchasedDate = lastPurchasedDate;
+    }
+
+    public Author.AuthorType getAuthorTypeAtTimeOfPublication() {
+        return authorTypeAtTimeOfPublication;
+    }
+
+    public void setAuthorTypeAtTimeOfPublication(Author.AuthorType authorTypeAtTimeOfPublication) {
+        this.authorTypeAtTimeOfPublication = authorTypeAtTimeOfPublication;
+    }
+
+    public Set<PublicationFormat> getPublicationFormats() {
+        return publicationFormats;
+    }
+
+    public void setPublicationFormats(Set<PublicationFormat> publicationFormats) {
+        this.publicationFormats = publicationFormats;
+    }
+}
diff --git a/elide-graphql/src/test/java/example/Job.java b/elide-graphql/src/test/java/example/Job.java
new file mode 100644
index 0000000000..b31f607f44
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Job.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+
+import hooks.JobLifeCycleHook;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * Tests lifecycle hooks in GraphQL that update model state.
+ */
+@Include
+@Data
+@LifeCycleHookBinding(
+        hook = JobLifeCycleHook.class,
+        operation = LifeCycleHookBinding.Operation.CREATE,
+        phase = LifeCycleHookBinding.TransactionPhase.PREFLUSH
+)
+@LifeCycleHookBinding(
+        hook = JobLifeCycleHook.class,
+        operation = LifeCycleHookBinding.Operation.CREATE,
+        phase = LifeCycleHookBinding.TransactionPhase.PRESECURITY
+)
+@LifeCycleHookBinding(
+        hook = JobLifeCycleHook.class,
+        operation = LifeCycleHookBinding.Operation.UPDATE,
+        phase = LifeCycleHookBinding.TransactionPhase.PREFLUSH
+)
+@LifeCycleHookBinding(
+        hook = JobLifeCycleHook.class,
+        operation = LifeCycleHookBinding.Operation.DELETE,
+        phase = LifeCycleHookBinding.TransactionPhase.PREFLUSH
+)
+public class Job {
+    @Id
+    private long id;
+
+    private int status = 0;
+
+    private String result;
+}
diff --git a/elide-graphql/src/test/java/example/ParameterizedExample.java b/elide-graphql/src/test/java/example/ParameterizedExample.java
new file mode 100644
index 0000000000..2d0d007473
--- /dev/null
+++ b/elide-graphql/src/test/java/example/ParameterizedExample.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.type.ParameterizedModel;
+
+import javax.persistence.Id;
+
+@Include
+public class ParameterizedExample extends ParameterizedModel {
+
+    @Id
+    long id;
+
+    private String attribute;
+}
diff --git a/elide-graphql/src/test/java/example/Preview.java b/elide-graphql/src/test/java/example/Preview.java
new file mode 100644
index 0000000000..331166f8ad
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Preview.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Include // optional here because class has this name
+@Entity
+@Subscription(operations = {}) //Denotes a custom subscription
+public class Preview {
+    @Id
+    private UUID id;
+
+    @ManyToOne
+    @SubscriptionField
+    private Book book;
+}
diff --git a/elide-graphql/src/test/java/example/Price.java b/elide-graphql/src/test/java/example/Price.java
new file mode 100644
index 0000000000..424920e179
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Price.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Currency;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonDeserialize(using = Price.PriceDeserializer.class)
+public class Price {
+    private BigDecimal units;
+    private Currency currency;
+
+    public static class PriceDeserializer extends StdDeserializer<Price> {
+        public PriceDeserializer() {
+            super(Price.class);
+        }
+
+
+        @Override
+        public Price deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException {
+            JsonNode node = parser.getCodec().readTree(parser);
+            if (node == null) {
+                return null;
+            }
+
+            JsonNode unitNode = node.get("units");
+
+            if (unitNode == null) {
+                return null;
+            }
+
+            JsonNode currencyNode = node.get("currency");
+
+            if (currencyNode == null) {
+                return new Price(new BigDecimal(unitNode.asDouble()), null);
+            }
+
+            Currency currency = Currency.getInstance(node.get("currency").get("currencyCode").asText(""));
+
+            return new Price(new BigDecimal(unitNode.asDouble()), currency);
+        }
+    }
+}
diff --git a/elide-graphql/src/test/java/example/Pseudonym.java b/elide-graphql/src/test/java/example/Pseudonym.java
new file mode 100644
index 0000000000..d59436c4f2
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Pseudonym.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+/**
+ * An author's pen-name.
+ */
+@Entity
+@Include(rootLevel = false)
+public class Pseudonym {
+    private long id;
+    private Author author;
+
+    @Getter @Setter
+    private String name;
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @OneToOne
+    public Author getAuthor() {
+        return author;
+    }
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/elide-graphql/src/test/java/example/PublicationFormat.java b/elide-graphql/src/test/java/example/PublicationFormat.java
new file mode 100644
index 0000000000..997fbc4b5b
--- /dev/null
+++ b/elide-graphql/src/test/java/example/PublicationFormat.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+public enum PublicationFormat {
+    PRINT,
+    PDF,
+    EBOOK
+}
diff --git a/elide-graphql/src/test/java/example/Publisher.java b/elide-graphql/src/test/java/example/Publisher.java
new file mode 100644
index 0000000000..071b817183
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Publisher.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * Model for publisher.
+ */
+@Entity
+@Include(rootLevel = false, description = "A book publisher")
+public class Publisher {
+    private long id;
+    private String name;
+    private Set<Book> books = new HashSet<>();
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String title) {
+        this.name = title;
+    }
+
+    @OneToMany(mappedBy = "publisher")
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+}
diff --git a/elide-graphql/src/test/java/example/Readme.md b/elide-graphql/src/test/java/example/Readme.md
new file mode 100644
index 0000000000..ce46d62781
--- /dev/null
+++ b/elide-graphql/src/test/java/example/Readme.md
@@ -0,0 +1,4 @@
+Example bean annotations
+=
+
+Sample Parent and Child JPA annotated beans with additional Elide annotations.
diff --git a/elide-graphql/src/test/java/example/package-info.java b/elide-graphql/src/test/java/example/package-info.java
new file mode 100644
index 0000000000..3c0788cb00
--- /dev/null
+++ b/elide-graphql/src/test/java/example/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+/**
+ * Example project.
+ */
+package example;
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/Author.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/Author.java
new file mode 100644
index 0000000000..0d37562d2c
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/Author.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels;
+
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import graphqlEndpointTestModels.security.UserChecks;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+
+@Include
+@Entity
+@CreatePermission(expression = Author.PERMISSION)
+@ReadPermission(expression = Author.PERMISSION)
+@UpdatePermission(expression = Author.PERMISSION)
+@DeletePermission(expression = Author.PERMISSION)
+public class Author {
+    private Long id;
+    private String name;
+    private Set<Book> books = new HashSet<>();
+    private DisallowTransfer noShare;
+    private Map<String, String> bookTitlesAndAwards = new HashMap<>();
+
+    public static final String PERMISSION = UserChecks.IS_USER_1 + " OR " + UserChecks.IS_USER_2;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @ManyToMany
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+
+    @Transient
+    @ComputedAttribute
+    public int getBookCount() {
+        return getBooks().size();
+    }
+
+    public void setBookCount(int unused) {
+        // Do nothing
+    }
+
+    @OneToOne
+    public DisallowTransfer getNoShare() {
+        return noShare;
+    }
+
+    public void setNoShare(DisallowTransfer noShare) {
+        this.noShare = noShare;
+    }
+
+    public Map<String, String> getBookTitlesAndAwards() {
+        return bookTitlesAndAwards;
+    }
+
+    public void setBookTitlesAndAwards(Map<String, String> bookTitlesAndAwards) {
+        this.bookTitlesAndAwards = bookTitlesAndAwards;
+    }
+}
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/Book.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/Book.java
new file mode 100644
index 0000000000..4f3ee83110
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/Book.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import graphqlEndpointTestModels.security.CommitChecks;
+import graphqlEndpointTestModels.security.UserChecks;
+import hooks.BookUpdatePostCommitHook;
+import hooks.BookUpdatePreCommitHook;
+import hooks.BookUpdatePreSecurityHook;
+import lombok.Builder;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Transient;
+
+/**
+ * Model for book.
+ * <p>
+ * <b>CAUTION: DO NOT DECORATE IT WITH {@link Builder}, which hides its no-args constructor. This will result in
+ * runtime error at places such as {@code entityClass.newInstance();}</b>
+ */
+@Include
+@Entity
+@CreatePermission(expression = UserChecks.IS_USER_1)
+@ReadPermission(expression = UserChecks.IS_USER_1 + " OR " + UserChecks.IS_USER_2 + " OR NOT "
+        + CommitChecks.IS_NOT_USER_3)
+@UpdatePermission(expression = CommitChecks.IS_NOT_USER_3 + " AND NOT " + UserChecks.IS_USER_2)
+@DeletePermission(expression = UserChecks.IS_USER_1)
+@Audit(action = Audit.Action.CREATE,
+       operation = 10,
+       logStatement = "{0}",
+       logExpressions = {"${book.title}"})
+public class Book {
+    long id;
+    String title;
+    Set<Author> authors = new HashSet<>();
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @LifeCycleHookBinding(hook = BookUpdatePreSecurityHook.class, operation = UPDATE, phase = PRESECURITY)
+    @LifeCycleHookBinding(hook = BookUpdatePreCommitHook.class, operation = UPDATE, phase = PRECOMMIT)
+    @LifeCycleHookBinding(hook = BookUpdatePostCommitHook.class, operation = UPDATE, phase = POSTCOMMIT)
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @ManyToMany
+    public Set<Author> getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(Set<Author> authors) {
+        this.authors = authors;
+    }
+
+    @Transient
+    @ComputedAttribute
+    @ReadPermission(expression = UserChecks.IS_USER_1)
+    public String getUser1SecretField() {
+        return "this is a secret for user 1 only1";
+    }
+
+    public void setUser1SecretField() {
+        // Do nothing
+    }
+}
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/DisallowTransfer.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/DisallowTransfer.java
new file mode 100644
index 0000000000..2a17f2aed1
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/DisallowTransfer.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Include(rootLevel = false)
+@Entity
+@NonTransferable
+public class DisallowTransfer {
+    Long id;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/Incident.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/Incident.java
new file mode 100644
index 0000000000..6efa5df603
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/Incident.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Tests model for Issue 1461 (Missing GeneratedValue annotation).
+ */
+@Include(name = "incidents")
+@Entity
+public class Incident {
+    @Id
+    // This annotation is missing
+    // @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+}
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/security/CommitChecks.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/security/CommitChecks.java
new file mode 100644
index 0000000000..fd0d0eff2f
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/security/CommitChecks.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels.security;
+
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.security.Principal;
+import java.util.Optional;
+
+public abstract class CommitChecks {
+    public static final String IS_NOT_USER_3 = "isnt user three";
+
+    public static class IsNotUser3 extends OperationCheck {
+
+        @Override
+        public boolean ok(Object object, RequestScope requestScope, Optional optional) {
+            Principal principal = requestScope.getUser().getPrincipal();
+            return !"3".equals(principal.getName());
+        }
+    }
+}
diff --git a/elide-graphql/src/test/java/graphqlEndpointTestModels/security/UserChecks.java b/elide-graphql/src/test/java/graphqlEndpointTestModels/security/UserChecks.java
new file mode 100644
index 0000000000..c09d3c9820
--- /dev/null
+++ b/elide-graphql/src/test/java/graphqlEndpointTestModels/security/UserChecks.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package graphqlEndpointTestModels.security;
+
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.UserCheck;
+
+import java.security.Principal;
+
+public class UserChecks {
+    public static final String IS_USER_1 = "is user one";
+    public static final String IS_USER_2 = "is user two";
+
+    public abstract static class IsUserId {
+        public static class One extends UserCheck {
+            @Override
+            public boolean ok(User user) {
+                Principal principal = user.getPrincipal();
+                if (principal == null) {
+                    return false;
+                }
+                return "1".equals(principal.getName());
+            }
+        }
+
+        public static class Two extends UserCheck {
+            @Override
+            public boolean ok(User user) {
+                Principal principal = user.getPrincipal();
+                if (principal == null) {
+                    return false;
+                }
+                return "2".equals(principal.getName());
+            }
+        }
+    }
+}
diff --git a/elide-graphql/src/test/java/hooks/BookUpdatePostCommitHook.java b/elide-graphql/src/test/java/hooks/BookUpdatePostCommitHook.java
new file mode 100644
index 0000000000..af18d77cff
--- /dev/null
+++ b/elide-graphql/src/test/java/hooks/BookUpdatePostCommitHook.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.graphql.GraphQLEndpointTest;
+import graphqlEndpointTestModels.Book;
+
+import java.util.Optional;
+
+/**
+ * Test post-commit hook for updates to Book.title.
+ */
+public class BookUpdatePostCommitHook implements LifeCycleHook<Book> {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                        Book elideEntity, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        GraphQLEndpointTest.User user = (GraphQLEndpointTest.User) requestScope.getUser().getPrincipal();
+        user.appendLog("On Title Update Post Commit\n");
+    }
+}
diff --git a/elide-graphql/src/test/java/hooks/BookUpdatePreCommitHook.java b/elide-graphql/src/test/java/hooks/BookUpdatePreCommitHook.java
new file mode 100644
index 0000000000..99c6a91884
--- /dev/null
+++ b/elide-graphql/src/test/java/hooks/BookUpdatePreCommitHook.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.graphql.GraphQLEndpointTest;
+import graphqlEndpointTestModels.Book;
+
+import java.util.Optional;
+
+/**
+ * Test pre-commit hook for updates to Book.title.
+ */
+public class BookUpdatePreCommitHook implements LifeCycleHook<Book> {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                          Book elideEntity, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        GraphQLEndpointTest.User user = (GraphQLEndpointTest.User) requestScope.getUser().getPrincipal();
+        user.appendLog("On Title Update Pre Commit\n");
+    }
+}
diff --git a/elide-graphql/src/test/java/hooks/BookUpdatePreSecurityHook.java b/elide-graphql/src/test/java/hooks/BookUpdatePreSecurityHook.java
new file mode 100644
index 0000000000..597ef6fe45
--- /dev/null
+++ b/elide-graphql/src/test/java/hooks/BookUpdatePreSecurityHook.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.graphql.GraphQLEndpointTest;
+import graphqlEndpointTestModels.Book;
+
+import java.util.Optional;
+
+/**
+ * Test pre-security hook for updates to Book.title.
+ */
+public class BookUpdatePreSecurityHook implements LifeCycleHook<Book> {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                        Book elideEntity, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        GraphQLEndpointTest.User user = (GraphQLEndpointTest.User) requestScope.getUser().getPrincipal();
+        user.appendLog("On Title Update Pre Security\n");
+    }
+}
diff --git a/elide-graphql/src/test/java/hooks/JobLifeCycleHook.java b/elide-graphql/src/test/java/hooks/JobLifeCycleHook.java
new file mode 100644
index 0000000000..afd8240dfc
--- /dev/null
+++ b/elide-graphql/src/test/java/hooks/JobLifeCycleHook.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package hooks;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import example.Job;
+import lombok.Setter;
+
+import java.util.Optional;
+import javax.inject.Inject;
+
+/**
+ * Tests a hooks in GraphQL.
+ */
+public class JobLifeCycleHook implements LifeCycleHook<Job> {
+
+    public interface JobService {
+        void jobDeleted(Job job);
+    }
+
+    @Inject
+    @Setter
+    private JobService jobService;
+
+
+    @Override
+    public void execute(
+            LifeCycleHookBinding.Operation operation,
+            LifeCycleHookBinding.TransactionPhase phase,
+            Job job, RequestScope requestScope,
+            Optional<ChangeSpec> changes
+    ) {
+        switch (operation) {
+            case DELETE: {
+                jobService.jobDeleted(job);
+            }
+            case UPDATE: {
+                job.setStatus(2);
+                return;
+            }
+            case CREATE: {
+                if (phase == LifeCycleHookBinding.TransactionPhase.PRESECURITY) {
+                    job.setResult("Pending");
+                } else {
+                    job.setStatus(1);
+                }
+            }
+        };
+    }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt1.graphql b/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt1.graphql
new file mode 100644
index 0000000000..13c93923de
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt1.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(op:DELETE, ids: ["1", "2"]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt2.graphql b/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt2.graphql
new file mode 100644
index 0000000000..b9b1d4095d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/delete/nestedCollectionPt2.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/delete/nestedSingleId.graphql b/elide-graphql/src/test/resources/graphql/requests/delete/nestedSingleId.graphql
new file mode 100644
index 0000000000..90dc3b5c29
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/delete/nestedSingleId.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(op:DELETE, ids: ["1"]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/delete/rootCollectionPt1.graphql b/elide-graphql/src/test/resources/graphql/requests/delete/rootCollectionPt1.graphql
new file mode 100644
index 0000000000..27512e636e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/delete/rootCollectionPt1.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op:DELETE, ids: ["1", "2"]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/delete/rootIdNoDataPt1.graphql b/elide-graphql/src/test/resources/graphql/requests/delete/rootIdNoDataPt1.graphql
new file mode 100644
index 0000000000..bbd25d37a8
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/delete/rootIdNoDataPt1.graphql
@@ -0,0 +1,10 @@
+mutation {
+  author(op:DELETE, ids: ["1"]) {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAmbiguous.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAmbiguous.graphql
new file mode 100644
index 0000000000..2b9517d791
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAmbiguous.graphql
@@ -0,0 +1,10 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        alias: id
+        alias: title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAttribute.graphql
new file mode 100644
index 0000000000..2949278f50
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasAttribute.graphql
@@ -0,0 +1,9 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id_alias: id
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/aliasPartialQueryAmbiguous.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasPartialQueryAmbiguous.graphql
new file mode 100644
index 0000000000..b11f611aa7
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasPartialQueryAmbiguous.graphql
@@ -0,0 +1,23 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        alias: id
+      }
+    }
+  }
+  book(ids: ["1"]) {
+    edges {
+      node {
+        alias: authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/aliasRelationship.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasRelationship.graphql
new file mode 100644
index 0000000000..742c5d8178
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasRelationship.graphql
@@ -0,0 +1,18 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        title
+        authors_alias: authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/aliasSameRelationship.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasSameRelationship.graphql
new file mode 100644
index 0000000000..b7b6c5622a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/aliasSameRelationship.graphql
@@ -0,0 +1,26 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        title
+        authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+        authors_alias: authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttribute.graphql
new file mode 100644
index 0000000000..5b5d10b044
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttribute.graphql
@@ -0,0 +1,16 @@
+{
+  book {
+    edges {
+      node {
+        id
+        title
+        price {
+          units
+          currency {
+            currencyCode
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeList.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeList.graphql
new file mode 100644
index 0000000000..edf20d4e68
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeList.graphql
@@ -0,0 +1,16 @@
+{
+  book {
+    edges {
+      node {
+        id
+        title
+        priceHistory {
+          units
+          currency {
+            currencyCode
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeMap.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeMap.graphql
new file mode 100644
index 0000000000..c2262f55ca
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/complexAttributeMap.graphql
@@ -0,0 +1,19 @@
+{
+  book {
+    edges {
+      node {
+        id
+        title
+        priceRevisions {
+          key
+          value {
+            units
+            currency {
+              currencyCode
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/computedAttributes.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/computedAttributes.graphql
new file mode 100644
index 0000000000..479b87dd2e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/computedAttributes.graphql
@@ -0,0 +1,9 @@
+{
+  author {
+    edges {
+      node {
+        bookTitlesWithPrefix
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/filterByAlias.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/filterByAlias.graphql
new file mode 100644
index 0000000000..d8f6b9c22f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/filterByAlias.graphql
@@ -0,0 +1,10 @@
+{
+  book(filter: "title_alias==\"Libro*\"") {
+    edges {
+      node {
+        id
+        title_alias: title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentInline.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentInline.graphql
new file mode 100644
index 0000000000..f0ebb97e46
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentInline.graphql
@@ -0,0 +1,26 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        ... on BookConnection {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentLoop.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentLoop.graphql
new file mode 100644
index 0000000000..b7de35abde
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentLoop.graphql
@@ -0,0 +1,31 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        ...BookFields
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+
+fragment BookFields on BookConnection {
+  edges {
+    node {
+      id
+      title
+      authors {
+        ...AuthorFields
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnConnection.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnConnection.graphql
new file mode 100644
index 0000000000..c4a9214719
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnConnection.graphql
@@ -0,0 +1,28 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        ...BookFields
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+
+fragment BookFields on BookConnection {
+  edges {
+    node {
+      id
+      title
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnEdges.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnEdges.graphql
new file mode 100644
index 0000000000..e0664c6db1
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnEdges.graphql
@@ -0,0 +1,28 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        edges {
+          ...BookFields
+        }
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+
+fragment BookFields on BookEdge {
+  node {
+    id
+    title
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnNode.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnNode.graphql
new file mode 100644
index 0000000000..544f11dbd0
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentOnNode.graphql
@@ -0,0 +1,28 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        edges {
+          node {
+             ...BookFields
+          }
+        }
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+
+fragment BookFields on Book {
+  id
+  title
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentUnknown.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentUnknown.graphql
new file mode 100644
index 0000000000..d6ad5cf3e7
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/fragmentUnknown.graphql
@@ -0,0 +1,31 @@
+query namedQuery {
+  author {
+    ...AuthorFields
+  }
+}
+
+fragment AuthorFields on AuthorConnection {
+  edges {
+    node {
+      id
+      books {
+        ...UnknownFields
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+
+fragment BookFields on BookConnection {
+  edges {
+    node {
+      id
+      title
+      authors {
+        ...AuthorFields
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollection.graphql
new file mode 100644
index 0000000000..240cc2a195
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollection.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(ids: ["1"]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionFilter.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionFilter.graphql
new file mode 100644
index 0000000000..a1a115b58c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionFilter.graphql
@@ -0,0 +1,16 @@
+query nestedCollectionFilter($Filter: String = "title==\"Libro U*\"") {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(filter: $Filter) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionPaginate.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionPaginate.graphql
new file mode 100644
index 0000000000..43639f3eee
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionPaginate.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(first: "1", after: "1") {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionSort.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionSort.graphql
new file mode 100644
index 0000000000..2d04ecda2d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedCollectionSort.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(sort: "title") {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/nestedSingle.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedSingle.graphql
new file mode 100644
index 0000000000..1e29302c3f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/nestedSingle.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        name
+        penName {
+          edges {
+            node {
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRelationship.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRelationship.graphql
new file mode 100644
index 0000000000..01dc78c385
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRelationship.graphql
@@ -0,0 +1,23 @@
+{
+  author {
+    edges {
+      node {
+        id
+        books {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+          pageInfo {
+            totalRecords
+          }
+        }
+      }
+    }
+    pageInfo {
+      totalRecords
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRoot.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRoot.graphql
new file mode 100644
index 0000000000..1ee75d63e0
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRoot.graphql
@@ -0,0 +1,16 @@
+{
+  book {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+    pageInfo {
+      endCursor
+      startCursor
+      hasNextPage
+      totalRecords
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithFilter.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithFilter.graphql
new file mode 100644
index 0000000000..31a1ad1f0d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithFilter.graphql
@@ -0,0 +1,13 @@
+{
+  book(filter: "title==\"Libro*\"") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+    pageInfo {
+      totalRecords
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithIds.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithIds.graphql
new file mode 100644
index 0000000000..2b90968d1c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithIds.graphql
@@ -0,0 +1,13 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+    pageInfo {
+      totalRecords
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithPagination.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithPagination.graphql
new file mode 100644
index 0000000000..a7e0e0d143
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/pageTotalsRootWithPagination.graphql
@@ -0,0 +1,16 @@
+{
+  book(first: "1", after: "1") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+    pageInfo {
+      totalRecords
+      startCursor
+      endCursor
+      hasNextPage
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollection.graphql
new file mode 100644
index 0000000000..d323394f4a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollection.graphql
@@ -0,0 +1,13 @@
+{
+  book {
+    edges {
+      node {
+        id
+        title
+        genre
+        language
+        publicationDate
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateGTFilter.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateGTFilter.graphql
new file mode 100644
index 0000000000..1f6fa1ac18
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateGTFilter.graphql
@@ -0,0 +1,11 @@
+{
+  book(filter: "publicationDate>=\"1984-01-01T00:00Z\"") {
+    edges {
+      node {
+        id
+        title
+        publicationDate
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateLTFilter.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateLTFilter.graphql
new file mode 100644
index 0000000000..8d080ddfee
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionDateLTFilter.graphql
@@ -0,0 +1,11 @@
+{
+  book(filter: "publicationDate<=\"1984-01-01T00:00Z\"") {
+    edges {
+      node {
+        id
+        title
+        publicationDate
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionFilter.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionFilter.graphql
new file mode 100644
index 0000000000..686736f47e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionFilter.graphql
@@ -0,0 +1,10 @@
+{
+  book(filter: "title==\"Libro U*\"") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionInvalidSort.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionInvalidSort.graphql
new file mode 100644
index 0000000000..68eae41272
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionInvalidSort.graphql
@@ -0,0 +1,10 @@
+{
+  book(sort: "-title|unknown") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionMultiSort.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionMultiSort.graphql
new file mode 100644
index 0000000000..742c60954c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionMultiSort.graphql
@@ -0,0 +1,17 @@
+{
+  book(sort: "-publisher.id,id") {
+    edges {
+      node {
+        id
+        title
+        publisher {
+          edges {
+            node {
+              id
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithOffset.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithOffset.graphql
new file mode 100644
index 0000000000..abd62759e6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithOffset.graphql
@@ -0,0 +1,10 @@
+{
+  book(first: "1", after: "1") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithoutOffset.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithoutOffset.graphql
new file mode 100644
index 0000000000..f111f2f550
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionPaginateWithoutOffset.graphql
@@ -0,0 +1,10 @@
+{
+  book(first: "1") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionSort.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionSort.graphql
new file mode 100644
index 0000000000..ad62fb9040
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootCollectionSort.graphql
@@ -0,0 +1,10 @@
+{
+  book(sort: "-title") {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultiple.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultiple.graphql
new file mode 100644
index 0000000000..c98de93477
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultiple.graphql
@@ -0,0 +1,16 @@
+{
+  book {
+    edges {
+      node {
+        id
+      }
+    }
+  }
+  author {
+    edges {
+      node {
+        id
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultipleIds.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultipleIds.graphql
new file mode 100644
index 0000000000..a85235190a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootMultipleIds.graphql
@@ -0,0 +1,10 @@
+{
+  book(ids: ["1", "2"]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootSingle.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootSingle.graphql
new file mode 100644
index 0000000000..4618eaf60e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootSingle.graphql
@@ -0,0 +1,19 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        title
+        authors {
+          edges {
+            node {
+              id
+              name
+              obj
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/rootUnknownField.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/rootUnknownField.graphql
new file mode 100644
index 0000000000..5a84ed8bd0
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/rootUnknownField.graphql
@@ -0,0 +1,18 @@
+{
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        unknown
+        authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/sortByAlias.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/sortByAlias.graphql
new file mode 100644
index 0000000000..00da026205
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/sortByAlias.graphql
@@ -0,0 +1,10 @@
+{
+  book(sort: "title_alias") {
+    edges {
+      node {
+        id
+        title_alias: title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/variableDefinition.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/variableDefinition.graphql
new file mode 100644
index 0000000000..fdcf2e461c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/variableDefinition.graphql
@@ -0,0 +1,18 @@
+query testBook($ids : [String] = ["1"]) {
+  book(ids: $ids) {
+    edges {
+      node {
+        id
+        title
+        authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/variableInvalidNonNull.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/variableInvalidNonNull.graphql
new file mode 100644
index 0000000000..3143220866
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/variableInvalidNonNull.graphql
@@ -0,0 +1,18 @@
+query testBook($ids : [String]!) {
+  book(ids: $ids) {
+    edges {
+      node {
+        id
+        title
+        authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/fetch/variableUnknownReference.graphql b/elide-graphql/src/test/resources/graphql/requests/fetch/variableUnknownReference.graphql
new file mode 100644
index 0000000000..f7597e6fee
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/fetch/variableUnknownReference.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(filter: $UnknownFilter) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionNothingToRemove.graphql b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionNothingToRemove.graphql
new file mode 100644
index 0000000000..4543998c12
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionNothingToRemove.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(op:REMOVE, ids: ["4"]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt1.graphql b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt1.graphql
new file mode 100644
index 0000000000..8393cc5962
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt1.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books(op:REMOVE, ids: ["1", "2"]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt2.graphql b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt2.graphql
new file mode 100644
index 0000000000..b9b1d4095d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt2.graphql
@@ -0,0 +1,16 @@
+{
+  author(ids: ["1"]) {
+    edges {
+      node {
+        books {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt3.graphql b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt3.graphql
new file mode 100644
index 0000000000..62e559b324
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/remove/nestedCollectionPt3.graphql
@@ -0,0 +1,9 @@
+{
+  book {
+    edges {
+      node {
+        id
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/remove/rootCollectionPt1.graphql b/elide-graphql/src/test/resources/graphql/requests/remove/rootCollectionPt1.graphql
new file mode 100644
index 0000000000..0a30ca0de5
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/remove/rootCollectionPt1.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op:REMOVE, ids: ["1", "2"]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/replace/replaceEmptyCollections.graphql b/elide-graphql/src/test/resources/graphql/requests/replace/replaceEmptyCollections.graphql
new file mode 100644
index 0000000000..dbceea64b9
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/replace/replaceEmptyCollections.graphql
@@ -0,0 +1,18 @@
+mutation {
+  book {
+    edges {
+      node {
+        id
+        title
+        authors(op: REPLACE, data:[]) {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/replace/replaceNestedCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/replace/replaceNestedCollection.graphql
new file mode 100644
index 0000000000..c2ef4de22b
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/replace/replaceNestedCollection.graphql
@@ -0,0 +1,18 @@
+mutation {
+  book {
+    edges {
+      node {
+        id
+        title
+        authors(op: REPLACE, data:[{name:"My New Author"},{id:"1"}]) {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/replace/replaceRootCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/replace/replaceRootCollection.graphql
new file mode 100644
index 0000000000..d7472c9dde
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/replace/replaceRootCollection.graphql
@@ -0,0 +1,18 @@
+mutation {
+  book(op: REPLACE, data:[{title:"abc",authors:[{id:"1"}]},{title:"xyz"}]) {
+    edges {
+      node {
+        id
+        title
+        authors {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/replace/replaceWithIdsFails.graphql b/elide-graphql/src/test/resources/graphql/requests/replace/replaceWithIdsFails.graphql
new file mode 100644
index 0000000000..b81381b0cc
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/replace/replaceWithIdsFails.graphql
@@ -0,0 +1,9 @@
+mutation {
+  book(op: REPLACE, ids: ["1"], data:{authors:[{id:"1"}]}) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/crossCyclicRelationships.graphql b/elide-graphql/src/test/resources/graphql/requests/update/crossCyclicRelationships.graphql
new file mode 100644
index 0000000000..21a42dd08e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/crossCyclicRelationships.graphql
@@ -0,0 +1,26 @@
+mutation {
+  author(op: UPDATE, data: {id: "1", name: "John Snow", books: [{id: "1", title: "Libro One", authors: [{id: "1", name: "Ned Stark"}]}]}) {
+    edges {
+      node {
+        id
+        name
+        books(ids: ["1"]) {
+          edges {
+            node {
+              id
+              title
+              authors(ids: ["1"]) {
+                edges {
+                  node {
+                    id
+                    name
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/nestedCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/update/nestedCollection.graphql
new file mode 100644
index 0000000000..1e89dc5b34
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/nestedCollection.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op:UPDATE, data: [{id: "1", title: "abc"}, {id: "2", title: "xyz"}]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/nestedCollectionMissingIds.graphql b/elide-graphql/src/test/resources/graphql/requests/update/nestedCollectionMissingIds.graphql
new file mode 100644
index 0000000000..9a475e7afa
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/nestedCollectionMissingIds.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(op:UPDATE, data: {id: "1", name: "John Snow", books: [{id: "3", title: "updated title"}, {title: "abc"}, {id: "2", title: "new title"}]}) {
+    edges {
+      node {
+         id
+         name
+         books(sort: "-title") {
+           edges {
+             node {
+               title
+             }
+           }
+         }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/nestedSingleUpdate.graphql b/elide-graphql/src/test/resources/graphql/requests/update/nestedSingleUpdate.graphql
new file mode 100644
index 0000000000..51426c5a66
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/nestedSingleUpdate.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op:UPDATE, data: {id: "1", title: "abc"}) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/nestedUpdates.graphql b/elide-graphql/src/test/resources/graphql/requests/update/nestedUpdates.graphql
new file mode 100644
index 0000000000..cfd73af909
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/nestedUpdates.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(op: UPDATE, data: {id: "1", name: "John Snow", books: [{id: "1", title: "Libro One"}, {id: "2", title: "Foobar"}]}) {
+    edges {
+      node {
+        name
+        books(op:UPDATE, data: {id: "1", title: "Changed Again"}) {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionInvalidIds.graphql b/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionInvalidIds.graphql
new file mode 100644
index 0000000000..6de815786f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionInvalidIds.graphql
@@ -0,0 +1,9 @@
+mutation {
+  book(op:UPDATE, data: [{id: "1", title: "my id"}, {id: "42", title: "xyz"}]) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionMissingIds.graphql b/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionMissingIds.graphql
new file mode 100644
index 0000000000..fadba162c2
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/rootCollectionMissingIds.graphql
@@ -0,0 +1,9 @@
+mutation {
+  book(op:UPDATE, data: [{id: "1", title: "my id"}, {title: "xyz"}]) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithId.graphql b/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithId.graphql
new file mode 100644
index 0000000000..815eff46d7
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithId.graphql
@@ -0,0 +1,10 @@
+mutation {
+  author(op:UPDATE, data: {id: "1", name: "abc" }) {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithList.graphql b/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithList.graphql
new file mode 100644
index 0000000000..d2f067a24a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/rootSingleWithList.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op:UPDATE, data: [{id: "1", title: "abc"}, {id: "2", title: "xyz"}]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/setComputedAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/update/setComputedAttribute.graphql
new file mode 100644
index 0000000000..d516d95cc6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/setComputedAttribute.graphql
@@ -0,0 +1,9 @@
+mutation {
+  author(op: UPDATE, ids: ["1"], data: {prefix: "MyPrefix", bookTitlesWithPrefix: ["I", "should", "do", "nothing!"]}) {
+    edges {
+      node {
+        bookTitlesWithPrefix
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttribute.graphql
new file mode 100644
index 0000000000..1581195484
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttribute.graphql
@@ -0,0 +1,16 @@
+mutation {
+  book(op:UPDATE,
+  data: {
+         id: "1",
+         price: { units: 124.4 }
+      }) {
+    edges {
+      node {
+        id
+        price {
+           units
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeList.graphql b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeList.graphql
new file mode 100644
index 0000000000..58f53b0ec5
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeList.graphql
@@ -0,0 +1,19 @@
+mutation {
+  book(op:UPDATE,
+  data: {
+         id: "1",
+         priceHistory: [{ units: 125 }, { units: 126, currency: { currencyCode: "USD" }}]
+      }) {
+    edges {
+      node {
+        id
+        priceHistory {
+           units,
+           currency {
+             currencyCode
+           }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeMap.graphql b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeMap.graphql
new file mode 100644
index 0000000000..f425c3827d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexAttributeMap.graphql
@@ -0,0 +1,25 @@
+mutation {
+  book(op:UPDATE,
+  data: {
+         id: "1",
+         priceRevisions: [
+            { key: "2016-01-02T00:00Z", value: { units: 490056468, currency: { currencyCode: "USD" }}},
+            { key: "2016-01-01T00:00Z", value: { units: 125.7}}
+         ]
+      }) {
+    edges {
+      node {
+        id
+        priceRevisions {
+          key
+          value {
+            units
+            currency {
+              currencyCode
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/update/updateComplexGraph.graphql b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexGraph.graphql
new file mode 100644
index 0000000000..5b13825c1d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/update/updateComplexGraph.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(op:UPDATE, data: {id: "1", name: "John Snow", books: [{id: "3", title: "updated again"}, {id: "2", title: "newish title"}]}) {
+    edges {
+      node {
+        id
+        name
+        books(ids: ["3"]) {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createComplexAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createComplexAttribute.graphql
new file mode 100644
index 0000000000..ca9fdf03fb
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createComplexAttribute.graphql
@@ -0,0 +1,20 @@
+mutation {
+  book(op: UPSERT, data: {
+       title: "Book Numero Tres",
+       publicationDate: "1984-12-25T00:00Z",
+       price: { units: 123.1, currency : { currencyCode : "USD" }}
+    }) {
+    edges {
+      node {
+        title
+        publicationDate
+        price {
+          units
+          currency {
+            currencyCode
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedCollection.graphql
new file mode 100644
index 0000000000..05c1fa6de1
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedCollection.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op: UPSERT, data: [{title: "Book Numero Dos"}, {title: "Book Numero Tres"}]) {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingle.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingle.graphql
new file mode 100644
index 0000000000..00c2de6c12
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingle.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op: UPSERT, data: {title: "Book Numero Dos"}) {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingleUnshareable.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingleUnshareable.graphql
new file mode 100644
index 0000000000..5232a6052e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createNestedSingleUnshareable.graphql
@@ -0,0 +1,16 @@
+mutation {
+  book(ids: ["1"]) {
+    edges {
+      node {
+        id
+        previews(op: UPSERT, data: {id: "123e4567-e89b-12d3-a456-426655440000"}) {
+          edges {
+            node {
+              id
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createRootCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createRootCollection.graphql
new file mode 100644
index 0000000000..826b937e0d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createRootCollection.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op: UPSERT, data: [{title: "Book Numero Dos"},{title:"Book Numero Tres"}] ) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createRootSingle.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createRootSingle.graphql
new file mode 100644
index 0000000000..fe47b0db11
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createRootSingle.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op: UPSERT, data: {title: "Book Numero Dos", publicationDate: "1984-12-25T00:00Z"} ) {
+    edges {
+      node {
+        title
+        publicationDate
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/createWithVariables.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/createWithVariables.graphql
new file mode 100644
index 0000000000..653388125f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/createWithVariables.graphql
@@ -0,0 +1,19 @@
+mutation createWithVariables($title: String!, $publicationDate: Date!, $publisherId: ID!, $publisherName: String!) {
+  book(op: UPSERT, data: {title: $title, publicationDate: $publicationDate}) {
+    edges {
+      node {
+        id
+        title
+        publicationDate
+        publisher(op: UPSERT, data: {id: $publisherId, name: $publisherName}) {
+          edges {
+            node {
+              id
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/crossCyclicRelationships.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/crossCyclicRelationships.graphql
new file mode 100644
index 0000000000..b43e8b9a49
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/crossCyclicRelationships.graphql
@@ -0,0 +1,26 @@
+mutation {
+  author(op: UPSERT, data: {id: "1", name: "John Snow", books: [{id: "1", title: "Libro One", authors: [{id: "1", name: "Ned Stark"}]}]}) {
+    edges {
+      node {
+        id
+        name
+        books(ids: ["1"]) {
+          edges {
+            node {
+              id
+              title
+              authors(ids: ["1"]) {
+                edges {
+                  node {
+                    id
+                    name
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/nestedCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedCollection.graphql
new file mode 100644
index 0000000000..fdec944826
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedCollection.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op:UPSERT, data: [{id: "1", title: "abc"}, {id: "2", title: "xyz"}]) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/nestedSingleUpdate.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedSingleUpdate.graphql
new file mode 100644
index 0000000000..ca987e848f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedSingleUpdate.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(ids: ["1"]) {
+    edges {
+      node {
+        id
+        books(op:UPSERT, data: {id: "1", title: "abc"}) {
+          edges {
+            node {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/nestedUpserts.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedUpserts.graphql
new file mode 100644
index 0000000000..b87ac17001
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/nestedUpserts.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(op: UPSERT, data: {id: "1", name: "John Snow", books: [{id: "1", title: "Libro One"}, {id: "2", title: "Foobar"}]}) {
+    edges {
+      node {
+        name
+        books(op:UPSERT, data: {id: "1", title: "Changed Again"}) {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdOnlyRequest2Back.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdOnlyRequest2Back.graphql
new file mode 100644
index 0000000000..6fa1c21542
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdOnlyRequest2Back.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(op:UPSERT, data: {id: "1", name: "John Snow", books: [{id: "3", title: "updated again"}, {id: "123", title: "the new one"}, {id: "2", title: "newish title"}]}) {
+    edges {
+      node {
+        id
+        name
+        books(ids: ["3", "123"], sort: "title") {
+          edges {
+            node {
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdReferenceCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdReferenceCollection.graphql
new file mode 100644
index 0000000000..a202a3cad2
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/nonCreatedIdReferenceCollection.graphql
@@ -0,0 +1,17 @@
+mutation {
+  author(op:UPSERT, data: {id: "1", name: "John Snow", books: [{id: "3", title: "updated title"}, {title: "abc"}, {id: "2", title: "new title"}]}) {
+    edges {
+      node {
+         id
+         name
+         books(sort: "-title") {
+           edges {
+             node {
+               title
+             }
+           }
+         }
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/rootCollectionMixedIds.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/rootCollectionMixedIds.graphql
new file mode 100644
index 0000000000..c2c64b95ff
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/rootCollectionMixedIds.graphql
@@ -0,0 +1,9 @@
+mutation {
+  book(op:UPSERT, data: [{id: "1", title: "my id"}, {id: "42", title: "xyz"}, {title: "abc"}]) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithId.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithId.graphql
new file mode 100644
index 0000000000..6f4ad5e235
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithId.graphql
@@ -0,0 +1,11 @@
+mutation {
+  author(op:UPSERT, data: {id: "1", name: "abc", obj: "bar" }) {
+    edges {
+      node {
+        id
+        name
+        obj
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithList.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithList.graphql
new file mode 100644
index 0000000000..5c4e7721a8
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/rootSingleWithList.graphql
@@ -0,0 +1,10 @@
+mutation {
+  book(op:UPSERT, data: [{id: "1", title: "abc"}, {id: "2", title: "xyz"}]) {
+    edges {
+      node {
+        id
+        title
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/setComputedAttribute.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/setComputedAttribute.graphql
new file mode 100644
index 0000000000..465afbcef3
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/setComputedAttribute.graphql
@@ -0,0 +1,9 @@
+mutation {
+  author(op: UPSERT, data: {prefix: "MyPrefix", bookTitlesWithPrefix: ["I", "should", "do", "nothing!"]}) {
+    edges {
+      node {
+        bookTitlesWithPrefix
+      }
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/requests/upsert/uspertOnCollection.graphql b/elide-graphql/src/test/resources/graphql/requests/upsert/uspertOnCollection.graphql
new file mode 100644
index 0000000000..f25ee04ee8
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/requests/upsert/uspertOnCollection.graphql
@@ -0,0 +1,16 @@
+mutation {
+  author(op:UPSERT, data: {name: "John Snow", books: [{id: "1", title: "my id"}, {title: "abc"}]}) {
+     edges {
+       node {
+         name
+         books(sort: "-title") {
+           edges {
+             node {
+               title
+             }
+           }
+         }
+       }
+     }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt1.json b/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt1.json
new file mode 100644
index 0000000000..2e7a98ff2c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt1.json
@@ -0,0 +1,14 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt2.json b/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt2.json
new file mode 100644
index 0000000000..2d97c8570a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/delete/nestedCollectionPt2.json
@@ -0,0 +1,13 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": []
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/delete/nestedSingleId.json b/elide-graphql/src/test/resources/graphql/responses/delete/nestedSingleId.json
new file mode 100644
index 0000000000..2e7a98ff2c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/delete/nestedSingleId.json
@@ -0,0 +1,14 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/delete/rootCollectionPt1.json b/elide-graphql/src/test/resources/graphql/responses/delete/rootCollectionPt1.json
new file mode 100644
index 0000000000..cc929eda16
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/delete/rootCollectionPt1.json
@@ -0,0 +1,6 @@
+{
+  "book": {
+    "edges": [
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/delete/rootIdNoDataPt1.json b/elide-graphql/src/test/resources/graphql/responses/delete/rootIdNoDataPt1.json
new file mode 100644
index 0000000000..c6da0b980c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/delete/rootIdNoDataPt1.json
@@ -0,0 +1,6 @@
+{
+  "author": {
+    "edges": [
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/aliasAttribute.json b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasAttribute.json
new file mode 100644
index 0000000000..5c6d4a43c9
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasAttribute.json
@@ -0,0 +1,11 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id_alias": "1"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/aliasRelationship.json b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasRelationship.json
new file mode 100644
index 0000000000..d4187ec800
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasRelationship.json
@@ -0,0 +1,22 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors_alias": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/aliasSameRelationship.json b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasSameRelationship.json
new file mode 100644
index 0000000000..b29162a650
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/aliasSameRelationship.json
@@ -0,0 +1,32 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          },
+          "authors_alias": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttribute.json b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttribute.json
new file mode 100644
index 0000000000..62213cc7fb
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttribute.json
@@ -0,0 +1,32 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "price": {
+            "units" : 123,
+            "currency" : {
+              "currencyCode" : "USD"
+            }
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "price": null
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "price": null
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeList.json b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeList.json
new file mode 100644
index 0000000000..8be28561ef
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeList.json
@@ -0,0 +1,40 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "priceHistory": null
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "priceHistory": [
+            {
+              "units" : 200,
+              "currency" : {
+                "currencyCode" : "USD"
+              }
+            },
+            {
+              "units" : 210,
+              "currency": {
+                "currencyCode" : "USD"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "priceHistory": []
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeMap.json b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeMap.json
new file mode 100644
index 0000000000..d42779bf5d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/complexAttributeMap.json
@@ -0,0 +1,46 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "priceRevisions": null
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "priceRevisions": [
+            {
+              "key" : "2020-05-22T22:48Z",
+              "value" : {
+                "units" : 210,
+                "currency" : {
+                  "currencyCode" : "USD"
+                }
+              }
+            },
+            {
+              "key" : "2020-05-22T22:46Z",
+              "value" : {
+                "units" : 200,
+                "currency" : {
+                  "currencyCode" : "USD"
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "priceRevisions": null
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/computedAttributes.json b/elide-graphql/src/test/resources/graphql/responses/fetch/computedAttributes.json
new file mode 100644
index 0000000000..5129557b4e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/computedAttributes.json
@@ -0,0 +1,21 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "bookTitlesWithPrefix": [
+            "default_Libro Uno",
+            "default_Libro Dos"
+          ]
+        }
+      },
+      {
+        "node": {
+          "bookTitlesWithPrefix": [
+            "default_Doctor Zhivago"
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/filterByAlias.json b/elide-graphql/src/test/resources/graphql/responses/fetch/filterByAlias.json
new file mode 100644
index 0000000000..1a1427a3ae
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/filterByAlias.json
@@ -0,0 +1,19 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title_alias": "Libro Uno"
+
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title_alias": "Libro Dos"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnConnection.json b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnConnection.json
new file mode 100644
index 0000000000..d134fac1b5
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnConnection.json
@@ -0,0 +1,48 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      },
+      {
+        "node": {
+          "id": "2",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "title": "Doctor Zhivago"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnEdges.json b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnEdges.json
new file mode 100644
index 0000000000..d134fac1b5
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnEdges.json
@@ -0,0 +1,48 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      },
+      {
+        "node": {
+          "id": "2",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "title": "Doctor Zhivago"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnNode.json b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnNode.json
new file mode 100644
index 0000000000..d134fac1b5
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/fragmentOnNode.json
@@ -0,0 +1,48 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      },
+      {
+        "node": {
+          "id": "2",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "title": "Doctor Zhivago"
+                }
+              }
+            ],
+            "__typename": "BookConnection"
+          },
+          "__typename": "Author"
+        },
+        "__typename": "AuthorEdge"
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollection.json b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollection.json
new file mode 100644
index 0000000000..7b06e15392
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollection.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionFilter.json b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionFilter.json
new file mode 100644
index 0000000000..7b06e15392
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionFilter.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionPaginate.json b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionPaginate.json
new file mode 100644
index 0000000000..283cfd19ca
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionPaginate.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionSort.json b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionSort.json
new file mode 100644
index 0000000000..9c2fceb16c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedCollectionSort.json
@@ -0,0 +1,26 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              },
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/nestedSingle.json b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedSingle.json
new file mode 100644
index 0000000000..09704e0e86
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/nestedSingle.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "name": "Mark Twain",
+          "penName": {
+            "edges": [
+              {
+                "node": {
+                  "name": "The People's Author"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRelationship.json b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRelationship.json
new file mode 100644
index 0000000000..9600473b8c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRelationship.json
@@ -0,0 +1,51 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro Uno"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "Libro Dos"
+                }
+              }
+            ],
+            "pageInfo": {
+              "totalRecords": 2
+            }
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "title": "Doctor Zhivago"
+                }
+              }
+            ],
+            "pageInfo": {
+              "totalRecords": 1
+            }
+          }
+        }
+      }
+    ],
+    "pageInfo": {
+      "totalRecords": 2
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRoot.json b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRoot.json
new file mode 100644
index 0000000000..803a23ee0b
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRoot.json
@@ -0,0 +1,30 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago"
+        }
+      }
+    ],
+    "pageInfo": {
+      "endCursor": "3",
+      "startCursor": "0",
+      "hasNextPage": false,
+      "totalRecords": 3
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithFilter.json b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithFilter.json
new file mode 100644
index 0000000000..bc78e95396
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithFilter.json
@@ -0,0 +1,21 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      }
+    ],
+    "pageInfo": {
+      "totalRecords": 2
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithIds.json b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithIds.json
new file mode 100644
index 0000000000..e1c5c97923
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithIds.json
@@ -0,0 +1,15 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      }
+    ],
+    "pageInfo": {
+      "totalRecords": 1
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithPagination.json b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithPagination.json
new file mode 100644
index 0000000000..0347224efc
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/pageTotalsRootWithPagination.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      }
+    ],
+    "pageInfo": {
+      "totalRecords": 3,
+      "startCursor": "1",
+      "endCursor": "2",
+      "hasNextPage": true
+    }
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollection.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollection.json
new file mode 100644
index 0000000000..367b929412
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollection.json
@@ -0,0 +1,33 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "genre": null,
+          "language": null,
+          "publicationDate": "2017-12-27T18:03Z"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "genre": null,
+          "language": null,
+          "publicationDate": "1970-01-01T00:00Z"
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "genre": null,
+          "language": null,
+          "publicationDate": null
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateGTFilter.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateGTFilter.json
new file mode 100644
index 0000000000..ba00a2261e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateGTFilter.json
@@ -0,0 +1,13 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "publicationDate":"2017-12-27T18:03Z"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateLTFilter.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateLTFilter.json
new file mode 100644
index 0000000000..901d838cb1
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionDateLTFilter.json
@@ -0,0 +1,13 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "publicationDate":"1970-01-01T00:00Z"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionFilter.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionFilter.json
new file mode 100644
index 0000000000..1eb795bc77
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionFilter.json
@@ -0,0 +1,12 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionMultiSort.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionMultiSort.json
new file mode 100644
index 0000000000..38ab13f989
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionMultiSort.json
@@ -0,0 +1,51 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "publisher": {
+            "edges": [
+              {
+                "node": {
+                  "id": "2"
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "publisher": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1"
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "publisher": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithOffset.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithOffset.json
new file mode 100644
index 0000000000..d27a1ad838
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithOffset.json
@@ -0,0 +1,12 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithoutOffset.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithoutOffset.json
new file mode 100644
index 0000000000..1eb795bc77
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionPaginateWithoutOffset.json
@@ -0,0 +1,12 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionSort.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionSort.json
new file mode 100644
index 0000000000..898a36b9fb
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootCollectionSort.json
@@ -0,0 +1,24 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootMultipleIds.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootMultipleIds.json
new file mode 100644
index 0000000000..dfdaf9bd5f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootMultipleIds.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/rootSingle.json b/elide-graphql/src/test/resources/graphql/responses/fetch/rootSingle.json
new file mode 100644
index 0000000000..7f191dd0bd
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/rootSingle.json
@@ -0,0 +1,23 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain",
+                  "obj": "foo"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/sortByAlias.json b/elide-graphql/src/test/resources/graphql/responses/fetch/sortByAlias.json
new file mode 100644
index 0000000000..849a27b294
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/sortByAlias.json
@@ -0,0 +1,25 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "3",
+          "title_alias": "Doctor Zhivago"
+
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title_alias": "Libro Dos"
+        }
+      },
+      {
+        "node": {
+          "id": "1",
+          "title_alias": "Libro Uno"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/fetch/variableDefinition.json b/elide-graphql/src/test/resources/graphql/responses/fetch/variableDefinition.json
new file mode 100644
index 0000000000..7138cfd022
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/fetch/variableDefinition.json
@@ -0,0 +1,22 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt1.json b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt1.json
new file mode 100644
index 0000000000..2e7a98ff2c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt1.json
@@ -0,0 +1,14 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": [
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt2.json b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt2.json
new file mode 100644
index 0000000000..2d97c8570a
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt2.json
@@ -0,0 +1,13 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "books": {
+            "edges": []
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt3.json b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt3.json
new file mode 100644
index 0000000000..18cdb03d99
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/remove/nestedCollectionPt3.json
@@ -0,0 +1,21 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1"
+        }
+      },
+      {
+        "node": {
+          "id": "2"
+        }
+      },
+      {
+        "node": {
+          "id": "3"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/remove/rootCollectionPt1.json b/elide-graphql/src/test/resources/graphql/responses/remove/rootCollectionPt1.json
new file mode 100644
index 0000000000..cc929eda16
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/remove/rootCollectionPt1.json
@@ -0,0 +1,6 @@
+{
+  "book": {
+    "edges": [
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/replace/replaceEmptyCollections.json b/elide-graphql/src/test/resources/graphql/responses/replace/replaceEmptyCollections.json
new file mode 100644
index 0000000000..353cacf5f1
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/replace/replaceEmptyCollections.json
@@ -0,0 +1,33 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors": {
+            "edges": []
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "authors": {
+            "edges": []
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "authors": {
+            "edges": []
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/replace/replaceNestedCollection.json b/elide-graphql/src/test/resources/graphql/responses/replace/replaceNestedCollection.json
new file mode 100644
index 0000000000..5d21fe590e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/replace/replaceNestedCollection.json
@@ -0,0 +1,72 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "Libro Uno",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "name": "My New Author"
+                }
+              },
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "Libro Dos",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "4",
+                  "name": "My New Author"
+                }
+              },
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "title": "Doctor Zhivago",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "5",
+                  "name": "My New Author"
+                }
+              },
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/replace/replaceRootCollection.json b/elide-graphql/src/test/resources/graphql/responses/replace/replaceRootCollection.json
new file mode 100644
index 0000000000..0fd73b6c05
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/replace/replaceRootCollection.json
@@ -0,0 +1,31 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "4",
+          "title": "abc",
+          "authors": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "name": "Mark Twain"
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "5",
+          "title": "xyz",
+          "authors": {
+            "edges": []
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/crossCyclicRelationships.json b/elide-graphql/src/test/resources/graphql/responses/update/crossCyclicRelationships.json
new file mode 100644
index 0000000000..462e2c156e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/crossCyclicRelationships.json
@@ -0,0 +1,32 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "Ned Stark",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro One",
+                  "authors": {
+                    "edges": [
+                      {
+                        "node": {
+                          "id": "1",
+                          "name": "Ned Stark"
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/nestedCollection.json b/elide-graphql/src/test/resources/graphql/responses/update/nestedCollection.json
new file mode 100644
index 0000000000..9c0dbddee6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/nestedCollection.json
@@ -0,0 +1,27 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "abc"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "xyz"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/nestedSingleUpdate.json b/elide-graphql/src/test/resources/graphql/responses/update/nestedSingleUpdate.json
new file mode 100644
index 0000000000..dba2fae729
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/nestedSingleUpdate.json
@@ -0,0 +1,21 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "abc"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/nestedUpdates.json b/elide-graphql/src/test/resources/graphql/responses/update/nestedUpdates.json
new file mode 100644
index 0000000000..699353d3d6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/nestedUpdates.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "Changed Again"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithId.json b/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithId.json
new file mode 100644
index 0000000000..280d4d913b
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithId.json
@@ -0,0 +1,12 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "abc"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithList.json b/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithList.json
new file mode 100644
index 0000000000..eefd344289
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/rootSingleWithList.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "abc"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "xyz"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/setComputedAttribute.json b/elide-graphql/src/test/resources/graphql/responses/update/setComputedAttribute.json
new file mode 100644
index 0000000000..c0a4949081
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/setComputedAttribute.json
@@ -0,0 +1,11 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "specialOrEcho": "MyPrefix"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttribute.json b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttribute.json
new file mode 100644
index 0000000000..b442d9e3c0
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttribute.json
@@ -0,0 +1,14 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "price": {
+            "units": 124.4
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeList.json b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeList.json
new file mode 100644
index 0000000000..a6bf45dd7b
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeList.json
@@ -0,0 +1,23 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "priceHistory": [
+            {
+              "units": 125,
+              "currency": null
+            },
+            {
+              "units": 126,
+              "currency": {
+                "currencyCode" : "USD"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeMap.json b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeMap.json
new file mode 100644
index 0000000000..6a05e7e472
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexAttributeMap.json
@@ -0,0 +1,30 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "priceRevisions": [
+            {
+              "key": "2016-01-02T00:00Z",
+              "value": {
+                "units": 490056468,
+                "currency": {
+                  "currencyCode": "USD"
+                }
+              }
+            },
+            {
+              "key": "2016-01-01T00:00Z",
+              "value": {
+                "units": 125.7,
+
+                "currency": null
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/update/updateComplexGraph.json b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexGraph.json
new file mode 100644
index 0000000000..bf99bf3d90
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/update/updateComplexGraph.json
@@ -0,0 +1,21 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "updated again"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createComplexAttribute.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createComplexAttribute.json
new file mode 100644
index 0000000000..2779ddf7da
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createComplexAttribute.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "title": "Book Numero Tres",
+          "publicationDate": "1984-12-25T00:00Z",
+          "price" : {
+            "units" : 123.1,
+            "currency" : {
+              "currencyCode" : "USD"
+            }
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedCollection.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedCollection.json
new file mode 100644
index 0000000000..54eb2acf46
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedCollection.json
@@ -0,0 +1,25 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "Book Numero Dos"
+                }
+              },
+              {
+                "node": {
+                  "title": "Book Numero Tres"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingle.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingle.json
new file mode 100644
index 0000000000..d0d351d07c
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingle.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "Book Numero Dos"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingleUnshareable.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingleUnshareable.json
new file mode 100644
index 0000000000..05623fb888
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createNestedSingleUnshareable.json
@@ -0,0 +1,20 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "previews": {
+            "edges": [
+              {
+                "node": {
+                  "id": "123e4567-e89b-12d3-a456-426655440000"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createRootCollection.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createRootCollection.json
new file mode 100644
index 0000000000..840f1168e6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createRootCollection.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "4",
+          "title": "Book Numero Dos"
+        }
+      },
+      {
+        "node": {
+          "id": "5",
+          "title": "Book Numero Tres"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createRootSingle.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createRootSingle.json
new file mode 100644
index 0000000000..298540c24d
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createRootSingle.json
@@ -0,0 +1,12 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "title": "Book Numero Dos",
+          "publicationDate": "1984-12-25T00:00Z"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/createWithVariables.json b/elide-graphql/src/test/resources/graphql/responses/upsert/createWithVariables.json
new file mode 100644
index 0000000000..ca1b70665e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/createWithVariables.json
@@ -0,0 +1,23 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "4",
+          "title": "My new book title from variable!",
+          "publicationDate": "1985-12-25T00:00Z",
+          "publisher": {
+            "edges": [
+              {
+                "node": {
+                  "id": "3",
+                  "name": "my new publisher"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/crossCyclicRelationships.json b/elide-graphql/src/test/resources/graphql/responses/upsert/crossCyclicRelationships.json
new file mode 100644
index 0000000000..462e2c156e
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/crossCyclicRelationships.json
@@ -0,0 +1,32 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "Ned Stark",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "Libro One",
+                  "authors": {
+                    "edges": [
+                      {
+                        "node": {
+                          "id": "1",
+                          "name": "Ned Stark"
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/nestedCollection.json b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedCollection.json
new file mode 100644
index 0000000000..9c0dbddee6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedCollection.json
@@ -0,0 +1,27 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "abc"
+                }
+              },
+              {
+                "node": {
+                  "id": "2",
+                  "title": "xyz"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/nestedSingleUpdate.json b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedSingleUpdate.json
new file mode 100644
index 0000000000..dba2fae729
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedSingleUpdate.json
@@ -0,0 +1,21 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "id": "1",
+                  "title": "abc"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/nestedUpserts.json b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedUpserts.json
new file mode 100644
index 0000000000..699353d3d6
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/nestedUpserts.json
@@ -0,0 +1,20 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "Changed Again"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdOnlyRequest2Back.json b/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdOnlyRequest2Back.json
new file mode 100644
index 0000000000..add9a32ea1
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdOnlyRequest2Back.json
@@ -0,0 +1,26 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "the new one"
+                }
+              },
+              {
+                "node": {
+                  "title": "updated again"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdReferenceCollection.json b/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdReferenceCollection.json
new file mode 100644
index 0000000000..925842b473
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/nonCreatedIdReferenceCollection.json
@@ -0,0 +1,31 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "updated title"
+                }
+              },
+              {
+                "node": {
+                  "title": "new title"
+                }
+              },
+              {
+                "node": {
+                  "title": "abc"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/rootCollectionMixedIds.json b/elide-graphql/src/test/resources/graphql/responses/upsert/rootCollectionMixedIds.json
new file mode 100644
index 0000000000..0cd32326fc
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/rootCollectionMixedIds.json
@@ -0,0 +1,21 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "title": "my id"
+        }
+      },
+      {
+        "node": {
+          "title": "xyz"
+        }
+      },
+      {
+        "node": {
+          "title": "abc"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithId.json b/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithId.json
new file mode 100644
index 0000000000..21c6bde68f
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithId.json
@@ -0,0 +1,13 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "name": "abc",
+          "obj" : "bar"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithList.json b/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithList.json
new file mode 100644
index 0000000000..eefd344289
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/rootSingleWithList.json
@@ -0,0 +1,18 @@
+{
+  "book": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "title": "abc"
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "title": "xyz"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/setComputedAttribute.json b/elide-graphql/src/test/resources/graphql/responses/upsert/setComputedAttribute.json
new file mode 100644
index 0000000000..c0a4949081
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/setComputedAttribute.json
@@ -0,0 +1,11 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "specialOrEcho": "MyPrefix"
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/graphql/responses/upsert/uspertOnCollection.json b/elide-graphql/src/test/resources/graphql/responses/upsert/uspertOnCollection.json
new file mode 100644
index 0000000000..bd7e6049e3
--- /dev/null
+++ b/elide-graphql/src/test/resources/graphql/responses/upsert/uspertOnCollection.json
@@ -0,0 +1,25 @@
+{
+  "author": {
+    "edges": [
+      {
+        "node": {
+          "name": "John Snow",
+          "books": {
+            "edges": [
+              {
+                "node": {
+                  "title": "my id"
+                }
+              },
+              {
+                "node": {
+                  "title": "abc"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/elide-graphql/src/test/resources/logback.xml b/elide-graphql/src/test/resources/logback.xml
new file mode 100644
index 0000000000..9dbd4e3abd
--- /dev/null
+++ b/elide-graphql/src/test/resources/logback.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/elide-integration-tests/pom.xml b/elide-integration-tests/pom.xml
index 78b8802416..b6e166d0d6 100644
--- a/elide-integration-tests/pom.xml
+++ b/elide-integration-tests/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-parent-pom</artifactId>
-        <version>2.3.14-SNAPSHOT</version>
+        <version>6.1.4-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -24,13 +24,33 @@
         </license>
     </licenses>
 
+    <properties>
+        <elide.version>6.1.4-SNAPSHOT</elide.version>
+    </properties>
+
     <dependencies>
         <!-- Elide dependencies for integration testing -->
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-core</artifactId>
-            <version>2.3.14-SNAPSHOT</version>
+            <version>${elide.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>${elide.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-test-helpers</artifactId>
+            <version>${elide.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-async</artifactId>
+            <version>${elide.version}</version>
+        </dependency>
+
         <!-- Additional dependencies -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -42,59 +62,49 @@
             <artifactId>jetty-webapp</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>4.3.2.Final</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>validation-api</artifactId>
-                    <groupId>javax.validation</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.20.0-GA</version>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.3.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-hibernate3</artifactId>
-            <version>2.6.3</version>
-            <scope>test</scope>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate5.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.28.0-GA</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>json-schema-validator</artifactId>
-            <scope>test</scope>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
         </dependency>
 
         <!-- Logging -->
@@ -115,14 +125,30 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <scope>test</scope>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
     </dependencies>
     <build>
@@ -168,6 +194,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <failBuildOnCVSS>11</failBuildOnCVSS>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/FilterIT.groovy b/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/FilterIT.groovy
deleted file mode 100644
index c5fc0e8875..0000000000
--- a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/FilterIT.groovy
+++ /dev/null
@@ -1,1485 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests
-import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.jayway.restassured.RestAssured
-import com.yahoo.elide.core.HttpStatus
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer
-import org.testng.Assert
-import org.testng.annotations.AfterTest
-import org.testng.annotations.BeforeClass
-import org.testng.annotations.Test
-/**
- * Tests for Filters
- */
-class FilterIT extends AbstractIntegrationTestInitializer {
-    private final ObjectMapper mapper = new ObjectMapper()
-
-    private JsonNode books = null
-    private JsonNode authors = null
-    private String asimovId = null
-    private JsonNode asimovBooks = null
-    private String thomasHarrisId = null
-    private JsonNode thomasHarrisBooks = null
-    private String nullNedId = null
-    private JsonNode nullNedBooks = null
-    private String orsonCardId = null
-    private Set<Integer> bookIds = new HashSet<>()
-    private Set<Integer> authorIds = new HashSet<>()
-
-    @BeforeClass
-    public void setup() {
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Ernest Hemingway"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345678-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345678-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "The Old Man and the Sea",
-                            "genre": "Literary Fiction",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345678-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "For Whom the Bell Tolls",
-                            "genre": "Literary Fiction",
-                            "language": "English"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/").then().statusCode(HttpStatus.SC_OK)
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Thomas Harris"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345678-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "I'm OK - You're OK",
-                            "genre": "Psychology & Counseling",
-                            "language": "English"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/").then().statusCode(HttpStatus.SC_OK)
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345679-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Orson Scott Card"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345679-1234-1234-1234-1234567890ac"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345679-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Enders Game",
-                            "genre": "Science Fiction",
-                            "language": "English",
-                            "publishDate": 1454638927412
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/").then().statusCode(HttpStatus.SC_OK)
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345680-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Isaac Asimov"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345680-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345680-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345680-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Foundation",
-                            "genre": "Science Fiction",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345680-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "The Roman Republic",
-                            "genre": "History",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book/12345680-1234-1234-1234-1234567890ad/chapters",
-                        "value": {
-                          "type": "chapter",
-                          "id": "12345680-1234-1234-1234-1234567890ae",
-                          "attributes": {
-                            "title": "Viva la Roma!"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/").then().statusCode(HttpStatus.SC_OK)
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345681-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Null Ned"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345681-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345681-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345681-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Life with Null Ned",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345681-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "Life with Null Ned 2",
-                            "genre": "Not Null",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book/12345681-1234-1234-1234-1234567890ad/chapters",
-                        "value": {
-                          "type": "chapter",
-                          "id": "12345680-1234-1234-1234-1234567890ae",
-                          "attributes": {
-                            "title": "Mamma mia I wantz some pizza!"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/").then().statusCode(HttpStatus.SC_OK)
-
-        books = mapper.readTree(RestAssured.get("/book").asString())
-        authors = mapper.readTree(RestAssured.get("/author").asString())
-
-        for (JsonNode author : authors.get("data")) {
-            authorIds.add(author.get("id").asInt());
-            if (author.get("attributes").get("name").asText() == "Isaac Asimov") {
-                asimovId = author.get("id").asText()
-            }
-
-            if (author.get("attributes").get("name").asText() == "Null Ned") {
-                nullNedId = author.get("id").asText()
-            }
-
-            if (author.get("attributes").get("name").asText() == "Orson Scott Card") {
-                orsonCardId = author.get("id").asText();
-            }
-
-            if (author.get("attributes").get("name").asText() == "Thomas Harris") {
-                thomasHarrisId = author.get("id").asText();
-            }
-        }
-
-        for (JsonNode book : books.get("data")) {
-            bookIds.add(book.get("id").asInt());
-        }
-
-        Assert.assertNotNull(asimovId)
-        Assert.assertNotNull(nullNedId)
-        Assert.assertNotNull(thomasHarrisId)
-
-        asimovBooks = mapper.readTree(RestAssured.get("/author/${asimovId}/books").asString())
-        nullNedBooks = mapper.readTree(RestAssured.get("/author/${nullNedId}/books").asString())
-        thomasHarrisBooks = mapper.readTree(RestAssured.get("/author/${thomasHarrisId}/books").asString())
-    }
-
-    @Test
-    public void testRootFilterInvalidField() {
-        /* Test Default */
-        RestAssured
-                .get("/book?filter[book.name]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL typed */
-        RestAssured
-                .get("/book?filter[book]=name==Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL global */
-        RestAssured
-                .get("/book?filter=name==Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testRootFilterInvalidEntity() {
-        /* Test Default */
-        RestAssured
-                .get("/book?filter[bank.title]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL typed */
-        RestAssured
-                .get("/book?filter[bank]=title==Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testRootInvalidOperator() {
-        /* Test Default */
-        RestAssured
-                .get("/book?filter[book.title][invalid]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL Typed */
-        RestAssured
-                .get("/book?filter[book]=title=invalid=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-         /* Test RSQL Global */
-        RestAssured
-                .get("/book?filter=title=invalid=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testFilterInvalidField() {
-        /* Test Default */
-        RestAssured
-                .get("/author/3/book?filter[book.name]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL Typed */
-        RestAssured
-                .get("/author/3/book?filter[book]=name==Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testFilterInvalidEntity() {
-        /* Test Default */
-        RestAssured
-                .get("/author/3/book?filter[bank.title]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL Typed */
-        RestAssured
-                .get("/author/3/book?filter[bank]=title==Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testInvalidOperator() {
-        /* Test Default */
-        RestAssured
-                .get("/author/3/book?filter[book.title][invalid]=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-
-        /* Test RSQL Typed */
-        RestAssured
-                .get("/author/3/book?filter[book]=title=invalid=Ignored")
-                .then()
-                .statusCode(HttpStatus.SC_BAD_REQUEST)
-    }
-
-    @Test
-    public void testRootFilterImplicitSingle() {
-        int scienceFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("genre").asText().equals("Science Fiction")) {
-                scienceFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(scienceFictionBookCount > 0)
-
-        /* Test Default */
-        def scienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre]=Science Fiction").asString())
-
-        Assert.assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        scienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre=='Science Fiction'").asString())
-
-        Assert.assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size())
-
-        /* Test RSQL Global */
-        scienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre=='Science Fiction'").asString())
-
-        Assert.assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size())
-
-    }
-
-    @Test
-    public void testRootFilterInSingle() {
-        int literaryFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("genre").asText().equals("Literary Fiction")) {
-                literaryFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(literaryFictionBookCount > 0)
-
-        /* Test Default */
-        def literaryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][in]=Literary Fiction").asString())
-
-        Assert.assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        literaryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre=in='Literary Fiction'").asString())
-
-        Assert.assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size())
-
-        /* Test RSQL Global */
-        literaryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre=in='Literary Fiction'").asString())
-
-        Assert.assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterNotInSingle() {
-        int nonLiteraryFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (!node.get("attributes").get("genre").isNull()
-                    && !node.get("attributes").get("genre").asText().equals("Literary Fiction")) {
-                nonLiteraryFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(nonLiteraryFictionBookCount > 0)
-
-        /* Test Default */
-        def nonLiteraryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][not]=Literary Fiction").asString())
-
-        Assert.assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size())
-
-        /* Test RSQL typed */
-        nonLiteraryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre!='Literary Fiction'").asString())
-
-        Assert.assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size())
-
-        /* Test RSQL global */
-        nonLiteraryFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre!='Literary Fiction'").asString())
-
-        Assert.assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterNotInMultiple() {
-        int nonFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (!node.get("attributes").get("genre").isNull()
-                    && !node.get("attributes").get("genre").asText().equals("Literary Fiction")
-                    && !node.get("attributes").get("genre").asText().equals("Science Fiction")) {
-                nonFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(nonFictionBookCount > 0)
-
-        /* Test default */
-        def nonFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][not]=Literary Fiction,Science Fiction").asString())
-
-        Assert.assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size())
-
-        /* Test RSQL typed */
-        nonFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre=out=('Literary Fiction','Science Fiction')").asString())
-
-        Assert.assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size())
-
-        /* Test RSQL global */
-        nonFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre=out=('Literary Fiction','Science Fiction')").asString())
-
-        Assert.assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterInMultipleSingle() {
-        int literaryAndScienceFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("genre").asText().equals("Literary Fiction")
-                    || node.get("attributes").get("genre").asText().equals("Science Fiction")) {
-                literaryAndScienceFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(literaryAndScienceFictionBookCount > 0)
-
-        /* Test Default */
-        def literaryAndScienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][in]=Literary Fiction,Science Fiction").asString())
-
-        Assert.assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size())
-
-        /* Test RSQL typed */
-        literaryAndScienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre=in=('Literary Fiction','Science Fiction')").asString())
-
-        Assert.assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size())
-
-        /* Test RSQL global */
-        literaryAndScienceFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre=in=('Literary Fiction','Science Fiction')").asString())
-
-        Assert.assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterPostfix() {
-        int genreEndsWithFictionBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("genre").asText().endsWith("Fiction")) {
-                genreEndsWithFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(genreEndsWithFictionBookCount > 0)
-
-        /* Test Default */
-        def genreEndsWithFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][postfix]=Fiction").asString())
-
-        Assert.assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        genreEndsWithFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=genre==*Fiction").asString())
-
-        Assert.assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size())
-
-        /* Test RSQL Global */
-        genreEndsWithFictionBooks = mapper.readTree(
-                RestAssured.get("/book?filter=genre==*Fiction").asString())
-
-        Assert.assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterPrefix() {
-        int titleStartsWithTheBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("title").asText().startsWith("The")) {
-                titleStartsWithTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleStartsWithTheBookCount > 0)
-
-        /* Test Default */
-        def titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.title][prefix]=The").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=title==The*").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Global  */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter=title==The*").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterPrefixWithSpecialChars() {
-        int titleStartsWithTheBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("title").asText().startsWith("I'm")) {
-                titleStartsWithTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleStartsWithTheBookCount > 0)
-
-        /* Test Default */
-        def titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.title][prefix]=I'm").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=title=='I\\'m*'").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Global */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter=title=='I\\'m*'").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterInfix() {
-        int titleContainsTheBookCount = 0
-        for (JsonNode node : books.get("data")) {
-            if (node.get("attributes").get("title").asText().toLowerCase().contains("the")) {
-                titleContainsTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleContainsTheBookCount > 0)
-
-        /* Test Default */
-        def titleContainsTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book.title][infix]=the").asString())
-
-        Assert.assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleContainsTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter[book]=title==*the*").asString())
-
-        Assert.assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size())
-
-        /* Test RSQL Global */
-        titleContainsTheBooks = mapper.readTree(
-                RestAssured.get("/book?filter=title==*the*").asString())
-
-        Assert.assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testRootFilterWithInclude() {
-        def authorIdsOfLiteraryFiction = [] as Set
-
-        for (JsonNode book : books.get("data")) {
-            if (book.get("attributes").get("genre").asText() == "Literary Fiction") {
-                for (JsonNode author : book.get("relationships").get("authors").get("data")) {
-                    authorIdsOfLiteraryFiction.add(author.get("id").asText())
-                }
-            }
-        }
-
-        Assert.assertTrue(authorIdsOfLiteraryFiction.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/book?include=authors&filter[book.genre]=Literary Fiction").asString())
-
-        for (JsonNode author : result.get("included")) {
-            Assert.assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()))
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(
-                RestAssured.get("/book?include=authors&filter[book]=genre=='Literary Fiction'").asString())
-
-        for (JsonNode author : result.get("included")) {
-            Assert.assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()))
-        }
-
-        /* Test RSQL Global */
-        result = mapper.readTree(
-                RestAssured.get("/book?include=authors&filter=genre=='Literary Fiction'").asString())
-
-        for (JsonNode author : result.get("included")) {
-            Assert.assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()))
-        }
-    }
-
-    @Test
-    public void testRootFilterIsNull() {
-        def bookIdsWithNullGenre = [] as Set
-
-        for (JsonNode book : books.get("data")) {
-            if (book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNullGenre.add(book.get("id"))
-            }
-        }
-
-        Assert.assertTrue(bookIdsWithNullGenre.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][isnull]").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Typed */
-        /* param = true */
-        result = mapper.readTree(
-                RestAssured.get("book?filter[book]=genre=isnull=true").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 1 */
-        result = mapper.readTree(
-                RestAssured.get("book?filter[book]=genre=isnull=1").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Global */
-        /* param = true */
-        result = mapper.readTree(
-                RestAssured.get("book?filter=genre=isnull=true").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 1 */
-        result = mapper.readTree(
-                RestAssured.get("book?filter=genre=isnull=1").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-    }
-
-    @Test
-    public void testRootFilterIsNotNull() {
-        def bookIdsWithNonNullGenre = [] as Set
-
-        for (JsonNode book : books.get("data")) {
-            if (!book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNonNullGenre.add(book.get("id"))
-            }
-        }
-
-        Assert.assertTrue(bookIdsWithNonNullGenre.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/book?filter[book.genre][notnull]").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Typed */
-        /* param = false */
-        result = mapper.readTree(
-                RestAssured.get("book?filter[book]=genre=isnull=false").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 0 */
-        result = mapper.readTree(
-                RestAssured.get("book?filter[book]=genre=isnull=0").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Global */
-        /* param = false */
-        result = mapper.readTree(
-                RestAssured.get("book?filter=genre=isnull=false").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 0 */
-        result = mapper.readTree(
-                RestAssured.get("book?filter=genre=isnull=0").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-    }
-
-    @Test
-    public void testNonRootFilterImplicitSingle() {
-        int asimovScienceFictionBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (node.get("attributes").get("genre").asText().equals("Science Fiction")) {
-                asimovScienceFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(asimovScienceFictionBookCount > 0)
-
-        /* Test Default */
-        def asimovScienceFictionBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.genre]=Science Fiction").asString())
-
-        Assert.assertEquals(asimovScienceFictionBookCount, asimovScienceFictionBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        asimovScienceFictionBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=genre=='Science Fiction'").asString())
-
-        Assert.assertEquals(asimovScienceFictionBookCount, asimovScienceFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterInSingle() {
-        int asimovHistoryBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (node.get("attributes").get("genre").asText().equals("History")) {
-                asimovHistoryBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(asimovHistoryBookCount > 0)
-
-        /* Test Default */
-        def asimovHistoryBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.genre]=History").asString())
-
-        Assert.assertEquals(asimovHistoryBookCount, asimovHistoryBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        asimovHistoryBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=genre==History").asString())
-
-        Assert.assertEquals(asimovHistoryBookCount, asimovHistoryBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterNotInSingle() {
-        int nonHistoryBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (!node.get("attributes").get("genre").isNull()
-                    && !node.get("attributes").get("genre").asText().equals("History")) {
-                nonHistoryBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(nonHistoryBookCount > 0)
-
-        /* Test Default */
-        def nonHistoryBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.genre][not]=History").asString())
-
-        Assert.assertEquals(nonHistoryBookCount, nonHistoryBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        nonHistoryBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=genre!=History").asString())
-
-        Assert.assertEquals(nonHistoryBookCount, nonHistoryBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterPostfix() {
-        int genreEndsWithFictionBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (node.get("attributes").get("genre").asText().endsWith("Fiction")) {
-                genreEndsWithFictionBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(genreEndsWithFictionBookCount > 0)
-
-        /* Test Default */
-        def genreEndsWithFictionBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.genre][postfix]=Fiction").asString())
-
-        Assert.assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        genreEndsWithFictionBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=genre==*Fiction").asString())
-
-        Assert.assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterPrefix() {
-        int titleStartsWithTheBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (node.get("attributes").get("title").asText().startsWith("The")) {
-                titleStartsWithTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleStartsWithTheBookCount > 0)
-
-        /* Test Default */
-        def titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.title][prefix]=The").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=title==The*").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterPrefixWithSpecialChars() {
-        int titleStartsWithTheBookCount = 0
-        for (JsonNode node : thomasHarrisBooks.get("data")) {
-            if (node.get("attributes").get("title").asText().startsWith("I'm")) {
-                titleStartsWithTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleStartsWithTheBookCount > 0)
-
-        /* Test Default */
-        def titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/author/${thomasHarrisId}/books?filter[book.title][prefix]=I'm").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleStartsWithTheBooks = mapper.readTree(
-                RestAssured.get("/author/${thomasHarrisId}/books?filter[book]=title=='I\\'m*'").asString())
-
-        Assert.assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterInfix() {
-        int titleContainsTheBookCount = 0
-        for (JsonNode node : asimovBooks.get("data")) {
-            if (node.get("attributes").get("title").asText().toLowerCase().contains("the")) {
-                titleContainsTheBookCount += 1
-            }
-        }
-
-        Assert.assertTrue(titleContainsTheBookCount > 0)
-
-        /* Test Default */
-        def titleContainsTheBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book.title][infix]=the").asString())
-
-        Assert.assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size())
-
-        /* Test RSQL Typed */
-        titleContainsTheBooks = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?filter[book]=title==*the*").asString())
-
-        Assert.assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size())
-    }
-
-    @Test
-    public void testNonRootFilterWithInclude() {
-        def authorIdsOfScienceFiction = [] as Set
-
-        for (JsonNode book : asimovBooks.get("data")) {
-            if (book.get("attributes").get("genre").asText() == "Science Fiction") {
-                for (JsonNode author : book.get("relationships").get("authors").get("data")) {
-                    authorIdsOfScienceFiction.add(author.get("id").asText())
-                }
-            }
-        }
-
-        Assert.assertTrue(authorIdsOfScienceFiction.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?include=authors&filter[book.genre]=Science Fiction").asString())
-
-        for (JsonNode author : result.get("included")) {
-            Assert.assertTrue(authorIdsOfScienceFiction.contains(author.get("id").asText()))
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(
-                RestAssured.get("/author/${asimovId}/books?include=authors&filter[book]=genre=='Science Fiction'").asString())
-
-        for (JsonNode author : result.get("included")) {
-            Assert.assertTrue(authorIdsOfScienceFiction.contains(author.get("id").asText()))
-        }
-    }
-
-    @Test
-    public void testNonRootFilterIsNull() {
-        def bookIdsWithNullGenre = [] as Set
-
-        for (JsonNode book : nullNedBooks.get("data")) {
-            if (book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNullGenre.add(book.get("id"))
-            }
-        }
-
-        Assert.assertTrue(bookIdsWithNullGenre.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book.genre][isnull]").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Typed */
-        /* param = true */
-        result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book]=genre=isnull=true").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 1 */
-        result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book]=genre=isnull=1").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNullGenre.contains(book.get("id")))
-        }
-    }
-
-    @Test
-    public void testNonRootFilterIsNotNull() {
-        def bookIdsWithNonNullGenre = [] as Set
-
-        for (JsonNode book : nullNedBooks.get("data")) {
-            if (!book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNonNullGenre.add(book.get("id"))
-            }
-        }
-
-        Assert.assertTrue(bookIdsWithNonNullGenre.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book.genre][notnull]").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* Test RSQL Typed */
-        /* param = false */
-        result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book]=genre=isnull=false").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-
-        /* param = 0 */
-        result = mapper.readTree(
-                RestAssured.get("/author/${nullNedId}/books?filter[book]=genre=isnull=0").asString())
-
-        Assert.assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size())
-
-        for (JsonNode book : result.get("data")) {
-            Assert.assertTrue(!book.get("attributes").get("genre").isNull())
-            Assert.assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")))
-        }
-    }
-
-    @Test
-    public void testPublishDateGreaterThanFilter() {
-        def bookIdsWithNonNullGenre = [] as Set
-        for (JsonNode book : nullNedBooks.get("data")) {
-            if (!book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNonNullGenre.add(book.get("id"))
-            }
-        }
-
-        Assert.assertTrue(bookIdsWithNonNullGenre.size() > 0)
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/book?filter[book.publishDate][gt]=1").asString())
-        Assert.assertEquals(result.get("data").size(), 1);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate > 1L);
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(
-                RestAssured.get("/book?filter[book]=publishDate>1").asString())
-        Assert.assertEquals(result.get("data").size(), 1);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate > 1L);
-        }
-    }
-
-    @Test
-    public void testPublishDateGreaterThanFilterSubRecord() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?filter[book.publishDate][gt]=1454638927411").asString());
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate > 1454638927411L);
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?filter[book]=publishDate>1454638927411").asString());
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate > 1454638927411L);
-        }
-    }
-
-    @Test
-    public void testPublishDateLessThanOrEqualsFilterSubRecord() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?filter[book.publishDate][le]=1454638927412").asString());
-        Assert.assertEquals(result.get("data").size(), 1);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate <= 1454638927412L);
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?filter[book]=publishDate<=1454638927412").asString());
-        Assert.assertEquals(result.get("data").size(), 1);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate <= 1454638927412L);
-        }
-    }
-
-    @Test
-    public void testPublishDateLessThanOrEqual() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("book?filter[book.publishDate][le]=1454638927412").asString());
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate <= 1454638927412L);
-        }
-
-        /* Test RSQL Typed */
-        result = mapper.readTree(RestAssured.get("book?filter[book]=publishDate<=1454638927412").asString());
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate <= 1454638927412L);
-        }
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("book?filter=publishDate<=1454638927412").asString());
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate <= 1454638927412L);
-        }
-    }
-
-    @Test
-    public void testPublishDateLessThanFilter() {
-        def bookIdsWithNonNullGenre = [] as Set
-        for (JsonNode book : nullNedBooks.get("data")) {
-            if (!book.get("attributes").get("genre").isNull()) {
-                bookIdsWithNonNullGenre.add(book.get("id"))
-            }
-        }
-
-        /* Test Default */
-        def result = mapper.readTree(
-                RestAssured.get("/book?filter[book.publishDate][lt]=1454638927411").asString())
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate < 1454638927411L);
-        }
-
-        /* RSQL Typed */
-        result = mapper.readTree(
-                RestAssured.get("/book?filter[book]=publishDate<1454638927411").asString())
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate < 1454638927411L);
-        }
-
-        /* RSQL Global */
-        result = mapper.readTree(
-                RestAssured.get("/book?filter=publishDate<1454638927411").asString())
-        Assert.assertTrue(result.get("data").size() > 0);
-        for (JsonNode book : result.get("data")) {
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate < 1454638927411L);
-        }
-    }
-
-    @Test
-    public void testGetBadRelationshipNameWithNestedFieldFilter() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("book?filter[book.author12.name]=Null Ned").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Unknown field in filter: author12\n" +
-                "Invalid query parameter: filter[book.author12.name]");
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("book?filter=author12.name=='Null Ned'").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Invalid filter format: filter\n" +
-                "No such association author12 for type book\n" +
-                "Invalid filter format: filter\n" +
-                "Invalid query parameter: filter");
-    }
-
-    @Test
-    public void testGetBooksFilteredByAuthors() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("book?filter[book.authors.name]=Null Ned").asString());
-        Assert.assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
-        for (JsonNode book : result.get("data")) {
-            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
-            Assert.assertEquals(authorId, nullNedId);
-        }
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("book?filter=authors.name=='Null Ned'").asString());
-        Assert.assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
-        for (JsonNode book : result.get("data")) {
-            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
-            Assert.assertEquals(authorId, nullNedId);
-        }
-    }
-
-    @Test
-    public void testGetBooksFilteredByAuthorAndTitle() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("book?filter[book.authors.name]=Null Ned&filter[book.title]=Life with Null Ned").asString());
-        Assert.assertEquals(result.get("data").size(), 1);
-        Assert.assertEquals(result.get("data").get(0).get("attributes").get("title").asText(), "Life with Null Ned");
-        Assert.assertEquals(result.get("data").get(0).get("relationships").get("authors").get("data").get(0).get("id").asText(), nullNedId);
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("book?filter=authors.name=='Null Ned';title=='Life with Null Ned'").asString());
-        Assert.assertEquals(result.get("data").size(), 1);
-        Assert.assertEquals(result.get("data").get(0).get("attributes").get("title").asText(), "Life with Null Ned");
-        Assert.assertEquals(result.get("data").get(0).get("relationships").get("authors").get("data").get(0).get("id").asText(), nullNedId);
-    }
-
-    @Test
-    public void testFilterAuthorsByBookChapterTitle() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("author?filter[author.books.chapters.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!").asString());
-        Assert.assertEquals(result.get("data").size(), 2);
-        String last = null;
-        for (JsonNode author : result.get("data")) {
-            String name = author.get("attributes").get("name").asText();
-            Assert.assertTrue(("Isaac Asimov".equals(name) || "Null Ned".equals(name)) && !name.equals(last));
-        }
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("author?filter=books.chapters.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')").asString());
-        Assert.assertEquals(result.get("data").size(), 2);
-        last = null;
-        for (JsonNode author : result.get("data")) {
-            String name = author.get("attributes").get("name").asText();
-            Assert.assertTrue(("Isaac Asimov".equals(name) || "Null Ned".equals(name)) && !name.equals(last));
-        }
-    }
-
-    @Test
-    public void testGetBadRelationshipRoot() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("author?filter[idontexist.books.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Unknown entity in filter: idontexist\n" +
-                        "Invalid query parameter: filter[idontexist.books.title][in]");
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("author?filter=idontexist.books.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Invalid filter format: filter\n" +
-                "No such association idontexist for type author\n" +
-                "Invalid filter format: filter\n" +
-                "Invalid query parameter: filter");
-    }
-
-    @Test
-    public void testGetBadRelationshipIntermediate() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("author?filter[author.idontexist.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Unknown field in filter: idontexist\n" +
-                        "Invalid query parameter: filter[author.idontexist.title][in]");
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("author?filter=idontexist.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Invalid filter format: filter\n" +
-                "No such association idontexist for type author\n" +
-                "Invalid filter format: filter\n" +
-                "Invalid query parameter: filter");
-    }
-
-    @Test
-    public void testGetBadRelationshipLeaf() {
-        /* Test Default */
-        def result = mapper.readTree(RestAssured.get("author?filter[author.books.idontexist][in]=Viva la Roma!,Mamma mia I wantz some pizza!").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Unknown field in filter: idontexist\n" +
-                        "Invalid query parameter: filter[author.books.idontexist][in]");
-
-        /* Test RSQL Global */
-        result = mapper.readTree(RestAssured.get("author?filter=books.idontexist=in=('Viva la Roma!','Mamma mia I wantz some pizza!')").asString());
-        Assert.assertEquals(result.get("errors").get(0).asText(),
-                "InvalidPredicateException: Invalid filter format: filter\n" +
-                        "No such association idontexist for type book\n" +
-                        "Invalid filter format: filter\n" +
-                        "Invalid query parameter: filter");
-    }
-
-
-    @AfterTest
-    public void cleanUp() {
-        for (int id : authorIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/author/"+id)
-        }
-        for (int id : bookIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/book/"+id)
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/MapEnumIT.groovy b/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/MapEnumIT.groovy
deleted file mode 100644
index 72cbf62c9a..0000000000
--- a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/MapEnumIT.groovy
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.yahoo.elide.core.HttpStatus
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer
-import org.testng.Assert
-import org.testng.annotations.Test
-
-import static com.jayway.restassured.RestAssured.given
-
-/**
- * Test rehydration of Map of Enums.
- */
-class MapEnumIT extends AbstractIntegrationTestInitializer {
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    @Test
-    public void testPostColorShape() {
-        // Create MapColorShape using Post
-        def postRequest = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "mapColorShape",
-                        "attributes": {
-                          "colorShapeMap": {
-                            "Red": "Circle"
-                          }
-                        }
-                      }
-                    }
-                    ''')
-                .post("/mapColorShape")
-        postRequest.then().statusCode(HttpStatus.SC_CREATED)
-
-        def postResponse = mapper.readTree(postRequest.asString())
-        Assert.assertEquals(postResponse["data"]["attributes"]["colorShapeMap"]["Red"].asText(), "Circle")
-
-        // Update MapColorShape using Patch
-        def patchRequest = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                      {
-                        "data": {
-                          "id": ${postResponse['data']['id']},
-                          "type": "mapColorShape",
-                          "attributes": {
-                            "colorShapeMap": {
-                              "Blue": "Square"
-                            }
-                          }
-                        }
-                      }
-                    ]
-                    """)
-                .patch("/mapColorShape/${postResponse['data']['id'].asText()}/")
-        patchRequest.then().statusCode(HttpStatus.SC_NO_CONTENT)
-
-        // Get MapColorShape
-        def getRequest = given()
-                .accept("application/vnd.api+json")
-                .get("/mapColorShape/${postResponse['data']['id'].asText()}/")
-        def getResponse = mapper.readTree(getRequest.asString())
-        Assert.assertEquals(getResponse["data"]["attributes"]["colorShapeMap"]["Blue"].asText(), "Square")
-    }
-
-    @Test
-    public void testPatchExtensionColorShape() {
-        // Create MapColorShape using Patch extension
-        def request = given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/mapColorShape",
-                        "value": {
-                          "id": "12345681-1234-1234-1234-1234567890ab",
-                          "type": "mapColorShape",
-                          "attributes": {
-                            "colorShapeMap": {
-                              "Blue": "Triangle"
-                            }
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-        request.then().statusCode(HttpStatus.SC_OK)
-
-        def response = mapper.readTree(request.asString())
-        Assert.assertEquals(response[0]["data"]["attributes"]["colorShapeMap"]["Blue"].asText(), "Triangle")
-    }
-}
diff --git a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/PaginateIT.groovy b/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/PaginateIT.groovy
deleted file mode 100644
index f6335be86c..0000000000
--- a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/PaginateIT.groovy
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.jayway.restassured.RestAssured
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import org.testng.Assert
-import org.testng.annotations.AfterClass
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test
-
-/**
- * Tests for pagination
- */
-public class PaginateIT extends AbstractIntegrationTestInitializer {
-    private final ObjectMapper mapper = new ObjectMapper()
-
-    private JsonNode books = null
-    private JsonNode authors = null
-    private String asimovId = null
-    private JsonNode asimovBooks = null
-    private String nullNedId = null
-    private JsonNode nullNedBooks = null
-    private String orsonCardId = null
-    private String parentId = null
-    private Set<Integer> bookIds = new HashSet<>()
-    private Set<Integer> authorIds = new HashSet<>()
-    private Set<Integer> childIds = new HashSet<>()
-
-    private int entityWithoutPaginateCreateCount = 20
-    private int entityWithPaginateCountableCreateCount = 5
-    private int entityWithPaginateDefaultLimitCreateCount = 5
-    private int entityWithPaginateMaxLimitCreateCount = 30
-
-    private Set<Integer> entityWithoutPaginateIds = new HashSet<>()
-    private Set<Integer> entityWithPaginateCountableFalseIds = new HashSet<>()
-    private Set<Integer> entityWithPaginateDefaultLimitIds = new HashSet<>()
-    private Set<Integer> entityWithPaginateMaxLimitIds = new HashSet<>()
-
-    @BeforeClass
-    public void setup() {
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/parent",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "parent",
-                          "relationships": {
-                            "children": {
-                              "data": [
-                                {
-                                  "type": "child",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "child",
-                                  "id": "12345678-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/parent/12345678-1234-1234-1234-1234567890ab/children",
-                        "value": {
-                          "type": "child",
-                          "id": "12345678-1234-1234-1234-1234567890ac"
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/parent/12345678-1234-1234-1234-1234567890ab/children",
-                        "value": {
-                          "type": "child",
-                          "id": "12345678-1234-1234-1234-1234567890ad"
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Ernest Hemingway"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345678-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345678-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "The Old Man and the Sea",
-                            "genre": "Literary Fiction",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345678-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "For Whom the Bell Tolls",
-                            "genre": "Literary Fiction",
-                            "language": "English"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345679-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Orson Scott Card"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345679-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "23451234-1234-1234-1234-1234567890ac"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345679-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Enders Game",
-                            "genre": "Science Fiction",
-                            "language": "English",
-                            "publishDate": 1454638927412
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "23451234-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Enders Shadow",
-                            "genre": "Science Fiction",
-                            "language": "English",
-                            "publishDate": 1464638927412
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345680-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Isaac Asimov"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345680-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345680-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345680-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Foundation",
-                            "genre": "Science Fiction",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345680-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "The Roman Republic",
-                            "genre": "History",
-                            "language": "English"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-
-        RestAssured
-                .given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body('''
-                    [
-                      {
-                        "op": "add",
-                        "path": "/author",
-                        "value": {
-                          "id": "12345681-1234-1234-1234-1234567890ab",
-                          "type": "author",
-                          "attributes": {
-                            "name": "Null Ned"
-                          },
-                          "relationships": {
-                            "books": {
-                              "data": [
-                                {
-                                  "type": "book",
-                                  "id": "12345681-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "book",
-                                  "id": "12345681-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345681-1234-1234-1234-1234567890ac",
-                          "attributes": {
-                            "title": "Life with Null Ned",
-                            "language": "English"
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/book",
-                        "value": {
-                          "type": "book",
-                          "id": "12345681-1234-1234-1234-1234567890ad",
-                          "attributes": {
-                            "title": "Life with Null Ned 2",
-                            "genre": "Not Null",
-                            "language": "English"
-                          }
-                        }
-                      }
-                    ]
-                    ''')
-                .patch("/")
-
-        books = mapper.readTree(RestAssured.get("/book").asString())
-        authors = mapper.readTree(RestAssured.get("/author").asString())
-        JsonNode parents = mapper.readTree(RestAssured.get("/parent").asString())
-
-        parentId = parents.get("data").get(0).get("id").asText()
-
-        for (JsonNode child : parents.get("data").get(0).get("relationships").get("children").get("data")) {
-            childIds.add(child.get("id").asInt())
-        }
-
-        for (JsonNode author : authors.get("data")) {
-            authorIds.add(author.get("id").asInt());
-            if (author.get("attributes").get("name").asText() == "Isaac Asimov") {
-                asimovId = author.get("id").asText()
-            }
-
-            if (author.get("attributes").get("name").asText() == "Null Ned") {
-                nullNedId = author.get("id").asText()
-            }
-
-            if (author.get("attributes").get("name").asText() == "Orson Scott Card") {
-                orsonCardId = author.get("id").asText();
-            }
-        }
-
-        for (JsonNode book : books.get("data")) {
-            bookIds.add(book.get("id").asInt());
-        }
-
-        Assert.assertNotNull(asimovId)
-        Assert.assertNotNull(nullNedId)
-
-        asimovBooks = mapper.readTree(RestAssured.get("/author/${asimovId}/books").asString())
-        nullNedBooks = mapper.readTree(RestAssured.get("/author/${nullNedId}/books").asString())
-
-        JsonNode responseJson
-
-        for (int i = 0; i < entityWithoutPaginateCreateCount; i++) {
-            RestAssured
-                    .given()
-                    .contentType("application/vnd.api+json")
-                    .accept("application/vnd.api+json")
-                    .body("""{"data": {"type": "entityWithoutPaginate","attributes": {"name": "A name"}}}""")
-                    .post("/entityWithoutPaginate")
-                    .thenReturn()
-        }
-        responseJson = mapper.readTree(RestAssured.get("/entityWithoutPaginate").asString())
-        for (JsonNode node : responseJson.get("data")) {
-            entityWithoutPaginateIds.add(node.get("id").asInt());
-        }
-        Assert.assertEquals(entityWithoutPaginateIds.size(), entityWithoutPaginateCreateCount)
-
-        for (int i = 0; i < entityWithPaginateCountableCreateCount; i++) {
-            RestAssured
-                    .given()
-                    .contentType("application/vnd.api+json")
-                    .accept("application/vnd.api+json")
-                    .body("""{"data": {"type": "entityWithPaginateCountableFalse","attributes": {"name": "A name"}}}""")
-                    .post("/entityWithPaginateCountableFalse")
-                    .thenReturn()
-        }
-        responseJson = mapper.readTree(RestAssured.get("/entityWithPaginateCountableFalse").asString())
-        for (JsonNode node : responseJson.get("data")) {
-            entityWithPaginateCountableFalseIds.add(node.get("id").asInt());
-        }
-        Assert.assertEquals(entityWithPaginateCountableFalseIds.size(), entityWithPaginateCountableCreateCount)
-
-        for (int i = 0; i < entityWithPaginateDefaultLimitCreateCount; i++) {
-            RestAssured
-                    .given()
-                    .contentType("application/vnd.api+json")
-                    .accept("application/vnd.api+json")
-                    .body("""{"data": {"type": "entityWithPaginateDefaultLimit","attributes": {"name": "A name"}}}""")
-                    .post("/entityWithPaginateDefaultLimit")
-                    .thenReturn()
-        }
-        responseJson = mapper.readTree(RestAssured.get("/entityWithPaginateDefaultLimit").asString())
-        for (JsonNode node : responseJson.get("data")) {
-            entityWithPaginateDefaultLimitIds.add(node.get("id").asInt());
-        }
-        Assert.assertEquals(entityWithPaginateDefaultLimitIds.size(), entityWithPaginateDefaultLimitCreateCount)
-
-        for (int i = 0; i < entityWithPaginateMaxLimitCreateCount; i++) {
-            RestAssured
-                    .given()
-                    .contentType("application/vnd.api+json")
-                    .accept("application/vnd.api+json")
-                    .body("""{"data": {"type": "entityWithPaginateMaxLimit","attributes": {"name": "A name"}}}""")
-                    .post("/entityWithPaginateMaxLimit")
-                    .thenReturn()
-        }
-        responseJson = mapper.readTree(RestAssured.get("/entityWithPaginateMaxLimit").asString())
-        for (JsonNode node : responseJson.get("data")) {
-            entityWithPaginateMaxLimitIds.add(node.get("id").asInt());
-        }
-        Assert.assertEquals(entityWithPaginateMaxLimitIds.size(), entityWithPaginateMaxLimitCreateCount)
-    }
-
-    @Test
-    public void testNoFilterSortDescPaginationFirstPage() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?sort=-title&page[size]=3").asString())
-        Assert.assertEquals(result.get("data").size(), 3);
-
-        final JsonNode books = result.get("data");
-        final String firstBookName = books.get(0).get("attributes").get("title").asText();
-        Assert.assertEquals(firstBookName, "The Roman Republic");
-    }
-
-    @Test
-    public void testPaginationOnSubRecords() {
-        final String httpResult = RestAssured.get("/author/${orsonCardId}/books?sort=-title&page[size]=1").asString();
-        def result = mapper.readTree(httpResult);
-        Assert.assertEquals(result.get("data").size(), 1);
-        JsonNode book = result.get("data").get(0);
-        Assert.assertEquals(book.get("attributes").get("title").asText(), "Enders Shadow");
-    }
-
-    @Test
-    public void testNoFilterSortDescPagination() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?sort=-title&page[number]=2&page[size]=3").asString())
-        Assert.assertEquals(result.get("data").size(), 3);
-
-        final JsonNode books = result.get("data");
-        final String firstBookName = books.get(0).get("attributes").get("title").asText();
-        Assert.assertEquals(firstBookName, "Life with Null Ned");
-    }
-
-    @Test
-    public void testNoFilterMultiSortPagination() {
-        //select * from book order by title desc, genre asc;
-        def result = mapper.readTree(
-                RestAssured.get("/book?sort=-title,genre&page[size]=3").asString())
-        Assert.assertEquals(result.get("data").size(), 3);
-
-        final JsonNode books = result.get("data");
-        final String firstBookName = books.get(0).get("attributes").get("title").asText();
-        Assert.assertEquals(firstBookName, "The Roman Republic"); // has a null genre, should be first.
-    }
-
-    @Test
-    public void testPublishDateLessThanFilter() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?filter[book.publishDate][lt]=1454638927411&page[size]=2").asString())
-        Assert.assertEquals(result.get("data").size(), 2);
-        for (JsonNode book : result.get("data")) {
-            // we should be starting off at index 4 here - this is true. However due to limitations of the test environment
-            // there is no way we can check based on index since results could have been added many times...
-            // should clean up in an after test...
-            long publishDate = book.get("attributes").get("publishDate").asLong();
-            Assert.assertTrue(publishDate < 1454638927411L);
-        }
-    }
-
-    @Test
-    public void testPageAndSortOnSubRecords() {
-        def result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?sort=-title,publishDate&page[size]=1").asString());
-        //select * from book join book_author on book.`id` = book_author.`books_id` where book_author.`authors_id` = 2 order by book.`title` desc, book.`publishDate` asc limit 1;
-        Assert.assertEquals(result.get("data").size(), 1);
-        JsonNode book = result.get("data").get(0);
-        long publishDate = book.get("attributes").get("publishDate").asLong();
-        Assert.assertEquals(publishDate, 1464638927412L);
-        String authorIdFromRelation = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
-        Assert.assertEquals(authorIdFromRelation, orsonCardId); // ensure we always have a bound relationship
-    }
-
-    @Test
-    public void testPageAndSortOnSubRecordsPageTwo() {
-        def result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?sort=-title&page[number]=2&page[size]=1").asString());
-        Assert.assertEquals(result.get("data").size(), 1);
-        JsonNode book = result.get("data").get(0);
-        String title = book.get("attributes").get("title").asText();
-        Assert.assertEquals(title, "Enders Game");
-        String authorIdFromRelation = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
-        Assert.assertEquals(authorIdFromRelation, orsonCardId); // ensure we always have a bound relationship
-    }
-
-    @Test
-    public void testPageAndSortShouldFailOnBadSortFields() {
-        def result = mapper.readTree(RestAssured.get("/author/${orsonCardId}/books?sort=-title,publishDate,onion&page[size]=1").asString());
-        Assert.assertEquals(result.get("errors").size(), 1);
-        JsonNode errors = result.get("errors").get(0);
-
-        String errorMsg = errors.asText();
-
-        Assert.assertEquals(errorMsg, "InvalidValueException: Invalid value: Book doesn't contain the field onion");
-    }
-
-    @Test
-    public void testBasicPageBasedPagination() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?page[number]=2&page[size]=2").asString())
-        Assert.assertEquals(result.get("data").size(), 2);
-    }
-
-    @Test
-    public void testBasicOffsetBasedPagination() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?page[offset]=3&page[limit]=2").asString())
-        Assert.assertEquals(result.get("data").size(), 2);
-    }
-
-    @Test
-    public void testPaginationOffsetOnly() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?page[offset]=3").asString())
-        Assert.assertEquals(result.get("data").size(), 5);
-    }
-
-    @Test
-    public void testPaginationSizeOnly() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?page[size]=2").asString())
-        Assert.assertEquals(result.get("data").size(), 2);
-    }
-
-    @Test(priority = -1)
-    public void testPaginationOffsetWithSorting() {
-        def result = mapper.readTree(
-                RestAssured.get("/book?sort=title&page[offset]=3").asString())
-        Assert.assertEquals(result.get("data").size(), 5);
-
-        final JsonNode books = result.get("data");
-        final String firstBookName = books.get(0).get("attributes").get("title").asText();
-        Assert.assertEquals(firstBookName, "Foundation");
-    }
-
-    @Test
-    public void testPaginateInvalidParameter() {
-        def response = RestAssured.get("/entityWithoutPaginate?page[bad]=2&page[totals]").asString();
-        Assert.assertTrue(response.contains("Invalid Pagination Parameter"), "Response should contain invalid parameter message");
-    }
-
-    @Test
-    public void testPaginateAnnotationTotals() {
-        def result = mapper.readTree(RestAssured.get("/entityWithoutPaginate?page[size]=2&page[totals]").asString())
-        Assert.assertEquals(result.get("data").size(), 2)
-        JsonNode pageNode = result.get("meta").get("page")
-        Assert.assertNotNull(pageNode)
-        Assert.assertEquals(pageNode.get("totalRecords").asInt(), entityWithoutPaginateCreateCount)
-        Assert.assertEquals(pageNode.get("totalPages").asInt(), (int) (entityWithoutPaginateCreateCount / 2))
-    }
-
-    @Test
-    public void testPaginateAnnotationPreventTotals() {
-        def result = mapper.readTree(RestAssured.get("/entityWithPaginateCountableFalse?page[size]=3&page[totals]").asString())
-        Assert.assertEquals(result.get("data").size(), 3)
-        JsonNode pageNode = result.get("meta").get("page")
-        Assert.assertNotNull(pageNode)
-        Assert.assertNull(pageNode.get("totalPages"))
-        Assert.assertNull(pageNode.get("totalRecords"))
-    }
-
-    @Test
-    public void testPaginateAnnotationDefaultLimit() {
-        def result = mapper.readTree(RestAssured.get("/entityWithPaginateDefaultLimit?page[number]=1").asString())
-        Assert.assertEquals(result.get("data").size(), 5)
-        JsonNode pageNode = result.get("meta").get("page")
-        Assert.assertNotNull(pageNode)
-        Assert.assertEquals(pageNode.get("number").asInt(), 1)
-        Assert.assertEquals(pageNode.get("limit").asInt(), 5)
-    }
-
-    @Test
-    public void testPaginateAnnotationMaxLimit() {
-        def response = RestAssured.get("/entityWithPaginateMaxLimit?page[limit]=100").asString()
-        Assert.assertTrue(response.contains("page[limit] value must be less than or equal to 10"),
-                "Should complain about exceeding the pagination max limit");
-    }
-
-    @Test
-    public void testPaginationNotPossibleAtRoot() {
-        def result = mapper.readTree(RestAssured.get("/parent?page[size]=1").asString());
-        Assert.assertEquals(result.get("errors").size(), 1);
-        JsonNode errors = result.get("errors").get(0);
-
-        String errorMsg = errors.asText();
-
-        Assert.assertEquals(errorMsg, "InvalidPredicateException: Cannot paginate parent");
-    }
-
-    @Test
-    public void testPaginationNotPossibleAtRelationship() {
-        def result = mapper.readTree(RestAssured.get("/parent/${parentId}/children?page[size]=1").asString());
-        Assert.assertEquals(result.get("errors").size(), 1);
-        JsonNode errors = result.get("errors").get(0);
-
-        String errorMsg = errors.asText();
-
-        Assert.assertEquals(errorMsg, "InvalidPredicateException: Cannot paginate child");
-    }
-
-    @AfterClass
-    public void cleanUp() {
-        for (int id : authorIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/author/"+id)
-        }
-        for (int id : bookIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/book/"+id)
-        }
-        for (int id : childIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/parent/"+parentId +"/"+id)
-        }
-        RestAssured
-            .given()
-            .accept("application/vnd.api+json; ext=jsonpatch")
-            .delete("/parent/"+parentId)
-
-        for (int id : entityWithoutPaginateIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/entityWithoutPaginate/"+id)
-        }
-        for (int id : entityWithPaginateCountableFalseIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/entityWithPaginateCountableFalse/"+id)
-        }
-        for (int id : entityWithPaginateDefaultLimitIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/entityWithPaginateDefaultLimit/"+id)
-        }
-        for (int id : entityWithPaginateMaxLimitIds) {
-            RestAssured
-                    .given()
-                    .accept("application/vnd.api+json; ext=jsonpatch")
-                    .delete("/entityWithPaginateMaxLimit/"+id)
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/ShareableIT.groovy b/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/ShareableIT.groovy
deleted file mode 100644
index 0cdcc7c9a0..0000000000
--- a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/ShareableIT.groovy
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.yahoo.elide.core.DataStoreTransaction
-import com.yahoo.elide.core.HttpStatus
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer
-import example.Left
-import org.testng.Assert
-import org.testng.annotations.BeforeClass
-import org.testng.annotations.Test
-
-import static com.jayway.restassured.RestAssured.given
-/**
- * @Shareable annotation integration tests
- */
-class ShareableIT extends AbstractIntegrationTestInitializer {
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    @BeforeClass
-    public void setUp() {
-        DataStoreTransaction tx = dataStore.beginTransaction();
-        Left left = new Left();
-        tx.save(left);
-        tx.commit();
-    }
-
-    @Test
-    public void testUnshareableForbiddenAccess() {
-        // Create container
-        def container = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "container"
-                      }
-                    }''')
-                .post("/container")
-        container.then().statusCode(HttpStatus.SC_CREATED)
-        def containerJson = mapper.readTree(container.asString())
-
-        // Create unshareable
-        def unshareable = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "unshareable"
-                      }
-                    }
-                    ''')
-                .post("/unshareable")
-        unshareable.then().statusCode(HttpStatus.SC_CREATED)
-        def unshareableJson = mapper.readTree(unshareable.asString())
-
-        // Fail to add unshareable to container's unshareables (unshareable is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "unshareable",
-                        "id": ${unshareableJson['data']['id']}
-                      }
-                    }
-                    """)
-                .patch("/container/${containerJson['data']['id'].asText()}/relationships/unshareables")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-
-        // Fail to replace container's unshareables collection (unshareable is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "unshareable",
-                        "id": ${unshareableJson['data']['id']}
-                      }
-                    }
-                    """)
-                .post("/container/${containerJson['data']['id'].asText()}/relationships/unshareables")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-
-        // Fail to update unshareable's container (container is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "container",
-                        "id": ${containerJson['data']['id']}
-                      }
-                    }
-                    """)
-                .patch("/unshareable/${unshareableJson['data']['id'].asText()}/relationships/container")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-
-        // Fail to set unshareable's container (container is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "container",
-                        "id": ${containerJson['data']['id']}
-                      }
-                    }
-                    """)
-                .post("/unshareable/${unshareableJson['data']['id'].asText()}/relationships/container")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-    }
-
-    @Test
-    public void testShareableForbiddenAccess() {
-        // Create container
-        def container = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "container"
-                      }
-                    }''')
-                .post("/container")
-        container.then().statusCode(HttpStatus.SC_CREATED)
-        def containerJson = mapper.readTree(container.asString())
-
-        // Create shareable
-        def shareable = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "shareable"
-                      }
-                    }
-                    ''')
-                .post("/shareable")
-        shareable.then().statusCode(HttpStatus.SC_CREATED)
-        def shareableJson = mapper.readTree(shareable.asString())
-
-        // Fail to update shareable's container (container is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "container",
-                        "id": ${containerJson['data']['id']}
-                      }
-                    }
-                    """)
-                .patch("/shareable/${shareableJson['data']['id'].asText()}/relationships/container")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-
-        // Fail to set shareable's container (container is not shareable)
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "container",
-                        "id": ${containerJson['data']['id']}
-                      }
-                    }
-                    """)
-                .post("/shareable/${shareableJson['data']['id'].asText()}/relationships/container")
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-    }
-
-    @Test
-    public void testShareablePost() {
-        // Create container
-        def container = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "container"
-                      }
-                    }''')
-                .post("/container")
-        container.then().statusCode(HttpStatus.SC_CREATED)
-        def containerJson = mapper.readTree(container.asString())
-
-        // Create shareable
-        def shareable = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "shareable"
-                      }
-                    }
-                    ''')
-                .post("/shareable")
-        shareable.then().statusCode(HttpStatus.SC_CREATED)
-        def shareableJson = mapper.readTree(shareable.asString())
-
-        // Add shareable to container's shareables
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "shareable",
-                        "id": ${shareableJson['data']['id']}
-                      }
-                    }
-                    """)
-                .post("/container/${containerJson['data']['id'].asText()}/relationships/shareables")
-                .then()
-                .statusCode(HttpStatus.SC_NO_CONTENT)
-
-        def result = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .get("/container/${containerJson['data']['id'].asText()}")
-        result.then().statusCode(HttpStatus.SC_OK)
-
-        def resultJson = mapper.readTree(result.asString())
-        Assert.assertEquals(resultJson['data']['relationships']['shareables'].size(), 1)
-    }
-
-    @Test
-    public void testShareablePatch() {
-        // Create container
-        def container = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "container"
-                      }
-                    }''')
-                .post("/container")
-        container.then().statusCode(HttpStatus.SC_CREATED)
-        def containerJson = mapper.readTree(container.asString())
-
-        // Create shareable
-        def shareable = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body('''
-                    {
-                      "data": {
-                        "type": "shareable"
-                      }
-                    }
-                    ''')
-                .post("/shareable")
-        shareable.then().statusCode(HttpStatus.SC_CREATED)
-        def shareableJson = mapper.readTree(shareable.asString())
-
-        // Add shareable to container's shareables
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                      "data": {
-                        "type": "shareable",
-                        "id": ${shareableJson['data']['id']}
-                      }
-                    }
-                    """)
-                .patch("/container/${containerJson['data']['id'].asText()}/relationships/shareables")
-                .then()
-                .statusCode(HttpStatus.SC_NO_CONTENT)
-
-        def result = given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .get("/container/${containerJson['data']['id'].asText()}")
-        result.then().statusCode(HttpStatus.SC_OK)
-
-        def resultJson = mapper.readTree(result.asString())
-        Assert.assertEquals(resultJson['data']['relationships']['shareables'].size(), 1)
-    }
-
-    @Test
-    public void testCreateContainerAndUnshareables() {
-        def patchResponse = given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body("""
-                    [
-                      {
-                        "op": "add",
-                        "path": "/container",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "container",
-                          "relationships": {
-                            "unshareables": {
-                              "data": [
-                                {
-                                  "type": "unshareable",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "unshareable",
-                                  "id": "12345678-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/unshareable",
-                        "value": {
-                          "type": "unshareable",
-                          "id": "12345678-1234-1234-1234-1234567890ac"
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/unshareable",
-                        "value": {
-                          "type": "unshareable",
-                          "id": "12345678-1234-1234-1234-1234567890ad"
-                        }
-                      }
-                    ]
-                    """)
-                .patch("/")
-        patchResponse.then().statusCode(HttpStatus.SC_OK)
-
-        def patchJson = mapper.readTree(patchResponse.asString())
-
-        // Should have 3 results, 1st is container, 2nd and 3rd are unshareables
-        Assert.assertEquals(patchJson.size(), 3)
-        Assert.assertEquals(patchJson[0]["data"]["type"].asText(), "container")
-        Assert.assertEquals(patchJson[1]["data"]["type"].asText(), "unshareable")
-        Assert.assertEquals(patchJson[2]["data"]["type"].asText(), "unshareable")
-
-        // Container should have 2 unshareables
-        Assert.assertEquals(patchJson[0]["data"]["relationships"]["unshareables"]["data"].size(), 2)
-    }
-
-    @Test
-    public void testCreateContainerAndShareables() {
-        def patchResponse = given()
-                .contentType("application/vnd.api+json; ext=jsonpatch")
-                .accept("application/vnd.api+json; ext=jsonpatch")
-                .body("""
-                    [
-                      {
-                        "op": "add",
-                        "path": "/container",
-                        "value": {
-                          "id": "12345678-1234-1234-1234-1234567890ab",
-                          "type": "container",
-                          "relationships": {
-                            "shareables": {
-                              "data": [
-                                {
-                                  "type": "shareable",
-                                  "id": "12345678-1234-1234-1234-1234567890ac"
-                                },
-                                {
-                                  "type": "shareable",
-                                  "id": "12345678-1234-1234-1234-1234567890ad"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/shareable",
-                        "value": {
-                          "type": "shareable",
-                          "id": "12345678-1234-1234-1234-1234567890ac"
-                        }
-                      },
-                      {
-                        "op": "add",
-                        "path": "/shareable",
-                        "value": {
-                          "type": "shareable",
-                          "id": "12345678-1234-1234-1234-1234567890ad"
-                        }
-                      }
-                    ]
-                    """)
-                .patch("/")
-        patchResponse.then().statusCode(HttpStatus.SC_OK)
-
-        def patchJson = mapper.readTree(patchResponse.asString())
-
-        // Should have 3 results, 1st is container, 2nd and 3rd are shareables
-        Assert.assertEquals(patchJson.size(), 3)
-        Assert.assertEquals(patchJson[0]["data"]["type"].asText(), "container")
-        Assert.assertEquals(patchJson[1]["data"]["type"].asText(), "shareable")
-        Assert.assertEquals(patchJson[2]["data"]["type"].asText(), "shareable")
-
-        // Container should have 2 shareables
-        Assert.assertEquals(patchJson[0]["data"]["relationships"]["shareables"]["data"].size(), 2)
-    }
-
-
-    @Test(priority = 3)
-    public void addUnsharedRelationship() {
-        given()
-                .contentType("application/vnd.api+json")
-                .accept("application/vnd.api+json")
-                .body("""
-                    {
-                        "data":{
-                            "type":"right",
-                            "relationships":{
-                                "one2one":{
-                                    "data":{
-                                        "type":"left",
-                                        "id":"1"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                """)
-                .post("/left/1/one2many")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED);
-    }
-}
diff --git a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/UserTypeIT.groovy b/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/UserTypeIT.groovy
deleted file mode 100644
index 278c8fc10e..0000000000
--- a/elide-integration-tests/src/test/groovy/com/yahoo/elide/tests/UserTypeIT.groovy
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.tests
-import com.yahoo.elide.core.HttpStatus
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer
-import org.testng.annotations.Test
-
-import static com.jayway.restassured.RestAssured.given
-/**
- * Tests for UserType
- */
-class UserTypeIT extends AbstractIntegrationTestInitializer {
-
-    @Test
-    public void testUserTypePost() {
-
-        String person = """
-        {
-            "data": {
-                "id": 1,
-                "type": "person",
-                "attributes": {
-                    "name": "AK",
-                    "address": {
-                        "street": "123 AnyStreet Dr",
-                        "state": "IL",
-                        "zip": {
-                            "zip": "61820",
-                            "plusFour": "1234"
-                        }
-                    }
-                }
-            }
-        }
-        """;
-
-        given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .body(person)
-            .post("/person")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
-
-        String resp = given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .get("/person/1")
-            .then()
-            .statusCode(HttpStatus.SC_OK).extract().body().asString();
-        assertEqualDocuments(resp, person);
-    }
-
-    @Test
-    public void testUserTypePatch() {
-
-        String originalPerson = """
-        {
-            "data": {
-                "id": 2,
-                "type": "person",
-                "attributes": {
-                    "name": "JK",
-                    "address": {
-                        "street": "456 AnyStreet Dr",
-                        "state": "IL",
-                        "zip": {
-                            "zip": "61822",
-                            "plusFour": "567"
-                        }
-                    }
-                }
-            }
-        }
-        """;
-
-        String updatedPerson = """
-        {
-            "data": {
-                "id": 2,
-                "type": "person",
-                "attributes": {
-                    "name": "DC",
-                    "address": {
-                        "street": "456 AnyRoad Ave",
-                        "state": "AZ",
-                        "zip": {
-                            "zip": "85001",
-                            "plusFour": "9999"
-                        }
-                    }
-                }
-            }
-        }
-        """;
-
-        given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .body(originalPerson)
-            .post("/person")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
-
-        given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .body(updatedPerson)
-            .patch("/person/2")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT);
-
-        String resp = given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .get("/person/2")
-            .then()
-            .statusCode(HttpStatus.SC_OK).extract().body().asString();
-        assertEqualDocuments(resp, updatedPerson);
-     }
-
-    @Test
-    public void testUserTypeMissingUserTypeField() {
-
-        given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .body( """
-            {
-                "data": {
-                    "id": 3,
-                    "type": "person",
-                    "attributes": {
-                        "name": "DM"
-                    }
-                }
-            }
-            """)
-            .post("/person")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
-
-        String resp = given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .get("/person/3")
-            .then()
-            .statusCode(HttpStatus.SC_OK).extract().body().asString();
-        assertEqualDocuments(resp, """
-            {
-                "data": {
-                    "type": "person",
-                    "id": "3",
-                    "attributes": {
-                        "address": null,
-                        "name": "DM"
-                    }
-                }
-            }
-            """);
-    }
-
-    @Test
-    public void testUserTypeMissingUserTypeProperties() {
-
-        given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .body( """
-            {
-                "data": {
-                    "id": 4,
-                    "type": "person",
-                    "attributes": {
-                        "name": "WC",
-                        "address": {
-                            "street": "1400 AnyAve St",
-                            "zip": {
-                                "zip": "60412"
-                            }
-                        }
-                    }
-                }
-            }
-            """)
-            .post("/person")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
-
-        String resp = given()
-            .contentType("application/vnd.api+json")
-            .accept("application/vnd.api+json")
-            .get("/person/4")
-            .then()
-            .statusCode(HttpStatus.SC_OK).extract().body().asString();
-
-        assertEqualDocuments(resp, """
-            {
-                "data": {
-                    "id": 4,
-                    "type": "person",
-                    "attributes": {
-                        "name": "WC",
-                        "address": {
-                            "street": "1400 AnyAve St",
-                            "state": null,
-                            "zip": {
-                                "zip": "60412",
-                                "plusFour": null
-                            }
-                        }
-                    }
-                }
-            }
-        """);
-    }
-}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/assignedIdLongTests/AssignedIdLongIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/assignedIdLongTests/AssignedIdLongIT.java
new file mode 100644
index 0000000000..3ccffc6730
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/assignedIdLongTests/AssignedIdLongIT.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.assignedIdLongTests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Data;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+public class AssignedIdLongIT extends IntegrationTest {
+
+    @Test
+    public void testResponseCodeOnUpdate() {
+        Data original = datum(
+                resource(
+                        type("assignedIdLong"),
+                        id("1"),
+                        attributes(
+                                attr("value", 3)
+                        )
+                )
+        );
+
+        Data modified = datum(
+                resource(
+                        type("assignedIdLong"),
+                        id("1"),
+                        attributes(
+                                attr("value", 9)
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(original)
+                .post("/assignedIdLong")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(equalTo(original.toJSON()));
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(modified)
+                .patch("/assignedIdLong/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncApiIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncApiIT.java
new file mode 100644
index 0000000000..2cd1c7a7d5
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncApiIT.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.integration.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.async.integration.tests.framework.AsyncIntegrationTestApplicationResourceConfig;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.BeforeEach;
+import io.restassured.response.Response;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.concurrent.Executors;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Parent class with common code for AsyncIT and TableExportIT.
+ */
+public abstract class AsyncApiIT extends IntegrationTest {
+    @Getter private Integer port;
+    private String apiPath;
+
+    private static final Resource ENDERS_GAME = resource(
+            type("book"),
+            attributes(
+                    attr("title", "Ender's Game"),
+                    attr("genre", "Science Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    private static final Resource GAME_OF_THRONES = resource(
+            type("book"),
+            attributes(
+                    attr("title", "Song of Ice and Fire"),
+                    attr("genre", "Mythology Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    private static final Resource FOR_WHOM_THE_BELL_TOLLS = resource(
+            type("book"),
+            attributes(
+                    attr("title", "For Whom the Bell Tolls"),
+                    attr("genre", "Literary Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    public AsyncApiIT(String apiPath) {
+        super(AsyncIntegrationTestApplicationResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+
+        this.port = super.getRestAssuredPort();
+        this.apiPath = apiPath;
+    }
+
+    @Override
+    public void modifyServletContextHandler() {
+        // Set Attributes to be fetched in AsyncIntegrationTestApplicationResourceConfig
+        this.servletContextHandler.setAttribute(AsyncIntegrationTestApplicationResourceConfig.ASYNC_EXECUTOR_ATTR, Executors.newFixedThreadPool(5));
+    }
+
+    @Override
+    protected DataStoreTestHarness createHarness() {
+        DataStoreTestHarness dataStoreTestHarness = super.createHarness();
+        return new DataStoreTestHarness() {
+                @Override
+                public DataStore getDataStore() {
+                    return new AsyncDelayDataStore(dataStoreTestHarness.getDataStore());
+                }
+                @Override
+                public void cleanseTestData() {
+                    dataStoreTestHarness.cleanseTestData();
+                }
+        };
+    }
+    /**
+     * Creates test data for all tests.
+     */
+    @BeforeEach
+    public void init() {
+        //Create Book: Ender's Game
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(ENDERS_GAME).toJSON()
+                )
+                .post("/book")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(GAME_OF_THRONES).toJSON()
+                )
+                .post("/book")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(FOR_WHOM_THE_BELL_TOLLS).toJSON()
+                )
+                .post("/book")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+
+    public Response getJSONAPIResponse(String id) throws InterruptedException {
+        Response response = null;
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/" + apiPath + "/" + id);
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+            // If Async API is completed
+            if (outputResponse.equals("COMPLETE")) {
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async API Request has failed.");
+            i++;
+            assertNotEquals(1000, i, "Async API Request not completed.");
+        }
+
+        return response;
+    }
+
+    public String getGraphQLResponse(String id, String additionalResultColumns) throws InterruptedException {
+        String  responseGraphQL = null;
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            responseGraphQL = given()
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .accept(MediaType.APPLICATION_JSON)
+                    .body("{\"query\":\"{ " + apiPath + "(ids: [\\\"" + id + "\\\"]) "
+                            + "{ edges { node { id queryType status result "
+                            + "{ " + additionalResultColumns + " httpStatus recordCount } } } } }\","
+                            + "\"variables\":null}")
+                    .post("/graphQL")
+                    .asString();
+            // If Async API Request is created and completed
+            if (responseGraphQL.contains("\"status\":\"COMPLETE\"")) {
+                break;
+            }
+            assertTrue(responseGraphQL.contains("\"status\":\"PROCESSING\""), "Async API Request has failed.");
+            i++;
+            assertNotEquals(1000, i, "Async API Request not completed.");
+        }
+
+        return responseGraphQL;
+    }
+
+    public JsonNode toJsonNode(String query, Map<String, Object> variables) {
+        ObjectNode graphqlNode = JsonNodeFactory.instance.objectNode();
+        graphqlNode.put("query", query);
+        if (variables != null) {
+            graphqlNode.set("variables", mapper.valueToTree(variables));
+        }
+        return graphqlNode;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayDataStore.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayDataStore.java
new file mode 100644
index 0000000000..3b753b08fd
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayDataStore.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.integration.tests;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+
+/**
+ * Data Store that wraps another store and provides delay for testing Async queries.
+ */
+public class AsyncDelayDataStore implements DataStore {
+
+    private DataStore delayStore;
+
+    public AsyncDelayDataStore(DataStore delayStore, Integer testDelay) {
+        this.delayStore = delayStore;
+    }
+
+    public AsyncDelayDataStore(DataStore delayStore) {
+        this.delayStore = delayStore;
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        delayStore.populateEntityDictionary(dictionary);
+    }
+
+    @Override
+    public DataStoreTransaction beginTransaction() {
+        return new AsyncDelayStoreTransaction(delayStore.beginTransaction());
+    }
+
+    @Override
+    public DataStoreTransaction beginReadTransaction() {
+        return new AsyncDelayStoreTransaction(delayStore.beginReadTransaction());
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayStoreTransaction.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayStoreTransaction.java
new file mode 100644
index 0000000000..6503262c15
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncDelayStoreTransaction.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.integration.tests;
+
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.datastore.wrapped.TransactionWrapper;
+import com.yahoo.elide.core.request.EntityProjection;
+import org.apache.commons.collections4.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * Data Store Transaction that wraps another transaction and provides delay for testing Async queries.
+ */
+@Slf4j
+public class AsyncDelayStoreTransaction extends TransactionWrapper {
+
+    public AsyncDelayStoreTransaction(DataStoreTransaction tx) {
+
+        super(tx);
+    }
+
+    @Override
+    public DataStoreIterable<Object> loadObjects(EntityProjection entityProjection, RequestScope scope) {
+        try {
+            log.debug("LoadObjects Sleep for delay test");
+
+            List<String> sleepTime = scope.getRequestHeaders().get("sleep");
+            if (CollectionUtils.isNotEmpty(sleepTime)) {
+                Thread.sleep(Integer.parseInt(sleepTime.get(0)));
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.debug("Test delay interrupted");
+        }
+        return super.loadObjects(entityProjection, scope);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncIT.java
new file mode 100644
index 0000000000..fdb309db7b
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/AsyncIT.java
@@ -0,0 +1,587 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.integration.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.UNQUOTED_VALUE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.integration.tests.framework.AsyncIntegrationTestApplicationResourceConfig;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.resources.SecurityContextUser;
+import com.yahoo.elide.test.graphql.EnumFieldSerializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.restassured.response.Response;
+import lombok.Data;
+
+import java.io.IOException;
+import java.security.Principal;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.SecurityContext;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AsyncIT extends AsyncApiIT {
+
+    @Data
+    private class AsyncQuery {
+
+        private String id;
+        private String query;
+
+        @JsonSerialize(using = EnumFieldSerializer.class, as = String.class)
+        private String queryType;
+        private Integer asyncAfterSeconds;
+
+        @JsonSerialize(using = EnumFieldSerializer.class, as = String.class)
+        private String status;
+    }
+
+    public AsyncIT() {
+        super("asyncQuery");
+    }
+
+    public String getGraphQLResponse(String id) throws InterruptedException {
+        return super.getGraphQLResponse(id, "responseBody contentLength");
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a AsyncQuery Request with asyncAfterSeconds value set to 0.
+     * Happy Path Test Scenario 1
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiHappyPath1() throws InterruptedException {
+
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("edc4a871-dff2-4054-804e-d80075cf830e"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "0")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf830e"))
+                .body("data.type", equalTo("asyncQuery"))
+                .body("data.attributes.status", equalTo("PROCESSING"))
+                .body("data.attributes.result.contentLength", nullValue())
+                .body("data.attributes.result.responseBody", nullValue())
+                .body("data.attributes.result.httpStatus", nullValue());
+
+        Response response = getJSONAPIResponse("edc4a871-dff2-4054-804e-d80075cf830e");
+
+        // Validate AsyncQuery Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf830e"))
+                .body("data.type", equalTo("asyncQuery"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.contentLength", notNullValue())
+                .body("data.attributes.result.recordCount", equalTo(3))
+                .body("data.attributes.result.responseBody", equalTo("{\"data\":"
+                        + "[{\"type\":\"book\",\"id\":\"3\",\"attributes\":{\"title\":\"For Whom the Bell Tolls\"}}"
+                        + ",{\"type\":\"book\",\"id\":\"2\",\"attributes\":{\"title\":\"Song of Ice and Fire\"}},"
+                        + "{\"type\":\"book\",\"id\":\"1\",\"attributes\":{\"title\":\"Ender's Game\"}}]}"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a AsyncQuery Request with asyncAfterSeconds value set to 7.
+     * Happy Path Test Scenario 2
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiHappyPath2() throws InterruptedException {
+
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("edc4a871-dff2-4054-804e-d80075cf831f"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "7")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf831f"))
+                .body("data.type", equalTo("asyncQuery"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.contentLength", notNullValue())
+                .body("data.attributes.result.recordCount", equalTo(3))
+                .body("data.attributes.result.responseBody", equalTo("{\"data\":"
+                        + "[{\"type\":\"book\",\"id\":\"3\",\"attributes\":{\"title\":\"For Whom the Bell Tolls\"}}"
+                        + ",{\"type\":\"book\",\"id\":\"2\",\"attributes\":{\"title\":\"Song of Ice and Fire\"}},"
+                        + "{\"type\":\"book\",\"id\":\"1\",\"attributes\":{\"title\":\"Ender's Game\"}}]}"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+    }
+
+    /**
+     * Test for a GraphQL query as a Async Request with asyncAfterSeconds value set to 0.
+     * Happy Path Test Scenario 1
+     * @throws InterruptedException
+     */
+    @Test
+    public void graphQLHappyPath1() throws InterruptedException {
+
+        AsyncQuery queryObj = new AsyncQuery();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { id title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "asyncQuery",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { id title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-dff2-4054-804e-d80075cf828e");
+        expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"responseBody\":\"{\\\"data\\\":{\\\"book\\\":{\\\"edges\\\":[{\\\"node\\\":{\\\"id\\\":\\\"1\\\",\\\"title\\\":\\\"Ender's Game\\\"}},"
+                + "{\\\"node\\\":{\\\"id\\\":\\\"2\\\",\\\"title\\\":\\\"Song of Ice and Fire\\\"}},"
+                + "{\\\"node\\\":{\\\"id\\\":\\\"3\\\",\\\"title\\\":\\\"For Whom the Bell Tolls\\\"}}]}}}\","
+                + "\"contentLength\":177,\"httpStatus\":200,\"recordCount\":3}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Test for a GraphQL query as a Async Request with asyncAfterSeconds value set to 7.
+     * Happy Path Test Scenario 2
+     * @throws InterruptedException
+     */
+    @Test
+    public void graphQLHappyPath2() throws InterruptedException {
+
+        AsyncQuery queryObj = new AsyncQuery();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf829e");
+        queryObj.setAsyncAfterSeconds(7);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { id title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "asyncQuery",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("status")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf829e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { id title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf829e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"responseBody\":\"{\\\"data\\\":{\\\"book\\\":{\\\"edges\\\":[{\\\"node\\\":{\\\"id\\\":\\\"1\\\",\\\"title\\\":\\\"Ender's Game\\\"}},"
+                + "{\\\"node\\\":{\\\"id\\\":\\\"2\\\",\\\"title\\\":\\\"Song of Ice and Fire\\\"}},"
+                + "{\\\"node\\\":{\\\"id\\\":\\\"3\\\",\\\"title\\\":\\\"For Whom the Bell Tolls\\\"}}]}}}\","
+                + "\"httpStatus\":200,\"contentLength\":177}}}]}}}";
+        given()
+                 .contentType(MediaType.APPLICATION_JSON)
+                 .accept(MediaType.APPLICATION_JSON)
+                 .body("{\"query\":\"{ asyncQuery(ids: [\\\"edc4a871-dff2-4054-804e-d80075cf829e\\\"]) "
+                         + "{ edges { node { id queryType status result "
+                         + "{ responseBody httpStatus contentLength } } } } }\","
+                         + "\"variables\":null}")
+                 .post("/graphQL")
+                 .then()
+                 .statusCode(org.apache.http.HttpStatus.SC_OK)
+                 .body(equalTo(expectedResponse));
+    }
+
+    /**
+     * Test for QueryStatus Set to PROCESSING instead of Queued.
+     */
+    @Test
+    public void graphQLTestCreateFailOnQueryStatus() {
+
+        AsyncQuery queryObj = new AsyncQuery();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf839e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("PROCESSING");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { id title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "asyncQuery",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", queryObj, UNQUOTED_VALUE)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("query"),
+                                                field("queryType"),
+                                                field("status")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(containsString("errors"));
+    }
+
+    /**
+     * Various tests for an unknown collection (group) that does not exist JSONAPI query as a Async Request.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiUnknownRequestTests() throws InterruptedException {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b"),
+                                        attributes(
+                                                attr("query", "/group?sort=genre&fields%5Bgroup%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b");
+
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b"))
+                .body("data.type", equalTo("asyncQuery"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.contentLength", notNullValue())
+                .body("data.attributes.result.responseBody", equalTo("{\"errors\":[{\"detail\":\"Unknown collection group\"}]}"))
+                .body("data.attributes.result.httpStatus", equalTo(404));
+    }
+
+    /**
+     * Various tests for making a Async request for AsyncQuery request that does not exist.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiBadRequestTests() throws InterruptedException {
+
+        //JSON API bad request
+        given()
+                .accept("application/vnd.api+json")
+                .get("/asyncQuery/ba31ca4e-ed8f-4be0-a0f3-12088fa9263a")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body("errors[0].detail", equalTo("Unknown identifier ba31ca4e-ed8f-4be0-a0f3-12088fa9263a for asyncQuery"));
+
+    }
+
+    /**
+     * Various tests for making a Async request for AsyncQuery request that does not exist.
+     * @throws InterruptedException
+     */
+    @Test
+    public void graphQLBadRequestTests() throws InterruptedException {
+
+      //GRAPHQL bad request
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{\"query\":\"{ asyncQuery(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263a\\\"]) "
+                        + "{ edges { node { id createdOn updatedOn queryType status result "
+                        + "{ responseBody httpStatus contentLength } } } } }\""
+                        + ",\"variables\":null}")
+                .post("/graphQL")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.asyncQuery", nullValue())
+                .body("errors[0].message", equalTo("Exception while fetching data (/asyncQuery) : Unknown identifier "
+                        + "[ba31ca4e-ed8f-4be0-a0f3-12088fa9263a] for asyncQuery"));
+
+    }
+
+    /**
+     * Various tests for making a Async request to a model to which the user does not have permissions.
+     * @throws InterruptedException
+     */
+    @Test
+    public void noReadEntityTests() throws InterruptedException {
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e"),
+                                        attributes(
+                                                attr("query", "/noread"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e");
+        // Validate AsyncQuery Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e"))
+                .body("data.type", equalTo("asyncQuery"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.recordCount", equalTo(0))
+                .body("data.attributes.result.contentLength", notNullValue())
+                .body("data.attributes.result.responseBody", equalTo("{\"data\":[]}"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+    }
+
+    /**
+     * Tests Read Permissions on AsyncQuery Model for Admin Role.
+     * @throws IOException IOException
+     */
+    @Test
+    public void asyncQueryModelAdminReadPermissions() throws IOException {
+
+        ElideResponse response = null;
+        String id = "edc4a871-dff2-4054-804e-d80075c08959";
+        String query = "test-query";
+
+        com.yahoo.elide.async.models.AsyncQuery queryObj = new com.yahoo.elide.async.models.AsyncQuery();
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setPrincipalName("owner-user");
+
+        dataStore.populateEntityDictionary(
+                        EntityDictionary.builder()
+                                .checks(AsyncIntegrationTestApplicationResourceConfig.MAPPINGS)
+                                .build());
+        DataStoreTransaction tx = dataStore.beginTransaction();
+        tx.createObject(queryObj, null);
+        tx.commit(null);
+        tx.close();
+
+        Elide elide = new Elide(new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(
+                                EntityDictionary.builder()
+                                        .checks(AsyncIntegrationTestApplicationResourceConfig.MAPPINGS)
+                                        .build())
+                        .withAuditLogger(new TestAuditLogger()).build());
+
+        elide.doScans();
+
+        User ownerUser = new User(() -> "owner-user");
+        SecurityContextUser securityContextAdminUser = new SecurityContextUser(new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return () -> "1";
+            }
+            @Override
+            public boolean isUserInRole(String s) {
+                return true;
+            }
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        });
+        SecurityContextUser securityContextNonAdminUser = new SecurityContextUser(new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return () -> "2";
+            }
+            @Override
+            public boolean isUserInRole(String s) {
+                return false;
+            }
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        });
+
+        String baseUrl = "/";
+        // Principal is Owner
+        response = elide.get(baseUrl, "/asyncQuery/" + id, new MultivaluedHashMap<>(), ownerUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        // Principal has Admin Role
+        response = elide.get(baseUrl, "/asyncQuery/" + id, new MultivaluedHashMap<>(), securityContextAdminUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        // Principal without Admin Role
+        response = elide.get(baseUrl, "/asyncQuery/" + id, new MultivaluedHashMap<>(), securityContextNonAdminUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_NOT_FOUND, response.getResponseCode());
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a Async Request with asyncAfterSeconds value set to 7.
+     * asyncAfterSeconds is more than 10.
+     * @throws InterruptedException
+     */
+    @Test
+    public void asyncAfterBeyondMax() throws InterruptedException {
+        String expected = "{\"errors\":[{\"detail\":\"Invalid value: Invalid Async After Seconds\"}]}";
+
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("edc4a871-dff2-4054-804e-e80075cf831f"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "70")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo(expected));
+
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/TableExportIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/TableExportIT.java
new file mode 100644
index 0000000000..1ac03f66ae
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/TableExportIT.java
@@ -0,0 +1,1238 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.integration.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.UNQUOTED_VALUE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.integration.tests.framework.AsyncIntegrationTestApplicationResourceConfig;
+import com.yahoo.elide.async.models.QueryType;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.jsonapi.resources.SecurityContextUser;
+import com.yahoo.elide.test.graphql.EnumFieldSerializer;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.restassured.response.Response;
+import lombok.Data;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.security.Principal;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.SecurityContext;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class TableExportIT extends AsyncApiIT {
+
+    @Data
+    private class TableExport {
+        private String id;
+        private String query;
+        @JsonSerialize(using = EnumFieldSerializer.class, as = String.class)
+        private String queryType;
+        private Integer asyncAfterSeconds;
+        @JsonSerialize(using = EnumFieldSerializer.class, as = String.class)
+        private String resultType;
+        @JsonSerialize(using = EnumFieldSerializer.class, as = String.class)
+        private String status;
+    }
+
+    public TableExportIT() {
+        super("tableExport");
+    }
+
+    @Override
+    public void modifyServletContextHandler() {
+        super.modifyServletContextHandler();
+        // Initialize Export End Point
+        ServletHolder exportServlet = servletContextHandler.addServlet(ServletContainer.class, "/export/*");
+        exportServlet.setInitOrder(3);
+        exportServlet.setInitParameter("jersey.config.server.provider.packages",
+                com.yahoo.elide.async.resources.ExportApiEndpoint.class.getPackage().getName());
+        exportServlet.setInitParameter("javax.ws.rs.Application", AsyncIntegrationTestApplicationResourceConfig.class.getName());
+
+        // Set Attributes to be fetched in AsyncIntegrationTestApplicationResourceConfig
+        try {
+            this.servletContextHandler.setAttribute(AsyncIntegrationTestApplicationResourceConfig.STORAGE_DESTINATION_ATTR, Files.createTempDirectory("asyncIT"));
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public String getGraphQLResponse(String id) throws InterruptedException {
+        return super.getGraphQLResponse(id, "message url");
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a TableExport Request with asyncAfterSeconds value set to 0.
+     * Happy Path Test Scenario 1
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void jsonApiHappyPath1() throws InterruptedException, IOException {
+
+        //Create Table Export Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("edc4a871-dff2-4054-804e-d80075cf830a"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "0"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf830a"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.status", equalTo("PROCESSING"))
+                .body("data.attributes.result.recordCount", nullValue())
+                .body("data.attributes.result.responseBody", nullValue())
+                .body("data.attributes.result.httpStatus", nullValue());
+
+
+        Response response = getJSONAPIResponse("edc4a871-dff2-4054-804e-d80075cf830a");
+
+        // Validate TableExport  Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf830a"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.message", nullValue())
+                .body("data.attributes.result.recordCount", equalTo(3))
+                .body("data.attributes.result.url",
+                        equalTo("http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cf830a"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+
+        assertEquals("\"title\"\n"
+                + "\"For Whom the Bell Tolls\"\n"
+                + "\"Song of Ice and Fire\"\n"
+                + "\"Ender's Game\"\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cf830a"));
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a TableExport Request with asyncAfterSeconds value set to 7.
+     * Happy Path Test Scenario 2
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void jsonApiHappyPath2() throws InterruptedException, IOException {
+
+        //Create TableExport Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("edc4a871-dff2-4054-804e-d80075cf831a"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "7"),
+                                                attr("resultType", "JSON")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("edc4a871-dff2-4054-804e-d80075cf831a"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.message", nullValue())
+                .body("data.attributes.result.recordCount", equalTo(3))
+                .body("data.attributes.result.url",
+                        equalTo("http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cf831a"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+        assertEquals("[\n"
+                + "{\"title\":\"For Whom the Bell Tolls\"}\n"
+                + ",{\"title\":\"Song of Ice and Fire\"}\n"
+                + ",{\"title\":\"Ender's Game\"}\n"
+                + "]\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cf831a"));
+
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with asyncAfterSeconds value set to 0.
+     * Happy Path Test Scenario 1
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void graphQLHappyPath1() throws InterruptedException, IOException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-dff2-4054-804e-d80075cf828e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":null,\"url\":\"http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cf828e\","
+                + "\"httpStatus\":200,\"recordCount\":3}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+        assertEquals("\"title\"\n"
+                + "\"Ender's Game\"\n"
+                + "\"Song of Ice and Fire\"\n"
+                + "\"For Whom the Bell Tolls\"\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cf828e"));
+    }
+
+    /**
+     * Test for a GraphQL query as a TableExport Request with asyncAfterSeconds value set to 7.
+     * Happy Path Test Scenario 2
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void graphQLHappyPath2() throws InterruptedException, IOException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf829e");
+        queryObj.setAsyncAfterSeconds(7);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("JSON");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("status"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf829e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"JSON\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = given()
+                 .contentType(MediaType.APPLICATION_JSON)
+                 .accept(MediaType.APPLICATION_JSON)
+                 .body("{\"query\":\"{ tableExport(ids: [\\\"edc4a871-dff2-4054-804e-d80075cf829e\\\"]) "
+                         + "{ edges { node { id queryType status result "
+                         + "{ url httpStatus recordCount } } } } }\","
+                         + "\"variables\":null}")
+                 .post("/graphQL")
+                 .asString();
+
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf829e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                 + "\"result\":{\"url\":\"http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cf829e\","
+                 + "\"httpStatus\":200,\"recordCount\":3}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+        assertEquals("[\n"
+                + "{\"title\":\"Ender's Game\"}\n"
+                + ",{\"title\":\"Song of Ice and Fire\"}\n"
+                + ",{\"title\":\"For Whom the Bell Tolls\"}\n"
+                + "]\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cf829e"));
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with asyncAfterSeconds value set to 0.
+     * Happy Path Test Scenario 1 with alias.
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void graphQLHappyPath1Alias() throws InterruptedException, IOException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cab28e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { bookName:title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cab28e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { bookName:title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-dff2-4054-804e-d80075cab28e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cab28e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":null,\"url\":\"http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cab28e\","
+                + "\"httpStatus\":200,\"recordCount\":3}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+        assertEquals("\"title\"\n"
+                + "\"Ender's Game\"\n"
+                + "\"Song of Ice and Fire\"\n"
+                + "\"For Whom the Bell Tolls\"\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cab28e"));
+    }
+
+    /**
+     * Test for a GraphQL query as a TableExport Request with asyncAfterSeconds value set to 7.
+     * Also uses alias for columns.
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void graphQLHappyPath2Alias() throws InterruptedException, IOException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cab29e");
+        queryObj.setAsyncAfterSeconds(7);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("JSON");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { bookName:title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("status"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cab29e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { bookName:title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"JSON\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = given()
+                 .contentType(MediaType.APPLICATION_JSON)
+                 .accept(MediaType.APPLICATION_JSON)
+                 .body("{\"query\":\"{ tableExport(ids: [\\\"edc4a871-dff2-4054-804e-d80075cab29e\\\"]) "
+                         + "{ edges { node { id queryType status result "
+                         + "{ url httpStatus recordCount } } } } }\","
+                         + "\"variables\":null}")
+                 .post("/graphQL")
+                 .asString();
+
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cab29e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                 + "\"result\":{\"url\":\"http://localhost:" + getPort() + "/export/edc4a871-dff2-4054-804e-d80075cab29e\","
+                 + "\"httpStatus\":200,\"recordCount\":3}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+        assertEquals("[\n"
+                + "{\"bookName\":\"Ender's Game\"}\n"
+                + ",{\"bookName\":\"Song of Ice and Fire\"}\n"
+                + ",{\"bookName\":\"For Whom the Bell Tolls\"}\n"
+                + "]\n", getStoredFileContents(getPort(), "edc4a871-dff2-4054-804e-d80075cab29e"));
+    }
+
+    /**
+     * Test for QueryStatus Set to PROCESSING instead of Queued.
+     */
+    @Test
+    public void graphQLTestCreateFailOnQueryStatus() {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf839e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        // Status should be QUEUED during submission.
+        queryObj.setStatus("PROCESSING");
+        queryObj.setResultType("CSV");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { id title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "tableExport",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", queryObj, UNQUOTED_VALUE)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("query"),
+                                                field("queryType"),
+                                                field("status")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(containsString("errors"))
+                .body(containsString("CreatePermission Denied"));
+    }
+
+    /**
+     * Test for ResultType Set to an unsupported value.
+     */
+    @Test
+    public void graphQLTestCreateFailOnUnSupportedResultType() {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf939e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        // XLS is not supported.
+        queryObj.setResultType("XLS");
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { id title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "tableExport",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", queryObj, UNQUOTED_VALUE)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("query"),
+                                                field("queryType"),
+                                                field("status")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(containsString("errors"))
+                .body(containsString("Validation error of type WrongType: argument &#39;data.resultType&#39;"));
+    }
+
+    /**
+     * Various tests for an unknown collection (group) that does not exist, used in TableExport Request JSONAPI query.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiUnknownRequestTests() throws InterruptedException {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b"),
+                                        attributes(
+                                                // entity "group" does not exist.
+                                                attr("query", "/group?sort=genre&fields%5Bgroup%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b");
+
+        // Validate TableExport Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9263b"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.recordCount", nullValue())
+                .body("data.attributes.result.url", nullValue())
+                .body("data.attributes.result.message", equalTo("Unknown collection group"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+    }
+
+    /**
+     * Various tests for bad export JSONAPI query as a TableExport Request.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiBadExportQueryTests() throws InterruptedException {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("ba31ca5e-ed8f-4be0-a0f3-12088fa9263b"),
+                                        attributes(
+                                                // %5Bgroup%5B instead of 5Bgroup%5D
+                                                attr("query", "/group?sort=genre&fields%5Bgroup%5B=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("ba31ca5e-ed8f-4be0-a0f3-12088fa9263b");
+        // Validate TableExport Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("ba31ca5e-ed8f-4be0-a0f3-12088fa9263b"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.recordCount", nullValue())
+                .body("data.attributes.result.url", nullValue())
+                .body("data.attributes.result.message", equalTo("Unknown collection group"))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+    }
+
+    /**
+     * Various tests for an unknown collection (group) that does not exist, used in TableExport Request GraphQL query.
+     * @throws InterruptedException
+     */
+    @Test
+    public void graphqlUnknownRequestTests() throws InterruptedException {
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075cf939e");
+        queryObj.setAsyncAfterSeconds(7);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        // entity "group" does not exist.
+        queryObj.setQuery("{\"query\":\"{ group { edges { node { title } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                mutation(
+                        selection(
+                                field(
+                                        "tableExport",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", queryObj, UNQUOTED_VALUE)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("query"),
+                                                field("queryType"),
+                                                field("status"),
+                                                field("resultType")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf939e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ group { edges { node { title } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{\"query\":\"{ tableExport(ids: [\\\"edc4a871-dff2-4054-804e-d80075cf939e\\\"]) "
+                        + "{ edges { node { id queryType status result "
+                        + "{ message httpStatus recordCount } } } } }\","
+                        + "\"variables\":null}")
+                .post("/graphQL")
+                .asString();
+
+       expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075cf939e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":\"Bad Request Body'Unknown entity {group}.'\","
+                + "\"httpStatus\":200,\"recordCount\":null}}}]}}}";
+
+       assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Tests for making a Async request for TableExport request that does not exist.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonApiBadRequestTests() throws InterruptedException {
+
+        //JSON API bad request, ba31ca4e-ed8f-4be0-a0f3-12088fa9263a does not exist.
+        given()
+                .accept("application/vnd.api+json")
+                .get("/tableExport/ba31ca4e-ed8f-4be0-a0f3-12088fa9263a")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body("errors[0].detail", equalTo("Unknown identifier ba31ca4e-ed8f-4be0-a0f3-12088fa9263a for tableExport"));
+
+    }
+
+    /**
+     * Test for making a Async request for TableExport request that does not exist.
+     * @throws InterruptedException
+     */
+    @Test
+    public void graphQLBadRequestTests() throws InterruptedException {
+
+      //GRAPHQL bad request, ba31ca4e-ed8f-4be0-a0f3-12088fa9263a does not exist.
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{\"query\":\"{ tableExport(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263a\\\"]) "
+                        + "{ edges { node { id createdOn updatedOn queryType status result "
+                        + "{ url httpStatus recordCount } } } } }\""
+                        + ",\"variables\":null}")
+                .post("/graphQL")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.tableExport", nullValue())
+                .body("errors[0].message", equalTo("Exception while fetching data (/tableExport) : Unknown identifier "
+                        + "[ba31ca4e-ed8f-4be0-a0f3-12088fa9263a] for tableExport"));
+
+    }
+
+    /**
+     * Test for making a TableExport request to a model with relationship.
+     * @throws InterruptedException
+     */
+    @Test
+    public void jsonAPIRelationshipFetchTests() throws InterruptedException {
+        //Create Table Export Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("0b0dd4e6-9cdc-4bbc-8db2-5c1491c5ee1e"),
+                                        attributes(
+                                                // Fetching Book with all fields including relationships.
+                                                attr("query", "/book"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("0b0dd4e6-9cdc-4bbc-8db2-5c1491c5ee1e");
+        // Validate TableExport Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("0b0dd4e6-9cdc-4bbc-8db2-5c1491c5ee1e"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.recordCount", nullValue())
+                .body("data.attributes.result.url", nullValue())
+                .body("data.attributes.result.message",
+                        equalTo("Export is not supported for Query that requires traversing Relationships."))
+                .body("data.attributes.result.httpStatus", equalTo(200));
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with a Bad Export Query.
+     * @throws InterruptedException InterruptedException
+     */
+    @Test
+    public void graphQLBadExportQueryFail() throws InterruptedException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dff2-4054-804e-d80075df828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        // Query missing }
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075df828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-dff2-4054-804e-d80075df828e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dff2-4054-804e-d80075df828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":\"Bad Request Body'Can't parse query: { book { edges { node { title } } }'\",\"url\":null,"
+                + "\"httpStatus\":200,\"recordCount\":null}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with Multiple Queries.
+     * @throws InterruptedException InterruptedException
+     */
+    @Test
+    public void graphQLMultipleQueryFail() throws InterruptedException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-def2-4054-804e-d80075cf828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        // book and author queried from single query
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title } } } author { edges { node { name } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-def2-4054-804e-d80075cf828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title } } } author { edges { node { name } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-def2-4054-804e-d80075cf828e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-def2-4054-804e-d80075cf828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":\"Export is only supported for single Query with one root projection.\",\"url\":null,"
+                + "\"httpStatus\":200,\"recordCount\":null}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with Multiple Projections.
+     * @throws InterruptedException InterruptedException
+     */
+    @Test
+    public void graphQLMultipleProjectionFail() throws InterruptedException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-daf2-4054-804e-d80075cf828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        // 2 Separate Queries for book and author
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title } } } } { author { edges { node { name } } } }\",\"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-daf2-4054-804e-d80075cf828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title } } } } { author { edges { node { name } } } }\\\",\\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-daf2-4054-804e-d80075cf828e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-daf2-4054-804e-d80075cf828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":\"Export is only supported for single Query with one root projection.\",\"url\":null,"
+                + "\"httpStatus\":200,\"recordCount\":null}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Test for a GraphQL query as a Table Export Request with Relationship fetch.
+     * @throws InterruptedException InterruptedException
+     */
+    @Test
+    public void graphQLRelationshipFetchFail() throws InterruptedException {
+
+        TableExport queryObj = new TableExport();
+        queryObj.setId("edc4a871-dbf2-4054-804e-d80075cf828e");
+        queryObj.setAsyncAfterSeconds(0);
+        queryObj.setQueryType("GRAPHQL_V1_0");
+        queryObj.setStatus("QUEUED");
+        queryObj.setResultType("CSV");
+        // Fetching relationship "authors"
+        queryObj.setQuery("{\"query\":\"{ book { edges { node { title authors {edges { node { name } } } } } } }\", \"variables\":null}");
+        String graphQLRequest = document(
+                 mutation(
+                         selection(
+                                 field(
+                                         "tableExport",
+                                         arguments(
+                                                 argument("op", "UPSERT"),
+                                                 argument("data", queryObj, UNQUOTED_VALUE)
+                                         ),
+                                         selections(
+                                                 field("id"),
+                                                 field("query"),
+                                                 field("queryType"),
+                                                 field("resultType")
+                                         )
+                                 )
+                         )
+                 )
+        ).toQuery();
+
+        String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dbf2-4054-804e-d80075cf828e\","
+                + "\"query\":\"{\\\"query\\\":\\\"{ book { edges { node { title authors {edges { node { name } } } } } } }\\\", \\\"variables\\\":null}\","
+                + "\"queryType\":\"GRAPHQL_V1_0\",\"resultType\":\"CSV\"}}]}}}";
+        JsonNode graphQLJsonNode = toJsonNode(graphQLRequest, null);
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("sleep", "1000")
+                .accept(MediaType.APPLICATION_JSON)
+                .body(graphQLJsonNode)
+                .post("/graphQL")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body(equalTo(expectedResponse));
+
+        String responseGraphQL = getGraphQLResponse("edc4a871-dbf2-4054-804e-d80075cf828e");
+        expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"edc4a871-dbf2-4054-804e-d80075cf828e\",\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\","
+                + "\"result\":{\"message\":\"Export is not supported for Query that requires traversing Relationships.\",\"url\":null,"
+                + "\"httpStatus\":200,\"recordCount\":null}}}]}}}";
+
+        assertEquals(expectedResponse, responseGraphQL);
+    }
+
+    /**
+     * Test for making a TableExport request to a model to which the user does not have permissions.
+     * It will finish successfully but only with header.
+     * @throws InterruptedException InterruptedException
+     * @throws IOException IOException
+     */
+    @Test
+    public void noReadEntityTests() throws InterruptedException, IOException {
+        Resource noRead = resource(
+                type("noread"),
+                attributes(
+                        attr("field", "No Read")
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(noRead).toJSON()
+                )
+                .post("/noread")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        //Create Table Export Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e"),
+                                        attributes(
+                                                attr("query", "/noread?fields%5Bnoread%5D=field"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        Response response = getJSONAPIResponse("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e");
+
+        // Validate TableExport Response
+        response
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.id", equalTo("0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e"))
+                .body("data.type", equalTo("tableExport"))
+                .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                .body("data.attributes.status", equalTo("COMPLETE"))
+                .body("data.attributes.result.recordCount", equalTo(0))
+                .body("data.attributes.result.url", notNullValue())
+                .body("data.attributes.result.message", nullValue())
+                .body("data.attributes.result.httpStatus", equalTo(200));
+
+        // Only Header in the file, no records.
+        String fileContents = getStoredFileContents(getPort(), "0b0dd4e7-9cdc-4bbc-8db2-5c1491c5ee1e");
+
+        assertEquals(1, fileContents.split("\n").length);
+        assertTrue(fileContents.contains("field"));
+    }
+
+    /**
+     * Tests Read Permissions on TableExport Model for Admin Role.
+     * @throws IOException IOException
+     */
+    @Test
+    public void tableExportModelAdminReadPermissions() throws IOException {
+
+        ElideResponse response = null;
+        String id = "edc4a871-dff2-4054-804e-d80075c08959";
+        String query = "test-query";
+
+        com.yahoo.elide.async.models.TableExport queryObj = new com.yahoo.elide.async.models.TableExport();
+        queryObj.setId(id);
+        queryObj.setQuery(query);
+        queryObj.setResultType(ResultType.CSV);
+        queryObj.setQueryType(QueryType.JSONAPI_V1_0);
+        queryObj.setPrincipalName("owner-user");
+
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .checks(AsyncIntegrationTestApplicationResourceConfig.MAPPINGS).build();
+        dataStore.populateEntityDictionary(dictionary);
+        DataStoreTransaction tx = dataStore.beginTransaction();
+        tx.createObject(queryObj, null);
+        tx.commit(null);
+        tx.close();
+
+        Elide elide = new Elide(new ElideSettingsBuilder(dataStore)
+                        .withEntityDictionary(dictionary)
+                        .withAuditLogger(new TestAuditLogger()).build());
+
+        User ownerUser = new User(() -> "owner-user");
+        SecurityContextUser securityContextAdminUser = new SecurityContextUser(new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return () -> "1";
+            }
+            @Override
+            public boolean isUserInRole(String s) {
+                return true;
+            }
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        });
+        SecurityContextUser securityContextNonAdminUser = new SecurityContextUser(new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return () -> "2";
+            }
+            @Override
+            public boolean isUserInRole(String s) {
+                return false;
+            }
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        });
+
+        String baseUrl = "/";
+        // Principal is Owner
+        response = elide.get(baseUrl, "/tableExport/" + id, new MultivaluedHashMap<>(), ownerUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        // Principal has Admin Role
+        response = elide.get(baseUrl, "/tableExport/" + id, new MultivaluedHashMap<>(), securityContextAdminUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        // Principal without Admin Role
+        response = elide.get(baseUrl, "/tableExport/" + id, new MultivaluedHashMap<>(), securityContextNonAdminUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_NOT_FOUND, response.getResponseCode());
+    }
+
+    /**
+     * Various tests for a JSONAPI query as a TableExport Request with asyncAfterSeconds value set to 7.
+     * asyncAfterSeconds is more than 10.
+     * @throws InterruptedException
+     */
+    @Test
+    public void asyncAfterBeyondMax() throws InterruptedException {
+        String expected = "{\"errors\":[{\"detail\":\"Invalid value: Invalid Async After Seconds\"}]}";
+
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .header("sleep", "1000")
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("edc4a871-dff2-4054-804e-e80075cf831f"),
+                                        attributes(
+                                                attr("query", "/book?sort=genre&fields%5Bbook%5D=title"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "70"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo(expected));
+
+    }
+
+    private String getStoredFileContents(Integer port, String id) {
+        return given()
+                .when()
+                .get("http://localhost:" + getPort() + "/export/" + id)
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .extract().asString();
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/framework/AsyncIntegrationTestApplicationResourceConfig.java b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/framework/AsyncIntegrationTestApplicationResourceConfig.java
new file mode 100644
index 0000000000..c3e25663b3
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/async/integration/tests/framework/AsyncIntegrationTestApplicationResourceConfig.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.async.integration.tests.framework;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.export.formatter.CSVExportFormatter;
+import com.yahoo.elide.async.export.formatter.JSONExportFormatter;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.hooks.AsyncQueryHook;
+import com.yahoo.elide.async.hooks.TableExportHook;
+import com.yahoo.elide.async.integration.tests.AsyncIT;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.models.security.AsyncAPIInlineChecks;
+import com.yahoo.elide.async.resources.ExportApiEndpoint.ExportApiProperties;
+import com.yahoo.elide.async.service.AsyncCleanerService;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.audit.InMemoryLogger;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import com.yahoo.elide.core.security.checks.Check;
+import example.TestCheckMappings;
+import example.models.triggers.Invoice;
+import example.models.triggers.InvoiceCompletionHook;
+import example.models.triggers.services.BillingService;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Context;
+
+public class AsyncIntegrationTestApplicationResourceConfig extends ResourceConfig {
+    public static final InMemoryLogger LOGGER = new InMemoryLogger();
+    public static final String ASYNC_EXECUTOR_ATTR = "asyncExecutor";
+    public static final String STORAGE_DESTINATION_ATTR = "storageDestination";
+
+    public static final Map<String, Class<? extends Check>> MAPPINGS = defineMappings();
+
+    private static Map<String, Class<? extends Check>> defineMappings() {
+        Map<String, Class<? extends Check>> map = new HashMap<>(TestCheckMappings.MAPPINGS);
+        map.put(AsyncAPIInlineChecks.AsyncAPIOwner.PRINCIPAL_IS_OWNER,
+                        AsyncAPIInlineChecks.AsyncAPIOwner.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIAdmin.PRINCIPAL_IS_ADMIN,
+                        AsyncAPIInlineChecks.AsyncAPIAdmin.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusValue.VALUE_IS_CANCELLED,
+                        AsyncAPIInlineChecks.AsyncAPIStatusValue.class);
+        map.put(AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.VALUE_IS_QUEUED,
+                        AsyncAPIInlineChecks.AsyncAPIStatusQueuedValue.class);
+        return Collections.unmodifiableMap(map);
+    }
+
+    @Inject
+    public AsyncIntegrationTestApplicationResourceConfig(ServiceLocator injector, @Context ServletContext servletContext) {
+        // Bind to injector
+        register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                EntityDictionary dictionary = EntityDictionary.builder()
+                        .injector(injector::inject).checks(MAPPINGS).build();
+
+                bind(dictionary).to(EntityDictionary.class);
+
+                DefaultFilterDialect defaultFilterStrategy = new DefaultFilterDialect(dictionary);
+                RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+                MultipleFilterDialect multipleFilterStrategy = new MultipleFilterDialect(
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy),
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy)
+                );
+
+                Elide elide = new Elide(new ElideSettingsBuilder(AsyncIT.getDataStore())
+                        .withAuditLogger(LOGGER)
+                        .withJoinFilterDialect(multipleFilterStrategy)
+                        .withSubqueryFilterDialect(multipleFilterStrategy)
+                        .withEntityDictionary(dictionary)
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                        .withExportApiPath("/export")
+                        .build());
+                bind(elide).to(Elide.class).named("elide");
+
+                elide.doScans();
+
+                AsyncAPIDAO asyncAPIDao = new DefaultAsyncAPIDAO(elide.getElideSettings(), elide.getDataStore());
+                bind(asyncAPIDao).to(AsyncAPIDAO.class);
+
+                ExecutorService executorService = (ExecutorService) servletContext.getAttribute(ASYNC_EXECUTOR_ATTR);
+                AsyncExecutorService asyncExecutorService = new AsyncExecutorService(elide,
+                        executorService, executorService, asyncAPIDao);
+
+                // Create ResultStorageEngine
+                Path storageDestination = (Path) servletContext.getAttribute(STORAGE_DESTINATION_ATTR);
+                if (storageDestination != null) { // TableExport is enabled
+                    ResultStorageEngine resultStorageEngine = new FileResultStorageEngine(storageDestination.toAbsolutePath().toString(), false);
+                    bind(resultStorageEngine).to(ResultStorageEngine.class).named("resultStorageEngine");
+
+                    Map<ResultType, TableExportFormatter> supportedFormatters = new HashMap<>();
+                    supportedFormatters.put(ResultType.CSV, new CSVExportFormatter(elide, false));
+                    supportedFormatters.put(ResultType.JSON, new JSONExportFormatter(elide));
+
+                    // Binding TableExport LifeCycleHook
+                    TableExportHook tableExportHook = new TableExportHook(asyncExecutorService, 10, supportedFormatters,
+                            resultStorageEngine);
+                    dictionary.bindTrigger(TableExport.class, CREATE, PREFLUSH, tableExportHook, false);
+                    dictionary.bindTrigger(TableExport.class, CREATE, POSTCOMMIT, tableExportHook, false);
+                    dictionary.bindTrigger(TableExport.class, CREATE, PRESECURITY, tableExportHook, false);
+
+                    ExportApiProperties exportApiProperties = new ExportApiProperties(executorService, 10);
+                    bind(exportApiProperties).to(ExportApiProperties.class).named("exportApiProperties");
+                }
+
+                BillingService billingService = new BillingService() {
+                    @Override
+                    public long purchase(Invoice invoice) {
+                        return 0;
+                    }
+                };
+
+                bind(billingService).to(BillingService.class);
+
+                // Binding AsyncQuery LifeCycleHook
+                AsyncQueryHook asyncQueryHook = new AsyncQueryHook(asyncExecutorService, 10);
+
+                InvoiceCompletionHook invoiceCompletionHook = new InvoiceCompletionHook(billingService);
+
+                dictionary.bindTrigger(AsyncQuery.class, CREATE, PREFLUSH, asyncQueryHook, false);
+                dictionary.bindTrigger(AsyncQuery.class, CREATE, POSTCOMMIT, asyncQueryHook, false);
+                dictionary.bindTrigger(AsyncQuery.class, CREATE, PRESECURITY, asyncQueryHook, false);
+                dictionary.bindTrigger(Invoice.class, "complete", CREATE, PRECOMMIT, invoiceCompletionHook);
+                dictionary.bindTrigger(Invoice.class, "complete", UPDATE, PRECOMMIT, invoiceCompletionHook);
+
+                AsyncCleanerService.init(elide, 30, 5, 150, asyncAPIDao);
+                bind(AsyncCleanerService.getInstance()).to(AsyncCleanerService.class);
+            }
+        });
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java b/elide-integration-tests/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java
deleted file mode 100644
index d110942f55..0000000000
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/audit/TestAuditLogger.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.audit;
-
-import java.io.IOException;
-
-/**
- * Example Logger test.
- */
-public class TestAuditLogger extends AuditLogger {
-    public int commitCount = 0;
-    public int logCount = 0;
-
-    @Override
-    public void log(LogMessage message) {
-        super.log(message);
-        logCount++;
-    }
-
-    @Override
-    public void commit() throws IOException {
-        commitCount++;
-    }
-}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/auditTests/AuditIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/auditTests/AuditIT.java
index 19d030bce1..249346287b 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/auditTests/AuditIT.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/auditTests/AuditIT.java
@@ -5,110 +5,223 @@
  */
 package com.yahoo.elide.auditTests;
 
-import com.yahoo.elide.audit.InMemoryLogger;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.audit.InMemoryLogger;
 import com.yahoo.elide.initialization.AuditIntegrationTestApplicationResourceConfig;
-import com.yahoo.elide.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import com.yahoo.elide.test.jsonapi.elements.ResourceLinkage;
 import org.apache.http.HttpStatus;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import static com.jayway.restassured.RestAssured.given;
+import org.junit.jupiter.api.Test;
 
 /**
  * Integration tests for audit functionality.
  */
-public class AuditIT extends AbstractIntegrationTestInitializer {
+public class AuditIT extends IntegrationTest {
     private final InMemoryLogger logger = AuditIntegrationTestApplicationResourceConfig.LOGGER;
-    private final JsonParser jsonParser = new JsonParser();
-
-    private static final String JSONAPI_CONTENT_TYPE = "application/vnd.api+json";
 
     public AuditIT() {
-        super(AuditIntegrationTestApplicationResourceConfig.class);
+        super(AuditIntegrationTestApplicationResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
     }
 
-    @Test(priority = 0)
-    public void testAuditOnCreate() throws Exception {
-        String request = jsonParser.getJson("/AuditIT/createAuditEntity.req.json");
-        String expected = jsonParser.getJson("/AuditIT/createAuditEntity.resp.json");
+    private static final Resource AUDIT_1 = resource(
+            type("auditEntity"),
+            id("1"),
+            attributes(
+                    attr("value", "test abc")
+            )
+    );
 
-        String actual = given()
-                .contentType(JSONAPI_CONTENT_TYPE)
-                .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
-                .post("/auditEntity")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED)
-                .extract().body().asString();
+    private static final Resource AUDIT_1_RELATIONSHIP = resource(
+            type("auditEntity"),
+            id("1"),
+            attributes(
+                    attr("value", "updated value")
+            ),
+            relationships(
+                    relation(
+                            "otherEntity",
+                            true,
+                            linkage(
+                                    type("auditEntity"),
+                                    id("2")
+                            )
+                    )
+            )
+    );
 
-        assertEqualDocuments(actual, expected);
-        Assert.assertTrue(logger.logMessages.contains("old: null\n"
+    private static final Resource AUDIT_2 = resource(
+            type("auditEntity"),
+            id("2"),
+            attributes(
+                    attr("value", "test def")
+            ),
+            relationships(
+                    relation(
+                            "otherEntity",
+                            true,
+                            linkage(
+                                    type("auditEntity"),
+                                    id("1")
+                            )
+                    )
+            )
+    );
+
+    @Test
+    public void testAuditOnCreate() {
+        String expected = datum(
+                resource(
+                        type("auditEntity"),
+                        id("1"),
+                        attributes(
+                                attr("value", "test abc")
+                        ),
+                        relationships(
+                                relation("otherEntity", (ResourceLinkage[]) null),
+                                relation("inverses")
+                        )
+                )
+        ).toJSON();
+
+        // create auditEntity 1 and validate the created entity
+        String actual = createAuditEntity(AUDIT_1);
+
+        assertEqualDocuments(actual, expected); // document comparison is needed as the order of relationship can be different
+        assertTrue(logger.logMessages.contains("old: null\n"
                 + "new: Value: test abc relationship: null"));
-        Assert.assertTrue(logger.logMessages.contains("Created with value: test abc"));
+        assertTrue(logger.logMessages.contains("Created with value: test abc"));
     }
 
-    @Test(priority = 1)
+    @Test
     public void testAuditOnUpdate() {
-        String request = jsonParser.getJson("/AuditIT/createAuditEntity2.req.json");
-        String expected = jsonParser.getJson("/AuditIT/createAuditEntity2.resp.json");
+        String expected = datum(
+                resource(
+                        type("auditEntity"),
+                        id("2"),
+                        attributes(
+                                attr("value", "test def")
+                        ),
+                        relationships(
+                                relation(
+                                        "otherEntity",
+                                        linkage(
+                                                type("auditEntity"),
+                                                id("1")
+                                        )
+                                ),
+                                relation("inverses")
+                        )
+                )
+        ).toJSON();
 
-        String actual = given()
-                .contentType(JSONAPI_CONTENT_TYPE)
-                .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
-                .post("/auditEntity")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED)
-                .extract().body().asString();
+        // create auditEntity 1
+        createAuditEntity(AUDIT_1);
 
-        assertEqualDocuments(actual, expected);
+        // create auditEntity 2 and validate the created entity
+        String actual = createAuditEntity(AUDIT_2);
 
-        request = jsonParser.getJson("/AuditIT/updateAuditEntity.req.json");
+        assertEqualDocuments(actual, expected); // document comparison is needed as the order of relationship can be different
 
+        // update auditEntity 1 directly
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
+                .body(
+                        datum(AUDIT_1_RELATIONSHIP).toJSON()
+                )
                 .patch("/auditEntity/1")
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
 
-        Assert.assertTrue(logger.logMessages.contains("Updated relationship (for id: 1): 2"));
-        Assert.assertTrue(logger.logMessages.contains("Updated value (for id: 1): updated value"));
+        assertTrue(logger.logMessages.contains("Updated relationship (for id: 1): 2"));
+        assertTrue(logger.logMessages.contains("Updated value (for id: 1): updated value"));
     }
 
-    @Test(priority = 2)
+    @Test
     public void testAuditWithDuplicateLineageEntry() {
-        String request = jsonParser.getJson("/AuditIT/updateAuditEntityLineageDup.req.json");
+        // create auditEntity 1 and 2
+        createAuditEntity(AUDIT_1);
+        createAuditEntity(AUDIT_2);
 
+        // update auditEntity 1 through the relationship of auditEntity 2
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
+                .body(
+                        datum(
+                                resource(
+                                        type("auditEntity"),
+                                        id("1"),
+                                        attributes(
+                                                attr("value", "update id 1 through id 2")
+                                        )
+                                )
+                        ).toJSON()
+                )
                 .patch("/auditEntity/2/otherEntity/1")
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
 
-        Assert.assertTrue(logger.logMessages.contains("Updated value (for id: 1): update id 1 through id 2"));
+        assertTrue(logger.logMessages.contains("Updated value (for id: 1): update id 1 through id 2"));
     }
 
-    @Test(priority = 3)
+    @Test
     public void testAuditUpdateOnInverseCollection() {
-        String request = jsonParser.getJson("/AuditIT/createAuditEntityInverse.req.json");
+        // create auditEntity 1 and 2, update auditEntity 1 to have relationship to auditEntity 2
+        createAuditEntity(AUDIT_1);
+        createAuditEntity(AUDIT_2);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(AUDIT_1_RELATIONSHIP).toJSON()
+                )
+                .patch("/auditEntity/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
 
-        Assert.assertFalse(logger.logMessages.contains("Inverse entities: [Value: update id 1 through id 2 relationship: 2]"));
+        assertFalse(logger.logMessages.contains("Inverse entities: [Value: updated value relationship: 2]"));
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
+                .body(
+                        datum(
+                                resource(
+                                        type("auditEntityInverse"),
+                                        id("1"),
+                                        relationships(
+                                                relation(
+                                                        "entities",
+                                                        linkage(
+                                                                type("auditEntity"),
+                                                                id("1")
+                                                        )
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                )
                 .post("/auditEntityInverse")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
-        Assert.assertTrue(logger.logMessages.contains("Entity with id 1 now has inverse list [AuditEntityInverse{id=1, entities=[Value: update id 1 through id 2 relationship: 2]}]"));
-        Assert.assertTrue(logger.logMessages.contains("Inverse entities: [Value: update id 1 through id 2 relationship: 2]"));
+        assertTrue(logger.logMessages.contains("Entity with id 1 now has inverse list [AuditEntityInverse{id=1, entities=[Value: updated value relationship: 2]}]"));
+        assertTrue(logger.logMessages.contains("Inverse entities: [Value: updated value relationship: 2]"));
 
         // This message may have been added on create. Remove it so we don't get a false positive.
         // NOTE: Our internal audit loggers handle this behavior by ignoring update messages associated with
@@ -124,7 +237,22 @@ public void testAuditUpdateOnInverseCollection() {
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
 
-        Assert.assertTrue(logger.logMessages.contains("Entity with id 1 now has inverse list []"));
-        Assert.assertTrue(logger.logMessages.contains("Inverse entities: []"));
+        assertTrue(logger.logMessages.contains("Entity with id 1 now has inverse list []"));
+        assertTrue(logger.logMessages.contains("Inverse entities: []"));
+    }
+
+    private String createAuditEntity(Resource auditEntity) {
+        return given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(auditEntity).toJSON()
+                )
+                .post("/auditEntity")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .extract()
+                .body()
+                .asString();
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/audit/InMemoryLogger.java b/elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/InMemoryLogger.java
similarity index 78%
rename from elide-integration-tests/src/test/java/com/yahoo/elide/audit/InMemoryLogger.java
rename to elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/InMemoryLogger.java
index 405312a866..850a44c0e7 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/audit/InMemoryLogger.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/InMemoryLogger.java
@@ -3,22 +3,23 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.audit;
+package com.yahoo.elide.core.audit;
 
-import com.yahoo.elide.security.ChangeSpec;
-import org.eclipse.jetty.util.ConcurrentHashSet;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.google.common.collect.Sets;
 
 import java.io.IOException;
+import java.util.Set;
 
 /**
  * Audit logger that stores messages in memory.
  */
 public class InMemoryLogger extends AuditLogger {
-    public final ConcurrentHashSet<String> logMessages = new ConcurrentHashSet<>();
+    public final Set<String> logMessages = Sets.newConcurrentHashSet();
 
     @Override
     public void commit() throws IOException {
-        for (LogMessage message : messages.get()) {
+        for (LogMessage message : MESSAGES.get()) {
             if (message.getChangeSpec().isPresent()) {
                 logMessages.add(changeSpecToString(message.getChangeSpec().get()));
             }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java b/elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java
new file mode 100644
index 0000000000..cbc8495bc9
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/core/audit/TestAuditLogger.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.core.audit;
+
+import java.io.IOException;
+
+/**
+ * Example Logger test.
+ */
+public class TestAuditLogger extends AuditLogger {
+    public int commitCount = 0;
+    public int logCount = 0;
+
+    @Override
+    public void log(LogMessage message) {
+        super.log(message);
+        logCount++;
+    }
+
+    @Override
+    public void commit() throws IOException {
+        commitCount++;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/utils/JsonParser.java b/elide-integration-tests/src/test/java/com/yahoo/elide/core/utils/JsonParser.java
similarity index 85%
rename from elide-integration-tests/src/test/java/com/yahoo/elide/utils/JsonParser.java
rename to elide-integration-tests/src/test/java/com/yahoo/elide/core/utils/JsonParser.java
index 1a6974f673..56f2538d14 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/utils/JsonParser.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/core/utils/JsonParser.java
@@ -3,11 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
-package com.yahoo.elide.utils;
+package com.yahoo.elide.core.utils;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.testng.Assert;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,7 +25,7 @@ public JsonNode toJsonNode(String jsonString) {
         try {
             return objectMapper.readTree(jsonString);
         } catch (IOException e) {
-            Assert.fail("Unable to parse JSON\n" + jsonString, e);
+            fail("Unable to parse JSON\n" + jsonString, e);
             throw new IllegalStateException(); // should not reach here
         }
     }
@@ -40,7 +40,7 @@ public String getJson(String resourceName) {
         try (InputStream is = this.getClass().getResourceAsStream(resourceName)) {
             return String.valueOf(objectMapper.readTree(is));
         } catch (IOException e) {
-            Assert.fail("Unable to open test data " + resourceName, e);
+            fail("Unable to open test data " + resourceName, e);
             throw new IllegalStateException(); // should not reach here
         }
     }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/EncodedErrorObjectsIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/EncodedErrorObjectsIT.java
new file mode 100644
index 0000000000..711d155ab5
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/EncodedErrorObjectsIT.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.errorEncodingTests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+public class EncodedErrorObjectsIT extends IntegrationTest {
+
+    private static final String GRAPHQL_CONTENT_TYPE = "application/json";
+    private final JsonParser jsonParser = new JsonParser();
+
+    @Test
+    public void invalidAttributeException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/InvalidAttributeException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidAttributeException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request)
+            .patch("/parent")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidCollectionException() {
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidCollectionErrorObject.json");
+        given()
+            .get("/unknown")
+            .then()
+            .statusCode(HttpStatus.SC_NOT_FOUND)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidEntityBodyException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/invalidEntityBodyException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidEntityBodyExceptionErrorObject.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request)
+            .patch("/parent")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidObjectIdentifierException() {
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidObjectIdentifierExceptionErrorObject.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/parent/100")
+            .then()
+            .statusCode(HttpStatus.SC_NOT_FOUND)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidValueException() {
+        Resource requestBody = resource(
+                type("invoice"),
+                id("a")
+        );
+
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidValueExceptionErrorObject.json");
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(requestBody))
+                .post("/invoice")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo(expected));
+    }
+
+    @Test
+    public void jsonPatchExtensionException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/jsonPatchExtensionException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/jsonPatchExtensionExceptionErrorObject.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request).patch()
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void transactionException() {
+        // intentionally forget the comma between type and id to force a transaction exception
+        String request = "{\"data\": {\"type\": \"invoice\" \"id\": 100}}";
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/transactionExceptionErrorObject.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(request).post("/invoice")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void graphQLMutationError() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLMutationError.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLMutationError.json");
+        given()
+            .contentType(GRAPHQL_CONTENT_TYPE)
+            .accept(GRAPHQL_CONTENT_TYPE)
+            .body(request)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void graphQLFetchError() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLFetchError.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLFetchErrorObjectEncoded.json");
+        given()
+            .contentType(GRAPHQL_CONTENT_TYPE)
+            .accept(GRAPHQL_CONTENT_TYPE)
+            .body(request)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(equalTo(expected));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/VerboseEncodedErrorResponsesIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/VerboseEncodedErrorResponsesIT.java
new file mode 100644
index 0000000000..5917f0844a
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/errorEncodingTests/VerboseEncodedErrorResponsesIT.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.errorEncodingTests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.initialization.VerboseEncodedErrorResponsesTestApplicationResourceConfig;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test class for checking encoding on verbose error messages.
+ * Note that many exceptions don't really differ very much/at all between verbose and non-verbose, so many
+ * of these tests are similar to {@link EncodedErrorResponsesIT}.
+ */
+public class VerboseEncodedErrorResponsesIT extends IntegrationTest {
+
+    private static final String GRAPHQL_CONTENT_TYPE = "application/json";
+    private final JsonParser jsonParser = new JsonParser();
+
+    public VerboseEncodedErrorResponsesIT() {
+        super(VerboseEncodedErrorResponsesTestApplicationResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    @Test
+    public void invalidAttributeException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/InvalidAttributeException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidAttributeException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request)
+            .patch("/parent")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidCollectionException() {
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidCollection.json");
+        given()
+            .get("/unknown")
+            .then()
+            .statusCode(HttpStatus.SC_NOT_FOUND)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidEntityBodyException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/invalidEntityBodyException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidEntityBodyException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request)
+            .patch("/parent")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidObjectIdentifierException() {
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidObjectIdentifierException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/parent/100")
+            .then()
+            .statusCode(HttpStatus.SC_NOT_FOUND)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidValueException() {
+        Resource requestBody = resource(
+                type("invoice"),
+                id("a")
+        );
+
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/invalidValueExceptionVerbose.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(requestBody))
+            .post("/invoice")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void jsonPatchExtensionException() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/jsonPatchExtensionException.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/jsonPatchExtensionException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(request).patch()
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void transactionException() {
+        // intentionally forget the comma between type and id to force a transaction exception
+        String request = "{\"data\": {\"type\": \"invoice\" \"id\": 100}}";
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/transactionException.json");
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(request).post("/invoice")
+            .then()
+            .statusCode(HttpStatus.SC_BAD_REQUEST)
+            .body(equalTo(expected));
+    }
+
+    @Test
+    public void graphQLMutationError() {
+        String request = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLMutationError.req.json");
+        String expected = jsonParser.getJson("/EncodedErrorResponsesIT/graphQLMutationError.json");
+        given()
+            .contentType(GRAPHQL_CONTENT_TYPE)
+            .accept(GRAPHQL_CONTENT_TYPE)
+            .body(request)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(equalTo(expected));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/errorObjectsTests/ErrorObjectsIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/errorObjectsTests/ErrorObjectsIT.java
new file mode 100644
index 0000000000..a92236ef84
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/errorObjectsTests/ErrorObjectsIT.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.errorObjectsTests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import javax.ws.rs.core.MediaType;
+
+public class ErrorObjectsIT extends IntegrationTest {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    public void testJsonAPIErrorObjects() throws IOException {
+        JsonNode errors = objectMapper.readTree(
+            given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                    datum(
+                        resource(
+                                type("nocreate"),
+                                id("1")
+                        )
+                    )
+                )
+                .post("/nocreate")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN)
+                .extract().body().asString());
+
+        for (JsonNode errorNode : errors.get("errors")) {
+            assertTrue(errorNode.isObject(), "expected error should be object");
+            assertTrue(errorNode.has("detail"), "JsonAPI error should have 'detail'");
+        }
+    }
+
+    @Test
+    public void testGraphQLErrorObjects() throws IOException {
+        // this is an incorrectly formatted query, which should result in a 400 error being thrown
+        String request = "mutation { nocreate(op: UPSERT, data:{id:\"1\"}) { edges { node { id } } } }";
+
+        JsonNode errors = objectMapper.readTree(
+            given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(request)
+                .post("/graphQL")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .extract().body().asString());
+
+        for (JsonNode errorNode : errors.get("errors")) {
+            assertTrue(errorNode.isObject(), "expected error should be object");
+            assertTrue(errorNode.has("message"), "GraphQL error should have 'message'");
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/fieldLevelTest/FieldLevelParentClassIdIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/fieldLevelTest/FieldLevelParentClassIdIT.java
new file mode 100644
index 0000000000..9d341dffef
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/fieldLevelTest/FieldLevelParentClassIdIT.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.fieldLevelTest;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+public class FieldLevelParentClassIdIT extends IntegrationTest {
+    private final JsonParser jsonParser = new JsonParser();
+
+    @Test
+    public void testResponseCodeOnUpdate() {
+        Resource original = resource(
+                type("fieldLevelChild"),
+                id("1"),
+                attributes(
+                        attr("childField", "someValue"),
+                        attr("parentField", "parentValue")
+                )
+        );
+
+        Resource modified = resource(
+                type("fieldLevelChild"),
+                id("1"),
+                attributes(
+                        attr("childField", "someOtherValue"),
+                        attr("parentField", "aNewParentValue")
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(original))
+                .post("/fieldLevelChild")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(equalTo(datum(original).toJSON()));
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(modified))
+                .patch("/fieldLevelChild/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java
new file mode 100644
index 0000000000..637e6be820
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.inheritance;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class InheritanceIT extends IntegrationTest {
+
+    @Test
+    public void testEmployeeHierarchy() {
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("manager"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/manager")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("1"));
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("employee"),
+                                        id(null),
+                                        attributes(),
+                                        relationships(
+                                                relation("boss",
+                                                        linkage(type("manager"), id("1"))
+                                                )
+                                        )
+                                )
+                        )
+                )
+                .post("/manager/1/minions")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("1"),
+                        "data.relationships.boss.data.id", equalTo("1")
+                );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .when()
+                .get("/manager/1")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data.id", equalTo("1"),
+                        "data.relationships.minions.data.id", contains("1"),
+                        "data.relationships.minions.data.type", contains("employee")
+                );
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractApiResourceInitializer.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractApiResourceInitializer.java
index 2f05957379..0c924de548 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractApiResourceInitializer.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractApiResourceInitializer.java
@@ -5,35 +5,48 @@
  */
 package com.yahoo.elide.initialization;
 
-import com.jayway.restassured.RestAssured;
-import com.yahoo.elide.resources.JsonApiEndpoint;
-import lombok.extern.slf4j.Slf4j;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import io.restassured.RestAssured;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Initialize API service.
  */
 @Slf4j
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractApiResourceInitializer {
-    private Server server;
+    private static volatile Server server = null;
     private final String resourceConfig;
+    private String packageName;
 
     public AbstractApiResourceInitializer() {
         this(IntegrationTestApplicationResourceConfig.class);
     }
 
-    protected AbstractApiResourceInitializer(final Class<? extends ResourceConfig> resourceConfig) {
+    protected AbstractApiResourceInitializer(final Class<? extends ResourceConfig> resourceConfig, String packageName) {
         this.resourceConfig = resourceConfig.getCanonicalName();
+        this.packageName = packageName;
     }
 
-    @BeforeSuite
+    protected AbstractApiResourceInitializer(final Class<? extends ResourceConfig> resourceConfig) {
+        this(resourceConfig, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    @BeforeAll
     public final void setUpServer() throws Exception {
+        if (server != null) {
+            server.stop();
+        }
+
         // setup RestAssured
         RestAssured.baseURI = "http://localhost/";
         RestAssured.basePath = "/";
@@ -41,7 +54,8 @@ public final void setUpServer() throws Exception {
         // port randomly picked in pom.xml
         String restassuredPort = System.getProperty("restassured.port", System.getenv("restassured.port"));
         RestAssured.port =
-                Integer.parseInt(restassuredPort != null && !restassuredPort.isEmpty() ? restassuredPort : "9999");
+                Integer.parseInt(StringUtils.isNotEmpty(restassuredPort) ? restassuredPort : "9999");
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
 
         // embedded jetty server
         server = new Server(RestAssured.port);
@@ -52,16 +66,14 @@ public final void setUpServer() throws Exception {
 
         final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
         servletHolder.setInitOrder(1);
-        servletHolder.setInitParameter("jersey.config.server.provider.packages",
-                JsonApiEndpoint.class.getPackage().getName());
-        servletHolder.setInitParameter("javax.ws.rs.Application",
-                resourceConfig);
+        servletHolder.setInitParameter("jersey.config.server.provider.packages", packageName);
+        servletHolder.setInitParameter("javax.ws.rs.Application", resourceConfig);
 
         log.debug("...Starting Server...");
         server.start();
     }
 
-    @AfterSuite
+    @AfterAll
     public final void tearDownServer() {
         log.debug("...Stopping Server...");
         try {
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractIntegrationTestInitializer.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractIntegrationTestInitializer.java
deleted file mode 100644
index 07ff858043..0000000000
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AbstractIntegrationTestInitializer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.initialization;
-
-import com.yahoo.elide.core.DataStore;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.jsonapi.JsonApiMapper;
-import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.testng.annotations.BeforeClass;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.function.Supplier;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-/**
- * Integration test initializer.
- *
- */
-public abstract class AbstractIntegrationTestInitializer extends AbstractApiResourceInitializer {
-    /**
-     * The constant dataStore.
-     */
-    public static DataStore dataStore = null;
-    /**
-     * The Json api mapper.
-     * Empty dictionary is OK provided the OBJECT_MAPPER is used for reading only
-     */
-    protected final JsonApiMapper jsonApiMapper = new JsonApiMapper(new EntityDictionary(new HashMap<>()));
-
-    public AbstractIntegrationTestInitializer() {
-        super();
-    }
-
-    protected AbstractIntegrationTestInitializer(final Class<? extends ResourceConfig> resourceConfig) {
-        super(resourceConfig);
-    }
-
-    /**
-     * Gets database manager.
-     *
-     * @return the database manager
-     */
-    public static DataStore getDatabaseManager() {
-        if (dataStore == null) {
-            return getNewDatabaseManager();
-        }
-        return dataStore;
-    }
-
-    public static DataStore getNewDatabaseManager() {
-        try {
-            final String dataStoreSupplierName = System.getProperty("dataStoreSupplier");
-            Supplier<DataStore> dataStoreSupplier =
-                    (Supplier<DataStore>) Class.forName(dataStoreSupplierName).newInstance();
-            dataStore = dataStoreSupplier.get();
-        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
-            throw new IllegalStateException(e);
-        }
-        return dataStore;
-    }
-
-        /**
-         * Hibernate init.
-         */
-    @BeforeClass
-    public static void hibernateInit() {
-        getNewDatabaseManager();
-    }
-
-    /**
-     * Assert equal documents.
-     *
-     * @param actual   the actual
-     * @param expected the expected
-     */
-    protected void assertEqualDocuments(final String actual, final String expected) {
-        try {
-            JsonApiDocument expectedDoc = jsonApiMapper.readJsonApiDocument(expected);
-            JsonApiDocument actualDoc = jsonApiMapper.readJsonApiDocument(actual);
-            assertEquals(actualDoc, expectedDoc, "\n" + actual + "\n" + expected + "\n");
-        } catch (IOException e) {
-            fail("\n" + actual + "\n" + expected + "\n", e);
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AuditIntegrationTestApplicationResourceConfig.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AuditIntegrationTestApplicationResourceConfig.java
index 15cfc718b9..1c0551cca2 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AuditIntegrationTestApplicationResourceConfig.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/AuditIntegrationTestApplicationResourceConfig.java
@@ -5,16 +5,20 @@
  */
 package com.yahoo.elide.initialization;
 
-import com.yahoo.elide.audit.InMemoryLogger;
+import com.yahoo.elide.core.audit.InMemoryLogger;
+import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.jersey.server.ResourceConfig;
 
+import javax.inject.Inject;
+
 /**
  * Resource config for Audit IT tests.
  */
 public class AuditIntegrationTestApplicationResourceConfig extends ResourceConfig {
     public static final InMemoryLogger LOGGER = new InMemoryLogger();
 
-    public AuditIntegrationTestApplicationResourceConfig() {
-        register(new StandardTestBinder(LOGGER));
+    @Inject
+    public AuditIntegrationTestApplicationResourceConfig(ServiceLocator injector) {
+        register(new StandardTestBinder(LOGGER, injector));
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/GraphQLIntegrationTest.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/GraphQLIntegrationTest.java
new file mode 100644
index 0000000000..85b0acf696
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/GraphQLIntegrationTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.initialization;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.fail;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.json.JSONException;
+import org.junit.jupiter.api.TestInstance;
+import org.skyscreamer.jsonassert.JSONAssert;
+import io.restassured.response.ValidatableResponse;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Adds test methods for GraphQL IT tests.
+ */
+@Slf4j
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public abstract class GraphQLIntegrationTest extends IntegrationTest {
+
+    protected static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+
+    public GraphQLIntegrationTest() {
+        super();
+    }
+
+    public GraphQLIntegrationTest(Class<? extends ResourceConfig> resourceConfig, String packageName) {
+        super(resourceConfig, packageName);
+    }
+
+    protected void runQueryWithExpectedResult(
+            String graphQLQuery,
+            Map<String, Object> variables,
+            String expected
+    ) throws IOException {
+        compareJsonObject(runQuery(graphQLQuery, variables), expected);
+    }
+
+    protected void runQueryWithExpectedResult(
+            String graphQLQuery,
+            Map<String, Object> variables,
+            String expected,
+            String apiVersion
+    ) throws IOException {
+        compareJsonObject(runQuery(graphQLQuery, variables, apiVersion), expected);
+    }
+
+    protected void runQueryWithExpectedResult(String graphQLQuery, String expected) throws IOException {
+        runQueryWithExpectedResult(graphQLQuery, null, expected);
+    }
+
+    protected void runQueryWithExpectedError(String graphQLQuery, String errorMessage) throws IOException {
+        runQueryWithExpectedError(graphQLQuery, null, errorMessage);
+    }
+
+    protected void runQueryWithExpectedError(
+            String graphQLQuery,
+            Map<String, Object> variables,
+            String errorMessage
+    ) throws IOException {
+        runQuery(graphQLQuery, variables).body("errors[0].message", equalTo(errorMessage));
+    }
+
+    protected void compareJsonObject(ValidatableResponse response, String expected) {
+        try {
+            JSONAssert.assertEquals(expected, response.extract().body().asString(), true);
+        } catch (JSONException e) {
+            fail(e);
+        }
+    }
+
+    protected ValidatableResponse runQuery(String query, Map<String, Object> variables,
+                                           String apiVersion) throws IOException {
+        return runQuery(toJsonQuery(query, variables), apiVersion);
+    }
+
+    protected ValidatableResponse runQuery(String query, Map<String, Object> variables) throws IOException {
+        return runQuery(toJsonQuery(query, variables), NO_VERSION);
+    }
+
+    protected ValidatableResponse runQuery(String query, String apiVersion) {
+        return given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(query)
+                .header("ApiVersion", apiVersion)
+                .post("/graphQL")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    protected String toJsonQuery(String query, Map<String, Object> variables) throws IOException {
+        return mapper.writeValueAsString(toJsonNode(query, variables));
+    }
+
+    protected JsonNode toJsonNode(String query) {
+        return toJsonNode(query, new HashMap<>());
+    }
+
+    protected JsonNode toJsonNode(String query, Map<String, Object> variables) {
+        ObjectNode graphqlNode = JsonNodeFactory.instance.objectNode();
+        graphqlNode.put("query", query);
+        if (variables != null) {
+            graphqlNode.set("variables", mapper.valueToTree(variables));
+        }
+        return graphqlNode;
+    }
+
+    public String loadGraphQLResponse(String fileName) throws IOException {
+        try (InputStream in = this.getClass().getResourceAsStream("/graphql/responses/" + fileName)) {
+            return new BufferedReader(new InputStreamReader(in)).lines().collect(Collectors.joining("\n"));
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java
new file mode 100644
index 0000000000..8e9ad108b4
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.initialization;
+
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.inmemory.HashMapDataStore;
+import com.yahoo.elide.core.datastore.inmemory.InMemoryDataStore;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+
+import com.google.common.collect.Sets;
+
+import example.Address;
+import example.Company;
+import example.Parent;
+import example.models.generics.Manager;
+import example.models.triggers.Invoice;
+import example.models.versioned.BookV2;
+
+import java.util.Set;
+
+/**
+ * Test Harness to initialize the default data store for IT tests.
+ */
+public class InMemoryDataStoreHarness implements DataStoreTestHarness {
+    private InMemoryDataStore memoryStore;
+    private HashMapDataStore mapStore;
+
+    public InMemoryDataStoreHarness() {
+        Set<Package> beanPackages = Sets.newHashSet(
+                Parent.class.getPackage(),
+                Invoice.class.getPackage(),
+                Manager.class.getPackage(),
+                BookV2.class.getPackage(),
+                AsyncQuery.class.getPackage(),
+                Company.class.getPackage(),
+                Address.class.getPackage()
+
+        );
+
+        mapStore = new HashMapDataStore(DefaultClassScanner.getInstance(), beanPackages);
+        memoryStore = new InMemoryDataStore(mapStore);
+    }
+
+    @Override
+    public DataStore getDataStore() {
+        return memoryStore;
+    }
+
+    @Override
+    public void cleanseTestData() {
+        mapStore.cleanseTestData();
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTest.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTest.java
new file mode 100644
index 0000000000..d7bbb56442
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.initialization;
+
+import static io.restassured.RestAssured.get;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.datastore.test.DataStoreTestHarness;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.models.JsonApiDocument;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import com.yahoo.elide.test.jsonapi.elements.Data;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.json.JSONException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.TestInstance;
+import org.skyscreamer.jsonassert.JSONCompare;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+import io.restassured.RestAssured;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+
+/**
+ * Integration test initializer.  Tests are intended to run sequentially (so they don't stomp on each other's data).
+ */
+@Slf4j
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public abstract class IntegrationTest {
+
+    /* Shared between the test setup code (to insert test data) as well as the Jetty server (to serve test data) */
+    protected static DataStoreTestHarness dataStoreHarness;
+
+    protected final ObjectMapper mapper = new ObjectMapper();
+    protected DataStore dataStore = null;
+    private Server server = null;
+    protected final ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
+
+    private final String resourceConfig;
+    private String packageName;
+
+    /**
+     * The Json api mapper.
+     * Empty dictionary is OK provided the OBJECT_MAPPER is used for reading only
+     */
+    protected final JsonApiMapper jsonApiMapper = new JsonApiMapper();
+
+    protected IntegrationTest() {
+        this(IntegrationTestApplicationResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    protected IntegrationTest(final Class<? extends ResourceConfig> resourceConfig, String packageName) {
+        this.resourceConfig = resourceConfig.getName();
+        this.packageName = packageName;
+
+        dataStoreHarness = createHarness();
+        this.dataStore = dataStoreHarness.getDataStore();
+
+        try {
+            this.server = setUpServer();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    protected DataStoreTestHarness createHarness() {
+        if (dataStoreHarness != null) {
+            return dataStoreHarness;
+        }
+
+        try {
+            final String dataStoreSupplierName = System.getProperty("dataStoreHarness");
+
+            if (StringUtils.isNotEmpty(dataStoreSupplierName)) {
+                return Class.forName(dataStoreSupplierName).asSubclass(DataStoreTestHarness.class).newInstance();
+            }
+            return new InMemoryDataStoreHarness();
+        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | ClassCastException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * Returns an initialized data store.
+     *
+     * @return an initialized data store.
+     */
+    public static DataStore getDataStore() {
+        return dataStoreHarness.getDataStore();
+    }
+
+    @AfterEach
+    public void afterEach() {
+
+        //Delete all of the test data
+        dataStoreHarness.cleanseTestData();
+    }
+
+    protected final Server setUpServer() throws Exception {
+        // setup RestAssured
+        RestAssured.baseURI = "http://localhost/";
+        RestAssured.basePath = "/";
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
+
+        // port randomly picked in pom.xml
+        RestAssured.port = getRestAssuredPort();
+
+        // embedded jetty server
+        Server server = new Server(RestAssured.port);
+        servletContextHandler.setContextPath("/");
+        server.setHandler(servletContextHandler);
+
+        modifyServletContextHandler();
+
+        final ServletHolder servletHolder = servletContextHandler.addServlet(ServletContainer.class, "/*");
+        servletHolder.setInitOrder(1);
+        servletHolder.setInitParameter("jersey.config.server.provider.packages", packageName);
+        servletHolder.setInitParameter("javax.ws.rs.Application", resourceConfig);
+
+        ServletHolder graphqlServlet = servletContextHandler.addServlet(ServletContainer.class, "/graphQL/*");
+        graphqlServlet.setInitOrder(2);
+        graphqlServlet.setInitParameter("jersey.config.server.provider.packages",
+                com.yahoo.elide.graphql.GraphQLEndpoint.class.getPackage().getName());
+        graphqlServlet.setInitParameter("javax.ws.rs.Application", resourceConfig);
+
+        log.debug("...Starting Server...");
+        server.start();
+
+        return server;
+    }
+
+    protected JsonNode getAsNode(String url) throws JsonProcessingException {
+        return getAsNode(url, HttpStatus.SC_OK);
+    }
+
+    protected JsonNode getAsNode(String url, int httpStatus) throws JsonProcessingException {
+        return mapper.readTree(get(url)
+                .then()
+                .statusCode(httpStatus)
+                .extract().body().asString());
+    }
+
+    @AfterAll
+    public final void afterAll() {
+        dataStoreHarness = null;
+        log.debug("...Stopping Server...");
+        try {
+            server.stop();
+        } catch (Exception e) {
+            log.debug(e.getMessage());
+        }
+    }
+
+    protected void assertEqualDocuments(final String actual, final String expected) {
+        try {
+            JsonApiDocument expectedDoc = jsonApiMapper.readJsonApiDocument(expected);
+            JsonApiDocument actualDoc = jsonApiMapper.readJsonApiDocument(actual);
+            assertEquals(expectedDoc, actualDoc, "\n" + actual + "\n" + expected + "\n");
+        } catch (IOException e) {
+            fail("\n" + actual + "\n" + expected + "\n", e);
+        }
+    }
+
+    public static Integer getRestAssuredPort() {
+        String restassuredPort = System.getProperty("restassured.port", System.getenv("restassured.port"));
+        return Integer.parseInt(StringUtils.isNotEmpty(restassuredPort) ? restassuredPort : "9999");
+    }
+
+    public void modifyServletContextHandler() {
+        // Do Nothing
+    }
+
+    protected CustomTypeSafeMatcher<String> jsonEquals(Object expected, boolean strict) {
+        String expectedString;
+        if (expected instanceof Data) {
+            expectedString = ((Data) expected).toJSON();
+        } else {
+            expectedString = expected.toString();
+        }
+        return new CustomTypeSafeMatcher<String>(expectedString) {
+            @Override
+            protected boolean matchesSafely(String actual) {
+                try {
+                    return JSONCompare.compareJSON(expectedString, actual,
+                            strict ? JSONCompareMode.STRICT : JSONCompareMode.LENIENT).passed();
+                } catch (JSONException e) {
+                    return false;
+                }
+            }
+        };
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTestApplicationResourceConfig.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTestApplicationResourceConfig.java
index 9447db8692..27dabc2c91 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTestApplicationResourceConfig.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTestApplicationResourceConfig.java
@@ -5,14 +5,20 @@
  */
 package com.yahoo.elide.initialization;
 
-import com.yahoo.elide.audit.TestAuditLogger;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.jersey.server.ResourceConfig;
 
+import javax.inject.Inject;
+
 /**
  * Resource configuration for integration tests.
  */
 public class IntegrationTestApplicationResourceConfig extends ResourceConfig {
-    public IntegrationTestApplicationResourceConfig() {
-        register(new StandardTestBinder(new TestAuditLogger()));
+
+    @Inject
+    public IntegrationTestApplicationResourceConfig(ServiceLocator injector) {
+        register(new StandardTestBinder(new TestAuditLogger(), injector));
+        register(TestAuthFilter.class);
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/LifeCycleIntegrationTestApplicationResourceConfig.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/LifeCycleIntegrationTestApplicationResourceConfig.java
new file mode 100644
index 0000000000..6459e6373c
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/LifeCycleIntegrationTestApplicationResourceConfig.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.initialization;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.UPDATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRECOMMIT;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.InMemoryLogger;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import example.TestCheckMappings;
+import example.models.triggers.Invoice;
+import example.models.triggers.InvoiceCompletionHook;
+import example.models.triggers.services.BillingService;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import javax.inject.Inject;
+
+public class LifeCycleIntegrationTestApplicationResourceConfig extends ResourceConfig {
+    public static final InMemoryLogger LOGGER = new InMemoryLogger();
+
+    @Inject
+    public LifeCycleIntegrationTestApplicationResourceConfig(ServiceLocator injector) {
+        // Bind to injector
+        register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                EntityDictionary dictionary = EntityDictionary.builder()
+                        .injector(injector::inject).checks(TestCheckMappings.MAPPINGS).build();
+
+                bind(dictionary).to(EntityDictionary.class);
+
+                DefaultFilterDialect defaultFilterStrategy = new DefaultFilterDialect(dictionary);
+                RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+                MultipleFilterDialect multipleFilterStrategy = new MultipleFilterDialect(
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy),
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy)
+                );
+
+                Elide elide = new Elide(new ElideSettingsBuilder(IntegrationTest.getDataStore())
+                        .withAuditLogger(LOGGER)
+                        .withJoinFilterDialect(multipleFilterStrategy)
+                        .withSubqueryFilterDialect(multipleFilterStrategy)
+                        .withEntityDictionary(dictionary)
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                        .build());
+                elide.doScans();
+                bind(elide).to(Elide.class).named("elide");
+
+                BillingService billingService = new BillingService() {
+                    @Override
+                    public long purchase(Invoice invoice) {
+                        return 100;
+                    }
+                };
+
+                bind(billingService).to(BillingService.class);
+
+                InvoiceCompletionHook invoiceCompletionHook = new InvoiceCompletionHook(billingService);
+                dictionary.bindTrigger(Invoice.class, "complete", CREATE, PRECOMMIT, invoiceCompletionHook);
+                dictionary.bindTrigger(Invoice.class, "complete", UPDATE, PRECOMMIT, invoiceCompletionHook);
+            }
+        });
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/StandardTestBinder.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/StandardTestBinder.java
index 59848346f7..933cfa6dc5 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/StandardTestBinder.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/StandardTestBinder.java
@@ -5,50 +5,68 @@
  */
 package com.yahoo.elide.initialization;
 
-import com.beust.jcommander.internal.Lists;
+import static org.mockito.Mockito.mock;
 import com.yahoo.elide.Elide;
-import com.yahoo.elide.audit.AuditLogger;
-import com.yahoo.elide.core.EntityDictionary;
-import com.yahoo.elide.core.filter.dialect.DefaultFilterDialect;
-import com.yahoo.elide.core.filter.dialect.MultipleFilterDialect;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
-import com.yahoo.elide.resources.JsonApiEndpoint;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import example.TestCheckMappings;
+import example.models.triggers.services.BillingService;
 import org.glassfish.hk2.api.Factory;
+import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import java.util.HashMap;
+import java.util.Arrays;
+import java.util.Calendar;
 
 /**
  * Typical-use test binder for integration test resource configs.
  */
 public class StandardTestBinder extends AbstractBinder {
     private final AuditLogger auditLogger;
+    private final ServiceLocator injector;
 
-    public StandardTestBinder(final AuditLogger auditLogger) {
+    public static final BillingService BILLING_SERVICE = mock(BillingService.class);
+
+    public StandardTestBinder(final AuditLogger auditLogger, final ServiceLocator injector) {
         this.auditLogger = auditLogger;
+        this.injector = injector;
     }
 
     @Override
     protected void configure() {
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .injector(injector::inject)
+                .checks(TestCheckMappings.MAPPINGS)
+                .build();
+
+        bind(dictionary).to(EntityDictionary.class);
+
         // Elide instance
         bindFactory(new Factory<Elide>() {
             @Override
             public Elide provide() {
-                EntityDictionary dictionary = new EntityDictionary(new HashMap<>());
                 DefaultFilterDialect defaultFilterStrategy = new DefaultFilterDialect(dictionary);
-                RSQLFilterDialect rsqlFilterStrategy = new RSQLFilterDialect(dictionary);
+                RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
 
                 MultipleFilterDialect multipleFilterStrategy = new MultipleFilterDialect(
-                        Lists.newArrayList(rsqlFilterStrategy, defaultFilterStrategy),
-                        Lists.newArrayList(rsqlFilterStrategy, defaultFilterStrategy)
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy),
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy)
                 );
 
-                return new Elide.Builder(AbstractIntegrationTestInitializer.getDatabaseManager())
+                Elide elide = new Elide(new ElideSettingsBuilder(IntegrationTest.getDataStore())
                         .withAuditLogger(auditLogger)
                         .withJoinFilterDialect(multipleFilterStrategy)
                         .withSubqueryFilterDialect(multipleFilterStrategy)
                         .withEntityDictionary(dictionary)
-                        .build();
+                        .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", Calendar.getInstance().getTimeZone())
+                        .build());
+
+                elide.doScans();
+                return elide;
             }
 
             @Override
@@ -57,18 +75,6 @@ public void dispose(Elide elide) {
             }
         }).to(Elide.class).named("elide");
 
-        // User function
-        bindFactory(new Factory<JsonApiEndpoint.DefaultOpaqueUserFunction>() {
-            private final Integer user = 1;
-
-            @Override
-            public JsonApiEndpoint.DefaultOpaqueUserFunction provide() {
-                return v -> user;
-            }
-
-            @Override
-            public void dispose(JsonApiEndpoint.DefaultOpaqueUserFunction defaultOpaqueUserFunction) {
-            }
-        }).to(JsonApiEndpoint.DefaultOpaqueUserFunction.class).named("elideUserExtractionFunction");
+        bind(BILLING_SERVICE).to(BillingService.class);
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/TestAuthFilter.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/TestAuthFilter.java
new file mode 100644
index 0000000000..0d90532f15
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/TestAuthFilter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.initialization;
+
+import java.io.IOException;
+import java.security.Principal;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.SecurityContext;
+
+/**
+ * JAX-RS Filter that creates a test principal with ID 1.
+ */
+public class TestAuthFilter implements ContainerRequestFilter {
+    @Override
+    public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+        containerRequestContext.setSecurityContext(new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return () -> "1";
+            }
+
+            @Override
+            public boolean isUserInRole(String s) {
+                return false;
+            }
+
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        });
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseEncodedErrorResponsesTestApplicationResourceConfig.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseEncodedErrorResponsesTestApplicationResourceConfig.java
new file mode 100644
index 0000000000..c8e9321994
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseEncodedErrorResponsesTestApplicationResourceConfig.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.initialization;
+
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.server.ResourceConfig;
+
+import javax.inject.Inject;
+
+public class VerboseEncodedErrorResponsesTestApplicationResourceConfig extends ResourceConfig {
+
+    @Inject
+    public VerboseEncodedErrorResponsesTestApplicationResourceConfig(ServiceLocator injector) {
+        register(new VerboseErrorResponsesTestBinder(new TestAuditLogger(), injector));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseErrorResponsesTestBinder.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseErrorResponsesTestBinder.java
new file mode 100644
index 0000000000..74b5c7495b
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/VerboseErrorResponsesTestBinder.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.initialization;
+
+import static com.yahoo.elide.initialization.IntegrationTest.getDataStore;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.DefaultFilterDialect;
+import com.yahoo.elide.core.filter.dialect.jsonapi.MultipleFilterDialect;
+import example.TestCheckMappings;
+import example.models.triggers.Invoice;
+import example.models.triggers.services.BillingService;
+import org.glassfish.hk2.api.Factory;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+
+/**
+ * Binder for integration tests related to verbose error responses.
+ */
+@Slf4j
+public class VerboseErrorResponsesTestBinder extends AbstractBinder {
+    private final AuditLogger auditLogger;
+    private final ServiceLocator injector;
+
+    public VerboseErrorResponsesTestBinder(final AuditLogger auditLogger, ServiceLocator injector) {
+        this.auditLogger = auditLogger;
+        this.injector = injector;
+    }
+
+    @Override
+    protected void configure() {
+        EntityDictionary dictionary = EntityDictionary.builder()
+                .injector(injector::inject)
+                .checks(TestCheckMappings.MAPPINGS)
+                .build();
+
+        bind(dictionary).to(EntityDictionary.class);
+
+        // Elide instance
+        bindFactory(new Factory<Elide>() {
+            @Override
+            public Elide provide() {
+                DefaultFilterDialect defaultFilterStrategy = new DefaultFilterDialect(dictionary);
+                RSQLFilterDialect rsqlFilterStrategy = RSQLFilterDialect.builder().dictionary(dictionary).build();
+
+                MultipleFilterDialect multipleFilterStrategy = new MultipleFilterDialect(
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy),
+                        Arrays.asList(rsqlFilterStrategy, defaultFilterStrategy)
+                );
+
+                Elide elide = new Elide(new ElideSettingsBuilder(getDataStore())
+                        .withAuditLogger(auditLogger)
+                        .withJoinFilterDialect(multipleFilterStrategy)
+                        .withSubqueryFilterDialect(multipleFilterStrategy)
+                        .withEntityDictionary(dictionary)
+                        .withVerboseErrors()
+                        .build());
+
+                elide.doScans();
+                return elide;
+            }
+
+            @Override
+            public void dispose(Elide elide) {
+                // do nothing
+            }
+        }).to(Elide.class).named("elide");
+
+        bind(new BillingService() {
+                 @Override
+                 public long purchase(Invoice invoice) {
+                     return 0;
+                 }
+             }
+        ).to(BillingService.class);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/AccessIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/AccessIT.java
index e400e696d9..e1311732f3 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/AccessIT.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/AccessIT.java
@@ -5,10 +5,12 @@
  */
 package com.yahoo.elide.tests;
 
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.initialization.IntegrationTest;
 import example.Parent;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -16,21 +18,28 @@
 /**
  * Simple integration tests to verify session and access.
  */
-public class AccessIT extends AbstractIntegrationTestInitializer {
+public class AccessIT extends IntegrationTest {
+
+    @BeforeAll
+    public void setup() {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
+    }
+
     @Test
     public void verifySession() throws IOException {
         try (DataStoreTransaction tx = dataStore.beginTransaction()) {
-            tx.commit();
+            tx.commit(null);
         }
     }
 
     @Test
-    public void accessParentBean() {
+    public void accessParentBean() throws IOException {
         DataStoreTransaction tx = dataStore.beginTransaction();
         Parent parent = new Parent();
         parent.setChildren(new HashSet<>());
         parent.setSpouses(new HashSet<>());
-        tx.save(parent);
-        tx.commit();
+        tx.createObject(parent, null);
+        tx.commit(null);
+        tx.close();
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/BookAuthorIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/BookAuthorIT.java
index 2c4b5eb6d1..a931329dc2 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/BookAuthorIT.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/BookAuthorIT.java
@@ -5,105 +5,170 @@
  */
 package com.yahoo.elide.tests;
 
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.RestAssured;
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import com.yahoo.elide.utils.JsonParser;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
-public class BookAuthorIT extends AbstractIntegrationTestInitializer {
-    private static final String JSONAPI_CONTENT_TYPE = "application/vnd.api+json";
+public class BookAuthorIT extends IntegrationTest {
 
     private static final String ATTRIBUTES = "attributes";
     private static final String RELATIONSHIPS = "relationships";
     private static final String INCLUDED = "included";
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final JsonParser jsonParser = new JsonParser();
+    private static final Resource HEMINGWAY = resource(
+            type("author"),
+            attributes(
+                    attr("name", "Ernest Hemingway")
+            )
+    );
+
+    private static final Resource THE_OLD_MAN_AND_THE_SEA = resource(
+            type("book"),
+            attributes(
+                    attr("title", "The Old Man and the Sea"),
+                    attr("genre", "Literary Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    private static final Resource HEMINGWAY_RELATIONSHIP = resource(
+            type("author"),
+            id(1)
+    );
+
+    private static final Resource ORSON_SCOTT_CARD = resource(
+            type("author"),
+            attributes(
+                    attr("name", "Orson Scott Card")
+            )
+    );
+
+    private static final Resource ENDERS_GAME = resource(
+            type("book"),
+            attributes(
+                    attr("title", "Ender's Game"),
+                    attr("genre", "Science Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    private static final Resource ORSON_RELATIONSHIP = resource(
+            type("author"),
+            id(2)
+    );
+
+    private static final Resource FOR_WHOM_THE_BELL_TOLLS = resource(
+            type("book"),
+            attributes(
+                    attr("title", "For Whom the Bell Tolls"),
+                    attr("genre", "Literary Fiction"),
+                    attr("language", "English")
+            )
+    );
+
+    @BeforeEach
+    public void setup() {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
 
-    @Test
-    public void setup() throws IOException {
         // Create Author: Ernest Hemingway
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/ernest_hemingway.json"))
+                .body(
+                        datum(HEMINGWAY).toJSON()
+                )
                 .post("/author")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Create Book: The Old Man and the Sea
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/the_old_man_and_the_sea.json"))
+                .body(
+                        datum(THE_OLD_MAN_AND_THE_SEA).toJSON()
+                )
                 .post("/book")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Create Relationship: Ernest Hemingway -> The Old Man and the Sea
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/ernest_hemingway_relationship.json"))
+                .body(
+                        datum(HEMINGWAY_RELATIONSHIP).toJSON()
+                )
                 .patch("/book/1/relationships/authors")
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
 
         // Create Author: Orson Scott Card
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/orson_scott_card.json"))
+                .body(
+                        datum(ORSON_SCOTT_CARD).toJSON()
+                )
                 .post("/author")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Create Book: Ender's Game
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/enders_game.json"))
+                .body(
+                        datum(ENDERS_GAME).toJSON()
+                )
                 .post("/book")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Create Relationship: Orson Scott Card -> Ender's Game
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/orson_scott_card_relationship.json"))
+                .body(
+                        datum(ORSON_RELATIONSHIP).toJSON()
+                )
                 .patch("/book/2/relationships/authors")
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
 
         // Create Book: For Whom the Bell Tolls
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/for_whom_the_bell_tolls.json"))
+                .body(
+                        datum(FOR_WHOM_THE_BELL_TOLLS).toJSON()
+                )
                 .post("/book")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Create Relationship: Ernest Hemingway -> For Whom the Bell Tolls
-        RestAssured
-                .given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(jsonParser.getJson("/BookAuthorIT/ernest_hemingway_relationship.json"))
+                .body(
+                        datum(HEMINGWAY_RELATIONSHIP).toJSON()
+                )
                 .patch("/book/3/relationships/authors")
                 .then()
                 .statusCode(HttpStatus.SC_NO_CONTENT);
@@ -111,130 +176,138 @@ public void setup() throws IOException {
 
     @Test
     public void testSparseSingleDataFieldValue() throws Exception {
-        JsonNode responseBody = objectMapper.readTree(
-                RestAssured
-                        .given()
+        JsonNode responseBody = mapper.readTree(
+                given()
                         .contentType(JSONAPI_CONTENT_TYPE)
                         .accept(JSONAPI_CONTENT_TYPE)
                         .param("include", "authors")
                         .param("fields[book]", "title")
-                        .get("/book").asString());
+                        .get("/book")
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .extract().body().asString());
 
-        Assert.assertTrue(responseBody.has("data"));
+        assertTrue(responseBody.has("data"));
 
         for (JsonNode bookNode : responseBody.get("data")) {
-            Assert.assertTrue(bookNode.has(ATTRIBUTES));
-            Assert.assertFalse(bookNode.has(RELATIONSHIPS));
+            assertTrue(bookNode.has(ATTRIBUTES));
+            assertFalse(bookNode.has(RELATIONSHIPS));
 
             JsonNode attributes = bookNode.get(ATTRIBUTES);
-            Assert.assertEquals(attributes.size(), 1);
-            Assert.assertTrue(attributes.has("title"));
+            assertEquals(1, attributes.size());
+            assertTrue(attributes.has("title"));
         }
 
-        Assert.assertTrue(responseBody.has(INCLUDED));
+        assertTrue(responseBody.has(INCLUDED));
 
         for (JsonNode include : responseBody.get(INCLUDED)) {
-            Assert.assertFalse(include.has(ATTRIBUTES));
-            Assert.assertFalse(include.has(RELATIONSHIPS));
+            assertFalse(include.has(ATTRIBUTES));
+            assertFalse(include.has(RELATIONSHIPS));
         }
     }
 
     @Test
     public void testSparseTwoDataFieldValuesNoIncludes() throws Exception {
-        JsonNode responseBody = objectMapper.readTree(
-                RestAssured
-                        .given()
+        JsonNode responseBody = mapper.readTree(
+                given()
                         .contentType(JSONAPI_CONTENT_TYPE)
                         .accept(JSONAPI_CONTENT_TYPE)
                         .param("fields[book]", "title,language")
-                        .get("/book").asString());
+                        .get("/book")
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .extract().body().asString());
 
-        Assert.assertTrue(responseBody.has("data"));
+        assertTrue(responseBody.has("data"));
 
         for (JsonNode bookNode : responseBody.get("data")) {
-            Assert.assertTrue(bookNode.has(ATTRIBUTES));
-            Assert.assertFalse(bookNode.has(RELATIONSHIPS));
+            assertTrue(bookNode.has(ATTRIBUTES));
+            assertFalse(bookNode.has(RELATIONSHIPS));
 
             JsonNode attributes = bookNode.get(ATTRIBUTES);
-            Assert.assertEquals(attributes.size(), 2);
-            Assert.assertTrue(attributes.has("title"));
-            Assert.assertTrue(attributes.has("language"));
+            assertEquals(2, attributes.size());
+            assertTrue(attributes.has("title"));
+            assertTrue(attributes.has("language"));
         }
 
-        Assert.assertFalse(responseBody.has(INCLUDED));
+        assertFalse(responseBody.has(INCLUDED));
     }
 
     @Test
     public void testSparseNoFilters() throws Exception {
-        JsonNode responseBody = objectMapper.readTree(
-                RestAssured
-                        .given()
+        JsonNode responseBody = mapper.readTree(
+                given()
                         .contentType(JSONAPI_CONTENT_TYPE)
                         .accept(JSONAPI_CONTENT_TYPE)
                         .param("include", "authors")
-                        .get("/book").asString());
+                        .get("/book")
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .extract().body().asString());
 
-        Assert.assertTrue(responseBody.has("data"));
+        assertTrue(responseBody.has("data"));
 
         for (JsonNode bookNode : responseBody.get("data")) {
-            Assert.assertTrue(bookNode.has(ATTRIBUTES));
+            assertTrue(bookNode.has(ATTRIBUTES));
             JsonNode attributes = bookNode.get(ATTRIBUTES);
-            Assert.assertTrue(attributes.has("title"));
-            Assert.assertTrue(attributes.has("language"));
-            Assert.assertTrue(attributes.has("genre"));
+            assertTrue(attributes.has("title"));
+            assertTrue(attributes.has("language"));
+            assertTrue(attributes.has("genre"));
 
-            Assert.assertTrue(bookNode.has(RELATIONSHIPS));
+            assertTrue(bookNode.has(RELATIONSHIPS));
             JsonNode relationships = bookNode.get(RELATIONSHIPS);
-            Assert.assertTrue(relationships.has("authors"));
+            assertTrue(relationships.has("authors"));
         }
 
-        Assert.assertTrue(responseBody.has(INCLUDED));
+        assertTrue(responseBody.has(INCLUDED));
 
         for (JsonNode include : responseBody.get(INCLUDED)) {
-            Assert.assertTrue(include.has(ATTRIBUTES));
+            assertTrue(include.has(ATTRIBUTES));
             JsonNode attributes = include.get(ATTRIBUTES);
-            Assert.assertTrue(attributes.has("name"));
+            assertTrue(attributes.has("name"));
 
-            Assert.assertTrue(include.has(RELATIONSHIPS));
+            assertTrue(include.has(RELATIONSHIPS));
             JsonNode relationships = include.get(RELATIONSHIPS);
-            Assert.assertTrue(relationships.has("books"));
+            assertTrue(relationships.has("books"));
         }
     }
 
     @Test
     public void testTwoSparseFieldFilters() throws Exception {
-        JsonNode responseBody = objectMapper.readTree(
-                RestAssured
-                        .given()
+        JsonNode responseBody = mapper.readTree(
+                given()
                         .contentType(JSONAPI_CONTENT_TYPE)
                         .accept(JSONAPI_CONTENT_TYPE)
                         .param("include", "authors")
                         .param("fields[book]", "title,genre,authors")
                         .param("fields[author]", "name")
-                        .get("/book").asString());
+                        .get("/book")
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .extract().body().asString());
 
-        Assert.assertTrue(responseBody.has("data"));
+        assertTrue(responseBody.has("data"));
 
         for (JsonNode bookNode : responseBody.get("data")) {
-            Assert.assertTrue(bookNode.has(ATTRIBUTES));
+            assertTrue(bookNode.has(ATTRIBUTES));
             JsonNode attributes = bookNode.get(ATTRIBUTES);
-            Assert.assertEquals(attributes.size(), 2);
-            Assert.assertTrue(attributes.has("title"));
-            Assert.assertTrue(attributes.has("genre"));
+            assertEquals(2, attributes.size());
+            assertTrue(attributes.has("title"));
+            assertTrue(attributes.has("genre"));
 
-            Assert.assertTrue(bookNode.has(RELATIONSHIPS));
+            assertTrue(bookNode.has(RELATIONSHIPS));
             JsonNode relationships = bookNode.get(RELATIONSHIPS);
-            Assert.assertTrue(relationships.has("authors"));
+            assertTrue(relationships.has("authors"));
         }
 
-        Assert.assertTrue(responseBody.has(INCLUDED));
+        assertTrue(responseBody.has(INCLUDED));
 
         for (JsonNode include : responseBody.get(INCLUDED)) {
-            Assert.assertTrue(include.has(ATTRIBUTES));
+            assertTrue(include.has(ATTRIBUTES));
             JsonNode attributes = include.get(ATTRIBUTES);
-            Assert.assertTrue(attributes.has("name"));
+            assertTrue(attributes.has("name"));
 
-            Assert.assertFalse(include.has(RELATIONSHIPS));
+            assertFalse(include.has(RELATIONSHIPS));
         }
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/DataStoreIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
new file mode 100644
index 0000000000..5bf3969a5a
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/DataStoreIT.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Data;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import example.Author;
+import example.Book;
+import example.Chapter;
+import example.Filtered;
+import example.TestCheckMappings;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+@Tag("skipInMemory") // Do not test Memory Datastores
+public class DataStoreIT extends IntegrationTest {
+    private final ObjectMapper mapper;
+    private final Elide elide;
+    private final User goodUser;
+    private final User badUser;
+
+    private static final String CLASH_OF_KINGS = "A Clash of Kings";
+    private static final String STORM_OF_SWORDS = "A Storm of Swords";
+    private static final String SONG_OF_ICE_AND_FIRE = "A Song of Ice and Fire";
+    private static final String DATA = "data";
+    private static final String ATTRIBUTES = "attributes";
+    private static final String TITLE = "title";
+    private static final String CHAPTER_COUNT = "chapterCount";
+    private static final String BASEURL = "http://localhost:8080/api";
+
+    private static final int ICE_AND_FIRE_CHAPTER_COUNT = 10;
+    private static final int CLASH_OF_KINGS_CHAPTER_COUNT = 20;
+    private static final int STORM_OF_SWORDS_CHAPTER_COUNT = 30;
+    private static final int ALL_BOOKS_COUNT = 3;
+
+    public DataStoreIT() {
+        goodUser = new User(() -> "1");
+        badUser = new User(() -> "-1");
+
+        mapper = new ObjectMapper();
+        Map<String, Class<? extends Check>> checks = new HashMap<>(TestCheckMappings.MAPPINGS);
+        checks.put("filterCheck", Filtered.FilterCheck.class);
+        checks.put("filterCheck3", Filtered.FilterCheck3.class);
+
+        elide = new Elide(new ElideSettingsBuilder(dataStore)
+                .withAuditLogger(new TestAuditLogger())
+                .withEntityDictionary(EntityDictionary.builder().checks(checks).build())
+                .build());
+
+        elide.doScans();
+    }
+
+    @BeforeEach
+    public void setUp() throws IOException {
+        try (DataStoreTransaction tx = dataStore.beginTransaction()) {
+
+            tx.createObject(new Filtered(), null);
+            tx.createObject(new Filtered(), null);
+            tx.createObject(new Filtered(), null);
+
+            Author georgeMartin = new Author();
+            tx.createObject(georgeMartin, null);
+            georgeMartin.setName("George R. R. Martin");
+
+            Book book1 = new Book();
+            tx.createObject(book1, null);
+            book1.setTitle(SONG_OF_ICE_AND_FIRE);
+            book1.setAuthors(Arrays.asList(georgeMartin));
+            Book book2 = new Book();
+            tx.createObject(book2, null);
+            book2.setTitle(CLASH_OF_KINGS);
+            book2.setAuthors(Arrays.asList(georgeMartin));
+            Book book3 = new Book();
+            tx.createObject(book3, null);
+            book3.setTitle(STORM_OF_SWORDS);
+            book3.setAuthors(Arrays.asList(georgeMartin));
+
+            georgeMartin.setBooks(Arrays.asList(book1, book2, book3));
+
+            addChapters(ICE_AND_FIRE_CHAPTER_COUNT, book1, tx);
+            addChapters(CLASH_OF_KINGS_CHAPTER_COUNT, book2, tx);
+            addChapters(STORM_OF_SWORDS_CHAPTER_COUNT, book3, tx);
+
+            tx.save(book1, null);
+            tx.save(book2, null);
+            tx.save(book3, null);
+            tx.save(georgeMartin, null);
+
+            tx.commit(null);
+        }
+    }
+
+    private static void addChapters(int numberOfChapters, Book book, DataStoreTransaction tx) {
+        Set<Chapter> chapters = new HashSet<>();
+        for (int idx = 0; idx < numberOfChapters; idx++) {
+            Chapter chapter = new Chapter();
+            tx.createObject(chapter, null);
+            chapter.setTitle("Chapter" + idx);
+            tx.save(chapter, null);
+            chapters.add(chapter);
+        }
+        book.setChapters(chapters);
+    }
+
+    @Test
+    public void testRootEntityFormulaFetch() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        ElideResponse response = elide.get(BASEURL, "/book", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(ALL_BOOKS_COUNT, result.get(DATA).size());
+        assertEquals(SONG_OF_ICE_AND_FIRE, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(1).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(STORM_OF_SWORDS, result.get(DATA).get(2).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(ICE_AND_FIRE_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(1).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(STORM_OF_SWORDS_CHAPTER_COUNT, result.get(DATA).get(2).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testSubcollectionEntityFormulaFetch() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        ElideResponse response = elide.get(BASEURL, "/author/1/books", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(ALL_BOOKS_COUNT, result.get(DATA).size());
+        assertEquals(SONG_OF_ICE_AND_FIRE, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(1).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(STORM_OF_SWORDS, result.get(DATA).get(2).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(ICE_AND_FIRE_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(1).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(STORM_OF_SWORDS_CHAPTER_COUNT, result.get(DATA).get(2).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testRootEntityFormulaWithFilter() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        queryParams.put("filter[book.chapterCount]", Arrays.asList("20"));
+        ElideResponse response = elide.get(BASEURL, "/book", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(1, result.get(DATA).size());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testSubCollectionEntityFormulaWithFilter() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        queryParams.put("filter[book.chapterCount]", Arrays.asList("20"));
+        ElideResponse response = elide.get(BASEURL, "/author/1/books", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(1, result.get(DATA).size());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testRootEntityFormulaWithSorting() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        queryParams.put("sort", Arrays.asList("-chapterCount"));
+        ElideResponse response = elide.get(BASEURL, "/book", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(ALL_BOOKS_COUNT, result.get(DATA).size());
+        assertEquals(STORM_OF_SWORDS, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(1).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(SONG_OF_ICE_AND_FIRE, result.get(DATA).get(2).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(STORM_OF_SWORDS_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(1).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(ICE_AND_FIRE_CHAPTER_COUNT, result.get(DATA).get(2).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testSubcollectionEntityFormulaWithSorting() throws Exception {
+        MultivaluedHashMap<String, String> queryParams = new MultivaluedHashMap<>();
+        queryParams.put("fields[book]", Arrays.asList("title,chapterCount"));
+        queryParams.put("sort", Arrays.asList("-chapterCount"));
+        ElideResponse response = elide.get(BASEURL, "/author/1/books", queryParams, goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+
+        JsonNode result = mapper.readTree(response.getBody());
+        assertEquals(ALL_BOOKS_COUNT, result.get(DATA).size());
+        assertEquals(STORM_OF_SWORDS, result.get(DATA).get(0).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(CLASH_OF_KINGS, result.get(DATA).get(1).get(ATTRIBUTES).get(TITLE).asText());
+        assertEquals(SONG_OF_ICE_AND_FIRE, result.get(DATA).get(2).get(ATTRIBUTES).get(TITLE).asText());
+
+        assertEquals(STORM_OF_SWORDS_CHAPTER_COUNT, result.get(DATA).get(0).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(CLASH_OF_KINGS_CHAPTER_COUNT, result.get(DATA).get(1).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+        assertEquals(ICE_AND_FIRE_CHAPTER_COUNT, result.get(DATA).get(2).get(ATTRIBUTES).get(CHAPTER_COUNT).asInt());
+    }
+
+    @Test
+    public void testFilteredWithPassingCheck() {
+        Data data = data(
+                linkage(type("filtered"), id("1")),
+                linkage(type("filtered"), id("2")),
+                linkage(type("filtered"), id("3"))
+        );
+
+        ElideResponse response = elide.get(BASEURL, "filtered", new MultivaluedHashMap<>(), goodUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+        assertEquals(data.toJSON(), response.getBody());
+    }
+
+    @Test
+    public void testFilteredWithFailingCheck() {
+        Data data = data(
+                linkage(type("filtered"), id("1")),
+                linkage(type("filtered"), id("3"))
+        );
+
+        ElideResponse response = elide.get(BASEURL, "filtered", new MultivaluedHashMap<>(), badUser, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+        assertEquals(data.toJSON(), response.getBody());
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java
index e0346ffff6..6d62b0e758 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java
@@ -5,35 +5,45 @@
  */
 package com.yahoo.elide.tests;
 
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static com.yahoo.elide.test.jsonapi.elements.Relation.TO_ONE;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
 import com.google.common.collect.ImmutableSet;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.core.HttpStatus;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import com.yahoo.elide.utils.JsonParser;
 import example.Embedded;
 import example.Left;
 import example.Right;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import static com.jayway.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.equalTo;
-
 /**
  * Integration test for embedded collections.
  */
-public class EmbeddedIT extends AbstractIntegrationTestInitializer {
-    private final JsonParser jsonParser = new JsonParser();
+public class EmbeddedIT extends IntegrationTest {
 
-    @BeforeClass
-    public static void setup() throws IOException {
+    @BeforeEach
+    public void setup() throws IOException {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
         DataStoreTransaction tx = dataStore.beginTransaction();
         Embedded embedded = new Embedded(); // id 1
         embedded.setSegmentIds(ImmutableSet.of(3L, 4L, 5L));
 
-        tx.save(embedded);
+        tx.createObject(embedded, null);
 
         Left left = new Left();
         Right right = new Right();
@@ -41,28 +51,47 @@ public static void setup() throws IOException {
         left.setOne2one(right);
         right.setOne2one(left);
 
-        tx.save(left);
-        tx.save(right);
+        tx.createObject(left, null);
+        tx.createObject(right, null);
 
-        tx.commit();
+        tx.commit(null);
+        tx.close();
     }
 
     @Test
     void testEmbedded() {
-        String expected = jsonParser.getJson("/EmbeddedIT/testEmbedded.json");
+        Resource resource = resource(
+                type("embedded"),
+                id("1"),
+                attributes(
+                        attr("segmentIds", new int[]{3, 4, 5})
+                )
+        );
 
-        given().when().get("/embedded/1").then().statusCode(HttpStatus.SC_OK).body(equalTo(expected));
+        given().when().get("/embedded/1").then().statusCode(HttpStatus.SC_OK).body(equalTo(datum(resource).toJSON()));
     }
 
     @Test
-    void testOne2One() {
-        String expected = jsonParser.getJson("/EmbeddedIT/testOne2One.json");
-
-        String actual =
-                given().when().get("/right/1")
-                        .then().statusCode(HttpStatus.SC_OK)
-                        .extract().body().asString();
+    void testOne2One() throws Exception {
+        Resource resource = resource(
+                type("right"),
+                id("1"),
+                relationships(
+                        relation("noUpdate"),
+                        relation("many2one", TO_ONE),
+                        relation("noUpdateOne2One", TO_ONE),
+                        relation("one2one", TO_ONE,
+                                linkage(type("left"), id("1"))
+                        ),
+                        relation("noDelete")
+                )
+        );
 
-        assertEqualDocuments(actual, expected);
+        given()
+                .when()
+                .get("/right/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(datum(resource), true));
     }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIdIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIdIT.java
new file mode 100644
index 0000000000..987ceb7ae1
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIdIT.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.initialization.GraphQLIntegrationTest;
+import com.google.common.collect.Sets;
+import example.embeddedid.Address;
+import example.embeddedid.AddressSerde;
+import example.embeddedid.Building;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import lombok.Data;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class EmbeddedIdIT extends GraphQLIntegrationTest {
+
+    protected Address address1 = new Address(0, "Bullion Blvd", 40121);
+    protected Address address2 = new Address(1409, "W Green St", 61801);
+    protected Address address3 = new Address(1800, "South First Street", 61820);
+    protected AddressSerde serde = new AddressSerde();
+
+    @BeforeAll
+    public void beforeAll() {
+        CoerceUtil.register(Address.class, serde);
+    }
+
+    @BeforeEach
+    public void setup() throws IOException {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
+        DataStoreTransaction tx = dataStore.beginTransaction();
+
+        Building building1 = new Building();
+        building1.setAddress(address1);
+        building1.setName("Fort Knox");
+
+        Building building2 = new Building();
+        building2.setAddress(address3);
+        building2.setName("Assembly Hall");
+
+        building1.setNeighbors(Sets.newHashSet(building2));
+        building2.setNeighbors(Sets.newHashSet(building1));
+
+        tx.createObject(building1, null);
+        tx.createObject(building2, null);
+
+        tx.commit(null);
+        tx.close();
+    }
+
+    @Test
+    public void testJsonApiFetchCollection() {
+        String address1Id = serde.serialize(address1);
+        String address3Id = serde.serialize(address3);
+
+        given()
+                .when()
+                .get("/building")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("building"),
+                                        id(address1Id),
+                                        attributes(
+                                                attr("name", "Fort Knox")
+                                        ),
+                                        relationships(
+                                                relation("neighbors",
+                                                        linkage(type("building"), id(address3Id))
+                                                )
+                                        )
+                                ),
+                                resource(
+                                        type("building"),
+                                        id(address3Id),
+                                        attributes(
+                                                attr("name", "Assembly Hall")
+                                        ),
+                                        relationships(
+                                                relation("neighbors",
+                                                        linkage(type("building"), id(address1Id))
+                                                )
+                                        )
+                                )
+                        ).toJSON())
+                );
+    }
+
+    @Test
+    public void testJsonApiFetchById() {
+        String address1Id = serde.serialize(address1);
+        String address3Id = serde.serialize(address3);
+
+        given()
+                .when()
+                .get("/building/" + address1Id)
+                .then()
+                .log().all()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                    datum(
+                        resource(
+                                type("building"),
+                                id(address1Id),
+                                attributes(
+                                        attr("name", "Fort Knox")
+                                ),
+                                relationships(
+                                        relation("neighbors",
+                                                linkage(type("building"), id(address3Id))
+                                        )
+                                )
+                        )
+                ).toJSON())
+        );
+    }
+
+    @Test
+    public void testJsonApiFetchRelationship() {
+        String address1Id = serde.serialize(address1);
+        String address3Id = serde.serialize(address3);
+
+        given()
+                .when()
+                .get("/building/" + address1Id + "/neighbors")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("building"),
+                                        id(address3Id),
+                                        attributes(
+                                                attr("name", "Assembly Hall")
+                                        ),
+                                        relationships(
+                                                relation("neighbors",
+                                                        linkage(type("building"), id(address1Id))
+                                                )
+                                        )
+                                )
+                        ).toJSON())
+                );
+    }
+
+    @Test
+    public void testJsonApiFilterById() {
+        String address1Id = serde.serialize(address1);
+        String address3Id = serde.serialize(address3);
+
+        given()
+            .when()
+            .get("/building?filter=id=='" + address1Id + "'")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                    data(
+                        resource(
+                            type("building"),
+                            id(address1Id),
+                            attributes(
+                                attr("name", "Fort Knox")
+                            ),
+                            relationships(
+                                relation("neighbors",
+                                linkage(type("building"), id(address3Id))
+                            )
+                        )
+                    )
+                ).toJSON()
+            ));
+    }
+
+    @Test
+    public void testJsonApiCreate() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(data(
+                        resource(
+                                type("building"),
+                                id(serde.serialize(address2)),
+                                attributes(attr(
+                                        "name", "Altgeld Hall"
+                                ))
+                        )
+
+                ))
+                .when()
+                .post("/building")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(equalTo(datum(
+                        resource(
+                            type("building"),
+                            id(serde.serialize(address2)),
+                            attributes(attr(
+                                    "name", "Altgeld Hall"
+                            )),
+                            relationships(relation("neighbors"))
+                        )).toJSON()
+                ));
+    }
+
+
+    @Test
+    public void testGraphQLFetchCollection() throws Exception {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "building",
+                                selections(
+                                        field("address"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "building",
+                                selections(
+                                        field("address", serde.serialize(address1)),
+                                        field("name", "Fort Knox")
+                                ),
+                                selections(
+                                        field("address", serde.serialize(address3)),
+                                        field("name", "Assembly Hall")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLFetchById() throws Exception {
+        String addressId = serde.serialize(address1);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "building",
+                                arguments(
+                                        argument("ids", Arrays.asList(addressId))
+                                ),
+                                selections(
+                                        field("address"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "building",
+                                selections(
+                                        field("address", addressId),
+                                        field("name", "Fort Knox")
+                                )
+
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLFetchRelationship() throws Exception {
+        String address1Id = serde.serialize(address1);
+        String address3Id = serde.serialize(address3);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "building",
+                                arguments(
+                                        argument("ids", Arrays.asList(address1Id))
+                                ),
+                                selections(
+                                        field("neighbors",
+                                                selections(
+                                                        field("name"),
+                                                        field("address")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "building",
+                                selections(
+                                        field("neighbors",
+                                                selections(
+                                                        field("name", "Assembly Hall"),
+                                                        field("address", address3Id)
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLFilterById() throws Exception {
+        String addressId = serde.serialize(address1);
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "building",
+                                arguments(
+                                        argument("filter", "\"id==\\\"" + addressId + "\\\"\"")
+                                ),
+                                selections(
+                                        field("address"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "building",
+                                selections(
+                                        field("address", addressId),
+                                        field("name", "Fort Knox")
+                                )
+
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testGraphQLCreate() throws Exception {
+
+        @Data
+        class SerializedBuilding {
+            private String name;
+            private String address;
+        }
+
+        String addressId = serde.serialize(address2);
+        SerializedBuilding building = new SerializedBuilding();
+        building.address = addressId;
+        building.name = "Altgeld Hall";
+
+        String graphQLRequest = document(
+            mutation(
+                    selection(
+                            field(
+                                    "building",
+                                    arguments(
+                                            argument("op", "UPSERT"),
+                                            argument("data", building)
+                                    ),
+                                    selections(
+                                            field("address"),
+                                            field("name")
+                                    )
+                            )
+                    )
+            )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "building",
+                                selections(
+                                        field("address", addressId),
+                                        field("name", "Altgeld Hall")
+                                )
+
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/FilterIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/FilterIT.java
new file mode 100644
index 0000000000..797b9f7377
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/FilterIT.java
@@ -0,0 +1,2138 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.collections4.CollectionUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
+
+public class FilterIT extends IntegrationTest {
+
+    private final JsonParser jsonParser = new JsonParser();
+
+    private JsonNode books;
+    private String asimovId;
+    private JsonNode asimovBooks;
+    private String thomasHarrisId;
+    private JsonNode thomasHarrisBooks;
+    private String nullNedId;
+    private JsonNode nullNedBooks;
+    private String orsonCardId;
+    private String hemingwayId;
+
+    private Set<Integer> bookIds = new HashSet<>();
+    private Set<Integer> authorIds = new HashSet<>();
+
+    private String getAuthorId(JsonNode author, String name) {
+        if (author.get("attributes").get("name").asText().equals(name)) {
+            return author.get("id").asText();
+        }
+        return null;
+    }
+
+
+    @BeforeEach
+    void setup() throws JsonProcessingException {
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/FilterIT/book_author_publisher_patch1.json"))
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/FilterIT/book_author_publisher_patch2.json"))
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/FilterIT/book_author_publisher_patch3.json"))
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/FilterIT/book_author_publisher_patch4.json"))
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/FilterIT/book_author_publisher_patch5.json"))
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        books = getAsNode("/book");
+        JsonNode authors = getAsNode("/author");
+
+        for (JsonNode author : authors.get("data")) {
+            authorIds.add(author.get("id").asInt());
+            hemingwayId = (getAuthorId(author, "Ernest Hemingway") == null ? hemingwayId : getAuthorId(author, "Ernest Hemingway"));
+            asimovId = (getAuthorId(author, "Isaac Asimov") == null ? asimovId : getAuthorId(author, "Isaac Asimov"));
+            nullNedId = (getAuthorId(author, "Null Ned") == null ? nullNedId : getAuthorId(author, "Null Ned"));
+            orsonCardId = (getAuthorId(author, "Orson Scott Card") == null ? orsonCardId : getAuthorId(author, "Orson Scott Card"));
+            thomasHarrisId = (getAuthorId(author, "Thomas Harris") == null ? thomasHarrisId : getAuthorId(author, "Thomas Harris"));
+        }
+
+        for (JsonNode book : books.get("data")) {
+            bookIds.add(book.get("id").asInt());
+        }
+
+        assertNotNull(asimovId);
+        assertNotNull(nullNedId);
+        assertNotNull(thomasHarrisId);
+
+        asimovBooks = getAsNode(String.format("/author/%s/books", asimovId));
+        nullNedBooks = getAsNode(String.format("/author/%s/books", nullNedId));
+        thomasHarrisBooks = getAsNode(String.format("/author/%s/books", thomasHarrisId));
+    }
+
+    @Test
+    void testRootFilterInvalidField() {
+        /* Test Default */
+        given()
+                .get("/book?filter[book.name]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL typed */
+        given()
+                .get("/book?filter[book]=name==Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL global */
+        given()
+                .get("/book?filter=name==Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testRootFilterInvalidEntity() {
+        /* Test Default */
+        given()
+                .get("/book?filter[bank.title]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL typed */
+        given()
+                .get("/book?filter[bank]=title==Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testRootInvalidOperator() {
+        /* Test Default */
+        given()
+                .get("/book?filter[book.title][invalid]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL Typed */
+        given()
+                .get("/book?filter[book]=title=invalid=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL Global */
+        given()
+                .get("/book?filter=title=invalid=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testFilterInvalidField() {
+        /* Test Default */
+        given()
+                .get("/author/3/book?filter[book.name]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL Typed */
+        given()
+                .get("/author/3/book?filter[book]=name==Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testFilterInvalidEntity() {
+        /* Test Default */
+        given()
+                .get("/author/3/book?filter[bank.title]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL Typed */
+        given()
+                .get("/author/3/book?filter[bank]=title==Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testInvalidOperator() {
+        /* Test Default */
+        given()
+                .get("/author/3/book?filter[book.title][invalid]=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+
+        /* Test RSQL Typed */
+        given()
+                .get("/author/3/book?filter[book]=title=invalid=Ignored")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    void testRootComplexAttribute() throws Exception {
+        JsonNode priceyBooks = getAsNode("/book?filter[book]=price.total>=10");
+
+        assertEquals(2, priceyBooks.get("data").size());
+
+        priceyBooks = getAsNode("/book?filter[book]=price.total<5");
+
+        assertEquals(0, priceyBooks.get("data").size());
+    }
+
+    @Test
+    void testRootNestedComplexAttribute() throws Exception {
+        JsonNode priceyBooks = getAsNode("/book?filter[book]=price.currency.isoCode==AED");
+
+        assertEquals(1, priceyBooks.get("data").size());
+
+        priceyBooks = getAsNode("/book?filter[book]=price.currency.isoCode==ABC");
+
+        assertEquals(0, priceyBooks.get("data").size());
+    }
+
+    @Test
+    void testRootFilterImplicitSingle() throws JsonProcessingException {
+        int scienceFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("genre").asText().equalsIgnoreCase("Science Fiction")) {
+                scienceFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(scienceFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode scienceFictionBooks = getAsNode("/book?filter[book.genre]=Science Fiction");
+
+        assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        scienceFictionBooks = getAsNode("/book?filter[book]=genre=='Science Fiction'");
+
+        assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size());
+
+        /* Test RSQL Global */
+        scienceFictionBooks = getAsNode("/book?filter=genre=='Science Fiction'");
+
+        assertEquals(scienceFictionBookCount, scienceFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testRootFilterInSingle() throws JsonProcessingException {
+        int literaryFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("genre").asText().equalsIgnoreCase("Literary Fiction")) {
+                literaryFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(literaryFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode literaryFictionBooks = getAsNode("/book?filter[book.genre][in]=Literary Fiction");
+
+        assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        literaryFictionBooks = getAsNode("/book?filter[book]=genre=in='Literary Fiction'");
+
+        assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size());
+
+        /* Test RSQL Global */
+        literaryFictionBooks = getAsNode("/book?filter=genre=in='Literary Fiction'");
+
+        assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size());
+
+        literaryFictionBooks = getAsNode("/book?filter=genre=ini='literary FICTION'");
+
+        assertEquals(literaryFictionBookCount, literaryFictionBooks.get("data").size());
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testRootFilterNotInSingle() throws JsonProcessingException {
+        int nonLiteraryFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (!node.get("attributes").get("genre").isNull()
+                    && !node.get("attributes").get("genre").asText().equalsIgnoreCase("Literary Fiction")) {
+                nonLiteraryFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(nonLiteraryFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode nonLiteraryFictionBooks = getAsNode("/book?filter[book.genre][not]=Literary Fiction");
+
+        assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size());
+
+        /* Test RSQL typed */
+        nonLiteraryFictionBooks = getAsNode("/book?filter[book]=genre!='Literary Fiction'");
+
+        assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size());
+
+        /* Test RSQL global */
+        nonLiteraryFictionBooks = getAsNode("/book?filter=genre!='Literary Fiction'");
+
+        assertEquals(nonLiteraryFictionBookCount, nonLiteraryFictionBooks.get("data").size());
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testRootFilterNotInMultiple() throws JsonProcessingException {
+        int nonFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (!node.get("attributes").get("genre").isNull()
+                    && !node.get("attributes").get("genre").asText().equalsIgnoreCase("Literary Fiction")
+                    && !node.get("attributes").get("genre").asText().equalsIgnoreCase("Science Fiction")) {
+                nonFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(nonFictionBookCount > 0);
+
+        /* Test default */
+        JsonNode nonFictionBooks = getAsNode("/book?filter[book.genre][not]=Literary Fiction,Science Fiction");
+
+        assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size());
+
+        /* Test RSQL typed */
+        nonFictionBooks = getAsNode("/book?filter[book]=genre=out=('Literary Fiction','Science Fiction')");
+
+        assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size());
+
+        /* Test RSQL global */
+        nonFictionBooks = getAsNode("/book?filter=genre=out=('Literary Fiction','Science Fiction')");
+
+        assertEquals(nonFictionBookCount, nonFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testRootFilterInMultipleSingle() throws JsonProcessingException {
+        int literaryAndScienceFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("genre").asText().equalsIgnoreCase("Literary Fiction")
+                    || node.get("attributes").get("genre").asText().equalsIgnoreCase("Science Fiction")) {
+                literaryAndScienceFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(literaryAndScienceFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode literaryAndScienceFictionBooks = getAsNode("/book?filter[book.genre][in]=Literary Fiction,Science Fiction");
+
+        assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size());
+
+        /* Test RSQL typed */
+        literaryAndScienceFictionBooks = getAsNode("/book?filter[book]=genre=in=('Literary Fiction','Science Fiction')");
+
+        assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size());
+
+        /* Test RSQL global */
+        literaryAndScienceFictionBooks = getAsNode("/book?filter=genre=in=('Literary Fiction','Science Fiction')");
+
+        assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size());
+
+        literaryAndScienceFictionBooks = getAsNode("/book?filter=genre=ini=('LITERARY FICTION','SCIENCE FICTION')");
+
+        assertEquals(literaryAndScienceFictionBookCount, literaryAndScienceFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootCollectionError() {
+        given()
+                .get("/publisher")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body("errors.detail", contains("Unknown collection publisher"));
+    }
+
+    @Test
+    void testNonRootEntityError() {
+        given()
+                .get("/publisher/1")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body("errors.detail", contains("Unknown collection publisher"));
+    }
+
+    @Test
+    void testRootFilterPostfix() throws JsonProcessingException {
+        int genreEndsWithFictionBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("genre").asText().toLowerCase(Locale.ENGLISH).endsWith("fiction")) {
+                genreEndsWithFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(genreEndsWithFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode genreEndsWithFictionBooks = getAsNode("/book?filter[book.genre][postfix]=Fiction");
+
+        assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        genreEndsWithFictionBooks = getAsNode("/book?filter[book]=genre==*Fiction");
+
+        assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size());
+
+        /* Test RSQL Global */
+        genreEndsWithFictionBooks = getAsNode("/book?filter=genre==*Fiction");
+
+        assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testRootFilterPrefix() throws JsonProcessingException {
+        int titleStartsWithTheBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("title").asText().toLowerCase(Locale.ENGLISH).startsWith("the")) {
+                titleStartsWithTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleStartsWithTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleStartsWithTheBooks = getAsNode("/book?filter[book.title][prefix]=The");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleStartsWithTheBooks = getAsNode("/book?filter[book]=title==The*");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Global */
+        titleStartsWithTheBooks = getAsNode("/book?filter=title==The*");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testRootFilterPrefixWithSpecialChars() throws JsonProcessingException {
+        int titleStartsWithTheBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("title").asText().toLowerCase(Locale.ENGLISH).startsWith("i'm")) {
+                titleStartsWithTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleStartsWithTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleStartsWithTheBooks = getAsNode("/book?filter[book.title][prefix]=i'm");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleStartsWithTheBooks = getAsNode("/book?filter[book]=title=='i\\'m*'");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Global */
+        titleStartsWithTheBooks = getAsNode("/book?filter=title=='i\\'m*'");
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testRootFilterInfix() throws JsonProcessingException {
+        int titleContainsTheBookCount = 0;
+        for (JsonNode node : books.get("data")) {
+            if (node.get("attributes").get("title").asText().toLowerCase(Locale.ENGLISH).contains("the")) {
+                titleContainsTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleContainsTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleContainsTheBooks = getAsNode("/book?filter[book.title][infix]=the");
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleContainsTheBooks = getAsNode("/book?filter[book]=title==*the*");
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+
+        /* Test RSQL Global */
+        titleContainsTheBooks = getAsNode("/book?filter=title==*the*");
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+
+        titleContainsTheBooks = getAsNode("/book?filter=title=ini=*THE*");
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+    }
+
+    @Test
+    void testRootFilterWithInclude() throws JsonProcessingException {
+        Set<String> authorIdsOfLiteraryFiction = new HashSet<>();
+
+        for (JsonNode book : books.get("data")) {
+            if (book.get("attributes").get("genre").asText().equals("Literary Fiction")) {
+                for (JsonNode author : book.get("relationships").get("authors").get("data")) {
+                    authorIdsOfLiteraryFiction.add(author.get("id").asText());
+                }
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(authorIdsOfLiteraryFiction));
+
+        /* Test Default */
+        JsonNode result = getAsNode("/book?include=authors&filter[book.genre]=Literary Fiction");
+
+        for (JsonNode author : result.get("included")) {
+            assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()));
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode("/book?include=authors&filter[book]=genre=='Literary Fiction'");
+
+        for (JsonNode author : result.get("included")) {
+            assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()));
+        }
+
+        /* Test RSQL Global */
+        result = getAsNode("/book?include=authors&filter=genre=='Literary Fiction'");
+
+        for (JsonNode author : result.get("included")) {
+            assertTrue(authorIdsOfLiteraryFiction.contains(author.get("id").asText()));
+        }
+    }
+
+    @Test
+    void testRootFilterIsNull() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNullGenre = new HashSet<>();
+
+        for (JsonNode book : books.get("data")) {
+            if (book.get("attributes").get("genre").isNull()) {
+                bookIdsWithNullGenre.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNullGenre));
+
+        /* Test Default */
+        JsonNode result = getAsNode("/book?filter[book.genre][isnull]");
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = true */
+        result = getAsNode("book?filter[book]=genre=isnull=true");
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 1 */
+        result = getAsNode("book?filter[book]=genre=isnull=1");
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Global */
+        /* param = true */
+        result = getAsNode("book?filter=genre=isnull=true");
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 1 */
+        result = getAsNode("book?filter=genre=isnull=1");
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+    }
+
+    @Test
+    void testRootFilterIsNotNull() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNonNullGenre = new HashSet<>();
+
+        for (JsonNode book : books.get("data")) {
+            if (!book.get("attributes").get("genre").isNull()) {
+                bookIdsWithNonNullGenre.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNonNullGenre));
+
+        /* Test Default */
+        JsonNode result = getAsNode("/book?filter[book.genre][notnull]");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = false */
+        result = getAsNode("book?filter[book]=genre=isnull=false");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 0 */
+        result = getAsNode("book?filter[book]=genre=isnull=0");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Global */
+        /* param = false */
+        result = getAsNode("book?filter=genre=isnull=false");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 0 */
+        result = getAsNode("book?filter=genre=isnull=0");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+    }
+
+    @Test
+    void testNonRootFilterImplicitSingle() throws JsonProcessingException {
+        int asimovScienceFictionBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (node.get("attributes").get("genre").asText().equals("Science Fiction")) {
+                asimovScienceFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(asimovScienceFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode asimovScienceFictionBooks = getAsNode(String.format("/author/%s/books?filter[book.genre]=Science Fiction", asimovId));
+
+        assertEquals(asimovScienceFictionBookCount, asimovScienceFictionBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        asimovScienceFictionBooks = getAsNode(String.format("/author/%s/books?filter[book]=genre=='Science Fiction'", asimovId));
+
+        assertEquals(asimovScienceFictionBookCount, asimovScienceFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterInSingle() throws JsonProcessingException {
+        int asimovHistoryBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (node.get("attributes").get("genre").asText().equals("History")) {
+                asimovHistoryBookCount += 1;
+            }
+        }
+
+        assertTrue(asimovHistoryBookCount > 0);
+
+        /* Test Default */
+        JsonNode asimovHistoryBooks = getAsNode(String.format("/author/%s/books?filter[book.genre]=History", asimovId));
+
+        assertEquals(asimovHistoryBookCount, asimovHistoryBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        asimovHistoryBooks = getAsNode(String.format("/author/%s/books?filter[book]=genre==History", asimovId));
+
+        assertEquals(asimovHistoryBookCount, asimovHistoryBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterNotInSingle() throws JsonProcessingException {
+        int nonHistoryBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (!node.get("attributes").get("genre").isNull()
+                    && !node.get("attributes").get("genre").asText().equals("History")) {
+                nonHistoryBookCount += 1;
+            }
+        }
+
+        assertTrue(nonHistoryBookCount > 0);
+
+        /* Test Default */
+        JsonNode nonHistoryBooks = getAsNode(String.format("/author/%s/books?filter[book.genre][not]=History", asimovId));
+
+        assertEquals(nonHistoryBookCount, nonHistoryBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        nonHistoryBooks = getAsNode(String.format("/author/%s/books?filter[book]=genre!=History", asimovId));
+
+        assertEquals(nonHistoryBookCount, nonHistoryBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterPostfix() throws JsonProcessingException {
+        int genreEndsWithFictionBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (node.get("attributes").get("genre").asText().endsWith("Fiction")) {
+                genreEndsWithFictionBookCount += 1;
+            }
+        }
+
+        assertTrue(genreEndsWithFictionBookCount > 0);
+
+        /* Test Default */
+        JsonNode genreEndsWithFictionBooks = getAsNode(String.format("/author/%s/books?filter[book.genre][postfix]=Fiction", asimovId));
+
+        assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        genreEndsWithFictionBooks = getAsNode(String.format("/author/%s/books?filter[book]=genre==*Fiction", asimovId));
+
+        assertEquals(genreEndsWithFictionBookCount, genreEndsWithFictionBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterPostfixInsensitive() throws JsonProcessingException {
+        int editorEdBooks = 0;
+        for (JsonNode node : nullNedBooks.get("data")) {
+            if (node.get("attributes").get("editorName").asText().endsWith("d")) {
+                editorEdBooks += 1;
+            }
+        }
+
+        assertTrue(editorEdBooks > 0);
+
+        /* Test Default */
+        JsonNode editorNameEndsWithd = getAsNode(String.format("/author/%s/books?filter[book.editorName][postfix]=D", nullNedId));
+
+        assertEquals(0, editorNameEndsWithd.get("data").size());
+
+        editorNameEndsWithd = getAsNode(String.format("/author/%s/books?filter[book.editorName][postfixi]=D", nullNedId));
+
+        assertEquals(editorEdBooks, editorNameEndsWithd.get("data").size());
+
+        /* Test RSQL Typed */
+        editorNameEndsWithd = getAsNode(String.format("/author/%s/books?filter[book]=editorName==*D", nullNedId));
+
+        assertEquals(0, editorNameEndsWithd.get("data").size());
+
+        editorNameEndsWithd = getAsNode(String.format("/author/%s/books?filter[book]=editorName=ini=*D", nullNedId));
+
+        assertEquals(editorEdBooks, editorNameEndsWithd.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterPrefixInsensitive() throws JsonProcessingException {
+        int editorEdBooks = 0;
+        for (JsonNode node : nullNedBooks.get("data")) {
+            if (node.get("attributes").get("editorName").asText().startsWith("E")) {
+                editorEdBooks += 1;
+            }
+        }
+
+        assertTrue(editorEdBooks > 0);
+
+        /* Test Default */
+        JsonNode editorNameStartsWithE = getAsNode(String.format("/author/%s/books?filter[book.editorName][prefix]=e", nullNedId));
+
+        assertEquals(0, editorNameStartsWithE.get("data").size());
+
+        editorNameStartsWithE = getAsNode(String.format("/author/%s/books?filter[book.editorName][prefixi]=e", nullNedId));
+
+        assertEquals(editorEdBooks, editorNameStartsWithE.get("data").size());
+
+        /* Test RSQL Typed */
+
+        editorNameStartsWithE = getAsNode(String.format("/author/%s/books?filter[book]=editorName==e*", nullNedId));
+
+        assertEquals(0, editorNameStartsWithE.get("data").size());
+
+        editorNameStartsWithE = getAsNode(String.format("/author/%s/books?filter[book]=editorName=ini=e*", nullNedId));
+
+        assertEquals(editorEdBooks, editorNameStartsWithE.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterInfixInsensitive() throws JsonProcessingException {
+        int editorEditBooks = 0;
+        for (JsonNode node : nullNedBooks.get("data")) {
+            if (node.get("attributes").get("editorName").asText().contains("Ed")) {
+                editorEditBooks += 1;
+            }
+        }
+
+        assertTrue(editorEditBooks > 0);
+
+        /* Test Default */
+        JsonNode editorNameContainsEd = getAsNode(String.format("/author/%s/books?filter[book.editorName][infix]=eD", nullNedId));
+
+        assertEquals(0, editorNameContainsEd.get("data").size());
+
+        editorNameContainsEd = getAsNode(String.format("/author/%s/books?filter[book.editorName][infixi]=eD", nullNedId));
+
+        assertEquals(editorEditBooks, editorNameContainsEd.get("data").size());
+
+        /* Test RSQL Typed */
+        editorNameContainsEd = getAsNode(String.format("/author/%s/books?filter[book]=editorName==*eD*", nullNedId));
+
+        assertEquals(0, editorNameContainsEd.get("data").size());
+
+        editorNameContainsEd = getAsNode(String.format("/author/%s/books?filter[book]=editorName=ini=*eD*", nullNedId));
+
+        assertEquals(editorEditBooks, editorNameContainsEd.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterPrefix() throws JsonProcessingException {
+        int titleStartsWithTheBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (node.get("attributes").get("title").asText().startsWith("The")) {
+                titleStartsWithTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleStartsWithTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleStartsWithTheBooks = getAsNode(String.format("/author/%s/books?filter[book.title][prefix]=The", asimovId));
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleStartsWithTheBooks = getAsNode(String.format("/author/%s/books?filter[book]=title==The*", asimovId));
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterPrefixWithSpecialChars() throws JsonProcessingException {
+        int titleStartsWithTheBookCount = 0;
+        for (JsonNode node : thomasHarrisBooks.get("data")) {
+            if (node.get("attributes").get("title").asText().startsWith("I'm")) {
+                titleStartsWithTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleStartsWithTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleStartsWithTheBooks = getAsNode(String.format("/author/%s/books?filter[book.title][prefix]=I'm", thomasHarrisId));
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleStartsWithTheBooks = getAsNode(String.format("/author/%s/books?filter[book]=title=='I\\'m*'", thomasHarrisId));
+
+        assertEquals(titleStartsWithTheBookCount, titleStartsWithTheBooks.get("data").size());
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testNonRootFilterInfix() throws JsonProcessingException {
+        int titleContainsTheBookCount = 0;
+        for (JsonNode node : asimovBooks.get("data")) {
+            if (node.get("attributes").get("title").asText().toLowerCase(Locale.ENGLISH).contains("the")) {
+                titleContainsTheBookCount += 1;
+            }
+        }
+
+        assertTrue(titleContainsTheBookCount > 0);
+
+        /* Test Default */
+        JsonNode titleContainsTheBooks = getAsNode(String.format("/author/%s/books?filter[book.title][infix]=the", asimovId));
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+
+        /* Test RSQL Typed */
+        titleContainsTheBooks = getAsNode(String.format("/author/%s/books?filter[book]=title==*the*", asimovId));
+
+        assertEquals(titleContainsTheBookCount, titleContainsTheBooks.get("data").size());
+    }
+
+    @Test
+    void testNonRootFilterWithInclude() throws JsonProcessingException {
+        Set<String> authorIdsOfScienceFiction = new HashSet<>();
+
+        for (JsonNode book : asimovBooks.get("data")) {
+            if (book.get("attributes").get("genre").asText().equals("Science Fiction")) {
+                for (JsonNode author : book.get("relationships").get("authors").get("data")) {
+                    authorIdsOfScienceFiction.add(author.get("id").asText());
+                }
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(authorIdsOfScienceFiction));
+
+        /* Test Default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?include=authors&filter[book.genre]=Science Fiction", asimovId));
+
+        for (JsonNode author : result.get("included")) {
+            assertTrue(authorIdsOfScienceFiction.contains(author.get("id").asText()));
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode(String.format("/author/%s/books?include=authors&filter[book]=genre=='Science Fiction'", asimovId));
+
+        for (JsonNode author : result.get("included")) {
+            assertTrue(authorIdsOfScienceFiction.contains(author.get("id").asText()));
+        }
+    }
+
+    @Test
+    void testNonRootFilterIsNull() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNullGenre = new HashSet<>();
+
+        for (JsonNode book : nullNedBooks.get("data")) {
+            if (book.get("attributes").get("genre").isNull()) {
+                bookIdsWithNullGenre.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNullGenre));
+
+        /* Test Default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.genre][isnull]", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = true */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=genre=isnull=true", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 1 */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=genre=isnull=1", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNullGenre.contains(book.get("id")));
+        }
+    }
+
+    @Test
+    void testNonRootFilterIsNotNull() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNonNullGenre = new HashSet<>();
+
+        for (JsonNode book : nullNedBooks.get("data")) {
+            if (!book.get("attributes").get("genre").isNull()) {
+                bookIdsWithNonNullGenre.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNonNullGenre));
+
+        /* Test Default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.genre][notnull]", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = false */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=genre=isnull=false", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+
+        /* param = 0 */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=genre=isnull=0", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonNullGenre.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("genre").isNull());
+            assertTrue(bookIdsWithNonNullGenre.contains(book.get("id")));
+        }
+    }
+
+    @Test
+    void testPublishDateGreaterThanFilter() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNonNullGenre = new HashSet<>();
+        long publishDate;
+
+        for (JsonNode book : nullNedBooks.get("data")) {
+            if (!book.get("attributes").get("genre").isNull()) {
+                bookIdsWithNonNullGenre.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNonNullGenre));
+
+        /* Test Default */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][gt]=1");
+
+        assertEquals(result.get("data").size(), 1);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate > 1L);
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode("/book?filter[book]=publishDate>1");
+
+        assertEquals(result.get("data").size(), 1);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate > 1L);
+        }
+    }
+
+    @Test
+    void testPublishDateEqualsFilter() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][in]=0,1454638927412");
+
+        assertEquals(8, result.get("data").size());
+
+        /* Test RSQL Typed */
+        result = getAsNode("/book?filter[book]=publishDate=in=(0,1454638927412)");
+
+        assertEquals(result.get("data").size(), 8);
+    }
+
+    @Test
+    void testPublishDatePrefixFilter() throws JsonProcessingException {
+        /* Test Default */
+        /* publish date = 1454638927412 */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][prefix]=1");
+
+        assertEquals(1, result.get("data").size());
+
+        /* Test RSQL Typed */
+        /* publish date = 1454638927412 */
+        result = getAsNode("/book?filter[book]=publishDate==1*");
+
+        assertEquals(result.get("data").size(), 1);
+    }
+
+    @Test
+    void testPublishDateInfixFilter() throws JsonProcessingException {
+        /* Test Default */
+        /* publish date = 1454638927412 */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][infix]=389");
+
+        assertEquals(1, result.get("data").size());
+
+        /* Test RSQL Typed */
+        /* publish date = 1454638927412 */
+        result = getAsNode("/book?filter[book]=publishDate==*389*");
+
+        assertEquals(result.get("data").size(), 1);
+    }
+
+    @Test
+    void testPublishDatePostfixFilter() throws JsonProcessingException {
+        /* Test Default */
+        /* publish date = 1454638927412 */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][postfix]=412");
+
+        assertEquals(1, result.get("data").size());
+
+        /* Test RSQL Typed */
+        /* publish date = 1454638927412 */
+        result = getAsNode("/book?filter[book]=publishDate==*412");
+
+        assertEquals(result.get("data").size(), 1);
+    }
+
+    @Test
+    void testPublishDateGreaterThanFilterSubRecord() throws JsonProcessingException {
+        long publishDate;
+
+        /* Test Default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.publishDate][gt]=1454638927411", orsonCardId));
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate > 1454638927411L);
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=publishDate>1454638927411", orsonCardId));
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate > 1454638927411L);
+        }
+    }
+
+    @Test
+    void testPublishDateLessThanOrEqualsFilterSubRecord() throws JsonProcessingException {
+        long publishDate;
+
+        /* Test Default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.publishDate][le]=1454638927412", orsonCardId));
+
+        assertEquals(result.get("data").size(), 1);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate <= 1454638927412L);
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=publishDate<=1454638927412", orsonCardId));
+
+        assertEquals(result.get("data").size(), 1);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate <= 1454638927412L);
+        }
+    }
+
+    @Test
+    void testPublishDateLessThanOrEqual() throws JsonProcessingException {
+        long publishDate;
+
+        /* Test Default */
+        JsonNode result = getAsNode("book?filter[book.publishDate][le]=1454638927412");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate <= 1454638927412L);
+        }
+
+        /* Test RSQL Typed */
+        result = getAsNode("book?filter[book]=publishDate<=1454638927412");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate <= 1454638927412L);
+        }
+
+        /* Test RSQL Global */
+        result = getAsNode("book?filter=publishDate<=1454638927412");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate <= 1454638927412L);
+        }
+    }
+
+    @Test
+    void testPublishDateLessThanFilter() throws JsonProcessingException {
+        long publishDate;
+
+        /* Test Default */
+        JsonNode result = getAsNode("/book?filter[book.publishDate][lt]=1454638927411");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate < 1454638927411L);
+        }
+
+        /* RSQL Typed */
+        result = getAsNode("/book?filter[book]=publishDate<1454638927411");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate < 1454638927411L);
+        }
+
+        /* RSQL Global */
+        result = getAsNode("/book?filter=publishDate<1454638927411");
+
+        assertTrue(result.get("data").size() > 0);
+
+        for (JsonNode book : result.get("data")) {
+            publishDate = book.get("attributes").get("publishDate").asLong();
+            assertTrue(publishDate < 1454638927411L);
+        }
+    }
+
+    /**
+     * Verifies that issue 508 is closed.
+     */
+    @Test
+    void testIssue508() throws JsonProcessingException {
+        JsonNode result = getAsNode("book?filter=(authors.name=='Thomas Harris',publisher.name=='Default publisher')&page[totals]");
+
+        assertEquals(2, result.get("data").size());
+
+        JsonNode pageNode = result.get("meta").get("page");
+        assertNotNull(pageNode);
+        assertEquals(pageNode.get("totalRecords").asInt(), 2);
+
+        result = getAsNode("book?filter=(authors.name=='Thomas Harris')&page[totals]");
+        assertEquals(2, result.get("data").size());
+
+        pageNode = result.get("meta").get("page");
+        assertNotNull(pageNode);
+        assertEquals(pageNode.get("totalRecords").asInt(), 2);
+
+        result = getAsNode("book?filter=(publisher.name=='Default publisher')&page[totals]");
+        assertEquals(1, result.get("data").size());
+
+        pageNode = result.get("meta").get("page");
+        assertNotNull(pageNode);
+        assertEquals(pageNode.get("totalRecords").asInt(), 1);
+    }
+
+    @Test
+    void testGetBadRelationshipNameWithNestedFieldFilter() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode(
+                "book?filter[book.author12.name]=Null Ned", HttpStatus.SC_BAD_REQUEST);
+
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Unknown field in filter: author12\n"
+                        + "Invalid query parameter: filter[book.author12.name]");
+
+        /* Test RSQL Global */
+        result = getAsNode("book?filter=author12.name=='Null Ned'", HttpStatus.SC_BAD_REQUEST);
+
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Invalid filter format: filter\n"
+                        + "No such association author12 for type book\n"
+                        + "Invalid filter format: filter\n"
+                        + "Invalid query parameter: filter");
+    }
+
+    @Test
+    void testGetBooksFilteredByAuthors() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode("book?filter[book.authors.name]=Null Ned");
+
+        assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
+
+        for (JsonNode book : result.get("data")) {
+            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
+            assertEquals(authorId, nullNedId);
+        }
+
+        /* Test RSQL Global */
+        result = getAsNode("book?filter=authors.name=='Null Ned'");
+
+        assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
+
+        for (JsonNode book : result.get("data")) {
+            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
+            assertEquals(authorId, nullNedId);
+        }
+    }
+
+    @Test
+    void testGetBooksFilteredByAuthorsId() throws JsonProcessingException {
+        String nullNedIdStr = String.valueOf(nullNedId);
+        /* Test Default */
+        JsonNode result = getAsNode("book?filter[book.authors.id]=" + nullNedIdStr);
+
+        assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
+
+        for (JsonNode book : result.get("data")) {
+            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
+            assertEquals(authorId, nullNedId);
+        }
+
+        /* Test RSQL Global */
+        result = getAsNode("book?filter=authors.id==" + nullNedIdStr);
+
+        assertEquals(result.get("data").size(), nullNedBooks.get("data").size());
+
+        for (JsonNode book : result.get("data")) {
+            String authorId = book.get("relationships").get("authors").get("data").get(0).get("id").asText();
+            assertEquals(authorId, nullNedId);
+        }
+    }
+
+    @Test
+    void testGetBooksFilteredByAuthorAndTitle() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode("book?filter[book.authors.name]=Null Ned&filter[book.title]=Life with Null Ned");
+
+        assertEquals(result.get("data").size(), 1);
+        assertEquals(result.get("data").get(0).get("attributes").get("title").asText(), "Life with Null Ned");
+        assertEquals(
+                result.get("data").get(0).get("relationships").get("authors").get("data").get(0).get("id").asText(),
+                nullNedId);
+
+        /* Test RSQL Global */
+        result = getAsNode("book?filter=authors.name=='Null Ned';title=='Life with Null Ned'");
+
+        assertEquals(result.get("data").size(), 1);
+        assertEquals(result.get("data").get(0).get("attributes").get("title").asText(), "Life with Null Ned");
+        assertEquals(
+                result.get("data").get(0).get("relationships").get("authors").get("data").get(0).get("id").asText(),
+                nullNedId);
+    }
+
+    @Test
+    void testFilterAuthorsByBookChapterTitle() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode("/author?sort=-name&filter[author.books.chapters.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!");
+
+        assertEquals(result.get("data").size(), 2);
+
+        for (JsonNode author : result.get("data")) {
+            String name = author.get("attributes").get("name").asText();
+            assertTrue(name.equals("Isaac Asimov") || name.equals("Null Ned"));
+        }
+
+        /* Test RSQL Global */
+        result = getAsNode("/author?filter=books.chapters.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')");
+
+        assertEquals(result.get("data").size(), 2);
+
+        for (JsonNode author : result.get("data")) {
+            String name = author.get("attributes").get("name").asText();
+            assertTrue(name.equals("Isaac Asimov") || name.equals("Null Ned"));
+        }
+    }
+
+    @Test
+    void testFilterAuthorBookByPublisher() throws JsonProcessingException {
+        /* Test default */
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.publisher.name]=Default publisher", hemingwayId));
+        JsonNode data = result.get("data");
+        assertEquals(data.size(), 1);
+
+        for (JsonNode book : data) {
+            String name = book.get("attributes").get("title").asText();
+            assertEquals("The Old Man and the Sea", name);
+        }
+
+        /* Test RSQL */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=publisher.name=='Default publisher'", hemingwayId));
+
+        data = result.get("data");
+        assertEquals(data.size(), 1);
+
+        for (JsonNode book : data) {
+            String name = book.get("attributes").get("title").asText();
+            assertEquals("The Old Man and the Sea", name);
+        }
+    }
+
+    /**
+     * Tests a computed relationship filter.
+     */
+    @Test
+    void testFilterBookByEditor() {
+        given()
+                .get("/book?filter[book]=editor.firstName=='John'")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data.attributes.title", contains("The Old Man and the Sea"))
+                .body("data", hasSize(1));
+
+
+        given()
+                .get("/book?filter[book]=editor.firstName=='Foobar'")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(0));
+    }
+
+    /**
+     * Tests a computed attribute filter.
+     */
+    @Test
+    void testFilterEditorByFullName() {
+
+        given()
+                .get("/editor?filter[editor]=fullName=='John Doe'")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data.attributes.firstName", contains("John"))
+                .body("data.attributes.lastName", contains("Doe"))
+                .body("data", hasSize(1));
+
+        given()
+                .get("/editor?filter[editor]=fullName=='Foobar'")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(0));
+    }
+
+    @Test
+    void testFilterByAuthorBookByChapter() {
+        /* Test default */
+        given()
+                .get(String.format("/author/%s/books?filter[book.chapters.title]=Viva la Roma!", asimovId))
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(1));
+
+        /* Test RSQL */
+        given()
+                .get(String.format("/author/%s/books?filter[book]=chapters.title=='Viva la Roma!'", asimovId))
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(1));
+
+        /* Test default */
+        given()
+                .get(String.format("/author/%s/books?filter[book.chapters.title]=None", hemingwayId))
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(0));
+
+        /* Test RSQL */
+        given()
+                .get(String.format("/author/%s/books?filter[book]=chapters.title=='None'", hemingwayId))
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data", hasSize(0));
+    }
+
+    @Test
+    void testFilterBookByAuthorAddress() throws JsonProcessingException {
+        /* Test default */
+        JsonNode result = getAsNode("book?filter[book.authors.homeAddress]=main&include=authors");
+        JsonNode data = result.get("data");
+        assertEquals(0, data.size(), result.toString());
+
+        /* Test RSQL */
+        result = getAsNode("book?filter=authors.homeAddress=='main'");
+        data = result.get("data");
+        assertEquals(0, data.size(), result.toString());
+    }
+
+
+    @Test
+    void testGetBadRelationshipRoot() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode(
+                "/author?filter[idontexist.books.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Unknown entity in filter: idontexist\n"
+                        + "Invalid query parameter: filter[idontexist.books.title][in]");
+
+        /* Test RSQL Global */
+        result = getAsNode(
+                "/author?filter=idontexist.books.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Invalid filter format: filter\n"
+                        + "No such association idontexist for type author\n"
+                        + "Invalid filter format: filter\n"
+                        + "Invalid query parameter: filter");
+    }
+
+    @Test
+    void testGetBadRelationshipIntermediate() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode(
+                "/author?filter[author.idontexist.title][in]=Viva la Roma!,Mamma mia I wantz some pizza!",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Unknown field in filter: idontexist\n"
+                        + "Invalid query parameter: filter[author.idontexist.title][in]");
+
+        /* Test RSQL Global */
+        result = getAsNode(
+                "/author?filter=idontexist.title=in=('Viva la Roma!','Mamma mia I wantz some pizza!')",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Invalid filter format: filter\n"
+                        + "No such association idontexist for type author\n"
+                        + "Invalid filter format: filter\n"
+                        + "Invalid query parameter: filter");
+    }
+
+    @Test
+    void testGetBadRelationshipLeaf() throws JsonProcessingException {
+        /* Test Default */
+        JsonNode result = getAsNode(
+                "/author?filter[author.books.idontexist][in]=Viva la Roma!,Mamma mia I wantz some pizza!",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Unknown field in filter: idontexist\n"
+                        + "Invalid query parameter: filter[author.books.idontexist][in]");
+
+        /* Test RSQL Global */
+        result = getAsNode(
+                "/author?filter=books.idontexist=in=('Viva la Roma!','Mamma mia I wantz some pizza!')",
+                HttpStatus.SC_BAD_REQUEST);
+        assertEquals(result.get("errors").get(0).get("detail").asText(),
+                "Invalid filter format: filter\n"
+                        + "No such association idontexist for type book\n"
+                        + "Invalid filter format: filter\n"
+                        + "Invalid query parameter: filter");
+    }
+
+    /*
+     * Verify that a combination of filters and order by generate working SQL.
+     */
+    @Test
+    void testFilterWithSort() throws JsonProcessingException {
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.title][notnull]=true&sort=title", asimovId));
+        JsonNode data = result.get("data");
+        assertEquals(data.size(), 2);
+    }
+
+    @Test
+    void testBetweenOperatorOnRoot() throws JsonProcessingException {
+        JsonNode result = getAsNode("/book?filter[book.id][between]=2,4");
+        JsonNode data = result.get("data");
+        assertEquals(3, data.size());
+        for (JsonNode book : data) {
+            assertTrue(Arrays.asList(2, 3, 4).contains(book.get("id").asInt()));
+        }
+
+        result = getAsNode("/book?filter=id=notbetween=(2,4);id!=7");
+        data = result.get("data");
+        assertEquals(4, data.size());
+        for (JsonNode book : data) {
+            assertTrue(Arrays.asList(1, 5, 6, 8).contains(book.get("id").asInt()));
+        }
+    }
+
+    @Test
+    void testBetweenOperatorOnNonRoot() throws JsonProcessingException {
+        JsonNode result = getAsNode(String.format("/author/%s/books?filter[book.id][notbetween]=6,7", nullNedId));
+        JsonNode data = result.get("data");
+        assertEquals(1, data.size());
+        for (JsonNode book : data) {
+            assertEquals(8, book.get("id").asInt());
+        }
+
+        result = getAsNode(String.format("/author/%s/books?filter[book]=id=between=(6,7)", nullNedId));
+        data = result.get("data");
+        assertEquals(1, data.size());
+        for (JsonNode book : data) {
+            assertEquals(7, book.get("id").asInt());
+        }
+    }
+
+
+    @Test
+    void testIsEmptyRelationshipOnRoot() throws JsonProcessingException {
+        //Book has ToMany relationship with chapter
+        Set<JsonNode> bookIdsWithEmptyChapters = new HashSet<>();
+        JsonNode result;
+
+        for (JsonNode book : books.get("data")) {
+            if (book.get("relationships").get("chapters").get("data").isEmpty()) {
+                bookIdsWithEmptyChapters.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithEmptyChapters));
+
+        /* Test Default */
+        result = getAsNode("/book?filter[book.chapters][isempty]");
+
+        assertEquals(bookIdsWithEmptyChapters.size(), result.get("data").size());
+
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithEmptyChapters.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = true */
+        result = getAsNode("/book?filter[book]=chapters=isempty=true");
+
+        assertEquals(result.get("data").size(), bookIdsWithEmptyChapters.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithEmptyChapters.contains(book.get("id")));
+        }
+
+        /* param = 1 */
+        // Global Expression
+        result = getAsNode(String.format("/book?filter=chapters=isempty=1"));
+
+        assertEquals(result.get("data").size(), bookIdsWithEmptyChapters.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithEmptyChapters.contains(book.get("id")));
+        }
+
+    }
+
+    @Test
+    void testNotEmptyRelationshipOnNonRoot() throws JsonProcessingException {
+        //Book has ToMany relationship with chapter
+        Set<JsonNode> bookIdsWithNonEmptyChapters = new HashSet<>();
+        JsonNode result;
+        for (JsonNode book : nullNedBooks.get("data")) {
+            if (!book.get("relationships").get("chapters").get("data").isEmpty()) {
+                bookIdsWithNonEmptyChapters.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNonEmptyChapters));
+
+        /* Test Default */
+        result = getAsNode(String.format("/author/%s/books?filter[book.chapters][notempty]", nullNedId));
+
+        assertEquals(bookIdsWithNonEmptyChapters.size(), result.get("data").size());
+
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithNonEmptyChapters.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = false */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=chapters=isempty=false", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonEmptyChapters.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithNonEmptyChapters.contains(book.get("id")));
+        }
+
+        /* param = 0 */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=chapters=isempty=0", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonEmptyChapters.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("relationships").get("chapters").get("data").isEmpty());
+            assertTrue(bookIdsWithNonEmptyChapters.contains(book.get("id")));
+        }
+
+    }
+
+    @Test
+    @Tag("excludeOnHibernate3")
+    @Tag("excludeOnHibernate5")
+    @Tag("excludeOnJPA")
+    void testNotEmptyAttributeOnRoot() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithNonEmptyAwards = new HashSet<>();
+        JsonNode result;
+
+        for (JsonNode book : books.get("data")) {
+            if (!book.get("attributes").get("awards").isEmpty()) {
+                bookIdsWithNonEmptyAwards.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithNonEmptyAwards));
+
+        /* Test Default */
+        result = getAsNode("/book?filter[book.awards][notempty]");
+
+        assertEquals(bookIdsWithNonEmptyAwards.size(), result.get("data").size());
+
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithNonEmptyAwards.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = true */
+        //Typed Expression
+        result = getAsNode("/book?filter[book]=awards=isempty=false");
+
+        assertEquals(result.get("data").size(), bookIdsWithNonEmptyAwards.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithNonEmptyAwards.contains(book.get("id")));
+        }
+
+        /* param = 1 */
+        //Global Expression
+        result = getAsNode(String.format("/book?filter=awards=isempty=0"));
+
+        assertEquals(result.get("data").size(), bookIdsWithNonEmptyAwards.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertFalse(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithNonEmptyAwards.contains(book.get("id")));
+        }
+
+    }
+
+    @Test
+    @Tag("excludeOnHibernate3")
+    @Tag("excludeOnHibernate5")
+    @Tag("excludeOnJPA")
+    void testIsEmptyAttributesOnNonRoot() throws JsonProcessingException {
+        Set<JsonNode> bookIdsWithEmptyAwards = new HashSet<>();
+        JsonNode result;
+        for (JsonNode book : nullNedBooks.get("data")) {
+            if (book.get("attributes").get("awards").isEmpty()) {
+                bookIdsWithEmptyAwards.add(book.get("id"));
+            }
+        }
+
+        assertTrue(CollectionUtils.isNotEmpty(bookIdsWithEmptyAwards));
+
+        /* Test Default */
+        result = getAsNode(String.format("/author/%s/books?filter[book.awards][isempty]", nullNedId));
+
+        assertEquals(bookIdsWithEmptyAwards.size(), result.get("data").size());
+
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithEmptyAwards.contains(book.get("id")));
+        }
+
+        /* Test RSQL Typed */
+        /* param = false */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=awards=isempty=true", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithEmptyAwards.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithEmptyAwards.contains(book.get("id")));
+        }
+
+        /* param = 0 */
+        result = getAsNode(String.format("/author/%s/books?filter[book]=awards=isempty=1", nullNedId));
+
+        assertEquals(result.get("data").size(), bookIdsWithEmptyAwards.size());
+
+        for (JsonNode book : result.get("data")) {
+            assertTrue(book.get("attributes").get("awards").isEmpty());
+            assertTrue(bookIdsWithEmptyAwards.contains(book.get("id")));
+        }
+
+    }
+
+    @Test
+    void testExceptionOnEmptyOperator() throws JsonProcessingException {
+        JsonNode result;
+        // Typed Expression
+        result = getAsNode(String.format("/author/%s/books?filter[book.authors.name][notempty]", nullNedId), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid predicate: book.authors.name NOTEMPTY []\n"
+                        + "Invalid query parameter: filter[book.authors.name][notempty]\n"
+                        + "Invalid toMany join. toMany association has to be the target collection.book.authors.name NOTEMPTY []\n"
+                        + "Invalid query parameter: filter[book.authors.name][notempty]",
+                result.get("errors").get(0).get("detail").asText()
+        );
+
+        //RSQL
+        result = getAsNode(String.format("/author/%s/books?filter[book]=authors.name=isempty=true", nullNedId), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid filter format: filter[book]\n"
+                        + "Invalid query parameter: filter[book]\n"
+                        + "Invalid filter format: filter[book]\n"
+                        + "Invalid association authors.name. toMany association has to be the target collection.",
+                result.get("errors").get(0).get("detail").asText()
+        );
+    }
+
+    @Test
+    @Tag("excludeOnHibernate3")
+    void testMemberOfOnAttributes() {
+        String filterString = "Booker Prize";
+        Set<String> awardBook = new HashSet<>();
+        Set<String> nullNedAwardBook = new HashSet<>();
+
+
+        // * Filter On Root Entity *
+        for (JsonNode book : books.get("data")) {
+            Iterator<JsonNode> awards = book.get("attributes").get("awards").elements();
+            while (awards.hasNext()) {
+                if (awards.next().asText().equals(filterString)) {
+                    awardBook.add(book.get("id").asText());
+                    break;
+                }
+            }
+        }
+        // Test Default filter type on Root Entity
+        when()
+                .get(String.format("/book?filter[book.awards][hasmember]=%s", filterString))
+                .then()
+                .body("data", hasSize(awardBook.size()),
+                        "data.id", contains(awardBook.toArray())
+                );
+
+
+        // Test RSQL type filter on Root Entity
+        when()
+                .get(String.format("/book?filter[book]=awards=hasmember=\"%s\"", filterString))
+                .then()
+                .body("data", hasSize(awardBook.size()),
+                        "data.id", contains(awardBook.toArray())
+                );
+
+
+        // * Filter On Non Root Entity *
+        for (JsonNode book : nullNedBooks.get("data")) {
+            Iterator<JsonNode> awards = book.get("attributes").get("awards").elements();
+            while (awards.hasNext()) {
+                if (awards.next().asText().equals(filterString)) {
+                    nullNedAwardBook.add(book.get("id").asText());
+                    break;
+                }
+            }
+        }
+// Disabled for bug in Hibernate - https://hibernate.atlassian.net/browse/HHH-13990
+//        // Test Default filter type on NonRoot Entity
+//        when()
+//                .get(String.format("/author/%s/books?filter[book.awards][hasmember]=%s", nullNedId, filterString))
+//                .then()
+//                .body("data", hasSize(nullNedAwardBook.size()),
+//                        "data.id", contains(nullNedAwardBook.toArray())
+//                );
+//
+//
+//
+//        // Test RSQL type filter on NonRoot Entity
+//        when()
+//                .get(String.format("/author/%s/books?filter[book]=awards=hasmember=\"%s\"", nullNedId, filterString))
+//                .then()
+//                .body("data", hasSize(nullNedAwardBook.size()),
+//                        "data.id", contains(nullNedAwardBook.toArray())
+//                );
+    }
+
+    @Test
+    @Tag("excludeOnHibernate3")
+    void testMembertoOneRelationships() {
+        String phoneNumber = "987-654-3210";
+        Set<String> publisherBook = new HashSet<>();
+
+
+        // * Filter On Root Entity *
+        for (JsonNode book : books.get("data")) {
+            int publisherId = book.get("relationships").get("publisher").get("data").get("id").asInt();
+            if (publisherId == 1) {
+                publisherBook.add(book.get("id").asText());
+                break;
+            }
+        }
+        // Test Default filter type on Root Entity
+        when()
+                .get(String.format("/book?filter[book.publisher.phoneNumbers][hasmember]=%s", phoneNumber))
+                .then()
+                .body("data", hasSize(publisherBook.size()),
+                        "data.id", contains(publisherBook.toArray())
+                );
+
+        // Test RSQL type filter on Root Entity
+        when()
+                .get(String.format("/book?filter[book]=publisher.phoneNumbers=hasmember=\"%s\"", phoneNumber))
+                .then()
+                .body("data", hasSize(publisherBook.size()),
+                        "data.id", contains(publisherBook.toArray())
+                );
+
+    }
+
+    @Test
+    void testRootMemberOfToManyRelationshipConjunction() {
+        /* RSQL Global */
+        when()
+                .get("/book?filter=authors.id=hasmember=1;authors.id=hasmember=2")
+                .then()
+                .body("data", hasSize(1))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[0].data.id[1]", equalTo("2"));
+    }
+
+    @Test
+    void testRootMemberOfToManyRelationship() {
+        /* RSQL Global */
+        when()
+                .get("/book?filter=authors.id=hasmember=1")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+
+
+        /* RSQL Typed */
+        when()
+                .get("/book?filter[book]=authors.id=hasmember=1")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+
+        /* Default */
+        when()
+                .get("/book?filter[book.authors.id][hasmember]=1")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+    }
+
+    @Test
+    void testRootMemberOfAndNotMemberOfToManyRelationship() {
+        /* RSQL Global */
+        when()
+                .get("/book?filter=authors.id=hasmember=1;authors.id=hasnomember=3")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+
+        /* RSQL Typed */
+        when()
+                .get("/book?filter[book]=authors.id=hasmember=1;authors.id=hasnomember=3")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+
+        /* Default */
+        when()
+                .get("/book?filter[book.authors.id][hasmember]=1&filter[book.authors.id][hasnomember]=3")
+                .then()
+                .body("data.relationships.authors", hasSize(2))
+                .body("data.relationships.authors[0].data.id[0]", equalTo("1"))
+                .body("data.relationships.authors[1].data.id[0]", equalTo("1"));
+    }
+
+    @Test
+    void testSubcollectionComplexAttribute() throws Exception {
+        JsonNode priceyBooks = getAsNode("/author/1/books?filter[book]=price.total>=10");
+
+        assertEquals(2, priceyBooks.get("data").size());
+
+        priceyBooks = getAsNode("/book?filter[book]=price.total<5");
+
+        assertEquals(0, priceyBooks.get("data").size());
+    }
+
+    @Test
+    void testSubcollectionNestedComplexAttribute() throws Exception {
+        JsonNode priceyBooks = getAsNode("/author/1/books?filter[book]=price.currency.isoCode==AED");
+
+        assertEquals(1, priceyBooks.get("data").size());
+
+        priceyBooks = getAsNode("/author/1/books?filter[book]=price.currency.isoCode==ABC");
+
+        assertEquals(0, priceyBooks.get("data").size());
+    }
+
+    @Test
+    void testSubcollectionMemberOfToManyRelationship() {
+        /* RSQL Typed */
+        when()
+                .get("/author/5/books?filter[book]=chapters.title=hasmember='Mamma mia I wantz some pizza!'")
+                .then()
+                .body("data.relationships.chapters", hasSize(1))
+                .body("data.relationships.chapters[0].data.id[0]", equalTo("2"));
+
+        /* Default */
+        when()
+                .get("/author/5/books?filter[book.chapters.title][hasmember]=Mamma mia I wantz some pizza!")
+                .then()
+                .body("data.relationships.chapters", hasSize(1))
+                .body("data.relationships.chapters[0].data.id[0]", equalTo("2"));
+    }
+
+    @Test
+    void testSubcollectionMemberOfToManyRelationshipConjunction() {
+        /* RSQL Typed */
+        when()
+                .get("/author/5/books?filter[book]=chapters.title=hasmember='Mamma mia I wantz some pizza!';chapters.title=hasnomember='Foo'")
+                .then()
+                .body("data.relationships.chapters", hasSize(1))
+                .body("data.relationships.chapters[0].data.id[0]", equalTo("2"));
+
+        /* Default */
+        when()
+                .get("/author/5/books?filter[book.chapters.title][hasmember]=Mamma mia I wantz some pizza!&filter[book.chapters.title][hasnomember]=Foo")
+                .then()
+                .body("data.relationships.chapters", hasSize(1))
+                .body("data.relationships.chapters[0].data.id[0]", equalTo("2"));
+    }
+
+    @Test
+    @Tag("excludeOnHibernate3")
+    void testExceptionOnMemberOfOperator() throws JsonProcessingException {
+        JsonNode result;
+        // Typed Expression
+        result = getAsNode(String.format("/author/%s/books?filter[book.authors][hasmember]", nullNedId), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid predicate: book.authors HASMEMBER []\n"
+                        + "Invalid query parameter: filter[book.authors][hasmember]\n"
+                        + "Invalid Path: Last Path Element cannot be a collection type\n"
+                        + "Invalid query parameter: filter[book.authors][hasmember]",
+                result.get("errors").get(0).get("detail").asText()
+        );
+
+        //RSQL
+        result = getAsNode(String.format("/author/%s/books?filter[book]=authors=hasmember=true", nullNedId), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid filter format: filter[book]\n"
+                        + "Invalid query parameter: filter[book]\n"
+                        + "Invalid filter format: filter[book]\n"
+                        + "Invalid Path: Last Path Element cannot be a collection type",
+                result.get("errors").get(0).get("detail").asText()
+        );
+
+
+        // Test RSQL type filter on Root Entity
+        result = getAsNode(String.format("/book?filter[book]=publisher.name=hasmember=\"%s\"", "Default publisher"), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid filter format: filter[book]\n"
+                        + "Invalid query parameter: filter[book]\n"
+                        + "Invalid filter format: filter[book]\n"
+                        + "Invalid Path: Last Path Element has to be a collection type",
+                result.get("errors").get(0).get("detail").asText()
+        );
+        result = getAsNode(String.format("/book?filter[book]=title=hasnomember=\"%s\"", "*The*"), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid filter format: filter[book]\n"
+                        + "Invalid query parameter: filter[book]\n"
+                        + "Invalid filter format: filter[book]\n"
+                        + "Invalid Path: Last Path Element has to be a collection type",
+                result.get("errors").get(0).get("detail").asText()
+        );
+        result = getAsNode(String.format("/book?filter[book.title][hasmember]=\"%s\"", "*The*"), HttpStatus.SC_BAD_REQUEST);
+        assertEquals(
+                "Invalid Path: Last Path Element has to be a collection type\n"
+                        + "Invalid query parameter: filter[book.title][hasmember]",
+                result.get("errors").get(0).get("detail").asText()
+        );
+    }
+
+    @AfterAll
+    void cleanUp() {
+        for (int id : authorIds) {
+            given()
+                    .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                    .delete("/author/" + id);
+        }
+        for (int id : bookIds) {
+            given()
+                    .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                    .delete("/book/" + id);
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GenerateIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GenerateIT.java
new file mode 100644
index 0000000000..2737fdaf77
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GenerateIT.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.notNullValue;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests for UserType
+ */
+class GenerateIT extends IntegrationTest {
+
+    @Test
+    @Tag("skipInMemory")
+    public void testGeneratePost() {
+
+        Resource resource = resource(
+                type("generate"),
+                id("1")
+        );
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(resource))
+            .post("/generate")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED)
+            .body("data.attributes.created", notNullValue());
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java
new file mode 100644
index 0000000000..a5ebc923c2
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java
@@ -0,0 +1,741 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.UNQUOTED_VALUE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.query;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.variableDefinition;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.variableDefinitions;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.GraphQLIntegrationTest;
+import com.yahoo.elide.test.graphql.VariableFieldSerializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import example.Currency;
+import example.Price;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * GraphQL integration tests.
+ */
+public class GraphQLIT extends GraphQLIntegrationTest {
+
+    private static class Book {
+        @Getter
+        @Setter
+        private long id;
+
+        @Getter
+        @Setter
+        @JsonSerialize(using = VariableFieldSerializer.class, as = String.class)
+        private String title;
+
+        @Getter
+        @Setter
+        private Price price;
+
+        private Collection<example.Author> authors = new ArrayList<>();
+    }
+
+    private static class Author {
+        @Getter
+        @Setter
+        private Long id;
+
+        @Getter
+        @Setter
+        @JsonSerialize(using = VariableFieldSerializer.class, as = String.class)
+        private String name;
+    }
+
+    @BeforeEach
+    public void createBookAndAuthor() throws IOException {
+        // before each test, create a new book and a new author
+        Book book = new Book();
+        book.setId(1);
+        book.setTitle("1984");
+        Price price = new Price();
+        price.setTotal(BigDecimal.valueOf(10.0));
+        price.setCurrency(new Currency("USD"));
+        book.setPrice(price);
+
+        Author author = new Author();
+        author.setId(1L);
+        author.setName("George Orwell");
+
+        String graphQLQuery = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title"),
+                                                field(
+                                                        "authors",
+                                                        arguments(
+                                                                argument("op", "UPSERT"),
+                                                                argument("data", author)
+                                                        ),
+                                                        selections(
+                                                                field("id"),
+                                                                field("name")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "1984"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "1"),
+                                                        field("name", "George Orwell")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLQuery, expectedResponse);
+    }
+
+    @Test
+    public void createWithVariables() throws IOException {
+        // create a second book using variable
+        Book book = new Book();
+        book.setId(2);
+        book.setTitle("$bookName");
+
+        Author author = new Author();
+        author.setId(2L);
+        author.setName("$authorName");
+
+        String graphQLRequest = document(
+                mutation(
+                        "myMutation",
+                        variableDefinitions(
+                                variableDefinition("bookName", "String"),
+                                variableDefinition("authorName", "String")
+                        ),
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book, UNQUOTED_VALUE)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title"),
+                                                field(
+                                                        "authors",
+                                                        arguments(
+                                                                argument("op", "UPSERT"),
+                                                                argument("data", author, UNQUOTED_VALUE)
+                                                        ),
+                                                        selections(
+                                                                field("id"),
+                                                                field("name")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "Grapes of Wrath"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "2"),
+                                                        field("name", "John Setinbeck")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("bookName", "Grapes of Wrath");
+        variables.put("authorName", "John Setinbeck");
+
+        runQueryWithExpectedResult(graphQLRequest, variables, expected);
+    }
+
+    @Test
+    public void fetchCollection() throws IOException {
+        // create a second book
+        createWithVariables();
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("title"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id"),
+                                                        field("name")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "1984"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "1"),
+                                                        field("name", "George Orwell")
+                                                )
+                                        )
+                                ),
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "Grapes of Wrath"),
+                                        field(
+                                                "authors",
+                                                selections(
+                                                        field("id", "2"),
+                                                        field("name", "John Setinbeck")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void testFilterByComplexAttribute() throws IOException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("filter", "\"price.total>=5\"")
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "1984")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+
+        graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("filter", "\"price.total<=5\"")
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        expectedResponse = "{\"data\": {\"book\": {\"edges\": []}}}";
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+    }
+
+    @Test
+    public void testFilterByNestedComplexAttribute() throws IOException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("filter", "\"price.currency.isoCode==USD\"")
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "1984")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+
+        graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("filter", "\"price.currency.isoCode==ABC\"")
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        expectedResponse = "{\"data\": {\"book\": {\"edges\": []}}}";
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+    }
+
+    @Test
+    public void testInvalidFetch() throws IOException {
+        Book book = new Book();
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                arguments(
+                                        argument("op", "FETCH"),
+                                        argument("data", book)
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "{\"data\":{\"book\":null},\"errors\":[{\"message\":\"Exception while fetching data "
+                + "(/book) : FETCH must not include data\","
+                + "\"locations\":[{\"line\":1,\"column\":2}],\"path\":[\"book\"],"
+                + "\"extensions\":{\"classification\":\"DataFetchingException\"}}]}";
+
+        runQueryWithExpectedResult(graphQLRequest, expected);
+    }
+
+    @Test
+    public void fetchRootSingle() throws IOException {
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                argument(
+                                        argument(
+                                                "ids",
+                                                Arrays.asList("1")
+                                        )
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("title", "1984")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+    }
+
+    @Test
+    public void runUpdateAndFetchDifferentTransactionsBatch() throws IOException {
+        Book book = new Book();
+        book.setId(2);
+        book.setTitle("my book created in batch!");
+
+        String graphQLRequest1 = document(
+                mutation(
+                        selection(
+                                field(
+                                        "book",
+                                        arguments(
+                                                argument("op", "UPSERT"),
+                                                argument("data", book)
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("title")
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String graphQLRequest2 = document(
+                selection(
+                        field(
+                                "book",
+                                argument(argument("ids", "\"2\"")),
+                                selections(
+                                        field("id"),
+                                        field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "my book created in batch!")
+                                )
+                        )
+                ),
+                selections(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "2"),
+                                        field("title", "my book created in batch!")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        compareJsonObject(
+                runQuery(toJsonArray(toJsonNode(graphQLRequest1), toJsonNode(graphQLRequest2)), NO_VERSION),
+                expectedResponse
+        );
+    }
+
+    @Test
+    public void runMultipleRequestsSameTransactionWithAliases() throws IOException {
+        // This test demonstrates that multiple roots can be manipulated within a _single_ transaction
+        String graphQLRequest = document(
+                selections(
+                        field(
+                                "firstAuthorCollection",
+                                "author",
+                                selections(
+                                        field("id"),
+                                        field("name")
+                                )
+                        ),
+                        field(
+                                "secondAuthorCollection",
+                                "author",
+                                selections(
+                                        field("id"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expectedResponse = document(
+                selections(
+                        field(
+                                "firstAuthorCollection",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "George Orwell")
+                                )
+                        ),
+                        field(
+                                "secondAuthorCollection",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "George Orwell")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+    }
+
+    @Tag("skipInMemory") //Elide doesn't support to-many filter joins in memory yet.
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "\"books.title==\\\"1984\\\"\"",
+            "\"books.id=isnull=false\"",
+            "\"books.title=in=(\\\"1984\\\")\""})
+    public void runManyToManyFilter(String filter) throws IOException {
+        String graphQLRequest = document(
+            query(
+                selections(
+                        field(
+                                "author",
+                                arguments(
+                                        argument("filter", filter)
+                                ),
+                                selections(
+                                        field("id"),
+                                        field("name"),
+                                        field(
+                                                "books",
+                                                selections(
+                                                        field("id"),
+                                                        field("title")
+                                                )
+                                        )
+                                        )
+                        )
+                )
+            )
+        ).toQuery();
+
+        String expectedResponse = document(
+            selection(
+                    field(
+                            "author",
+                            selections(
+                                    field("id", "1"),
+                                    field("name", "George Orwell"),
+                                    field(
+                                            "books",
+                                            selections(
+                                                    field("id", "1"),
+                                                    field("title", "1984")
+                                            )
+                                    )
+                            )
+                    )
+            )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, expectedResponse);
+    }
+
+    @Test
+    public void testTypeIntrospection() throws Exception {
+        String graphQLRequest = "{"
+                + "__type(name: \"Book\") {"
+                + "   name"
+                + "   fields {"
+                + "     name"
+                + "   }"
+                + "}"
+                + "}";
+
+        String query = toJsonQuery(graphQLRequest, new HashMap<>());
+
+        given()
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON)
+            .body(query)
+            .post("/graphQL")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body("data.__type.fields.name", containsInAnyOrder("id", "awards", "chapterCount",
+                    "editorName", "genre", "language", "publishDate", "title", "authors", "chapters", "price",
+                    "editor", "publisher"));
+    }
+
+    @Test
+    public void testVersionedTypeIntrospection() throws Exception {
+        String graphQLRequest = "{"
+                + "__type(name: \"Book\") {"
+                + "   name"
+                + "   fields {"
+                + "     name"
+                + "   }"
+                + "}"
+                + "}";
+
+        String query = toJsonQuery(graphQLRequest, new HashMap<>());
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .header("ApiVersion", "1.0")
+                .body(query)
+                .post("/graphQL")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.__type.fields.name", containsInAnyOrder("id", "name", "publishDate"));
+    }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common underlying database table.
+    public void fetchCollectionVersioned() throws IOException {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = document(
+                selections(
+                        field(
+                                "book",
+                                selections(
+                                        field("id", "1"),
+                                        field("name", "1984")
+                                )
+                        )
+                )
+        ).toResponse();
+
+        runQueryWithExpectedResult(graphQLRequest, null, expected, "1.0");
+    }
+
+    @Test
+    public void testInvalidApiVersion() throws IOException {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "book",
+                                selections(
+                                        field("id"),
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "{\"errors\":[{\"message\":\"Invalid operation: Invalid API Version\"}]}";
+
+        String query = toJsonQuery(graphQLRequest, new HashMap<>());
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .header("ApiVersion", "2.0")
+                .body(query)
+                .post("/graphQL")
+                .then()
+                .body(equalTo(expected))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testMissingVersionedModel() throws IOException {
+
+        String graphQLRequest = document(
+                selection(
+                        field(
+                                "parent",
+                                selections(
+                                        field("id")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "{\"errors\":[{\"message\":\"Bad Request Body&#39;Unknown entity {parent}.&#39;\"}]}";
+
+        runQueryWithExpectedResult(graphQLRequest, null, expected, "1.0");
+    }
+
+    private String toJsonArray(JsonNode... nodes) throws IOException {
+        ArrayNode arrayNode = JsonNodeFactory.instance.arrayNode();
+        for (JsonNode node : nodes) {
+            arrayNode.add(node);
+        }
+        return mapper.writeValueAsString(arrayNode);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/MapEnumIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/MapEnumIT.java
new file mode 100644
index 0000000000..ad76349585
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/MapEnumIT.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Test rehydration of Map of Enums.
+ */
+class MapEnumIT extends IntegrationTest {
+    @Test
+    public void testPostColorShape() {
+
+        Map<String, String> colorMap = new HashMap<>();
+        colorMap.put("Red", "Circle");
+
+        // Create MapColorShape using Post
+        Resource resource = resource(
+                type("mapColorShape"),
+                id("1"),
+                attributes(
+                        attr("colorShapeMap", colorMap)
+                )
+        );
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(resource))
+                .post("/mapColorShape")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(equalTo(datum(resource).toJSON()));
+
+        colorMap.clear();
+        colorMap.put("Blue", "Square");
+
+        // Update MapColorShape using Patch
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(resource))
+                .patch("/mapColorShape/1")
+                .then().statusCode(HttpStatus.SC_NO_CONTENT);
+
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/mapColorShape/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(datum(resource).toJSON()));
+    }
+
+    @Test
+    public void testPatchExtensionColorShape() {
+        Map<String, String> colorMap = new HashMap<>();
+        colorMap.put("Blue", "Triangle");
+
+        // Create MapColorShape using Post
+        Resource resource = resource(
+                type("mapColorShape"),
+                id("1"),
+                attributes(
+                        attr("colorShapeMap", colorMap)
+                )
+        );
+        // Create MapColorShape using Patch extension
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body("[\n"
+                        + "{\n"
+                        + "  \"op\": \"add\",\n"
+                        + "  \"path\": \"/mapColorShape\",\n"
+                        + "  \"value\": {\n"
+                        + "  \"id\": \"12345681-1234-1234-1234-1234567890ab\",\n"
+                        + "  \"type\": \"mapColorShape\",\n"
+                        + "  \"attributes\": {\n"
+                        + "    \"colorShapeMap\": {\n"
+                        + "       \"Blue\": \"Triangle\"\n"
+                        + "     }\n"
+                        + "   }\n"
+                        + " }\n"
+                        + "}\n"
+                        + "]")
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/mapColorShape/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(datum(resource).toJSON()));
+
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/PaginateIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/PaginateIT.java
new file mode 100644
index 0000000000..40e9a9d098
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/PaginateIT.java
@@ -0,0 +1,645 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.patchOperation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.patchSet;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static com.yahoo.elide.test.jsonapi.elements.PatchOperationType.add;
+import static io.restassured.RestAssured.get;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400;
+import static org.eclipse.jetty.http.HttpStatus.CREATED_201;
+import static org.eclipse.jetty.http.HttpStatus.OK_200;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.initialization.IntegrationTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import io.restassured.response.Response;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
+
+/**
+ * Tests for pagination
+ */
+class PaginateIT extends IntegrationTest {
+
+    private String asimovId = null;
+    private String hemingwayId = null;
+    private String orsonCardId = null;
+    private String parentId = null;
+
+    @BeforeEach
+    void setup() {
+        createFamilyEntities();
+        createBookEntities();
+        createPaginationEntities();
+    }
+
+    private void createPaginationEntities() {
+        BiConsumer<String, Integer> createEntities = (type, numberOfEntities) -> {
+            IntStream.range(0, numberOfEntities).forEach(value -> given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                    datum(
+                        resource(
+                            type(type),
+                            attributes(
+                                attr("name", "A name")
+                            )
+                        )
+                    ).toJSON()
+                ).post("/" + type)
+                .then()
+                .statusCode(CREATED_201));
+            get("/" + type).path("data.id");
+        };
+
+        createEntities.accept("entityWithoutPaginate", 20);
+        createEntities.accept("entityWithPaginateCountableFalse", 5);
+        createEntities.accept("entityWithPaginateDefaultLimit", 5);
+        createEntities.accept("entityWithPaginateMaxLimit", 30);
+    }
+
+    private void createBookEntities() {
+        String tempAuthorId1 = "12345678-1234-1234-1234-1234567890ab";
+        String tempAuthorId2 = "12345679-1234-1234-1234-1234567890ab";
+        String tempAuthorId3 = "12345681-1234-1234-1234-1234567890ab";
+
+        String tempBookId1 = "12345678-1234-1234-1234-1234567890ac";
+        String tempBookId2 = "12345678-1234-1234-1234-1234567890ad";
+        String tempBookId3 = "12345679-1234-1234-1234-1234567890ac";
+        String tempBookId4 = "23451234-1234-1234-1234-1234567890ac";
+        String tempBookId5 = "12345680-1234-1234-1234-1234567890ac";
+        String tempBookId6 = "12345680-1234-1234-1234-1234567890ad";
+        String tempBookId7 = "12345681-1234-1234-1234-1234567890ac";
+        String tempBookId8 = "12345681-1234-1234-1234-1234567890ad";
+
+        String tempPubId = "12345678-1234-1234-1234-1234567890ae";
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(
+                patchSet(
+                    patchOperation(add, "/author", resource(
+                        type("author"),
+                        id(tempAuthorId1),
+                        attributes(
+                            attr("name", "Ernest Hemingway")
+                        ),
+                        relationships(
+                            relation("books",
+                                linkage(type("book"), id(tempBookId1)),
+                                linkage(type("book"), id(tempBookId2))
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/book/", resource(
+                        type("book"),
+                        id(tempBookId1),
+                        attributes(
+                            attr("title", "The Old Man and the Sea"),
+                            attr("genre", "Literary Fiction"),
+                            attr("language", "English")
+                        ),
+                        relationships(
+                            relation("publisher",
+                                linkage(type("publisher"), id(tempPubId))
+
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/book/", resource(
+                        type("book"),
+                        id(tempBookId2),
+                        attributes(
+                            attr("title", "For Whom the Bell Tolls"),
+                            attr("genre", "Literary Fiction"),
+                            attr("language", "English")
+                        )
+                    )),
+                    patchOperation(add, "/book/" + tempBookId1 + "/publisher", resource(
+                        type("publisher"),
+                        id(tempPubId),
+                        attributes(
+                            attr("name", "Default publisher")
+                        )
+                    ))
+                ).toJSON()
+            )
+            .patch("/")
+            .then()
+            .statusCode(OK_200);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(
+                patchSet(
+                    patchOperation(add, "/author", resource(
+                        type("author"),
+                        id(tempAuthorId2),
+                        attributes(
+                            attr("name", "Orson Scott Card")
+                        ),
+                        relationships(
+                            relation("books",
+                                linkage(type("book"), id(tempBookId3)),
+                                linkage(type("book"), id(tempBookId4))
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId3),
+                        attributes(
+                            attr("title", "Enders Game"),
+                            attr("genre", "Science Fiction"),
+                            attr("language", "English"),
+                            attr("publishDate", 1454638927412L)
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId4),
+                        attributes(
+                            attr("title", "Enders Shadow"),
+                            attr("genre", "Science Fiction"),
+                            attr("language", "English"),
+                            attr("publishDate", 1464638927412L)
+                        )
+                    ))
+                )
+            )
+            .patch("/")
+            .then()
+            .statusCode(OK_200);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(
+                patchSet(
+                    patchOperation(add, "/author", resource(
+                        type("author"),
+                        id(tempAuthorId3),
+                        attributes(
+                            attr("name", "Isaac Asimov")
+                        ),
+                        relationships(
+                            relation("books",
+                                linkage(type("book"), id(tempBookId5)),
+                                linkage(type("book"), id(tempBookId6))
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId5),
+                        attributes(
+                            attr("title", "Foundation"),
+                            attr("genre", "Science Fiction"),
+                            attr("language", "English")
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId6),
+                        attributes(
+                            attr("title", "The Roman Republic"),
+                            //genre null
+                            attr("language", "English")
+                        )
+                    ))
+                )
+            )
+            .patch("/")
+            .then()
+            .statusCode(OK_200);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(
+                patchSet(
+                    patchOperation(add, "/author", resource(
+                        type("author"),
+                        id(tempAuthorId3),
+                        attributes(
+                            attr("name", "Null Ned")
+                        ),
+                        relationships(
+                            relation("books",
+                                linkage(type("book"), id(tempBookId7)),
+                                linkage(type("book"), id(tempBookId8))
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId7),
+                        attributes(
+                            attr("title", "Life with Null Ned"),
+                            attr("language", "English")
+                        )
+                    )),
+                    patchOperation(add, "/book", resource(
+                        type("book"),
+                        id(tempBookId8),
+                        attributes(
+                            attr("title", "Life with Null Ned 2"),
+                            attr("genre", "Not Null"),
+                            attr("language", "English")
+                        )
+                    ))
+                ).toJSON()
+            )
+            .patch("/")
+            .then()
+            .statusCode(OK_200);
+
+        Response authors = get("/author").then().extract().response();
+        UnaryOperator<String> findAuthorId = name ->
+            authors.path("data.find { it.attributes.name=='" + name + "' }.id");
+
+        asimovId = findAuthorId.apply("Isaac Asimov");
+        orsonCardId = findAuthorId.apply("Orson Scott Card");
+        hemingwayId = findAuthorId.apply("Ernest Hemingway");
+    }
+
+    private void createFamilyEntities() {
+        String tempParentId = "12345678-1234-1234-1234-1234567890ab";
+        String tempChildId1 = "12345678-1234-1234-1234-1234567890ac";
+        String tempChildId2 = "12345678-1234-1234-1234-1234567890ad";
+        String tempSpouseId = "12345678-1234-1234-1234-1234567890af";
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+            .body(
+                patchSet(
+                    patchOperation(add, "/parent", resource(
+                        type("parent"),
+                        id(tempParentId),
+                        relationships(
+                            relation("children",
+                                linkage(type("child"), id(tempChildId1)),
+                                linkage(type("child"), id(tempChildId2))
+                            ),
+                            relation("spouses",
+                                linkage(type("parent"), id(tempSpouseId))
+                            )
+                        )
+                    )),
+                    patchOperation(add, "/parent/" + tempParentId + "/children", resource(
+                        type("child"),
+                        id(tempChildId1)
+                    )),
+                    patchOperation(add, "/parent/" + tempParentId + "/children", resource(
+                        type("child"),
+                        id(tempChildId2)
+                    )),
+                    patchOperation(add, "/parent", resource(
+                        type("parent"),
+                        id(tempSpouseId)
+                    ))
+                ).toJSON()
+            )
+            .patch("/")
+            .then()
+            .statusCode(OK_200);
+
+        Response parents = get("/parent").then().extract().response();
+        parentId = parents.path("data[0].id");
+    }
+
+    @Test
+    void testNoFilterSortDescPaginationFirstPage() {
+        String url = "/book?sort=-title&page[size]=3";
+        when()
+            .get(url)
+        .then()
+            .body("data.attributes.title",
+                contains("The Roman Republic", "The Old Man and the Sea", "Life with Null Ned 2"));
+    }
+
+    @Test
+    void testPaginationOnSubRecords() {
+        String url = "/author/" + orsonCardId + "/books?sort=-title&page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("data.attributes.title", contains("Enders Shadow"));
+    }
+
+    @Test
+    void testNoFilterSortDescPagination() {
+        String url = "/book?sort=-title&page[number]=2&page[size]=3";
+        when()
+            .get(url)
+        .then()
+            .body("data.attributes.title", contains("Life with Null Ned", "Foundation", "For Whom the Bell Tolls"));
+    }
+
+    @Test
+    void testNoFilterMultiSortPagination() {
+        //select * from book order by title desc, genre asc;
+        String url = "/book?sort=-title,genre&page[size]=3";
+        when()
+            .get(url)
+        .then()
+            .body("data.attributes.title",
+                contains("The Roman Republic", "The Old Man and the Sea", "Life with Null Ned 2"),
+                "data.attributes.genre", contains(null, "Literary Fiction", "Not Null")
+            );
+        //"The Roman Republic has a null genre and should be should be first.
+    }
+
+    @Test
+    void testPublishDateLessThanFilter() {
+        String url = "/book?filter[book.publishDate][lt]=1454638927411&page[size]=2";
+        Response response = get(url).then().extract().response();
+
+        List allBooks = response.path("data.attributes");
+        assertEquals(2, allBooks.size());
+
+        List filteredBooks = response.path("data.findAll { it.attributes.publishDate < 1454638927411L }");
+        assertEquals(allBooks.size(), filteredBooks.size());
+    }
+
+    @Test
+    void testPageAndSortOnSubRecords() {
+
+        String url = "/author/" + orsonCardId + "/books?sort=-title,publishDate&page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "data[0].attributes.publishDate", equalTo(1464638927412L),
+                "data[0].relationships.authors.data.id", contains(orsonCardId)
+            );
+    }
+
+    @Test
+    void testPageAndSortOnSubRecordsPageTwo() {
+        String url = "/author/" + orsonCardId + "/books?sort=-title&page[number]=2&page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "data[0].attributes.title", equalTo("Enders Game"),
+                "data[0].relationships.authors.data.id", contains(orsonCardId),
+                "data[0].relationships.authors.data.id", contains(orsonCardId)
+            );
+    }
+
+    @Test
+    void testPageAndSortShouldFailOnBadSortFields() {
+        String url = "/author/" + orsonCardId + "/books?sort=-title,publishDate,onion&page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("errors", hasSize(1),
+                "errors[0].detail",
+                equalTo("Invalid value: book does not contain the field onion"))
+            .statusCode(BAD_REQUEST_400);
+
+    }
+
+    @Test
+    void testBasicPageBasedPagination() {
+        String url = "/book?page[number]=2&page[size]=2";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2));
+    }
+
+    @Test
+    void testBasicOffsetBasedPagination() {
+        String url = "/book?page[offset]=3&page[limit]=2";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2));
+    }
+
+    @Test
+    void testPaginationOffsetOnly() {
+        String url = "/book?page[offset]=3";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(5));
+    }
+
+    @Test
+    void testPaginationSizeOnly() {
+        String url = "/book?page[size]=2";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2));
+    }
+
+    @Test()
+    void testPaginationOffsetWithSorting() {
+        String url = "/book?sort=title&page[offset]=3";
+        when()
+            .get(url)
+            .then()
+            .body("data", hasSize(5),
+                "data[0].attributes.title", equalTo("Foundation")
+            );
+    }
+
+    @Test
+    void testPaginateInvalidParameter() {
+        String url = "/entityWithoutPaginate?page[bad]=2&page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("errors[0].detail", containsString("Invalid Pagination Parameter"))
+            .statusCode(BAD_REQUEST_400);
+    }
+
+    @Test
+    void testPaginateAnnotationTotals() {
+        String url = "/entityWithoutPaginate?page[size]=2&page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2),
+                "meta.page.totalRecords", equalTo(20),
+                "meta.page.totalPages", equalTo(10)
+            );
+    }
+
+    @Test
+    void testPaginateAnnotationTotalsWithFilter() {
+        String url = "/entityWithoutPaginate?page[size]=2&page[totals]&filter[entityWithoutPaginate.id][le]=10";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2),
+                "meta.page.totalRecords", equalTo(10),
+                "meta.page.totalPages", equalTo(5)
+            );
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    void testPaginateAnnotationTotalsWithToManyJoinFilter() {
+        /* Test RSQL Global */
+        String url = "/author?page[totals]&filter=books.title=in=('The Roman Republic','Foundation','Life With Null Ned')";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(2),
+                "data.attributes.name", contains("Isaac Asimov", "Null Ned"),
+                "meta.page.totalRecords", equalTo(2)
+            );
+    }
+
+    @Test
+    void testRelationshipPaginateAnnotationTotals() {
+        String url = "/author/" + asimovId + "/books?page[size]=1&page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "meta.page.totalRecords", equalTo(2),
+                "meta.page.totalPages", equalTo(2)
+            );
+    }
+
+    @Test
+    void testRelationshipPaginateAnnotationTotalsWithFilter() {
+        String url = "/author/" + asimovId + "/books?page[size]=1&page[totals]&filter[book.title][infixi]=FounDation";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "meta.page.totalRecords", equalTo(1),
+                "meta.page.totalPages", equalTo(1)
+            );
+    }
+
+    @Test
+    void testPageTotalsForSameTypedRelationship() {
+        String url = "/parent/" + parentId + "/spouses?page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "meta.page.totalRecords", equalTo(1),
+                "meta.page.totalPages.", equalTo(1)
+            );
+    }
+
+    @Test
+    void testRelationshipPaginateAnnotationTotalsWithNestedFilter() {
+        String url = "/author/" + hemingwayId + "/books?filter[book.publisher.name]=Default publisher&page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(1),
+                "meta.page.totalRecords", equalTo(1),
+                "meta.page.totalPages.", equalTo(1)
+            );
+    }
+
+    @Test
+    void testPaginateAnnotationPreventTotals() {
+        String url = "/entityWithPaginateCountableFalse?page[size]=3&page[totals]";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(3),
+                "meta.page.totalRecords", nullValue(),
+                "meta.page.totalPages.", nullValue()
+            );
+    }
+
+    @Test
+    void testPaginateAnnotationDefaultLimit() {
+        String url = "/entityWithPaginateDefaultLimit?page[number]=1";
+        when()
+            .get(url)
+        .then()
+            .body("data", hasSize(5),
+                "meta.page.number", equalTo(1),
+                "meta.page.limit", equalTo(5)
+            );
+    }
+
+    @Test
+    void testPaginateAnnotationMaxLimit() {
+        String url = "/entityWithPaginateMaxLimit?page[limit]=100";
+        when()
+            .get(url)
+        .then()
+            .body("errors", hasSize(1),
+                "errors[0].detail", containsString("Invalid value: Pagination limit must be less than or equal to 10"))
+            .statusCode(BAD_REQUEST_400);
+    }
+
+    @Test
+    void testPaginationNotPossibleAtRoot() {
+        String url = "/child?page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("errors", hasSize(1),
+                "errors[0].detail", containsString("Cannot paginate child")
+            ).statusCode(BAD_REQUEST_400);
+    }
+
+    @Test
+    void testPaginationNotPossibleAtRelationship() {
+        String url = "/parent/" + parentId + "/children?page[size]=1";
+        when()
+            .get(url)
+        .then()
+            .body("errors", hasSize(1),
+                "errors[0].detail", containsString("Cannot paginate child")
+            );
+    }
+
+    @Test
+    void testPaginationTotalsOfEmptyCollection() {
+        /* Test RSQL Global */
+        String url = "/author?page[totals]&filter=books.title=in=('Does Not Exist')";
+        when()
+                .get(url)
+                .then()
+                .body("data", hasSize(0),
+                        "meta.page.totalRecords", equalTo(0)
+                );
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java
index 8399f887e9..da24a0122c 100644
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java
@@ -5,63 +5,273 @@
  */
 package com.yahoo.elide.tests;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.collect.Sets;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.document;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.include;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static com.yahoo.elide.test.jsonapi.elements.Relation.TO_ONE;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.StringStartsWith.startsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.yahoo.elide.Elide;
 import com.yahoo.elide.ElideResponse;
-import com.yahoo.elide.audit.TestAuditLogger;
-import com.yahoo.elide.core.DataStoreTransaction;
-import com.yahoo.elide.initialization.AbstractIntegrationTestInitializer;
-import com.yahoo.elide.jsonapi.models.Data;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.audit.TestAuditLogger;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.InfixPredicate;
+import com.yahoo.elide.core.filter.predicates.PostfixPredicate;
+import com.yahoo.elide.core.filter.predicates.PrefixPredicate;
+import com.yahoo.elide.core.pagination.PaginationImpl;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
-import com.yahoo.elide.jsonapi.models.Resource;
-import com.yahoo.elide.jsonapi.models.ResourceIdentifier;
-import com.yahoo.elide.security.executors.BypassPermissionExecutor;
-import com.yahoo.elide.utils.JsonParser;
+import com.yahoo.elide.test.jsonapi.elements.Data;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+
+import com.google.common.collect.Sets;
+
+import example.Address;
+import example.Book;
 import example.Child;
+import example.Company;
+import example.ExceptionThrowingBean;
 import example.FunWithPermissions;
+import example.Invoice;
+import example.LineItem;
 import example.Parent;
+import example.TestCheckMappings;
 import example.User;
+
+import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.owasp.encoder.Encode;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.Response.Status;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Stream;
 
-import static com.jayway.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.Response.Status;
 
 /**
  * The type Config resource test.
  */
-public class ResourceIT extends AbstractIntegrationTestInitializer {
-    private static final String JSONAPI_CONTENT_TYPE = "application/vnd.api+json";
-    private static final String JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION =
-            "application/vnd.api+json; ext=jsonpatch";
+public class ResourceIT extends IntegrationTest {
+    private static final Resource COMPANY = resource(
+            type("company"),
+            id("abc"),
+            attributes(
+                    attr("address", buildAddress("street1", null, Map.of("foo", "bar"))),
+                    attr("description", "ABC")
+            )
+    );
+    private static final Resource PARENT1 = resource(
+            type("parent"),
+            id("1"),
+            attributes(
+                    attr("firstName", null)
+            ),
+            relationships(
+                    relation("children",
+                            linkage(type("child"), id("1"))
+                    ),
+                    relation("spouses")
+            )
+    );
+    private static final Resource PARENT2 = resource(
+            type("parent"),
+            id("2"),
+            attributes(
+                    attr("firstName", "John")
+            ),
+            relationships(
+                    relation("children",
+                            linkage(type("child"), id("2")),
+                            linkage(type("child"), id("3"))
+                    ),
+                    relation("spouses")
+            )
+    );
+    private static final Resource PARENT3 = resource(
+            type("parent"),
+            id("3"),
+            attributes(
+                    attr("firstName", "Link")
+            ),
+            relationships(
+                    relation("children",
+                            linkage(type("child"), id("4")),
+                            linkage(type("child"), id("5"))
+                    ),
+                    relation("spouses")
+            )
+    );
+    private static final Resource PARENT4 = resource(
+            type("parent"),
+            id("4"),
+            attributes(
+                    attr("firstName", "Unknown")
+            ),
+            relationships(
+                    relation("children"),
+                    relation("spouses",
+                            linkage(type("parent"), id("3"))
+                    )
+            )
+    );
+    private static final Resource CHILD1 = resource(
+            type("child"),
+            id("1"),
+            attributes(
+                    attr("name", null)
+            ),
+            relationships(
+                    relation("friends"),
+                    relation("parents",
+                            linkage(type("parent"), id("1"))
+                    )
+            )
+    );
+    private static final Resource CHILD2 = resource(
+            type("child"),
+            id("2"),
+            attributes(
+                    attr("name", "Child-ID2")
+            ),
+            relationships(
+                    relation("friends",
+                            linkage(type("child"), id("3"))
+                    ),
+                    relation("parents",
+                            linkage(type("parent"), id("2"))
+                    )
+            )
+    );
+    private static final Resource CHILD3 = resource(
+            type("child"),
+            id("3"),
+            attributes(
+                    attr("name", "Child-ID3")
+            ),
+            relationships(
+                    relation("friends"),
+                    relation("parents",
+                            linkage(type("parent"), id("2"))
+                    )
+            )
+    );
+    private static final Resource CHILD4 = resource(
+            type("child"),
+            id("4"),
+            attributes(
+                    attr("name", null)
+            ),
+            relationships(
+                    relation("friends"),
+                    relation("parents",
+                            linkage(type("parent"), id("3"))
+                    )
+            )
+    );
+    private static final Resource CHILD5 = resource(
+            type("child"),
+            id("5"),
+            attributes(
+                    attr("name", null)
+            ),
+            relationships(
+                    relation("friends"),
+                    relation("parents",
+                            linkage(type("parent"), id("3"))
+                    )
+            )
+    );
     private final JsonParser jsonParser = new JsonParser();
+    private final String baseUrl = "http://localhost:8080/api";
+
+    private static Address buildAddress(String street1, String street2, Map<Object, Object> properties) {
+        final Address address = new Address();
+        address.setStreet1(street1);
+        address.setStreet2(street2);
+        address.setProperties(properties);
+        return address;
+    }
 
-    @BeforeClass
-    public static void setup() {
+    private static Stream<Arguments> likeQueryProvider() {
+        return Stream.of(
+                Arguments.of("filter[book.title][infix]=with%perce", 1),
+                Arguments.of("filter[book.title][prefix]=titlewith%perce", 1),
+                Arguments.of("filter[book.title][postfix]=with%percentage", 1)
+        );
+    }
+
+    private static Stream<Arguments> queryProviderHQL() {
+        Path.PathElement pathToTitle = new Path.PathElement(Book.class, String.class, "title");
+
+        return Stream.of(
+                Arguments.of(new InfixPredicate(pathToTitle, "with%perce"), 1),
+                Arguments.of(new PrefixPredicate(pathToTitle, "titlewith%perce"), 1),
+                Arguments.of(new PostfixPredicate(pathToTitle, "with%percentage"), 1)
+        );
+    }
+
+    @BeforeEach
+    public void setup() throws IOException {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
         DataStoreTransaction tx = dataStore.beginTransaction();
+
+        final Company company = new Company();
+        company.setId("abc");
+        company.setDescription("ABC");
+
+        Address address = new Address();
+        address.setStreet1("foo");
+        address.setProperties(Map.of("boo", "baz"));
+
+        company.setAddress(address);
+
+        tx.createObject(company, null);
+
         Parent parent = new Parent(); // id 1
         Child child = new Child(); // id 1
         parent.setChildren(Sets.newHashSet(child));
         parent.setSpouses(Sets.newHashSet());
         child.setParents(Sets.newHashSet(parent));
 
-        tx.save(parent);
-        tx.save(child);
+        tx.createObject(parent, null);
+        tx.createObject(child, null);
 
         // Single tests
         Parent p1 = new Parent(); // id 2
@@ -86,10 +296,6 @@ public static void setup() {
 
         p1.setChildren(childrenSet1);
 
-        tx.save(p1);
-        tx.save(c1);
-        tx.save(c2);
-
         // List tests
         Parent p2 = new Parent(); // id 3
         Parent p3 = new Parent();  // id 4
@@ -107,174 +313,249 @@ public static void setup() {
         p3.setFirstName("Unknown");
 
         p2.setSpouses(Sets.newHashSet());
-        p3.setSpouses(Sets.newHashSet());
+        p3.setSpouses(Sets.newHashSet(p2));
         p3.setChildren(Sets.newHashSet());
 
-        tx.save(p2);
-        tx.save(p3);
-        tx.save(c3);
-        tx.save(c4);
+        tx.createObject(c1, null);
+        tx.createObject(c2, null);
+        tx.createObject(c3, null);
+        tx.createObject(c4, null);
+
+        tx.createObject(p1, null);
+        tx.createObject(p2, null);
+        tx.createObject(p3, null);
+
+        Book bookWithPercentage = new Book();
+        bookWithPercentage.setTitle("titlewith%percentage");
+        Book bookWithoutPercentage = new Book();
+        bookWithoutPercentage.setTitle("titlewithoutpercentage");
+
+        tx.createObject(bookWithPercentage, null);
+        tx.createObject(bookWithoutPercentage, null);
 
         FunWithPermissions fun = new FunWithPermissions();
-        tx.save(fun);
+        tx.createObject(fun, null);
 
         User user = new User(); //ID 1
         user.setPassword("god");
-        tx.save(user);
+        tx.createObject(user, null);
+
+        Invoice invoice = new Invoice();
+        invoice.setId(1);
+        LineItem item = new LineItem();
+        invoice.setItems(Sets.newHashSet(item));
+        item.setInvoice(invoice);
+        tx.createObject(invoice, null);
+        tx.createObject(item, null);
+
+        ExceptionThrowingBean etb = new ExceptionThrowingBean();
+        etb.setId(1L);
+        tx.createObject(etb, null);
 
-        tx.commit();
+        tx.commit(null);
+        tx.close();
     }
 
-    @Test(priority = -1)
+    @Test
     public void testRootCollection() throws Exception {
         String actual = given().when().get("/parent").then().statusCode(HttpStatus.SC_OK)
                 .extract().body().asString();
 
         JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
-        assertEquals(doc.getData().get().size(), 4);
+        assertEquals(4, doc.getData().get().size());
     }
 
     @Test
-    public void testReadPermissionWithFilterCheckCollectionId() {
-        /*
-         * To see the detail of the FilterExpression check, go to the bean of filterExpressionCheckObj and see
-         * CheckRestrictUser.
-         */
-        String createObj1 = jsonParser.getJson("/ResourceIT/createFilterExpressionCheckObj.1.json");
+    public void testRootCollectionWithNoOperatorFilter() throws Exception {
+        String actual = given().when().get("/parent?filter[parent.id][isnull]").then().statusCode(HttpStatus.SC_OK)
+                .extract().body().asString();
+
+        JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
+        assertEquals(0, doc.getData().get().size());
+    }
 
+    @Test
+    public void testReadPermissionWithFilterExpressionCheckCollectionId() {
+        // To see the detail of the FilterExpression check, go to the bean of filterExpressionCheckObj and see
+        // CheckRestrictUser.
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createObj1)
+                .body(
+                        data(
+                                resource(
+                                        type("filterExpressionCheckObj"),
+                                        id(null),
+                                        attributes(attr("name", "obj1"))
+                                )
+                        )
+                )
                 .post("/filterExpressionCheckObj")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED);
-
-        String createObj2 = jsonParser.getJson("/ResourceIT/createFilterExpressionCheckObj.2.json");
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createObj2)
+                .body(
+                        data(
+                                resource(
+                                        type("filterExpressionCheckObj"),
+                                        id("2"),
+                                        attributes(attr("name", "obj2"))
+                                )
+                        )
+                )
                 .post("/filterExpressionCheckObj")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED);
-
-        String createObj3 = jsonParser.getJson("/ResourceIT/createFilterExpressionCheckObj.3.json");
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("2"));
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createObj2)
+                .body(
+                        data(
+                                resource(
+                                        type("filterExpressionCheckObj"),
+                                        id("3"),
+                                        attributes(attr("name", "obj3"))
+                                )
+                        )
+                )
                 .post("/filterExpressionCheckObj")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED);
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("3"));
 
-        String createAnother = jsonParser.getJson("/ResourceIT/createAnotherFilterExpressionCheckObj.json");
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("anotherFilterExpressionCheckObj"),
+                                        id("1"),
+                                        attributes(
+                                                attr("anotherName", "anotherObj1"),
+                                                attr("createDate", "1999")
+                                        ),
+                                        relationships(
+                                                relation("linkToParent",
+                                                        linkage(type("filterExpressionCheckObj"), id("1"))
+                                                )
+                                        )
+                                )
+                        )
+                )
+                .post("/anotherFilterExpressionCheckObj")
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("1"));
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createAnother)
+                .body(
+                        data(
+                                resource(
+                                        type("anotherFilterExpressionCheckObj"),
+                                        attributes(
+                                                attr("anotherName", "anotherObj2"),
+                                                attr("createDate", "2000")
+                                        )
+                                )
+                        )
+                )
                 .post("/anotherFilterExpressionCheckObj")
-                .then()
-                .statusCode(HttpStatus.SC_CREATED);
+                .then().statusCode(HttpStatus.SC_CREATED).body("data.id", equalTo("2"));
 
         //The User ID is set to one so the following get request won't return record including
         // filterExpressionCheckObj.id != User'id.
-
         //test root object collection, should just receive 2 out of 3 records.
-        String getResult1 = given()
+        String expected1 = "{\"data\":[{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\","
+                + "\"attributes\":{\"name\":\"obj1\"},"
+                + "\"relationships\":{\"listOfAnotherObjs\":{"
+                + "\"data\":[{\"type\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\"}]}}},{"
+                + "\"type\":\"filterExpressionCheckObj\",\"id\":\"2\",\"relationships\":{"
+                + "\"listOfAnotherObjs\":{\"data\":[]}}}]}";
+
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/filterExpressionCheckObj")
-                .then()
-                .statusCode(HttpStatus.SC_OK)
-                .extract().response().asString();
+                .then().statusCode(HttpStatus.SC_OK).body(equalTo(expected1));
 
         //test authentication pass querying with ID == 1
-        String getResult2 = given()
+        String expected2 = "{\"data\":{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\","
+                + "\"attributes\":{\"name\":\"obj1\"},\"relationships\":{\"listOfAnotherObjs\":{\"data\":[{\"type"
+                + "\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\"}]}}}}";
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/filterExpressionCheckObj/1")
-                .then()
-                .statusCode(HttpStatus.SC_OK)
-                .extract().response().asString();
+                .then().statusCode(HttpStatus.SC_OK).body(equalTo(expected2));
 
         //test authentication pass querying with ID == 2, it shouldn't contain attribute "name".
-        String getResult3 = given()
+        String expected3 = "{\"data\":{\"type\":\"filterExpressionCheckObj\",\"id\":\"2\","
+                + "\"relationships\":{\"listOfAnotherObjs\":{\"data\":[]}}}}";
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/filterExpressionCheckObj/2")
-                .then()
-                .statusCode(HttpStatus.SC_OK)
-                .extract().response().asString();
+                .then().statusCode(HttpStatus.SC_OK).body(equalTo(expected3));
 
         //test authentication fail querying with ID == 3
-        String getResult4 = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/filterExpressionCheckObj/3")
                 .then()
                 .statusCode(HttpStatus.SC_NOT_FOUND)
-                .extract().response().asString();
+                .body("errors[0].detail", equalTo("Unknown identifier 3 for filterExpressionCheckObj"));
 
         //test authentication pass query a relation of object
-        String getResult5 = given()
+        String expected5 = "{\"data\":[{\"type\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\","
+                + "\"attributes\":{\"anotherName\":\"anotherObj1\",\"createDate\":1999},\"relationships\":{"
+                + "\"linkToParent\":{\"data\":[{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\"}]}}}]}";
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/filterExpressionCheckObj/1/listOfAnotherObjs")
-                .then()
-                .statusCode(HttpStatus.SC_OK)
-                .extract().response().asString();
-
-        String expected1 = "{\"data\":[{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\",\"attributes\":{\"name\":\"obj1\"},\"relationships\":{\"listOfAnotherObjs\":{\"data\":[{\"type\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\"}]}}},{\"type\":\"filterExpressionCheckObj\",\"id\":\"2\",\"relationships\":{\"listOfAnotherObjs\":{\"data\":[]}}}]}";
+                .then().statusCode(HttpStatus.SC_OK).body(equalTo(expected5));
 
-        String expected2 = "{\"data\":{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\",\"attributes\":{\"name\":\"obj1\"},\"relationships\":{\"listOfAnotherObjs\":{\"data\":[{\"type\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\"}]}}}}";
-
-        String expected3 = "{\"data\":{\"type\":\"filterExpressionCheckObj\",\"id\":\"2\",\"relationships\":{\"listOfAnotherObjs\":{\"data\":[]}}}}";
-
-        String expected5 = "{\"data\":[{\"type\":\"anotherFilterExpressionCheckObj\",\"id\":\"1\",\"attributes\":{\"anotherName\":\"anotherObj1\",\"createDate\":1999},\"relationships\":{\"linkToParent\":{\"data\":[{\"type\":\"filterExpressionCheckObj\",\"id\":\"1\"}]}}}]}";
-
-        assertEquals(getResult1, expected1);
-        assertEquals(getResult2, expected2);
-        assertEquals(getResult3, expected3);
-        assertEquals(getResult5, expected5);
+        //test authentication pass query a relation of object
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/anotherFilterExpressionCheckObj")
+                .then().statusCode(HttpStatus.SC_OK).body(equalTo(expected5));
     }
 
     @Test
     public void testRootCollectionId() {
-        String expected = jsonParser.getJson("/ResourceIT/testRootCollectionId.json");
-
-        String actual = given().when().get("/parent/1").then().statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEquals(actual, expected);
+        given()
+                .when()
+                .get("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(PARENT1).toJSON()));
     }
 
     @Test
     public void testRootCollectionRelationships() {
-        String expected = jsonParser.getJson("/ResourceIT/testRootCollectionRelationships.json");
-
         given()
-            .when().get("/parent/1/relationships/children").then().statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .when().get("/parent/1/relationships/children").then().statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(linkage(type("child"), id("1"))).toJSON()));
     }
 
     @Test
     public void testChild() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/testChild.json");
-
         given().when().get("/parent/1/children/1").then().statusCode(HttpStatus.SC_OK)
-        .body(equalTo(expected));
+                .body(equalTo(datum(CHILD1).toJSON()));
     }
 
     @Test
     public void testSubCollectionRelationships() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/testSubCollectionRelationships.json");
-
-        given().when().get("/parent/1/children/1/relationships/parents").then().statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+        given().when().get("/parent/1/children/1/relationships/parents").then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(linkage(type("parent"), id("1"))).toJSON()));
     }
 
     @Test
@@ -284,436 +565,508 @@ public void failRootCollectionRelationships() {
 
     @Test
     public void failRootCollection() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/failRootCollection.json");
+        String expected = "{\"errors\":[{\"detail\":\"Unknown collection unknown\"}]}";
 
-        given().when().get("/unknown").then().statusCode(HttpStatus.SC_NOT_FOUND)
-        .body(equalTo(expected));
+        given().when().get("/unknown").then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body(equalTo(expected));
     }
 
     @Test
     public void failRootCollectionId() {
-        String expected = jsonParser.getJson("/ResourceIT/failRootCollectionId.json");
+        String expected = "{\"errors\":[{\"detail\":\"Unknown identifier 6789 for parent\"}]}";
 
         given().when().get("/parent/6789").then().statusCode(HttpStatus.SC_NOT_FOUND)
-        .body(equalTo(expected));
+                .body(equalTo(expected));
     }
 
     @Test
     public void failChild() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/failChild.json");
+        String expected = "{\"errors\":[{\"detail\":\"Unknown collection unknown\"}]}";
 
         given().when().get("/parent/1/unknown").then().statusCode(HttpStatus.SC_NOT_FOUND)
-        .body(equalTo(expected));
+                .body(equalTo(expected));
     }
 
     @Test
     public void failFieldRequest() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/failFieldRequest.json");
+        String expected = "{\"errors\":[{\"detail\":\"Unknown collection id\"}]}";
 
         given().when().get("/parent/1/id").then().statusCode(HttpStatus.SC_NOT_FOUND)
-        .body(equalTo(expected));
+                .body(equalTo(expected));
     }
 
     @Test
     public void parseFailure() {
-        String expected = jsonParser.getJson("/ResourceIT/parseFailure.json");
+        String expected = "{\"errors\":[{\"detail\":\"token recognition error at: &#39;|&#39;\"}]}";
 
         given().when().get("company/1|apps/2/links/foo").then().statusCode(HttpStatus.SC_NOT_FOUND)
-        .body(equalTo(expected));
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 1)
+    @Test
     public void testPatchAttrSingle() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/testPatchAttrSingle.json");
-
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/2")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/2")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .extract().response().asString();
-
-        JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
-        Data<Resource> data = doc.getData();
-        Resource resource = data.getSingleValue();
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(
+                                                attr("firstName", "syzygy")
+                                        )
+                                )
+                        )
+                )
+                .patch("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
-        assertEquals(resource.getAttributes().get("firstName"), "syzygy");
-        assertEquals(resource.getRelationships().size(), 2);
-        assertEquals(resource.getRelationships().get("children").getData().get().size(), 2);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(
+                                                attr("firstName", "syzygy")
+                                        ),
+                                        relationships(
+                                                relation("children",
+                                                        linkage(type("child"), id("2")),
+                                                        linkage(type("child"), id("3"))
+                                                ),
+                                                relation("spouses")
+                                        )
+                                )
+                        ).toJSON()
+                ));
     }
 
-    @Test(priority = 2)
-    public void testPatchAttrNoUpdateSingle() {
-        String request = jsonParser.getJson("/ResourceIT/testPatchAttrNoUpdateSingle.json");
+    @Test
+    public void testPatchComplexAttribute() {
+
+        final Address update = new Address();
+        update.setStreet1("street1");
+        update.setProperties(Map.of("foo", "bar"));
+
+        // update company address
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("company"),
+                                        id("abc"),
+                                        attributes(
+                                                attr("address", update)
+                                        )
+                                )
+                        )
+                )
+                .patch("/company/abc")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/2")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .body(isEmptyOrNullString());
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/company/abc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(equalTo(datum(COMPANY).toJSON()
+                ));
     }
 
-    @Test(priority = 3)
+    @Test
     public void testPatchAttrList() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/testPatchAttrList.json");
+        String request = "{\n"
+                + "    \"data\":[\n"
+                + "        {\n"
+                + "            \"type\":\"parent\",\n"
+                + "            \"id\":\"3\",\n"
+                + "            \"attributes\":{\n"
+                + "                \"firstName\":\"Senor\"\n"
+                + "            }\n"
+                + "        },\n"
+                + "        {\n"
+                + "            \"type\":\"parent\",\n"
+                + "            \"id\":\"11\",\n"
+                + "            \"attributes\":{\n"
+                + "                \"firstName\":\"woot\"\n"
+                + "            }\n"
+                + "        }\n"
+                + "    ]\n"
+                + "}";
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/3")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(request)
+                .patch("/parent/3")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
     }
 
-    @Test(priority = 4)
+    @Test
     public void testPatchSetRel() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/testPatchSetRel.json");
-
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("4"),
+                                        attributes(),
+                                        relationships(
+                                                relation("children",
+                                                        linkage(type("child"), id("4")),
+                                                        linkage(type("child"), id("5"))
+                                                )
+                                        )
+                                )
+                        )
+
+                )
+                .patch("/parent/4")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().response().asString();
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("4"),
+                                        attributes(
+                                                attr("firstName", "Unknown")
+                                        ),
+                                        relationships(
+                                                relation("children",
+                                                        linkage(type("child"), id("4")),
+                                                        linkage(type("child"), id("5"))
+                                                ),
+                                                relation("spouses",
+                                                        linkage(type("parent"), id("3"))
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                ));
+    }
 
-        JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
-        Data<Resource> data = doc.getData();
-        Resource resource = data.getSingleValue();
-        Iterator<Resource> itr = resource.getRelationships().get("children").getData().get().iterator();
-        String rel1 = itr.next().getId();
-        String rel2 = itr.next().getId();
-
-        // Sort is not enabled-- order agnostic.
-        String id1;
-        String id2;
-        if (rel1.equals("4")) {
-            id1 = rel1;
-            id2 = rel2;
-        } else {
-            id1 = rel2;
-            id2 = rel1;
-        }
-
-        assertEquals(resource.getAttributes().get("firstName"), "Unknown");
-        assertEquals(id1, "4");
-        assertEquals(id2, "5");
-    }
-
-    @Test(priority = 5)
+    @Test
     public void testPatchRemoveRelSingle() {
-        String request = jsonParser.getJson("/ResourceIT/testPatchRemoveRelSingle.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/testPatchRemoveRelSingle.json");
-
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(),
+                                        relationships(
+                                                relation("children",
+                                                        linkage(type("child"), id("2"))
+                                                )
+                                        )
+                                )
+                        )
+
+                )
+                .patch("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
-        assertEqualDocuments(actual, expected);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(
+                                                attr("firstName", "John")
+                                        ),
+                                        relationships(
+                                                relation("children",
+                                                        linkage(type("child"), id("2"))
+                                                ),
+                                                relation("spouses")
+                                        )
+                                )
+                        ).toJSON()
+                ));
     }
 
-    @Test(priority = 6)
+    @Test
     public void testPatchRelNoUpdateSingle() {
-        String request = jsonParser.getJson("/ResourceIT/testPatchRelNoUpdateSingle.json");
+        //Test a relationship update that leaves the resource unchanged.
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(PARENT2))
+                .patch("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(datum(PARENT2).toJSON()
+                ));
     }
 
-    @Test(priority = 7)
+    @Test
     public void testPatchRelRemoveColl() {
-        String request = jsonParser.getJson("/ResourceIT/testPatchRelRemoveColl.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/testPatchRelRemoveColl.json");
-
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/4")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(),
+                                        relationships(
+                                                relation("children")
+                                        )
+                                )
+                        )
+                )
+                .patch("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
-        assertEqualDocuments(actual, expected);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("parent"),
+                                        id("2"),
+                                        attributes(
+                                                attr("firstName", "John")
+                                        ),
+                                        relationships(
+                                                relation("children"),
+                                                relation("spouses")
+                                        )
+                                )
+                        ).toJSON()
+                ));
     }
 
-    @Test(priority = 8)
-    public void testGetNestedSingleInclude() throws IOException {
-        String expected  = jsonParser.getJson("/ResourceIT/testGetNestedSingleInclude.json");
+    @Test
+    public void testGetNestedSingleInclude() throws Exception {
+        String expected = document(
+                datum(PARENT2),
+                include(CHILD2, CHILD3)).toJSON();
 
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent/2?include=children.friends")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEqualDocuments(actual, expected);
+                .body(jsonEquals(expected, false));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetSingleIncludeOnCollection() throws Exception {
 
-        /*
-         * /parent?include=children
-         *
-         * {data: [
-         *      all the parents
-         * ], include: [
-         *      all the children belonging to a parent
-         * ]}
-         */
-        String expected  = jsonParser.getJson("/ResourceIT/testGetSingleIncludeOnCollection.json");
+        String expected = document(
+                data(PARENT1, PARENT2, PARENT3, PARENT4),
+                include(CHILD1, CHILD2, CHILD3, CHILD4, CHILD5)).toJSON();
 
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent?include=children")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEqualDocuments(actual, expected);
+                .body(jsonEquals(expected, false));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetMultipleIncludeOnCollection() throws Exception {
+        String expected = document(
+                data(PARENT1, PARENT2, PARENT3, PARENT4),
+                include(CHILD1, CHILD2, CHILD3, CHILD4, CHILD5, PARENT3)).toJSON();
 
-        /*
-         * /parent?include=children,spouses
-         *
-         * {data: [
-         *      all the parents
-         * ], include: [
-         *      all the children and spouses belonging to a parent
-         * ]}
-         */
-        String expected  = jsonParser.getJson("/ResourceIT/testGetMultipleIncludeOnCollection.json");
-
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent?include=children,spouses")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEqualDocuments(actual, expected);
+                .body(jsonEquals(expected, false));
     }
 
     @Test
     public void testGetSingleIncludeOnRelationship() {
-
-        /*
-         * /parent/1/relationships/children?include=children
-         *
-         * {data: [
-         *      child 1 resource identification object
-         * ], include: [
-         *      child 1's data
-         * ]}
-         */
-        String expected = jsonParser.getJson("/ResourceIT/testGetSingleIncludeOnRelationship.json");
+        String expected = document(
+                data(linkage(type("child"), id("1"))),
+                include(CHILD1)).toJSON();
 
         given()
                 .when().get("/parent/1/relationships/children?include=children").then().statusCode(HttpStatus.SC_OK)
                 .body(equalTo(expected));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetIncludeBadRelation() {
-
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent/1?include=children.BadRelation")
                 .then()
-                .statusCode(HttpStatus.SC_NOT_FOUND);
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testMissingTypeInJsonBody() {
+        String detail = "Resource 'type' field is missing or empty.";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body("{ \"data\": { \"id\": \"1\", \"attributes\": { \"firstName\": \"foo\" }}}")
+                .patch("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors[0].detail", equalTo(Encode.forHtml(detail)));
+    }
+
+    @Test
+    public void testInvalidJson() {
+        String detail = "Unexpected close marker ']': expected '}' (for Object starting at [Source: (String)\"{ ]\"; line: 1, column: 1])\n at [Source: (String)\"{ ]\"; line: 1, column: 4]";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body("{ ]")
+                .patch("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors[0].detail", equalTo(Encode.forHtml(detail)));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetSortCollection() throws Exception {
 
-        /*
-         * /parent?sort=firstName
-         *
-         * {data: [
-         *      parents sorted by name
-         * ]}
-         */
-        String expected  = jsonParser.getJson("/ResourceIT/testGetSortCollection.json");
+        String expected = data(PARENT1, PARENT2, PARENT3, PARENT4).toJSON();
 
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent?sort=+firstName")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEqualDocuments(actual, expected);
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetReverseSortCollection() throws Exception {
 
-        /*
-         * /parent?sort=firstName
-         *
-         * {data: [
-         *      parents sorted by name
-         * ]}
-         */
-        String expected  = jsonParser.getJson("/ResourceIT/testGetReverseSortCollection.json");
+        String expected = data(PARENT4, PARENT3, PARENT2, PARENT1).toJSON();
 
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/parent?sort=-firstName")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        assertEquals(actual, expected);
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetRelEmptyColl() {
-        String expected = jsonParser.getJson("/ResourceIT/testGetRelEmptyColl.json");
+        String expected = data(null).toJSON();
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/4/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 8)
+    @Test
     public void testGetWithTrailingSlash() {
-        String expected = jsonParser.getJson("/ResourceIT/testGetWithTrailingSlash.json");
+        String expected = data(PARENT1, PARENT2, PARENT3, PARENT4).toJSON();
 
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(actual, expected);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 9)
+    @Test
     public void testPatchRelSetDirect() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/testPatchRelSetDirect.json");
 
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/4/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().response().asString();
-
-        JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
-        Data<Resource> list = doc.getData();
-        Iterator<Resource> itr = list.get().iterator();
-        String rel1 = itr.next().getId();
-        String rel2 = itr.next().getId();
+        Data relationships = data(
+                linkage(type("child"), id("4")),
+                linkage(type("child"), id("5"))
+        );
 
-        // Sort is not enabled-- order agnostic.
-        String id1;
-        String id2;
-        if (rel1.equals("4")) {
-            id1 = rel1;
-            id2 = rel2;
-        } else {
-            id1 = rel2;
-            id2 = rel1;
-        }
-
-        assertEquals(id1, "4");
-        assertEquals(id2, "5");
-    }
-
-    @Test(priority = 10)
-    public void testPatchRelNoUpdateDirect() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/testPatchRelNoUpdateDirect.json");
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(relationships)
+                .patch("/parent/4/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/parent/4/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(relationships, false));
     }
 
-    @Test(priority = 11)
+    @Test
     public void testNoDeleteExcludedRelationship() throws Exception {
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
@@ -724,262 +1077,449 @@ public void testNoDeleteExcludedRelationship() throws Exception {
                 .statusCode(HttpStatus.SC_NOT_FOUND);
     }
 
-    @Test(priority = 11)
+    @Test
     public void testForbiddenDeleteEmptyCollectionRelationship() throws Exception {
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .body("{\"data\":[]}")
-                .delete("/parent/4/children/4/relationships/parents")
+                .delete("/parent/1/children/1/relationships/parents")
                 .then()
                 .statusCode(HttpStatus.SC_FORBIDDEN);
     }
 
-    @Test(priority = 11)
+    @Test
     public void testDeleteParent() {
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .delete("/parent/1")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .body(isEmptyOrNullString());
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .delete("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .body(isEmptyOrNullString());
     }
 
+    @Test
+    public void testDeleteWithCascade() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .delete("/invoice/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .body(isEmptyOrNullString());
+    }
 
-    @Test(priority = 12)
+    @Test
     public void failDeleteParent() {
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .delete("/parent/678")
-            .then()
-            .statusCode(HttpStatus.SC_NOT_FOUND);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .delete("/parent/678")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
     }
 
-    @Test(priority = 1)
-    public void createParentNoRels() {
-        String request = jsonParser.getJson("/ResourceIT/createParentNoRels.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/createParentNoRels.json");
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED)
-            .extract().body().asString();
+    @Test
+    public void createParentNoRels() throws Exception {
+
+        Data parent = datum(
+                resource(
+                        type("parent"),
+                        id("5"),
+                        attributes(
+                                attr("firstName", "I'm new here")
+                        ),
+                        relationships(
+                                relation("spouses"),
+                                relation("children")
+                        )
+                )
+        );
 
-        assertEqualDocuments(actual, expected);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(parent)
+                .post("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(jsonEquals(parent, true));
     }
 
-    @Test(priority = 2)
-    public void createParentWithRels() {
-        String request = jsonParser.getJson("/ResourceIT/createParentWithRels.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/createParentWithRels.json");
-
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED)
-            .extract().body().asString();
+    @Test
+    public void createParentWithRels() throws Exception {
+
+        Data parentInput = datum(
+                resource(
+                        type("parent"),
+                        id("required"),
+                        attributes(
+                                attr("firstName", "omg. I have kidz.")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("2"))
+                                )
+                        )
+                )
+        );
+
+        Data parentOutput = datum(
+                resource(
+                        type("parent"),
+                        id("5"),
+                        attributes(
+                                attr("firstName", "omg. I have kidz.")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("2"))
+                                ),
+                                relation("spouses")
+                        )
+                )
+        );
 
-        assertEqualDocuments(actual, expected);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(parentInput)
+                .post("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(jsonEquals(parentOutput, true));
     }
 
     @Test
     public void createParentList() {
         String request = jsonParser.getJson("/ResourceIT/createParentList.req.json");
-        String expected = "{\"errors\":[\"InvalidEntityBodyException: Bad Request Body";
+        String expected = "{\"errors\":[{\"detail\":\"Bad Request Body";
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST)
-            .body(startsWith(expected));
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(request)
+                .post("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(startsWith(expected));
     }
 
-    @Test(priority = 3)
+    @Test
     public void createChild() throws Exception {
-        String request = jsonParser.getJson("/ResourceIT/createChild.json");
-
-        String childActual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent/5/children")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED)
-            .extract().body().asString();
-
-        JsonApiDocument childJsonApiDocument = jsonApiMapper.readJsonApiDocument(childActual);
-        Resource resource = childJsonApiDocument.getData().getSingleValue();
-        Collection<ResourceIdentifier> resourceIdentifiers = resource.getRelationships().get("parents").getResourceIdentifierData().get();
-        ResourceIdentifier rId1 = resourceIdentifiers.iterator().next();
-        assertEquals(resource.getId(), "6");
-        assertEquals(resource.getType(), "child");
-        assertEquals(resource.getRelationships().size(), 2);
-        assertEquals(resourceIdentifiers.size(), 2);
-        assertEquals(rId1.getType(), "parent");
-
-        String parentActual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/5")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        JsonApiDocument parentJsonApiDocument = jsonApiMapper.readJsonApiDocument(parentActual);
-        boolean hasIdentifier = false;
-
-        resource = parentJsonApiDocument.getData().getSingleValue();
-        resourceIdentifiers = resource.getRelationships().get("children").getResourceIdentifierData().get();
-        for (ResourceIdentifier resourceIdentifier : resourceIdentifiers) {
-            hasIdentifier |= resourceIdentifier.getId().equals("6");
-        }
-        assertTrue(hasIdentifier);
+
+        Data childInput = data(
+                resource(
+                        type("child"),
+                        id("required"),
+                        attributes(),
+                        relationships(
+                                relation("parents",
+                                        linkage(type("parent"), id("1"))
+                                )
+                        )
+                )
+        );
+
+        Data childOutput = datum(
+                resource(
+                        type("child"),
+                        id("6"),
+                        attributes(
+                                attr("name", null)
+                        ),
+                        relationships(
+                                relation("parents",
+                                        linkage(type("parent"), id("1")),
+                                        linkage(type("parent"), id("4"))
+                                ),
+                                relation("friends")
+                        )
+                )
+        );
+
+        Data parentOutput = datum(
+                resource(
+                        type("parent"),
+                        id("4"),
+                        attributes(
+                                attr("firstName", "Unknown")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("6"))
+                                ),
+                                relation("spouses",
+                                        linkage(type("parent"), id("3"))
+                                )
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(childInput)
+                .post("/parent/4/children")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(jsonEquals(childOutput, true));
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(parentOutput, true));
     }
 
     @Test
     public void createParentBadUri() {
-        String request = jsonParser.getJson("/ResourceIT/createParentBadUri.json");
+
+        Data parentInput = data(
+                resource(
+                        type("parent"),
+                        id("required"),
+                        attributes(
+                                attr("firstName", "I should not be created :x")
+                        )
+                )
+        );
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent/678")
-            .then()
-            .statusCode(HttpStatus.SC_NOT_FOUND);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(parentInput)
+                .post("/parent/678")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
     }
 
     @Test
     public void createChildNonRootable() {
-        String request = jsonParser.getJson("/ResourceIT/createChildNonRootable.json");
+        Data childInput = data(
+                resource(
+                        type("child"),
+                        id("required"),
+                        attributes(
+                                attr("firstName", "I should not be created :x")
+                        )
+                )
+        );
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/child")
-            .then()
-            .statusCode(HttpStatus.SC_NOT_FOUND);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(childInput)
+                .post("/child")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
     }
 
     @Test
-    public void testAddAndRemoveOneToOneRelationship() {
-        // first set
-        final String request1 = jsonParser.getJson("/ResourceIT/testAddAndRemoveOneToOneRelationship.req.json");
+    public void testAddAndRemoveOneToOneRelationship() throws Exception {
+
+        Data funInput = datum(
+                resource(
+                        type("fun"),
+                        id("1"),
+                        attributes(),
+                        relationships(
+                                relation("relation3", TO_ONE,
+                                        linkage(type("child"), id("2"))
+                                )
+                        )
+                )
+        );
+
+        Data funOutput = datum(
+                resource(
+                        type("fun"),
+                        id("1"),
+                        attributes(
+                                attr("field2", null),
+                                attr("field3", null),
+                                attr("field4", null),
+                                attr("field5", null),
+                                attr("field6", null),
+                                attr("field8", null)
+                        ),
+                        relationships(
+                                relation("relation3", TO_ONE,
+                                        linkage(type("child"), id("2"))
+                                ),
+                                relation("relation1"),
+                                relation("relation2")
+                        )
+                )
+        );
+
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request1)
-            .patch("/fun/1")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(funInput)
+                .patch("/fun/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
+
+        given().when().get("/fun/1").then().statusCode(HttpStatus.SC_OK).body(jsonEquals(funOutput, true));
+
+        funInput = datum(
+                resource(
+                        type("fun"),
+                        id("1"),
+                        attributes(),
+                        relationships(
+                                relation("relation3", TO_ONE)
+                        )
+                )
+        );
+
+        funOutput = datum(
+                resource(
+                        type("fun"),
+                        id("1"),
+                        attributes(
+                                attr("field2", null),
+                                attr("field3", null),
+                                attr("field4", null),
+                                attr("field5", null),
+                                attr("field6", null),
+                                attr("field8", null)
+                        ),
+                        relationships(
+                                relation("relation3", TO_ONE),
+                                relation("relation1"),
+                                relation("relation2")
+                        )
+                )
+        );
 
-        final String expected1 = jsonParser.getJson("/ResourceIT/testAddAndRemoveOneToOneRelationship.json");
-        final String actual1 = given().when().get("/fun/1").then().statusCode(HttpStatus.SC_OK).extract().body().asString();
-        assertEqualDocuments(actual1, expected1);
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(funInput)
+                .patch("/fun/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
-        // second set
-        final String request2 = jsonParser.getJson("/ResourceIT/testAddAndRemoveOneToOneRelationship.2.req.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request2)
-            .patch("/fun/1")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-        final String expected2 = jsonParser.getJson("/ResourceIT/testAddAndRemoveOneToOneRelationship.2.json");
-        final String actual2 = given().when().get("/fun/1").then().statusCode(HttpStatus.SC_OK).extract().body().asString();
-        assertEqualDocuments(actual2, expected2);
+                .when()
+                .get("/fun/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(funOutput, true));
     }
 
-    @Test(priority = 13)
+    @Test
     public void createDependentPatchExt() {
         String request = jsonParser.getJson("/ResourceIT/createDependentPatchExt.req.json");
         String expected = jsonParser.getJson("/ResourceIT/createDependentPatchExt.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 14)
+    @Test
     public void createChildRelateExisting() {
         String request = jsonParser.getJson("/ResourceIT/createChildRelateExisting.req.json");
         String expected = jsonParser.getJson("/ResourceIT/createChildRelateExisting.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
+    }
+
+    @Test
+    public void invalidPatchMissingId() {
+        String request = jsonParser.getJson("/ResourceIT/invalidPatchMissingId.req.json");
+
+        String detail = "Bad Request Body'Patch extension requires all objects to have an assigned "
+                + "ID (temporary or permanent) when assigning relationships.'";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors[0].detail[0]", equalTo(Encode.forHtml(detail)));
     }
 
-    @Test(priority = 15)
+    @Test
+    public void invalidPatchMissingPath() {
+        String request = jsonParser.getJson("/ResourceIT/invalidPatchMissingPath.req.json");
+
+        String detail = "Bad Request Body'Patch extension requires all objects to have an assigned path'";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors[0].detail[0]", equalTo(Encode.forHtml(detail)));
+    }
+
+    @Test
     public void updateChildRelationToExisting() {
         String request = jsonParser.getJson("/ResourceIT/updateChildRelationToExisting.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/updateChildRelationToExisting.1.json");
         String expected2 = jsonParser.getJson("/ResourceIT/updateChildRelationToExisting.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/5/children/8")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected2));
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4/children/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected2));
     }
 
-    @Test(priority = 16)
+    @Test
     public void replaceAttributesAndRelationship() {
         String request = jsonParser.getJson("/ResourceIT/replaceAttributesAndRelationship.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/replaceAttributesAndRelationship.json");
         String expected2 = jsonParser.getJson("/ResourceIT/replaceAttributesAndRelationship.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
-        String response = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/7")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(response, expected2);
-    }
-
-    @Test(priority = 17)
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(expected2, false));
+    }
+
+    @Test
     public void removeObject() {
         String req1 = jsonParser.getJson("/ResourceIT/removeObject.1.req.json");
         String req2 = jsonParser.getJson("/ResourceIT/removeObject.2.req.json");
@@ -987,476 +1527,723 @@ public void removeObject() {
         String expected1 = jsonParser.getJson("/ResourceIT/removeObject.1.json");
         String expected2 = jsonParser.getJson("/ResourceIT/removeObject.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(req1)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/8")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expectedDirect));
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(req2)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected2));
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/8")
-            .then()
-            .statusCode(HttpStatus.SC_NOT_FOUND);
-    }
-
-    @Test(priority = 18)
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(req1)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/5")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expectedDirect));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(req2)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected2));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/5")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+
+    @Test
     public void createAndRemoveParent() {
         String request = jsonParser.getJson("/ResourceIT/createAndRemoveParent.req.json");
         String expected = jsonParser.getJson("/ResourceIT/createAndRemoveParent.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/7")
-            .then()
-            .statusCode(HttpStatus.SC_OK);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/7")
-            .then()
-            .statusCode(HttpStatus.SC_NOT_FOUND);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/4")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
     }
 
-    @Test(priority = 19)
+    @Test
     public void testAddRoot() {
         String request = jsonParser.getJson("/ResourceIT/testAddRoot.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/testAddRoot.1.json");
         String expected2 = jsonParser.getJson("/ResourceIT/testAddRoot.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/10")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected2));
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/5")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected2));
     }
 
-    @Test(priority = 20)
+    @Test
     public void updateRelationshipDirect() {
         String request = jsonParser.getJson("/ResourceIT/updateRelationshipDirect.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/updateRelationshipDirect.1.json");
         String expected2 = jsonParser.getJson("/ResourceIT/updateRelationshipDirect.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent/10/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
-        String response = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/10")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(response, expected2);
-    }
-
-    @Test(priority = 21)
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent/1/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(expected2, true));
+    }
+
+    @Test
     public void removeSingleRelationship() {
         String request = jsonParser.getJson("/ResourceIT/removeSingleRelationship.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/removeSingleRelationship.1.json");
         String expected2 = jsonParser.getJson("/ResourceIT/removeSingleRelationship.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent/10/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
-        String response = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/10")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(response, expected2);
-    }
-
-    @Test(priority = 22)
-    public void addRelationshipChild() {
-        String request = jsonParser.getJson("/ResourceIT/addRelationshipChild.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/addRelationshipChild.json");
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/parent/5/children/6/relationships/parents")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-        String response = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/5/children/6")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(response, expected);
-    }
-
-    @Test(priority = 23)
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent/2/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(expected2, false));
+    }
+
+    @Test
+    public void addRelationshipChild() throws Exception {
+        Data expected = datum(
+                resource(
+                        type("child"),
+                        id("1"),
+                        attributes(
+                                attr("name", null)
+                        ),
+                        relationships(
+                                relation("friends"),
+                                relation("parents",
+                                        linkage(type("parent"), id("1")),
+                                        linkage(type("parent"), id("2"))
+                                )
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                linkage(type("parent"), id("2"))
+                        )
+                )
+                .post("/parent/1/children/1/relationships/parents")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/1/children/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(expected, false));
+    }
+
+    @Test
     public void removeRelationshipChild() {
-        String request = jsonParser.getJson("/ResourceIT/removeRelationshipChild.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/removeRelationshipChild.json");
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .delete("/parent/5/children/6/relationships/parents")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-length", (String) null);
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/5/children/6")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
-    }
-
-    @Test(priority = 24)
-    public void addRelationships() throws IOException {
+        Data expected = datum(
+                resource(
+                        type("child"),
+                        id("1"),
+                        attributes(
+                                attr("name", null)
+                        ),
+                        relationships(
+                                relation("friends"),
+                                relation("parents")
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(
+                        linkage(type("parent"), id("1"))
+                ))
+                .delete("/parent/1/children/1/relationships/parents")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/child/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected.toJSON()));
+    }
+
+    @Test
+    public void addRelationships() {
         String request = jsonParser.getJson("/ResourceIT/addRelationships.req.json");
         String expected1 = jsonParser.getJson("/ResourceIT/addRelationships.json");
         String expected2 = jsonParser.getJson("/ResourceIT/addRelationships.2.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent/10/relationships/children")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected1));
-        String response = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/parent/10")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        assertEqualDocuments(response, expected2);
-    }
-
-    @Test(priority = 25)
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent/1/relationships/children")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected1));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(expected2, false));
+    }
+
+    @Test
     public void checkJsonApiPatchWithError() {
         String request = jsonParser.getJson("/ResourceIT/checkJsonApiPatchWithError.req.json");
         String expected = jsonParser.getJson("/ResourceIT/checkJsonApiPatchWithError.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/parent")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 26)
+    @Test
     public void patchExtBadId() {
         String request = jsonParser.getJson("/ResourceIT/patchExtBadId.req.json");
         String expected = jsonParser.getJson("/ResourceIT/patchExtBadId.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 27)
+    @Test
     public void patchExtAddUpdate() {
         String request = jsonParser.getJson("/ResourceIT/patchExtAddUpdate.req.json");
         String expected = jsonParser.getJson("/ResourceIT/patchExtAddUpdate.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 28)
+    @Test
+    @Tag("skipInMemory")
+    //Verifies violation of unique column constraint.
     public void patchExtBadValue() throws IOException {
         String request = jsonParser.getJson("/ResourceIT/patchExtBadValue.req.json");
 
-        JsonNode result = jsonApiMapper.getObjectMapper().readTree(given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST)
-            .extract()
-            .body()
-            .asString());
-
-        JsonNode errors = result.get("errors");
-        Assert.assertNotNull(errors);
-        Assert.assertEquals(errors.size(), 3);
-
-        String error = errors.get(2).get("detail").asText();
-        String expected = "Unknown identifier '2d1b";
-        Assert.assertTrue(error.startsWith(expected), "Error does not start with '" + expected + "'");
-        Assert.assertEquals(errors.get(2).get("status").asInt(), 404);
+        jsonApiMapper.getObjectMapper().readTree(given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(anyOf(equalTo(HttpStatus.SC_LOCKED), equalTo(HttpStatus.SC_BAD_REQUEST)))
+                .extract()
+                .body()
+                .asString());
     }
 
-    @Test(priority = 29)
+    @Test
     public void patchExtBadDelete() {
         String request = jsonParser.getJson("/ResourceIT/patchExtBadDelete.req.json");
         String expected = jsonParser.getJson("/ResourceIT/patchExtBadDelete.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(jsonEquals(expected, false));
     }
 
-    @Test(priority = 30)
+    @Test
     public void createParentWithoutId() {
-        String request = jsonParser.getJson("/ResourceIT/createParentWithoutId.req.json");
-        String expected = jsonParser.getJson("/ResourceIT/createParentWithoutId.json");
+        Data newParent = data(
+                resource(
+                        type("parent"),
+                        attributes(
+                                attr("firstName", "omg. I have kidz.")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("2"))
+                                ),
+                                relation("spouses")
+                        )
+                )
+        );
+
+        Data expected = new Data(
+                resource(
+                        type("parent"),
+                        id("5"),
+                        attributes(
+                                attr("firstName", "omg. I have kidz.")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("2"))
+                                ),
+                                relation("spouses")
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(newParent)
+                .post("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(jsonEquals(expected, false));
+    }
+
+    @Test
+    public void testOneToOneRelationshipAdding() {
+
+        Data oneToOneRoot = datum(
+                resource(
+                        type("oneToOneRoot"),
+                        id("1"),
+                        attributes(
+                                attr("name", "test123")
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(oneToOneRoot)
+                .post("/oneToOneRoot")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Verify it was actually created
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(oneToOneRoot)
+                .get("/oneToOneRoot/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        Data oneToOneNonRoot = datum(
+                resource(
+                        type("oneToOneNonRoot"),
+                        id("1"),
+                        attributes(
+                                attr("test", "Other object")
+                        )
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(oneToOneNonRoot)
+                .post("/oneToOneRoot/1/otherObject")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Verify contents
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/oneToOneRoot/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("oneToOneRoot"),
+                                        id("1"),
+                                        attributes(
+                                                attr("name", "test123")
+                                        ),
+                                        relationships(
+                                                relation("otherObject", TO_ONE,
+                                                        linkage(type("oneToOneNonRoot"), id("1"))
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                ));
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/oneToOneRoot/1/otherObject")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("oneToOneNonRoot"),
+                                        id("1"),
+                                        attributes(
+                                                attr("test", "Other object")
+                                        ),
+                                        relationships(
+                                                relation("root", TO_ONE,
+                                                        linkage(type("oneToOneRoot"), id("1"))
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                ));
+    }
+
+    @Test
+    public void testReadPermissionDefaultOverride() throws Exception {
+        Resource obj = resource(
+                type("yetAnotherPermission"),
+                id("1"),
+                attributes(
+                        attr("youShouldBeAbleToRead", "this!")
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(obj))
+                .post("/yetAnotherPermission")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
 
-        String actualResponse = given()
+        // Verify contents
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
-                .post("/parent")
+                .get("/yetAnotherPermission")
                 .then()
-                .statusCode(HttpStatus.SC_CREATED)
-                .extract().body().asString();
-
-        assertEqualDocuments(actualResponse, expected);
+                .statusCode(HttpStatus.SC_OK)
+                .body(jsonEquals(data(obj), true));
     }
 
-    @Test(priority = 31)
-    public void testOneToOneRelationshipAdding() {
-        // This is a regression test: we had an issue that disallowed creation of non-root one-to-one objects.
-        String createRoot = jsonParser.getJson("/ResourceIT/createOneToOneRoot.json");
+    @Test
+    public void testUpdateToOneCollection() throws Exception {
+        Data oneToOneRoot = datum(
+                resource(
+                        type("oneToOneRoot"),
+                        id("1"),
+                        attributes(
+                                attr("name", "test123")
+                        )
+                )
+        );
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(createRoot)
-            .post("/oneToOneRoot")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(oneToOneRoot)
+                .post("/oneToOneRoot")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
 
-        // Verify it was actually created
-        String o = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(createRoot)
-            .get("/oneToOneRoot/1")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().asString();
+        Data oneToOneNonRoot = datum(
+                resource(
+                        type("oneToOneNonRoot"),
+                        id("1"),
+                        attributes(
+                                attr("test", "Other object")
+                        )
+                )
+        );
 
         // Create other object
-        String createChild = jsonParser.getJson("/ResourceIT/createOneToOneNonRoot.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(createChild)
-            .post("/oneToOneRoot/1/otherObject")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
-
-        // Verify contents
-        String actualFirst = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(createChild)
-            .get("/oneToOneRoot/1")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        String actualChild = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(createChild)
-            .get("/oneToOneRoot/1/otherObject")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        String expectedFirst = jsonParser.getJson("/ResourceIT/oneToOneRootCreatedRelationship.json");
-        String expectedChild = jsonParser.getJson("/ResourceIT/oneToOneNonRootCreatedRelationship.json");
-
-        assertEqualDocuments(actualFirst, expectedFirst);
-        assertEqualDocuments(actualChild, expectedChild);
-    }
-
-    @Test(priority = 32)
-    public void testReadPermissionDefaultOverride() {
-        String create = jsonParser.getJson("/ResourceIT/createYetAnotherPermissionRead.req.json");
-
-        given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(create)
-            .post("/yetAnotherPermission")
-            .then()
-            .statusCode(HttpStatus.SC_CREATED);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(oneToOneNonRoot)
+                .post("/oneToOneRoot/1/otherObject")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
 
         // Verify contents
-        String actual = given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .get("/yetAnotherPermission")
-            .then()
-            .statusCode(HttpStatus.SC_OK)
-            .extract().body().asString();
-
-        String expected = jsonParser.getJson("/ResourceIT/createYetAnotherPermissionRead.json");
-
-        assertEqualDocuments(actual, expected);
-    }
-
-    @Test(priority = 33)
-    public void testUpdateToOneCollection() {
-        String createRoot = jsonParser.getJson("/ResourceIT/createOneToOneRoot.json");
-
-        // Verify it was actually created
-        String o = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createRoot)
                 .get("/oneToOneRoot/1")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().asString();
-
-        // Create other object
-        String createChild = jsonParser.getJson("/ResourceIT/updateOneToOneNonRoot.json");
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("oneToOneRoot"),
+                                        id("1"),
+                                        attributes(
+                                                attr("name", "test123")
+
+                                        ),
+                                        relationships(
+                                                relation("otherObject", TO_ONE,
+                                                        linkage(type("oneToOneNonRoot"), id("1"))
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                ));
+
+        Data updated = datum(
+                resource(
+                        type("oneToOneNonRoot"),
+                        id("2"),
+                        attributes(
+                                attr("test", "Another object")
+                        )
+                )
+        );
+
+        // Create another object
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createChild)
+                .body(updated)
                 .post("/oneToOneRoot/1/otherObject")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
 
         // Verify contents
-        String actualFirst = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createChild)
                 .get("/oneToOneRoot/1")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("oneToOneRoot"),
+                                        id("1"),
+                                        attributes(
+                                                attr("name", "test123")
+
+                                        ),
+                                        relationships(
+                                                relation("otherObject", TO_ONE,
+                                                        linkage(type("oneToOneNonRoot"), id("2"))
+                                                )
+                                        )
+                                )
+                        ).toJSON()
+                ));
+    }
+
+    @Test
+    public void testPostToRecord() {
+        Data oneToOneRoot = datum(
+                resource(
+                        type("oneToOneRoot"),
+                        id("1"),
+                        attributes(
+                                attr("name", "test123")
+                        )
+                )
+        );
 
-        String actualChild = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createChild)
-                .get("/oneToOneRoot/1/otherObject")
+                .body(oneToOneRoot)
+                .post("/oneToOneRoot")
                 .then()
-                .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-
-        String
-                expectedFirst = jsonParser.getJson("/ResourceIT/oneToOneRootUpdatedRelationship.json");
-        String expectedChild = jsonParser.getJson("/ResourceIT/oneToOneNonRootUpdatedRelationship.json");
-
-        assertEqualDocuments(actualFirst, expectedFirst);
-        assertEqualDocuments(actualChild, expectedChild);
-    }
-
-    @Test(priority = 34)
-    public void testPostToRecord() {
-        String createRoot = jsonParser.getJson("/ResourceIT/createOneToOneRoot.json");
+                .statusCode(HttpStatus.SC_CREATED);
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createRoot)
+                .body(oneToOneRoot)
                 .post("/oneToOneRoot/1")
                 .then()
                 .statusCode(HttpStatus.SC_BAD_REQUEST);
     }
 
-    @Test(priority = 34)
+    @Test
     public void testFilterIds() {
-        String expectedRels = jsonParser.getJson("/ResourceIT/testFilterIdRels.json");
-        String expectedIncl = jsonParser.getJson("/ResourceIT/testFilterIdIncluded.json");
-        String expectedColl = jsonParser.getJson("/ResourceIT/testFilterIdCollection.json");
         given()
-                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-                .get("/parent/10/relationships/children?filter[child.id]=4")
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2/relationships/children?filter[child.id]=3")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .body(equalTo(expectedRels));
+                .body(equalTo(
+                        data(
+                                linkage(type("child"), id("3"))
+                        ).toJSON()));
         given()
-                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-                .get("/parent/10?include=children&filter[child.id]=4,5")
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2?include=children&filter[child.id]=3")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        document(
+                                datum(
+                                        resource(
+                                                type("parent"),
+                                                id("2"),
+                                                attributes(
+                                                        attr("firstName", "John")
+                                                ),
+                                                relationships(
+                                                        relation("children",
+                                                                linkage(type("child"), id("3"))
+                                                        ),
+                                                        relation("spouses")
+                                                )
+                                        )
+                                ),
+                                include(CHILD3)
+                        ).toJSON()
+                ));
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent?include=children&filter[child.id]=4")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .body(equalTo(expectedIncl));
+                .body(equalTo(
+                        document(
+                                data(
+                                        resource(
+                                                type("parent"),
+                                                id("1"),
+                                                attributes(
+                                                        attr("firstName", null)
+                                                ),
+                                                relationships(
+                                                        relation("children"),
+                                                        relation("spouses")
+                                                )
+
+                                        ),
+                                        resource(
+                                                type("parent"),
+                                                id("2"),
+                                                attributes(
+                                                        attr("firstName", "John")
+                                                ),
+                                                relationships(
+                                                        relation("children"),
+                                                        relation("spouses")
+                                                )
+
+                                        ),
+                                        resource(
+                                                type("parent"),
+                                                id("3"),
+                                                attributes(
+                                                        attr("firstName", "Link")
+                                                ),
+                                                relationships(
+                                                        relation("children",
+                                                                linkage(type("child"), id("4"))
+                                                        ),
+                                                        relation("spouses")
+                                                )
+
+                                        ),
+                                        resource(
+                                                type("parent"),
+                                                id("4"),
+                                                attributes(
+                                                        attr("firstName", "Unknown")
+                                                ),
+                                                relationships(
+                                                        relation("children"),
+                                                        relation("spouses",
+                                                                linkage(type("parent"), id("3"))
+                                                        )
+                                                )
+
+                                        )
+                                ),
+                                include(CHILD4)
+                        ).toJSON()));
+    }
+
+    @Test
+    public void testIssue608() {
+        String req = jsonParser.getJson("/ResourceIT/Issue608.req.json");
+        String expected = jsonParser.getJson("/ResourceIT/Issue608.resp.json");
         given()
                 .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
                 .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-                .get("/parent?include=children&filter[child.id]=4")
+                .body(req)
+                .patch("/parent")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .body(equalTo(expectedColl));
+                .body(equalTo(expected));
     }
 
-    @Test(priority = 36)
+    @Test
     public void testNestedPatch() {
         String req = jsonParser.getJson("/ResourceIT/nestedPatchCreate.req.json");
         String expected = jsonParser.getJson("/ResourceIT/nestedPatchCreate.resp.json");
@@ -1470,17 +2257,17 @@ public void testNestedPatch() {
                 .body(equalTo(expected));
     }
 
-    @Test(priority = 37)
+    @Test
     public void testCreatedRootNoReadPermRequired() {
         String req = jsonParser.getJson("/ResourceIT/testPatchExtNoReadPermForNew.req.json");
         String badReq = "[{\n"
-                 + "    \"op\": \"add\","
-                 + "    \"path\": \"/1/child\",\n"
-                 + "    \"value\": {\n"
-                 + "      \"type\": \"child\",\n"
-                 + "      \"id\": \"12345678-1234-1234-1234-123456789ab2\"\n"
-                 + "    }\n"
-                 + "  }]";
+                + "    \"op\": \"add\","
+                + "    \"path\": \"/1/child\",\n"
+                + "    \"value\": {\n"
+                + "      \"type\": \"child\",\n"
+                + "      \"id\": \"12345678-1234-1234-1234-123456789ab2\"\n"
+                + "    }\n"
+                + "  }]";
         String expected = jsonParser.getJson("/ResourceIT/testPatchExtNoReadPermForNew.resp.json");
         given()
                 .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
@@ -1496,38 +2283,45 @@ public void testCreatedRootNoReadPermRequired() {
                 .body(badReq)
                 .patch("/specialread")
                 .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN)
-                .body(equalTo("{\"errors\":[\"ForbiddenAccessException\"]}"));
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body(equalTo("[{\"errors\":[{\"detail\":\"UpdatePermission Denied\",\"status\":\"403\"}]}]"));
     }
 
-    @Test(priority = 38)
+    @Test
     public void testUserNoShare() {
-        String initialCreate = "{\n"
-                + "  \"data\":{\n"
-                + "    \"type\":\"noShareBid\",\n"
-                + "    \"id\":\"1\"\n"
-                + "  }\n"
-                + "}\n";
-        String req = jsonParser.getJson("/ResourceIT/noShareBiDirectional.req.json");
-        String expected = "{\"data\":{\"type\":\"noShareBid\",\"id\":\"2\",\"relationships\":{\"other\":{\"data\":{\"type\":\"noShareBid\",\"id\":\"1\"}}}}}";
+        Resource noShareBid1 = resource(
+                type("noShareBid"),
+                id("1")
+        );
+
+        Resource noShareBid2 = resource(
+                type("noShareBid"),
+                id("2"),
+                relationships(
+                        relation("other", TO_ONE,
+                                linkage(type("noShareBid"), id("1"))
+                        )
+                )
+        );
+
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(initialCreate)
+                .body(datum(noShareBid1))
                 .post("/noShareBid")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED);
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(req)
+                .body(datum(noShareBid2))
                 .post("/noShareBid/1/other")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED)
-                .body(equalTo(expected));
+                .body(equalTo(datum(noShareBid2).toJSON()));
     }
 
-    @Test(priority = 39)
+    @Test
     public void testPatchExtNoCommit() {
         String req = jsonParser.getJson("/ResourceIT/testPatchExtNoCommit.req.json");
         given()
@@ -1537,12 +2331,37 @@ public void testPatchExtNoCommit() {
                 .patch("/")
                 .then()
                 .statusCode(HttpStatus.SC_FORBIDDEN)
-                .body(equalTo("{\"errors\":[\"ForbiddenAccessException\"]}"));
+                .body(equalTo("{\"errors\":[{\"detail\":\"CreatePermission Denied\"}]}"));
     }
 
-    @Test(priority = 40)
+    @Test
     public void testInverseDeleteFromCollection() {
-        // NOTE: This only tests this behavior is correct BECAUSE of the Child4Parent10 check.
+        Data parentOutput = datum(
+                resource(
+                        type("parent"),
+                        id("5"),
+                        attributes(
+                                attr("firstName", "omg. I have kidz.")
+                        ),
+                        relationships(
+                                relation("children",
+                                        linkage(type("child"), id("4"))
+                                ),
+                                relation("spouses")
+                        )
+                )
+        );
+
+        //Create parent 5 and assign it to child 4 (for the strange security check).
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(parentOutput)
+                .post("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // NOTE: This only tests this behavior is correct BECAUSE of the Child4Parent5 check.
         // It's a bit contrived, but we shouldn't lose the logic.
         // The problem: when deleting an inverse relation, it checks whether it can update its inverse field back
         // to the original. This is flawed logic since you're deleting the original in the first place (and that check
@@ -1550,58 +2369,119 @@ public void testInverseDeleteFromCollection() {
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .delete("/parent/10/children/4")
+                .delete("/parent/5/children/4")
                 .then()
                 .statusCode(204);
     }
 
-    @Test(priority = 41)
+    @Test
     public void testPostInvalidRelationship() {
         // Note: This tests the correct response when POSTing a resource with a not "include" relationship. The server
         // should returns UnknownEntityException rather than NPE.
-        String createRoot = jsonParser.getJson("/ResourceIT/testPostWithInvalidRelationship.json");
+        Resource invalid = resource(
+                type("resourceWithInvalidRelationship"),
+                id("1"),
+                attributes(
+                        attr("name", "test123")
+                ),
+                relationships(
+                        relation("notIncludedResource",
+                                linkage(type("notIncludedResource"), id("1"))
+                        )
+                )
+        );
 
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(createRoot)
+                .body(datum(invalid))
                 .post("resourceWithInvalidRelationship")
                 .then()
                 .statusCode(HttpStatus.SC_BAD_REQUEST);
     }
 
+    @Test
+    public void testSortByIdRootableTopLevel() {
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent?sort=id")
+                .then()
+                .body(equalTo(data(PARENT1, PARENT2, PARENT3, PARENT4).toJSON()));
+
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent?sort=-id")
+                .then()
+                .body(equalTo(data(PARENT4, PARENT3, PARENT2, PARENT1).toJSON()));
+    }
+
+    @Test
+    public void testSortByIdNonRootableTopLevel() {
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2/children?sort=id")
+                .then()
+                .body(equalTo(data(CHILD2, CHILD3).toJSON()));
+
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/parent/2/children?sort=-id")
+                .then()
+                .body(equalTo(data(CHILD3, CHILD2).toJSON()));
+    }
+
+    @Test
+    public void testExceptionThrowingBean() {
+        // Ensure web exception from bean gets bubbled up
+        given()
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/exceptionThrowingBean/1")
+                .then()
+                .statusCode(Status.GONE.getStatusCode());
+    }
+
     @Test
     public void assignedIdString() {
-        String expected = jsonParser.getJson("/ResourceIT/assignedIdString.json");
+
+        Resource resource = resource(
+                type("assignedIdString"),
+                id("user1"),
+                attributes(
+                        attr("value", 22)
+                )
+        );
 
         //Create user with assigned id
-        String request = jsonParser.getJson("/ResourceIT/assignedIdString.req.json");
-        String actual = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
+                .body(datum(resource))
                 .post("/assignedIdString")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED)
-                .extract().body().asString();
-        assertEqualDocuments(actual, expected);
+                .body(equalTo(datum(resource).toJSON()));
 
         //Fetch newly created user
-        String getResponse = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/assignedIdString/user1")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-        assertEqualDocuments(getResponse, expected);
+                .body(equalTo(datum(resource).toJSON()));
+
+        Resource modified = resource(
+                type("assignedIdString"),
+                id("user2"),
+                attributes(
+                        attr("value", 22)
+                )
+        );
 
-        //Try to reassign id
-        String patchRequest = jsonParser.getJson("/ResourceIT/failPatchIdString.req.json");
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(patchRequest)
+                .body(datum(modified))
                 .patch("/assignedIdString/user1")
                 .then()
                 .statusCode(HttpStatus.SC_BAD_REQUEST);
@@ -1609,36 +2489,46 @@ public void assignedIdString() {
 
     @Test
     public void assignedIdLong() {
-        String expected = jsonParser.getJson("/ResourceIT/assignedIdLong.json");
 
-        //Create user with assigned id
-        String postRequest = jsonParser.getJson("/ResourceIT/assignedIdLong.req.json");
-        String postResponse = given()
+        Resource resource = resource(
+                type("assignedIdLong"),
+                id("1"),
+                attributes(
+                        attr("value", 22)
+                )
+        );
+
+
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(postRequest)
+                .body(datum(resource))
                 .post("/assignedIdLong")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED)
-                .extract().body().asString();
-        assertEqualDocuments(postResponse, expected);
+                .body(equalTo(datum(resource).toJSON()));
 
         //Fetch newly created user
-        String getResponse = given()
+        given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
                 .get("/assignedIdLong/1")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .extract().body().asString();
-        assertEqualDocuments(getResponse, expected);
+                .body(equalTo(datum(resource).toJSON()));
+
+        Resource modified = resource(
+                type("assignedIdLong"),
+                id("2"),
+                attributes(
+                        attr("value", 22)
+                )
+        );
 
-        //Try to reassign id
-        String patchRequest = jsonParser.getJson("/ResourceIT/failPatchIdLong.req.json");
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(patchRequest)
+                .body(datum(modified))
                 .patch("/assignedIdLong/1")
                 .then()
                 .statusCode(HttpStatus.SC_BAD_REQUEST);
@@ -1646,69 +2536,127 @@ public void assignedIdLong() {
 
     @Test
     public void assignedIdWithoutProvidedId() {
-        String request = jsonParser.getJson("/ResourceIT/assignedIdWithoutId.req.json");
+        Resource resource = resource(
+                type("assignedIdString"),
+                attributes(
+                        attr("value", 22)
+                )
+        );
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .post("/assignedIdString")
-            .then()
-            .statusCode(HttpStatus.SC_BAD_REQUEST);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(resource))
+                .post("/assignedIdString")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
     }
 
     @Test
-    public void elideBypassSecurity() {
-        String expected = jsonParser.getJson("/ResourceIT/elideBypassSecurity.json");
+    public void elideSecurityEnabled() {
+        Elide elide = new Elide(new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(EntityDictionary.builder().checks(TestCheckMappings.MAPPINGS).build())
+                .withAuditLogger(new TestAuditLogger())
+                .build());
 
-        Elide elide = new Elide.Builder(new TestAuditLogger(), AbstractIntegrationTestInitializer.getDatabaseManager())
-                .permissionExecutor(BypassPermissionExecutor.class)
-                .build();
-        ElideResponse response =
-                elide.get("parent/1/children/1", new MultivaluedHashMap<>(), -1);
-        assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        assertEquals(response.getBody(), expected);
-    }
+        elide.doScans();
 
-    @Test
-    public void elideSecurityEnabled() {
-        Elide elide = new Elide.Builder(new TestAuditLogger(), AbstractIntegrationTestInitializer.getDatabaseManager()).build();
-        ElideResponse response = elide.get("parent/1/children", new MultivaluedHashMap<>(), -1);
-        assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        assertEquals(response.getBody(), "{\"data\":[]}");
+        com.yahoo.elide.core.security.User user = new com.yahoo.elide.core.security.User(() -> "-1");
+        ElideResponse response = elide.get(baseUrl, "parent/1/children", new MultivaluedHashMap<>(), user, NO_VERSION);
+        assertEquals(HttpStatus.SC_OK, response.getResponseCode());
+        assertEquals("{\"data\":[]}", response.getBody());
     }
 
     @Test
     public void testComputedAttribute() throws Exception {
-        String expected = jsonParser.getJson("/ResourceIT/testComputedAttribute.json");
-        String request = jsonParser.getJson("/ResourceIT/testComputedAttribute.req.json");
+        Resource patched = resource(
+                type("user"),
+                id("1"),
+                attributes(
+                        attr("password", "god")
+                )
+        );
+
+        Resource returned = resource(
+                type("user"),
+                id("1"),
+                attributes(
+                        attr("password", ""),
+                        attr("reversedPassword", "dog"),
+                        attr("role", 0)
+                )
+        );
 
         given()
-            .contentType(JSONAPI_CONTENT_TYPE)
-            .accept(JSONAPI_CONTENT_TYPE)
-            .body(request)
-            .patch("/user/1")
-            .then()
-            .statusCode(HttpStatus.SC_NO_CONTENT)
-            .header("content-lenth", (String) null);
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(patched))
+                .patch("/user/1")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT)
+                .header(HttpHeaders.CONTENT_LENGTH, nullValue());
 
         given().when().get("/user/1").then().statusCode(HttpStatus.SC_OK)
-            .body(equalTo(expected));
+                .body(equalTo(datum(returned).toJSON()));
+    }
+
+    @Test
+    public void testPrivilegeEscalation() throws Exception {
+        Resource patched = resource(
+                type("user"),
+                id("1"),
+                attributes(
+                        attr("role", 1)
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(patched))
+                .patch("/user/1")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
     }
 
     // Update checks should be _deferred_ (neither ignored nor aggressively applied) on newly created objects.
     @Test
     public void testUpdateDeferredOnCreate() {
-        String expected = jsonParser.getJson("/ResourceIT/createButNoUpdate.resp.json");
-        String badRequest = jsonParser.getJson("/ResourceIT/createButNoUpdate.bad.req.json");
-        String request = jsonParser.getJson("/ResourceIT/createButNoUpdate.req.json");
-        String updateRequest = jsonParser.getJson("/ResourceIT/createButNoUpdate.update.req.json");
+
+        Resource expected = resource(
+                type("createButNoUpdate"),
+                id("1"),
+                attributes(
+                        attr("cannotModify", "unmodified"),
+                        attr("textValue", "new value")
+                ),
+                relationships(
+                        relation("toOneRelation", true)
+                )
+        );
+
+        Resource badRequest = resource(
+                type("createButNoUpdate"),
+                id("1"),
+                attributes(
+                        attr("cannotModify", "This should fail this whole create"),
+                        attr("textValue", "test")
+                )
+        );
+
+        Resource validRequest = resource(
+                type("createButNoUpdate"),
+                id("1"),
+                attributes(
+                        attr("textValue", "new value")
+                )
+        );
 
         // First ensure we cannot update fields that are explicitly disallowed
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(badRequest)
+                .body(datum(badRequest))
                 .post("/createButNoUpdate")
                 .then()
                 .statusCode(HttpStatus.SC_FORBIDDEN);
@@ -1717,38 +2665,147 @@ public void testUpdateDeferredOnCreate() {
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(request)
+                .body(datum(validRequest))
                 .post("/createButNoUpdate")
                 .then()
                 .statusCode(HttpStatus.SC_CREATED)
-                .body(equalTo(expected));
+                .body(equalTo(datum(expected).toJSON()));
 
         // Ensure we cannot update that newly created object
         given()
                 .contentType(JSONAPI_CONTENT_TYPE)
                 .accept(JSONAPI_CONTENT_TYPE)
-                .body(updateRequest)
+                .body(datum(validRequest))
                 .patch("/createButNoUpdate/1")
                 .then()
                 .statusCode(HttpStatus.SC_FORBIDDEN);
     }
 
+    @Test
+    public void testUpdatingExistingResourceWithoutPermissionsIsForbidden() {
+
+        Resource entity1 = resource(
+                type("createButNoUpdate"),
+                id("1"),
+                attributes(
+                        attr("textValue", "new value")
+                )
+        );
+
+        Resource entity2 = resource(
+                type("createButNoUpdate"),
+                id("2"),
+                attributes(
+                        attr("textValue", "new value")
+                ),
+                relationships(
+                        relation("toOneRelation", linkage(type("createButNoUpdate"), id("1")))
+                )
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(entity1))
+                .post("/createButNoUpdate")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(entity2))
+                .post("/createButNoUpdate")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+
+        Data relationships = data(
+                linkage(type("createButNoUpdate"), id("1"))
+        );
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(relationships)
+                .post("/createButNoUpdate/2/relationships/toOneRelation")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+    }
+
     @Test
     public void testPatchDeferredOnCreate() {
         String request = jsonParser.getJson("/ResourceIT/testPatchDeferredOnCreate.req.json");
         String expected = jsonParser.getJson("/ResourceIT/testPatchDeferredOnCreate.json");
         given()
-            .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
-            .body(request)
-            .patch("/")
-            .then()
-            .statusCode(HttpStatus.SC_FORBIDDEN)
-            .body(equalTo(expected));
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN)
+                .body(equalTo(expected));
     }
 
-    // TODO: Test that user checks still apply at commit time
+    @ParameterizedTest
+    @MethodSource("likeQueryProvider")
+    public void testSpecialCharacterLikeQuery(String filterParam, int noOfRecords) throws Exception {
+        String actual = given().when().get(String.format("/book?%s", filterParam)).then().statusCode(HttpStatus.SC_OK)
+                .extract().body().asString();
+        JsonApiDocument doc = jsonApiMapper.readJsonApiDocument(actual);
+        assertEquals(doc.getData().get().size(), noOfRecords);
+
+    }
+
+    @ParameterizedTest
+    @MethodSource("queryProviderHQL")
+    public void testSpecialCharacterLikeQueryHQL(FilterPredicate filterPredicate, int noOfRecords) throws Exception {
+        DataStoreTransaction tx = dataStore.beginReadTransaction();
+        RequestScope scope = mock(RequestScope.class);
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+        dictionary.bindEntity(Book.class);
+        when(scope.getDictionary()).thenReturn(dictionary);
+        PaginationImpl pagination = mock(PaginationImpl.class);
+        when(pagination.returnPageTotals()).thenReturn(true);
+        tx.loadObjects(EntityProjection.builder()
+                .type(Book.class)
+
+                .filterExpression(filterPredicate)
+                .pagination(pagination)
+                .build(), scope);
+        tx.commit(scope);
+        tx.close();
+        verify(pagination).setPageTotals((long) noOfRecords);
+    }
 
+    @Test
+    public void testPaginationLimitOverrides() {
+        // Well below the limit
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .get("/parent?page[size]=10")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        // At the limit
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .get("/parent?page[size]=100000")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        // Above the limit
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .get("/parent?page[size]=100001")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    // TODO: Test that user checks still apply at commit time
     @Test
     public void badRoot() {
         given().when().get("/oops").then().statusCode(Status.NOT_FOUND.getStatusCode());
@@ -1768,4 +2825,162 @@ public void badChildCollection() {
     public void badChildCollectionId() {
         given().when().get("/user/1/oops/1").then().statusCode(Status.NOT_FOUND.getStatusCode());
     }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common table.
+    public void testVersionedBookFetch() throws Exception {
+        given()
+                .header("ApiVersion", "1.0")
+                .when()
+                .get("/book?fields[book]=name")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("book"),
+                                        id("1"),
+                                        attributes(
+                                                attr("name", "titlewith%percentage")
+                                        )
+                                ),
+                                resource(
+                                        type("book"),
+                                        id("2"),
+                                        attributes(
+                                                attr("name", "titlewithoutpercentage")
+                                        )
+                                )
+                        ).toJSON()
+                ));
+
+        given()
+                .header("ApiVersion", NO_VERSION)
+                .when()
+                .get("/book?fields[book]=title")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("book"),
+                                        id("1"),
+                                        attributes(
+                                                attr("title", "titlewith%percentage")
+                                        )
+                                ),
+                                resource(
+                                        type("book"),
+                                        id("2"),
+                                        attributes(
+                                                attr("title", "titlewithoutpercentage")
+                                        )
+                                )
+                        ).toJSON()
+                ));
+    }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common table.
+    public void testVersionedBookCreate() throws Exception {
+        given()
+                .header("ApiVersion", "1.0")
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("book"),
+                                        attributes(
+                                                attr("name", "A new book."),
+                                                attr("publishDate", 1123)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/book")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body(equalTo(
+                        datum(
+                                resource(
+                                        type("book"),
+                                        id("3"),
+                                        attributes(
+                                                attr("name", "A new book."),
+                                                attr("publishDate", 1123)
+                                        )
+                                )
+                        ).toJSON()
+                ));
+    }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common table.
+    public void testVersionedBookPatch() throws Exception {
+        given()
+                .header("ApiVersion", "1.0")
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("book"),
+                                        id("2"),
+                                        attributes(
+                                                attr("name", "A new book.")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/book/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common table.
+    public void testVersionedPatchExtension() {
+        String req = jsonParser.getJson("/ResourceIT/versionedPatchExtension.req.json");
+        String expected = jsonParser.getJson("/ResourceIT/versionedPatchExtension.resp.json");
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .header("ApiVersion", "1.0")
+                .body(req)
+                .patch("/book")
+                .then()
+                .log().all()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(expected));
+    }
+
+    @Test
+    @Tag("skipInMemory") //Skipping because storage for in-memory store is
+    //broken out by class instead of a common table.
+    public void testVersionedBookDelete() throws Exception {
+        given()
+                .header("ApiVersion", "1.0")
+                .when()
+                .delete("/book/2")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+
+    @Test
+    public void testMissingVersionedModels() throws Exception {
+        given()
+                .header("ApiVersion", "1.0")
+                .when()
+                .get("/parent")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
 }
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/SortingIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/SortingIT.java
new file mode 100644
index 0000000000..be350b8c85
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/SortingIT.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.utils.JsonParser;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+public class SortingIT extends IntegrationTest {
+    private final JsonParser jsonParser = new JsonParser();
+
+    @BeforeEach
+    public void setup() {
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/SortingIT/addAuthorBookPublisher1.json"))
+                .patch("/");
+
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/SortingIT/addAuthorBookPublisher2.json"))
+                .patch("/");
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/SortingIT/addAuthorBookPublisher3.json"))
+                .patch("/");
+
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(jsonParser.getJson("/SortingIT/addAuthorBookPublisher4.json"))
+                .patch("/");
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testSortingRootCollectionByRelationshipProperty() throws IOException {
+        JsonNode result = getAsNode("/book?sort=-publisher.name");
+        int size = result.get("data").size();
+        assertEquals(8, size);
+
+        JsonNode books = result.get("data");
+        String firstBookName = books.get(0).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", firstBookName);
+
+        String secondBookName = books.get(1).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", secondBookName);
+
+        result = getAsNode("/book?sort=publisher.name");
+        size = result.get("data").size();
+        assertEquals(8, size);
+
+        books = result.get("data");
+        firstBookName = books.get(size - 2).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", firstBookName);
+
+        secondBookName = books.get(size - 1).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", secondBookName);
+    }
+
+    @Test
+    public void testSortingSubcollectionByRelationshipProperty() throws IOException {
+        JsonNode result = getAsNode("/author/1/books?sort=-publisher.name");
+        //We expect 2 results because the Hibernate does an inner join between book & publisher
+        assertEquals(2, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        String firstBookName = books.get(0).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", firstBookName);
+
+        String secondBookName = books.get(1).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", secondBookName);
+
+        result = getAsNode("/author/1/books?sort=publisher.name");
+        //We expect 2 results because the Hibernate does an inner join between book & publisher
+        assertEquals(2, result.get("data").size());
+
+        books = result.get("data");
+        firstBookName = books.get(0).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", firstBookName);
+
+        secondBookName = books.get(1).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", secondBookName);
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testSortingRootCollectionByRelationshipPropertyWithJoinFilterAndPagination() throws IOException {
+        final JsonNode result = getAsNode("/book?filter[book.authors.name][infixi]=Hemingway&sort=-publisher.name", HttpStatus.SC_BAD_REQUEST);
+        assertNotNull(result.get("errors"));
+    }
+
+    @Test
+    public void testSortingByRelationshipId() throws IOException {
+        JsonNode result = getAsNode("/book?sort=-publisher.id");
+
+        //We expect 8 results because publisher_id is a foreign key inside the book table.
+        assertEquals(8, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        String firstBookName = books.get(0).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", firstBookName);
+
+        String secondBookName = books.get(1).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", secondBookName);
+
+        result = getAsNode("/book?sort=publisher.id");
+        assertEquals(8, result.get("data").size());
+
+        books = result.get("data");
+        firstBookName = books.get(6).get("attributes").get("title").asText();
+        assertEquals("The Old Man and the Sea", firstBookName);
+
+        secondBookName = books.get(7).get("attributes").get("title").asText();
+        assertEquals("For Whom the Bell Tolls", secondBookName);
+    }
+
+    @Test
+    public void testSortingByComplexAttribute() throws IOException {
+        List<Double> bookPrices = Arrays.asList(10.0, 9.0);
+
+        JsonNode result = getAsNode("/book?filter[book]=price=isnull=false&sort=-price.total");
+        assertEquals(2, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        for (int idx = 0; idx < bookPrices.size(); idx++) {
+            Double expectedPrice = bookPrices.get(idx);
+            Double actualPrice = books.get(idx).get("attributes").get("price").get("total").asDouble();
+            assertEquals(expectedPrice, actualPrice);
+        }
+    }
+
+    @Test
+    public void testSortingByNestedComplexAttribute() throws IOException {
+        List<String> isoCodes = Arrays.asList("AED", "USD");
+
+        JsonNode result = getAsNode("/book?filter[book]=price=isnull=false&sort=price.currency.isoCode");
+        assertEquals(2, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        for (int idx = 0; idx < isoCodes.size(); idx++) {
+            String expectedCode = isoCodes.get(idx);
+            String actualCode = books.get(idx).get("attributes").get("price").get("currency").get("isoCode").asText();
+            assertEquals(expectedCode, actualCode);
+        }
+    }
+
+    @Test
+    public void testSortingSubcollectionByNestedComplexAttribute() throws IOException {
+        List<String> isoCodes = Arrays.asList("AED", "USD");
+
+        JsonNode result = getAsNode("/author/1/books?filter[book]=price=isnull=false&sort=price.currency.isoCode");
+        assertEquals(2, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        for (int idx = 0; idx < isoCodes.size(); idx++) {
+            String expectedCode = isoCodes.get(idx);
+            String actualCode = books.get(idx).get("attributes").get("price").get("currency").get("isoCode").asText();
+            assertEquals(expectedCode, actualCode);
+        }
+    }
+
+    @Test
+    public void testSortingById() throws IOException {
+        List<String> bookTitles = Arrays.asList(
+                "Life with Null Ned 2",
+                "Life with Null Ned",
+                "The Roman Republic",
+                "Foundation",
+                "Enders Shadow",
+                "Enders Game",
+                "For Whom the Bell Tolls",
+                "The Old Man and the Sea"
+        );
+
+        JsonNode result = getAsNode("/book?sort=-id");
+        assertEquals(8, result.get("data").size());
+
+        JsonNode books = result.get("data");
+        for (int idx = 0; idx < bookTitles.size(); idx++) {
+            String expectedTitle = bookTitles.get(idx);
+            String actualTitle = books.get(idx).get("attributes").get("title").asText();
+            assertEquals(expectedTitle, actualTitle);
+        }
+    }
+
+    @Test
+    public void testRootCollectionByNullRelationshipProperty() {
+        // Test whether all book records are received
+        when()
+                .get("/book?sort=publisher.editor.lastName")
+                .then()
+                .body("data", hasSize(8))
+        ;
+        when()
+                .get("/book?sort=-publisher.editor.lastName")
+                .then()
+                .body("data", hasSize(8))
+        ;
+
+    }
+
+    @Test
+    public void testSubcollectionByNullRelationshipProperty() {
+        when()
+                .get("/author/1/books?sort=publisher.editor.lastName")
+                .then()
+                .body("data", hasSize(2))
+        ;
+        when()
+                .get("/author/1/books?sort=-publisher.editor.lastName")
+                .then()
+                .body("data", hasSize(2))
+        ;
+    }
+
+    /**
+     * Tests a computed relationship sort.
+     */
+    @Test
+    void testSortByComputedRelationship() {
+        given()
+                .get("/book?sort=-editor.firstName")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data[0].relationships.editor.data.id", equalTo("1"));
+    }
+
+    /**
+     * Tests a computed attribute sort.
+     */
+    @Test
+    void testSortByComputedAttribute() {
+        given()
+                .get("/editor?sort=-fullName")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_OK)
+                .body("data[0].attributes.fullName", equalTo("John Doe"));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/TransferableIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/TransferableIT.java
new file mode 100644
index 0000000000..3573d08920
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/TransferableIT.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static com.yahoo.elide.test.jsonapi.elements.Relation.TO_ONE;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import example.Left;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import io.restassured.response.Response;
+
+/**
+ * @NonTransferable annotation integration tests
+ */
+class TransferableIT extends IntegrationTest {
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        dataStore.populateEntityDictionary(EntityDictionary.builder().build());
+        DataStoreTransaction tx = dataStore.beginTransaction();
+        Left left = new Left();
+        tx.createObject(left, null);
+        tx.commit(null);
+        tx.close();
+    }
+
+    @Test
+    public void testNonTransferableForbiddenAccess() {
+        // Create container
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/container")
+                .then().statusCode(HttpStatus.SC_CREATED);
+
+        // Create untransferable
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("untransferable"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/untransferable")
+                .then().statusCode(HttpStatus.SC_CREATED);
+
+        // Fail to add untransferable to container's untransferables (untransferable is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("untransferable"),
+                                        id("1")
+                                )
+                        )
+                )
+                .patch("/container/1/relationships/untransferables")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        // Fail to replace container's untransferables collection (untransferable is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("untransferable"),
+                                        id("1")
+                                )
+                        )
+                )
+                .post("/container/1/relationships/untransferables")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        // Fail to update untransferables's container (container is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id("1")
+                                )
+                        )
+                )
+                .patch("/untransferable/1/relationships/container")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        // Fail to set untransferable's container (container is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id("1")
+                                )
+                        )
+                )
+                .post("/untransferable/1/relationships/container")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+    }
+
+    @Test
+    public void testTransferableForbiddenAccess() {
+        // Create container
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id("1")
+                                )
+                        )
+                )
+                .post("/container")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Create transferable
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("transferable"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/transferable")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Fail to update transferable's container (container is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id("1")
+                                )
+                        )
+                )
+                .patch("/transferable/1/relationships/container")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        // Fail to set transferable's container (container is not transferable)
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id("1")
+                                )
+                        )
+                )
+                .post("/transferable/1/relationships/container")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+    }
+
+    @Test
+    public void testTransferablePost() {
+        // Create container
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("container"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/container")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Create transferable
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("transferable"),
+                                        id(null)
+                                )
+                        )
+                )
+                .post("/transferable")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        // Add transferable to container's transferables
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("transferable"),
+                                        id("1")
+                                )
+                        )
+                )
+                .post("/container/1/relationships/transferables")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/container/1")
+                .then().statusCode(HttpStatus.SC_OK)
+                .body(equalTo(datum(
+                        resource(
+                                type("container"),
+                                id("1"),
+                                relationships(
+                                        relation("transferables",
+                                                linkage(type("transferable"), id("1"))
+                                        ),
+                                        relation("untransferables")
+                                )
+                        )).toJSON())
+                );
+    }
+
+    @Test
+    public void testTransferablePatch() {
+        // Create container
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(
+                        resource(
+                                type("container"),
+                                id(null)
+                        )
+                ))
+                .post("/container")
+                .then().statusCode(HttpStatus.SC_CREATED);
+
+        // Create transferable
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(
+                        resource(
+                                type("transferable"),
+                                id(null)
+                        )
+                ))
+                .post("/transferable")
+                .then().statusCode(HttpStatus.SC_CREATED);
+
+        // Add transferable to container's transferables
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(datum(
+                        resource(
+                                type("transferable"),
+                                id("1")
+                        )
+                ))
+                .patch("/container/1/relationships/transferables")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .get("/container/1")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(datum(
+                        resource(
+                                type("container"),
+                                id("1"),
+                                relationships(
+                                        relation("transferables",
+                                                linkage(type("transferable"), id("1"))
+                                        ),
+                                        relation("untransferables")
+                                )
+                        )).toJSON())
+                );
+    }
+
+    @Test
+    public void testCreateContainerAndNonTransferable() throws Exception {
+        Response response = given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body("    [\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/container\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ab\",\n"
+                        + "          \"type\": \"container\",\n"
+                        + "          \"relationships\": {\n"
+                        + "            \"untransferables\": {\n"
+                        + "              \"data\": [\n"
+                        + "                {\n"
+                        + "                  \"type\": \"untransferable\",\n"
+                        + "                  \"id\": \"12345678-1234-1234-1234-1234567890ac\"\n"
+                        + "                },\n"
+                        + "                {\n"
+                        + "                  \"type\": \"untransferable\",\n"
+                        + "                  \"id\": \"12345678-1234-1234-1234-1234567890ad\"\n"
+                        + "                }\n"
+                        + "              ]\n"
+                        + "            }\n"
+                        + "          }\n"
+                        + "        }\n"
+                        + "      },\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/untransferable\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"type\": \"untransferable\",\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ac\"\n"
+                        + "        }\n"
+                        + "      },\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/untransferable\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"type\": \"untransferable\",\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ad\"\n"
+                        + "        }\n"
+                        + "      }\n"
+                        + "    ]"
+                )
+                .patch("/");
+
+        response.then().statusCode(HttpStatus.SC_OK);
+
+        ArrayNode patchJson = (ArrayNode) mapper.readTree(response.asString());
+
+        // Should have 3 results, 1st is container, 2nd and 3rd are untransferables
+        assertEquals(3, patchJson.size());
+        assertEquals("container", patchJson.get(0).get("data").get("type").asText());
+        assertEquals("untransferable", patchJson.get(1).get("data").get("type").asText());
+        assertEquals("untransferable", patchJson.get(2).get("data").get("type").asText());
+
+        // Container should have 2 untransferables
+        assertEquals(2, patchJson.get(0).get("data").get("relationships").get("untransferables").get("data").size());
+    }
+
+    @Test
+    public void testCreateContainerAndTransferables() throws Exception {
+        Response patchResponse = given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body("    [\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/container\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ab\",\n"
+                        + "          \"type\": \"container\",\n"
+                        + "          \"relationships\": {\n"
+                        + "            \"transferables\": {\n"
+                        + "              \"data\": [\n"
+                        + "                {\n"
+                        + "                  \"type\": \"transferable\",\n"
+                        + "                  \"id\": \"12345678-1234-1234-1234-1234567890ac\"\n"
+                        + "                },\n"
+                        + "                {\n"
+                        + "                  \"type\": \"transferable\",\n"
+                        + "                  \"id\": \"12345678-1234-1234-1234-1234567890ad\"\n"
+                        + "                }\n"
+                        + "              ]\n"
+                        + "            }\n"
+                        + "          }\n"
+                        + "        }\n"
+                        + "      },\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/transferable\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"type\": \"transferable\",\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ac\"\n"
+                        + "        }\n"
+                        + "      },\n"
+                        + "      {\n"
+                        + "        \"op\": \"add\",\n"
+                        + "        \"path\": \"/transferable\",\n"
+                        + "        \"value\": {\n"
+                        + "          \"type\": \"transferable\",\n"
+                        + "          \"id\": \"12345678-1234-1234-1234-1234567890ad\"\n"
+                        + "        }\n"
+                        + "      }\n"
+                        + "    ]"
+                )
+                .patch("/");
+
+        patchResponse.then().statusCode(HttpStatus.SC_OK);
+
+        ArrayNode patchJson = (ArrayNode) mapper.readTree(patchResponse.asString());
+
+        // Should have 3 results, 1st is container, 2nd and 3rd are transferables
+        assertEquals(3, patchJson.size());
+        assertEquals("container", patchJson.get(0).get("data").get("type").asText());
+        assertEquals("transferable", patchJson.get(1).get("data").get("type").asText());
+        assertEquals("transferable", patchJson.get(2).get("data").get("type").asText());
+
+        // Container should have 2 transferables
+        assertEquals(2, patchJson.get(0).get("data").get("relationships").get("transferables").get("data").size());
+    }
+
+    @Test
+    public void addNonTransferableRelationship() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("right"),
+                                        id(null),
+                                        relationships(
+                                                relation("one2one", TO_ONE,
+                                                        linkage(type("left"), id("1"))
+                                                )
+                                        )
+                                )
+                        )
+                )
+                .post("/left/1/one2many")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/UserTypeIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/UserTypeIT.java
new file mode 100644
index 0000000000..b2c7262594
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/UserTypeIT.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Tests for UserType
+ */
+class UserTypeIT extends IntegrationTest {
+
+    @Data
+    @AllArgsConstructor
+    private class Address {
+        private String street;
+        private String state;
+        private Zip zip;
+
+    }
+
+    @Data
+    @AllArgsConstructor
+    private class Zip {
+        private String zip;
+        private String plusFour;
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testUserTypePost() throws Exception {
+        Resource resource = resource(
+                type("person"),
+                id("1"),
+                attributes(
+                        attr("name", "AK"),
+                        attr("address", new Address(
+                                "123 AnyStreet Dr",
+                                "IL",
+                                new Zip("61820", "1234")
+                        )),
+                        attr("alternateAddress", new Address(
+                                "XYZ AnyStreet Dr",
+                                "IL",
+                                new Zip("61820", "1234")
+                        ))
+                )
+        );
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(resource))
+            .post("/person")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/person/1")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(jsonEquals(datum(resource), true));
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testUserTypePatch() throws Exception {
+        Resource original = resource(
+                type("person"),
+                id("2"),
+                attributes(
+                        attr("name", "JK"),
+                        attr("address", new Address(
+                                "456 AnyStreet Dr",
+                                "IL",
+                                new Zip("61822", "567")
+                        )),
+                        attr("alternateAddress", new Address(
+                                "XYZ AnyStreet Dr",
+                                "IL",
+                                new Zip("61820", "1234")
+                        ))
+                )
+        );
+
+        Resource modified = resource(
+                type("person"),
+                id("2"),
+                attributes(
+                        attr("name", "DC"),
+                        attr("address", new Address(
+                                "456 AnyRoad Ave",
+                                "AZ",
+                                new Zip("85001", "9999")
+                        )),
+                        attr("alternateAddress", new Address(
+                                "ABC AnyStreet Dr",
+                                "CO",
+                                new Zip("12345", "1234")
+                        ))
+                )
+        );
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(original))
+            .post("/person")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(modified))
+            .patch("/person/2")
+            .then()
+            .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/person/2")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(jsonEquals(datum(modified), true));
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testUserTypeMissingUserTypeField() throws Exception {
+        Resource resource = resource(
+                type("person"),
+                id("3"),
+                attributes(
+                        attr("name", "DM")
+                )
+        );
+
+        Resource expected = resource(
+                type("person"),
+                id("3"),
+                attributes(
+                        attr("name", "DM"),
+                        attr("address", null),
+                        attr("alternateAddress", null)
+                )
+        );
+
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(resource))
+            .post("/person")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/person/3")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(jsonEquals(datum(expected), true));
+    }
+
+    @Test
+    @Tag("skipInMemory")
+    public void testUserTypeMissingUserTypeProperties() throws Exception {
+
+        Map<String, Object> partialZip = new HashMap<>();
+        partialZip.put("zip", "60412");
+
+        Map<String, Object> partialAddress = new HashMap<>();
+        partialAddress.put("street", "1400 AnyAve St");
+        partialAddress.put("zip", partialZip);
+
+        Resource resource = resource(
+            type("person"),
+            id("4"),
+            attributes(
+                attr("name", "WC"),
+                attr("address", partialAddress),
+                attr("alternateAddress", partialAddress)
+            )
+        );
+
+        Resource expected = resource(
+            type("person"),
+            id("4"),
+            attributes(
+                attr("name", "WC"),
+                attr("address", new Address(
+                    "1400 AnyAve St",
+                    null,
+                    new Zip("60412", null)
+                )),
+                attr("alternateAddress", new Address(
+                    "1400 AnyAve St",
+                    null,
+                    new Zip("60412", null)
+                ))
+            )
+        );
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(datum(resource))
+            .post("/person")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .get("/person/4")
+            .then()
+            .statusCode(HttpStatus.SC_OK)
+            .body(jsonEquals(datum(expected), true));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/triggers/LifeCycleHookIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/triggers/LifeCycleHookIT.java
new file mode 100644
index 0000000000..9080676314
--- /dev/null
+++ b/elide-integration-tests/src/test/java/com/yahoo/elide/triggers/LifeCycleHookIT.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.triggers;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.initialization.IntegrationTest;
+import com.yahoo.elide.initialization.LifeCycleIntegrationTestApplicationResourceConfig;
+import com.yahoo.elide.jsonapi.resources.JsonApiEndpoint;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class LifeCycleHookIT extends IntegrationTest {
+
+    public LifeCycleHookIT() {
+        super(LifeCycleIntegrationTestApplicationResourceConfig.class, JsonApiEndpoint.class.getPackage().getName());
+    }
+
+    @Test
+    public void testBillingServiceInvocation() {
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("customerInvoice"),
+                                        id("123"),
+                                        attributes(
+                                                attr("complete", true),
+                                                attr("total", 1000)
+                                        )
+                                )
+                        )
+                )
+                .post("/customerInvoice")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED)
+                .body("data.id", equalTo("1"))
+                .body("data.attributes.total", equalTo(1100))
+                .body("data.attributes.complete", equalTo(true));
+    }
+}
diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/utils/ClassScanner.java b/elide-integration-tests/src/test/java/com/yahoo/elide/utils/ClassScanner.java
deleted file mode 100644
index e8f4642445..0000000000
--- a/elide-integration-tests/src/test/java/com/yahoo/elide/utils/ClassScanner.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package com.yahoo.elide.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.server.internal.scanning.AnnotationAcceptingListener;
-import org.glassfish.jersey.server.internal.scanning.PackageNamesScanner;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Scans a package for classes by looking at files in the classpath.
- */
-@Slf4j
-public class ClassScanner {
-    /**
-     * Scans all classes accessible from the context class loader which belong to the given package and subpackages.
-     * @param pckg package name
-     * @param annotation Annotation to search
-     * @return The classes
-     */
-    static public List<Class<?>> getAnnotatedClasses(Package pckg, Class<? extends Annotation> annotation) {
-        final AnnotationAcceptingListener annotationAcceptingListener = new AnnotationAcceptingListener(annotation);
-        try (final PackageNamesScanner scanner = new PackageNamesScanner(new String[] { pckg.getName() }, true)) {
-            while (scanner.hasNext()) {
-                final String next = scanner.next();
-                if (annotationAcceptingListener.accept(next)) {
-                    try (final InputStream in = scanner.open()) {
-                        annotationAcceptingListener.process(next, in);
-                    } catch (IOException e) {
-                        throw new RuntimeException("AnnotationAcceptingListener failed to process scanned resource: "
-                                + next);
-                    }
-                }
-            }
-        }
-
-        return annotationAcceptingListener.getAnnotatedClasses()
-                .stream().collect(Collectors.toCollection(ArrayList::new));
-    }
-}
diff --git a/elide-integration-tests/src/test/java/example/Address.java b/elide-integration-tests/src/test/java/example/Address.java
new file mode 100644
index 0000000000..a7afd6752d
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Address.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Data;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Embeddable;
+
+@Embeddable
+@Data
+public class Address {
+
+    private String street1;
+    private String street2;
+
+    @Column(name = "properties", columnDefinition = "TEXT")
+    @Convert(attributeName = "key", converter = MapConverter.class)
+    Map<Object, Object> properties;
+
+    public static class MapConverter implements AttributeConverter<Map<Object, Object>, String> {
+        ObjectMapper mapper = new ObjectMapper();
+
+        @Override
+        public String convertToDatabaseColumn(Map<Object, Object> attribute) {
+            try {
+                return mapper.writeValueAsString(attribute);
+            } catch (JsonProcessingException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        @Override
+        public Map<Object, Object> convertToEntityAttribute(String dbData) {
+            try {
+                TypeReference<HashMap<Object, Object>> typeRef = new TypeReference<>() {
+                };
+
+                return mapper.readValue(dbData, typeRef);
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/AnotherFilterExpressionCheckObj.java b/elide-integration-tests/src/test/java/example/AnotherFilterExpressionCheckObj.java
index abc57156a3..8445bcd1c8 100644
--- a/elide-integration-tests/src/test/java/example/AnotherFilterExpressionCheckObj.java
+++ b/elide-integration-tests/src/test/java/example/AnotherFilterExpressionCheckObj.java
@@ -7,32 +7,29 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
+import com.yahoo.elide.core.Path;
 import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.security.*;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 /**
  * Model for anotherFilterExpressionCheckObj.
  */
 @Entity
-@SharePermission(any = {Role.ALL.class})
 @Table(name = "anotherFilterExpressionCheckObj")
-@ReadPermission(any = {AnotherFilterExpressionCheckObj.CheckActsLikeFilter.class})
-@Include(rootLevel = true)
-public class AnotherFilterExpressionCheckObj {
-    private long id;
+@ReadPermission(expression = "checkActsLikeFilter")
+@Include
+public class AnotherFilterExpressionCheckObj extends BaseId {
     private String anotherName;
     private long createDate = 0;
 
@@ -63,32 +60,19 @@ public void setCreateDate(long createDate) {
         this.createDate = createDate;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public static Predicate createFilterPredicate() {
-        List<Predicate.PathElement> pathList = new ArrayList<>();
-        Predicate.PathElement path1 = new Predicate.PathElement(AnotherFilterExpressionCheckObj.class,
-                "anotherFilterExpressionCheckObj",
+    public static FilterPredicate createFilterPredicate() {
+        Path.PathElement path1 = new Path.PathElement(AnotherFilterExpressionCheckObj.class,
                 long.class, "createDate");
-        pathList.add(path1);
         Operator op = Operator.IN;
         List<Object> value = new ArrayList<>();
         value.add(1999L);
-        return new Predicate(pathList, op, value);
+        return new FilterPredicate(path1, op, value);
     }
 
     public static class CheckActsLikeFilter extends FilterExpressionCheck {
 
         @Override
-        public Predicate getFilterExpression(RequestScope requestScope) {
+        public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
             return createFilterPredicate();
         }
 
diff --git a/elide-integration-tests/src/test/java/example/AssignedIdLong.java b/elide-integration-tests/src/test/java/example/AssignedIdLong.java
index 0d6d467ab6..2eee5067f1 100644
--- a/elide-integration-tests/src/test/java/example/AssignedIdLong.java
+++ b/elide-integration-tests/src/test/java/example/AssignedIdLong.java
@@ -16,7 +16,7 @@
  */
 @Entity
 @Table(name = "assigned_id_long")
-@Include(rootLevel = true)
+@Include
 public class AssignedIdLong {
     private long id;
     private int value;
@@ -37,4 +37,14 @@ public int getValue() {
     public void setValue(int value) {
         this.value = value;
     }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof AssignedIdLong && ((AssignedIdLong) obj).id == id;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/AssignedIdString.java b/elide-integration-tests/src/test/java/example/AssignedIdString.java
index b3a3f7ba21..dd83c6dd06 100644
--- a/elide-integration-tests/src/test/java/example/AssignedIdString.java
+++ b/elide-integration-tests/src/test/java/example/AssignedIdString.java
@@ -16,7 +16,7 @@
  */
 @Entity
 @Table(name = "assigned_id_string")
-@Include(rootLevel = true)
+@Include
 public class AssignedIdString {
     private String id;
     private int value;
@@ -37,4 +37,21 @@ public int getValue() {
     public void setValue(int value) {
         this.value = value;
     }
+
+    @Override
+    public int hashCode() {
+        if (id == null) {
+            return super.hashCode();
+        }
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (id == null) {
+            return super.equals(obj);
+        }
+
+        return obj instanceof AssignedIdString && id.equals(((AssignedIdString) obj).id);
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/AuditEntity.java b/elide-integration-tests/src/test/java/example/AuditEntity.java
index c5331d4c97..d70d81fee3 100644
--- a/elide-integration-tests/src/test/java/example/AuditEntity.java
+++ b/elide-integration-tests/src/test/java/example/AuditEntity.java
@@ -10,44 +10,27 @@
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
+import java.util.List;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToOne;
-import java.util.List;
 
 @Entity
 @Audit(action = Audit.Action.CREATE,
         logStatement = "Created with value: {0}",
         logExpressions = {"${auditEntity.value}"})
-@Include(rootLevel = true)
-@ReadPermission(all = Role.ALL.class)
-@CreatePermission(all = Role.ALL.class)
-@DeletePermission(all = Role.ALL.class)
-@UpdatePermission(all = Role.ALL.class)
-@SharePermission(all = Role.ALL.class)
-public class AuditEntity {
-    private Long id;
+@Include
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@DeletePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
+public class AuditEntity extends BaseId {
     private AuditEntity otherEntity;
     private String value;
     private List<AuditEntityInverse> inverses;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     @OneToOne
     @Audit(action = Audit.Action.UPDATE,
             logStatement = "Updated relationship (for id: {0}): {1}",
diff --git a/elide-integration-tests/src/test/java/example/AuditEntityInverse.java b/elide-integration-tests/src/test/java/example/AuditEntityInverse.java
index 0b2d5d529b..8fe26535ac 100644
--- a/elide-integration-tests/src/test/java/example/AuditEntityInverse.java
+++ b/elide-integration-tests/src/test/java/example/AuditEntityInverse.java
@@ -10,38 +10,21 @@
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
+import java.util.List;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToMany;
-import java.util.List;
 
 @Entity
-@Include(rootLevel = true)
-@ReadPermission(all = Role.ALL.class)
-@CreatePermission(all = Role.ALL.class)
-@UpdatePermission(all = Role.ALL.class)
-@DeletePermission(all = Role.ALL.class)
-@SharePermission(all = Role.ALL.class)
-public class AuditEntityInverse {
-    private Long id;
+@Include
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
+@DeletePermission(expression = "Prefab.Role.All")
+public class AuditEntityInverse extends BaseId {
     private List<AuditEntity> entities;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     @ManyToMany
     @Audit(action = Audit.Action.UPDATE,
             logStatement = "Inverse entities: {0}",
diff --git a/elide-integration-tests/src/test/java/example/Author.java b/elide-integration-tests/src/test/java/example/Author.java
index 0f0da6241b..cb17c1be43 100644
--- a/elide-integration-tests/src/test/java/example/Author.java
+++ b/elide-integration-tests/src/test/java/example/Author.java
@@ -6,60 +6,82 @@
 package example;
 
 import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.Exclude;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.Paginate;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.annotation.ReadPermission;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
 
 /**
  * Model for authors.
+ * <p>
+ * <b>CAUTION: DO NOT DECORATE IT WITH {@link Builder}, which hides its no-args constructor. This will result in
+ * runtime error at places such as {@code entityClass.newInstance();}</b>
  */
 @Entity
 @Table(name = "author")
-@Include(rootLevel = true)
-@SharePermission(any = {Role.ALL.class})
+@Include
 @Paginate
 @Audit(action = Audit.Action.CREATE,
         operation = 10,
         logStatement = "{0}",
         logExpressions = {"${author.name}"})
 public class Author {
-    private long id;
-    private String name;
-    private Collection<Book> books = new ArrayList<>();
+    @Setter
+    private Long id;
 
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
-        this.id = id;
-    }
+    @Exclude
+    private String naturalKey = UUID.randomUUID().toString();
 
-    public String getName() {
-        return name;
-    }
+    @Getter @Setter
+    private String name;
 
-    public void setName(String name) {
-        this.name = name;
-    }
+    @Setter
+    private Collection<Book> books = new ArrayList<>();
 
     @ManyToMany(mappedBy = "authors")
     public Collection<Book> getBooks() {
         return books;
     }
 
-    public void setBooks(Collection<Book> books) {
-        this.books = books;
+    @Setter
+    private String homeAddress;
+
+    @ReadPermission(expression = "Prefab.Role.None")
+    public String getHomeAddress() {
+        return homeAddress;
+    }
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Author && ((Author) obj).naturalKey.equals(naturalKey);
+    }
+
+    @Override
+    public String toString() {
+        return "Author: " + id;
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/BaseId.java b/elide-integration-tests/src/test/java/example/BaseId.java
index 20dfee6bc4..4b4059ecc6 100644
--- a/elide-integration-tests/src/test/java/example/BaseId.java
+++ b/elide-integration-tests/src/test/java/example/BaseId.java
@@ -5,6 +5,9 @@
  */
 package example;
 
+import com.yahoo.elide.annotation.Exclude;
+
+import java.util.UUID;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -12,10 +15,11 @@
 
 @MappedSuperclass
 public abstract class BaseId {
-    private long id;
+    protected long id;
+    protected String naturalKey = UUID.randomUUID().toString();
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     public long getId() {
         return id;
     }
@@ -23,4 +27,28 @@ public long getId() {
     public void setId(long id) {
         this.id = id;
     }
+
+    @Exclude
+    public String getNaturalKey() {
+        return naturalKey;
+    }
+
+    public void setNaturalKey(String naturalKey) {
+        this.naturalKey = naturalKey;
+    }
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof BaseId && naturalKey.equals(((BaseId) obj).naturalKey);
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + ": " + id;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/Book.java b/elide-integration-tests/src/test/java/example/Book.java
index 5d505527db..9f1354166f 100644
--- a/elide-integration-tests/src/test/java/example/Book.java
+++ b/elide-integration-tests/src/test/java/example/Book.java
@@ -6,17 +6,28 @@
 package example;
 
 import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.FilterExpressionPath;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.Paginate;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.annotation.ReadPermission;
+import org.hibernate.annotations.Formula;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embedded;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -25,31 +36,24 @@
  * Model for books.
  */
 @Entity
-@SharePermission(any = {Role.ALL.class})
 @Table(name = "book")
-@Include(rootLevel = true)
+@Include
 @Paginate
 @Audit(action = Audit.Action.CREATE,
         operation = 10,
         logStatement = "{0}",
         logExpressions = {"${book.title}"})
-public class Book {
-    private long id;
+public class Book extends BaseId {
     private String title;
     private String genre;
     private String language;
     private Date publishDate = new Date(0);
     private Collection<Author> authors = new ArrayList<>();
     private Collection<Chapter> chapters = new ArrayList<>();
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+    private String editorName;
+    private Publisher publisher;
+    private Collection<String> awards = new ArrayList<>();
+    private Price price;
 
     public String getTitle() {
         return title;
@@ -83,7 +87,44 @@ public Date getPublishDate() {
         return this.publishDate;
     }
 
-    @ManyToMany
+    @ElementCollection(targetClass = String.class)
+    public Collection<String> getAwards() {
+        return awards;
+    }
+
+    public void setAwards(Collection<String> awards) {
+        this.awards = awards;
+    }
+
+    @Embedded
+    public Price getPrice() {
+        return price;
+    }
+
+    public void setPrice(Price price) {
+        this.price = price;
+    }
+
+    /**
+     * Demonstrates a more complex ranking use case.
+     * @return The number of chapters in a book.
+     */
+    @Formula(value = "(SELECT COUNT(*) FROM book AS b JOIN book_chapter AS bc ON bc.book_id = b.id WHERE id=b.id)")
+    public int getChapterCount() {
+        return chapters.size();
+    }
+
+    public void setChapterCount(int unused) {
+        //NOOP
+        return;
+    }
+
+    @OneToMany
+    @JoinTable(
+            name = "book_chapter",
+            joinColumns = @JoinColumn(name = "book_id"),
+            inverseJoinColumns = @JoinColumn(name = "chapters_id")
+    )
     public Collection<Chapter> getChapters() {
         return chapters;
     }
@@ -100,4 +141,40 @@ public Collection<Author> getAuthors() {
     public void setAuthors(Collection<Author> authors) {
         this.authors = authors;
     }
+
+    // Case sensitive collation for H2
+    @Column(columnDefinition = "VARCHAR_CASESENSITIVE(255) DEFAULT NULL")
+    public String getEditorName() {
+        return editorName;
+    }
+
+    public void setEditorName(String editorName) {
+        this.editorName = editorName;
+    }
+
+    @ManyToOne
+    public Publisher getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(Publisher publisher) {
+        this.publisher = publisher;
+    }
+
+    @Transient
+    @ComputedRelationship
+    @OneToOne
+    @FilterExpressionPath("publisher.editor")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        if (publisher != null) {
+            return getPublisher().getEditor();
+        }
+
+        return null;
+    }
+    @Override
+    public String toString() {
+        return "Book: " + id;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/Chapter.java b/elide-integration-tests/src/test/java/example/Chapter.java
index 8e606443e6..e8bb5a516e 100644
--- a/elide-integration-tests/src/test/java/example/Chapter.java
+++ b/elide-integration-tests/src/test/java/example/Chapter.java
@@ -5,31 +5,39 @@
  */
 package example;
 
+import com.yahoo.elide.annotation.Exclude;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.UUID;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-@Include(rootLevel = true, type = "chapter")
-@SharePermission(all = {Role.ALL.class})
+@Include(name = "chapter")
+/**
+ * This class tests using JPA Field based access.
+ */
 public class Chapter {
-    private Long id;
-    @Getter @Setter private String title;
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
+    private long id;
+
+    @Exclude
+    private String naturalKey = UUID.randomUUID().toString();
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Chapter && ((Chapter) obj).naturalKey.equals(naturalKey);
     }
+
+    @Getter @Setter private String title;
 }
diff --git a/elide-integration-tests/src/test/java/example/Child.java b/elide-integration-tests/src/test/java/example/Child.java
index 36b229ee27..f85403f940 100644
--- a/elide-integration-tests/src/test/java/example/Child.java
+++ b/elide-integration-tests/src/test/java/example/Child.java
@@ -5,40 +5,37 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedAttribute;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.Child.InitCheck;
-
-import javax.persistence.CascadeType;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import com.yahoo.elide.core.type.Type;
+
+import java.util.Optional;
+import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToOne;
-import java.util.Optional;
-import java.util.Set;
+import javax.persistence.Transient;
 
 /**
  * Child test bean.
  */
-@Entity
-@CreatePermission(any = { InitCheck.class })
-@SharePermission(any = { Role.ALL.class })
-@ReadPermission(all = {NegativeChildIdCheck.class, NegativeIntegerUserCheck.class, Child.InitCheckOp.class})
-@Include
+@Entity(name = "childEntity")
+@CreatePermission(expression = "initCheck")
+@ReadPermission(expression = "negativeChildId AND negativeIntegerUser AND initCheck AND initCheckFilter")
+@Include(name = "child")
 @Audit(action = Audit.Action.DELETE,
        operation = 0,
        logStatement = "DELETE Child {0} Parent {1}",
@@ -47,35 +44,20 @@
        operation = 0,
        logStatement = "CREATE Child {0} Parent {1}",
        logExpressions = {"${child.id}", "${parent.id}"})
-public class Child {
-    @JsonIgnore
-
-    private long id;
+public class Child extends BaseId {
     private Set<Parent> parents;
 
-
     private String name;
 
     private Set<Child> friends;
     private Child noReadAccess;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
     @ManyToMany(
-            cascade = {CascadeType.PERSIST, CascadeType.MERGE},
             mappedBy = "children",
             targetEntity = Parent.class
         )
     // Contrived check for regression example. Should clean this up. No updating child 4 via parent 10
-    @UpdatePermission(all = Child4Parent10Check.class)
+    @UpdatePermission(expression = "child4Parent5")
     public Set<Parent> getParents() {
         return parents;
     }
@@ -110,7 +92,7 @@ public void setName(String name) {
     }
 
     @OneToOne(targetEntity = Child.class, fetch = FetchType.LAZY)
-    @ReadPermission(all = {Role.NONE.class})
+    @ReadPermission(expression = "Prefab.Role.None")
     public Child getNoReadAccess() {
         return noReadAccess;
     }
@@ -119,25 +101,34 @@ public void setNoReadAccess(Child noReadAccess) {
         this.noReadAccess = noReadAccess;
     }
 
-    /**
-     * Initialization validation check.
-     */
-    static public class InitCheck extends CommitCheck<Child> {
+    @Transient
+    @ComputedAttribute
+    @ReadPermission(expression = "FailCheckOp")
+    public String getComputedFailTest() {
+        return "computed";
+    }
+
+    public String setComputedFailTest(String unused) {
+        throw new IllegalAccessError();
+    }
+
+    static public class InitCheck extends OperationCheck<Child> {
         @Override
         public boolean ok(Child child, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (child.getParents() != null) {
-                return true;
-            }
-            return false;
+            return child.getParents() != null;
+        }
+    }
+
+    static public class InitCheckFilter extends FilterExpressionCheck<Child> {
+        @Override
+        public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
+            return new NotNullPredicate(new Path.PathElement(Child.class, Long.class, "id"));
         }
     }
 
-    static public class InitCheckOp extends OperationCheck<Child> {
+    static public class FailCheckOp extends OperationCheck<Child> {
         @Override
         public boolean ok(Child child, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (child.getParents() != null) {
-                return true;
-            }
             return false;
         }
     }
diff --git a/elide-integration-tests/src/test/java/example/Child4Parent10Check.java b/elide-integration-tests/src/test/java/example/Child4Parent10Check.java
deleted file mode 100644
index d157489800..0000000000
--- a/elide-integration-tests/src/test/java/example/Child4Parent10Check.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.OperationCheck;
-
-import java.util.Optional;
-
-/**
- * Contrived check to disallow updates on Child 4 through parent 10
- */
-public class Child4Parent10Check extends OperationCheck<Child> {
-    @Override
-    public boolean ok(Child object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-        return object.getId() != 4L || object.getParents().stream().map(Parent::getId).noneMatch(id -> id == 10);
-    }
-}
diff --git a/elide-integration-tests/src/test/java/example/Child4Parent5Check.java b/elide-integration-tests/src/test/java/example/Child4Parent5Check.java
new file mode 100644
index 0000000000..bb3f8f4fd1
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Child4Parent5Check.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.util.Optional;
+
+/**
+ * Contrived check to disallow updates on Child 4 through parent 10
+ */
+public class Child4Parent5Check extends OperationCheck<Child> {
+    @Override
+    public boolean ok(Child object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+        return object.getId() != 4L || object.getParents().stream().map(Parent::getId).noneMatch(id -> id == 5);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/Company.java b/elide-integration-tests/src/test/java/example/Company.java
new file mode 100644
index 0000000000..571141030a
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Company.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Data;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Include
+@Data
+public class Company {
+
+    @Id
+    private String id;
+    private String description;
+
+    @Embedded
+    private Address address;
+}
diff --git a/elide-integration-tests/src/test/java/example/Container.java b/elide-integration-tests/src/test/java/example/Container.java
index 7c1220634e..6fbfa4e0f7 100644
--- a/elide-integration-tests/src/test/java/example/Container.java
+++ b/elide-integration-tests/src/test/java/example/Container.java
@@ -6,51 +6,39 @@
 package example;
 
 import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
 
+import java.util.Collection;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import java.util.Collection;
 
 /**
  * Container for shareables and unshareables.
  */
 @Entity
 @Table(name = "container")
-@Include(rootLevel = true, type = "container")
-public class Container {
-    private long id;
-    private Collection<Unshareable> unshareables;
-    private Collection<Shareable> shareables;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+@Include(name = "container")
+@NonTransferable
+public class Container extends BaseId {
+    private Collection<Untransferable> untransferables;
+    private Collection<Transferable> transferables;
 
     @OneToMany(mappedBy = "container")
-    public Collection<Unshareable> getUnshareables() {
-        return unshareables;
+    public Collection<Untransferable> getUntransferables() {
+        return untransferables;
     }
 
-    public void setUnshareables(Collection<Unshareable> unshareables) {
-        this.unshareables = unshareables;
+    public void setUntransferables(Collection<Untransferable> untransferables) {
+        this.untransferables = untransferables;
     }
 
     @OneToMany(mappedBy = "container")
-    public Collection<Shareable> getShareables() {
-        return shareables;
+    public Collection<Transferable> getTransferables() {
+        return transferables;
     }
 
-    public void setShareables(Collection<Shareable> shareables) {
-        this.shareables = shareables;
+    public void setTransferables(Collection<Transferable> transferables) {
+        this.transferables = transferables;
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/CreateButNoRead.java b/elide-integration-tests/src/test/java/example/CreateButNoRead.java
index 8c57ca6e57..392583f8fb 100644
--- a/elide-integration-tests/src/test/java/example/CreateButNoRead.java
+++ b/elide-integration-tests/src/test/java/example/CreateButNoRead.java
@@ -8,14 +8,12 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 
 import java.util.Optional;
 import java.util.Set;
-
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
@@ -23,14 +21,14 @@
 /**
  * A model intended to be ONLY created and read, but never updated
  */
-@Include(rootLevel = true)
+@Include
 @Entity
-@CreatePermission(any = {Role.ALL.class})
+@CreatePermission(expression = "Prefab.Role.All")
 public class CreateButNoRead extends BaseId {
     private Set<CreateButNoReadChild> otherObjects;
 
     @OneToMany(fetch = FetchType.LAZY)
-    @ReadPermission(any = {NOREAD.class})
+    @ReadPermission(expression = "noRead")
     public Set<CreateButNoReadChild> getOtherObjects() {
         return otherObjects;
     }
diff --git a/elide-integration-tests/src/test/java/example/CreateButNoReadChild.java b/elide-integration-tests/src/test/java/example/CreateButNoReadChild.java
index 8abfb49826..87489abf97 100644
--- a/elide-integration-tests/src/test/java/example/CreateButNoReadChild.java
+++ b/elide-integration-tests/src/test/java/example/CreateButNoReadChild.java
@@ -8,7 +8,6 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
@@ -16,14 +15,14 @@
 /**
  * A model intended to be ONLY created and read, but never updated
  */
-@Include(rootLevel = true)
+@Include
 @Entity
-@CreatePermission(any = {Role.ALL.class})
+@CreatePermission(expression = "Prefab.Role.All")
 public class CreateButNoReadChild extends BaseId {
     private CreateButNoRead otherObject;
 
     @ManyToOne()
-    @ReadPermission(any = {Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     public CreateButNoRead getOtherObject() {
         return otherObject;
     }
diff --git a/elide-integration-tests/src/test/java/example/CreateButNoUpdate.java b/elide-integration-tests/src/test/java/example/CreateButNoUpdate.java
index 4c4b87a32e..8e872517be 100644
--- a/elide-integration-tests/src/test/java/example/CreateButNoUpdate.java
+++ b/elide-integration-tests/src/test/java/example/CreateButNoUpdate.java
@@ -9,36 +9,48 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Common;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 /**
  * A model intended to be ONLY created and read, but never updated.
  */
-@Include(rootLevel = true)
+@Include
 @Entity
-@CreatePermission(any = {Role.ALL.class})
-@ReadPermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Common.UpdateOnCreate.class, Role.NONE.class})
-public class CreateButNoUpdate {
-    public Long id;
-    public String textValue;
-
-    @UpdatePermission(all = {Role.NONE.class})
-    public String cannotModify = "unmodified";
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.None")
+public class CreateButNoUpdate extends BaseId {
+    private String textValue;
+
+    private String cannotModify = "unmodified";
+
+    private CreateButNoUpdate toOneRelation;
+
+    @CreatePermission(expression = "Prefab.Role.None")
+    public String getCannotModify() {
+        return cannotModify;
+    }
+
+    public void setCannotModify(String cannotModify) {
+        this.cannotModify = cannotModify;
+    }
+
+    public void setTextValue(String textValue) {
+        this.textValue = textValue;
+    }
+
+    public String getTextValue() {
+        return textValue;
+    }
+
+    @OneToOne
+    public CreateButNoUpdate getToOneRelation() {
+        return toOneRelation;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setToOneRelation(CreateButNoUpdate toOneRelation) {
+        this.toOneRelation = toOneRelation;
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/Currency.java b/elide-integration-tests/src/test/java/example/Currency.java
new file mode 100644
index 0000000000..bd410b1388
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Currency.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Currency {
+    String isoCode;
+}
diff --git a/elide-integration-tests/src/test/java/example/Editor.java b/elide-integration-tests/src/test/java/example/Editor.java
new file mode 100644
index 0000000000..c1cc3e0377
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Editor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Audit;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.ComputedRelationship;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.filter.predicates.NotNullPredicate;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * Model for authors.
+ */
+@Entity
+@Table(name = "editor")
+@Include
+@Audit(action = Audit.Action.CREATE,
+        operation = 10,
+        logStatement = "{0}",
+        logExpressions = {"${editor.name}"})
+public class Editor {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Getter @Setter
+    private Long id;
+
+    @Exclude
+    private String naturalKey = UUID.randomUUID().toString();
+
+    @Getter @Setter
+    private String firstName;
+
+    @Getter @Setter
+    private String lastName;
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Editor && ((Editor) obj).naturalKey.equals(naturalKey);
+    }
+
+    @ComputedAttribute
+    public String getFullName() {
+        return firstName + " " + lastName;
+    }
+
+    @Transient
+    @ComputedRelationship
+    @OneToOne
+    @FilterExpressionPath("this")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        return this;
+    }
+
+    public static class FieldPathFilterExpression extends FilterExpressionCheck {
+        @Override
+        public FilterPredicate getFilterExpression(Type entityClass, com.yahoo.elide.core.security.RequestScope requestScope) {
+            Path path = super.getFieldPath(entityClass, requestScope, "getEditor", "editor");
+            return new NotNullPredicate(path);
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/Embedded.java b/elide-integration-tests/src/test/java/example/Embedded.java
index d55276e232..d2ab9cd84c 100644
--- a/elide-integration-tests/src/test/java/example/Embedded.java
+++ b/elide-integration-tests/src/test/java/example/Embedded.java
@@ -5,38 +5,20 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.Include;
 
 import java.util.Set;
-
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
 
 /**
  * Embedded test bean.
  */
-@Include(rootLevel = true)
+@Include
 @Entity
-public class Embedded {
-    @JsonIgnore
-    private long id;
+public class Embedded extends BaseId {
     private Set<Long> segmentIds;
 
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
     @ElementCollection
     public Set<Long> getSegmentIds() {
         return segmentIds;
diff --git a/elide-integration-tests/src/test/java/example/EntityWithPaginateCountableFalse.java b/elide-integration-tests/src/test/java/example/EntityWithPaginateCountableFalse.java
index 6b62792385..802eb84d87 100644
--- a/elide-integration-tests/src/test/java/example/EntityWithPaginateCountableFalse.java
+++ b/elide-integration-tests/src/test/java/example/EntityWithPaginateCountableFalse.java
@@ -11,23 +11,11 @@
 import lombok.Setter;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
 @Entity
-@Include(rootLevel = true)
+@Include
 @Paginate(countable = false)
-public class EntityWithPaginateCountableFalse {
-    @Setter
-    private Long id;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId () {
-        return id;
-    }
-
+public class EntityWithPaginateCountableFalse extends BaseId {
     @Getter
     @Setter
     private String name;
diff --git a/elide-integration-tests/src/test/java/example/EntityWithPaginateDefaultLimit.java b/elide-integration-tests/src/test/java/example/EntityWithPaginateDefaultLimit.java
index dbfa4c4924..5251826548 100644
--- a/elide-integration-tests/src/test/java/example/EntityWithPaginateDefaultLimit.java
+++ b/elide-integration-tests/src/test/java/example/EntityWithPaginateDefaultLimit.java
@@ -11,23 +11,11 @@
 import lombok.Setter;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
 @Entity
-@Include(rootLevel = true)
+@Include
 @Paginate(defaultLimit = 5)
-public class EntityWithPaginateDefaultLimit {
-    @Setter
-    private Long id;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId () {
-        return id;
-    }
-
+public class EntityWithPaginateDefaultLimit extends BaseId {
     @Getter
     @Setter
     private String name;
diff --git a/elide-integration-tests/src/test/java/example/EntityWithPaginateMaxLimit.java b/elide-integration-tests/src/test/java/example/EntityWithPaginateMaxLimit.java
index 5bf82fc66b..aa0439a767 100644
--- a/elide-integration-tests/src/test/java/example/EntityWithPaginateMaxLimit.java
+++ b/elide-integration-tests/src/test/java/example/EntityWithPaginateMaxLimit.java
@@ -11,23 +11,11 @@
 import lombok.Setter;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
 @Entity
-@Include(rootLevel = true)
-@Paginate(maxLimit = 10)
-public class EntityWithPaginateMaxLimit {
-    @Setter
-    private Long id;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId () {
-        return id;
-    }
-
+@Include
+@Paginate(maxLimit = 10, defaultLimit = 10)
+public class EntityWithPaginateMaxLimit extends BaseId {
     @Getter
     @Setter
     private String name;
diff --git a/elide-integration-tests/src/test/java/example/EntityWithoutPaginate.java b/elide-integration-tests/src/test/java/example/EntityWithoutPaginate.java
index 74f881837c..4d4ed832bd 100644
--- a/elide-integration-tests/src/test/java/example/EntityWithoutPaginate.java
+++ b/elide-integration-tests/src/test/java/example/EntityWithoutPaginate.java
@@ -10,25 +10,13 @@
 import lombok.Setter;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
 /**
  * Entity that does not have the Paginate annotation that modifies pagination behavior.
  */
 @Entity
-@Include(rootLevel = true)
-public class EntityWithoutPaginate {
-    @Setter
-    private Long id;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId () {
-        return id;
-    }
-
+@Include
+public class EntityWithoutPaginate extends BaseId {
     @Getter
     @Setter
     private String name;
diff --git a/elide-integration-tests/src/test/java/example/ExceptionThrowingBean.java b/elide-integration-tests/src/test/java/example/ExceptionThrowingBean.java
new file mode 100644
index 0000000000..ed3a30b345
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/ExceptionThrowingBean.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+@Include
+@Entity
+public class ExceptionThrowingBean {
+    private long id;
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Transient
+    @ComputedAttribute
+    public String getBadValue() {
+        throw new WebApplicationException("This should bubble up to the top!", Response.Status.GONE);
+    }
+
+    public void setBadValue(String unused) {
+        // Do nothing
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof ExceptionThrowingBean && id == ((ExceptionThrowingBean) obj).id;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/FieldLevelChildEntity.java b/elide-integration-tests/src/test/java/example/FieldLevelChildEntity.java
new file mode 100644
index 0000000000..bb8a1be863
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/FieldLevelChildEntity.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "child_field_level")
+@Include(name = "fieldLevelChild")
+public class FieldLevelChildEntity extends FieldLevelParentSuperclass {
+    private String childField;
+}
diff --git a/elide-integration-tests/src/test/java/example/FieldLevelParentSuperclass.java b/elide-integration-tests/src/test/java/example/FieldLevelParentSuperclass.java
new file mode 100644
index 0000000000..511b5bee70
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/FieldLevelParentSuperclass.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class FieldLevelParentSuperclass {
+    @Id
+    private String id;
+    private String parentField;
+}
diff --git a/elide-integration-tests/src/test/java/example/FilterExpressionCheckObj.java b/elide-integration-tests/src/test/java/example/FilterExpressionCheckObj.java
index 95e35f9923..6fbe5cf746 100644
--- a/elide-integration-tests/src/test/java/example/FilterExpressionCheckObj.java
+++ b/elide-integration-tests/src/test/java/example/FilterExpressionCheckObj.java
@@ -7,48 +7,34 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
+import com.yahoo.elide.core.Path;
 import com.yahoo.elide.core.filter.Operator;
-import com.yahoo.elide.core.filter.Predicate;
-import com.yahoo.elide.security.*;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 /**
  * Model for filterExpressionCheckObj.
  */
 @Entity
 @Table(name = "filterExpressionCheckObj")
-@Include(rootLevel = true)
-@SharePermission(any = {Role.ALL.class})
-@ReadPermission(any = {FilterExpressionCheckObj.CheckLE.class, Role.NONE.class})  //ReadPermission for object id <= 2
-public class FilterExpressionCheckObj {
-    private long id;
+@Include
+@ReadPermission(expression = "checkLE OR Prefab.Role.None")  //ReadPermission for object id <= 2
+public class FilterExpressionCheckObj extends BaseId {
     private String name;
 
     private Collection<AnotherFilterExpressionCheckObj> listOfAnotherObjs = new ArrayList<>();
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
     //This field only display for id == User.id (which is 1 in IT)
-    @ReadPermission(all = {CheckRestrictUser.class})
+    @ReadPermission(expression = "checkRestrictUser")
     public String getName() {
         return name;
     }
@@ -67,25 +53,23 @@ public void setListOfAnotherObjs(Collection<AnotherFilterExpressionCheckObj> lis
     }
 
     //Predicate that restrict resource's id to be the same as cuurent User's id.
-    public static Predicate createUserPredicate(RequestScope requestScope, boolean setUserId, long setId) {
-        List<Predicate.PathElement> pathList = new ArrayList<>();
-        Predicate.PathElement path1 = new Predicate.PathElement(FilterExpressionCheckObj.class, "filterExpressionCheckObj", long.class, "id");
-        pathList.add(path1);
+    public static FilterPredicate createUserPredicate(RequestScope requestScope, boolean setUserId, long setId) {
+        Path.PathElement path1 = new Path.PathElement(FilterExpressionCheckObj.class, long.class, "id");
         Operator op = Operator.IN;
         List<Object> value = new ArrayList<>();
-        int userId = (int) requestScope.getUser().getOpaqueUser();
+        int userId = Integer.valueOf(requestScope.getUser().getPrincipal().getName());
         if (setUserId) {
             value.add(setId);
         } else {
             value.add((long) userId);
         }
-        return new Predicate(pathList, op, value);
+        return new FilterPredicate(path1, op, value);
     }
 
     public static class CheckRestrictUser extends FilterExpressionCheck {
 
         @Override
-        public Predicate getFilterExpression(RequestScope requestScope) {
+        public FilterPredicate getFilterExpression(Type entityClass, RequestScope requestScope) {
             return createUserPredicate(requestScope, false, 1L);
         }
 
@@ -97,14 +81,12 @@ public CheckRestrictUser() {
     public static class CheckLE extends FilterExpressionCheck {
 
         @Override
-        public Predicate getFilterExpression(RequestScope requestScope) {
-            List<Predicate.PathElement> pathList = new ArrayList<>();
-            Predicate.PathElement path1 = new Predicate.PathElement(FilterExpressionCheckObj.class, "filterExpressionCheckObj", long.class, "id");
-            pathList.add(path1);
+        public FilterPredicate getFilterExpression(Type entityClass, RequestScope requestScope) {
+            Path.PathElement path1 = new Path.PathElement(FilterExpressionCheckObj.class, long.class, "id");
             Operator op = Operator.LE;
             List<Object> value = new ArrayList<>();
             value.add((long) 2);
-            return new Predicate(pathList, op, value);
+            return new FilterPredicate(path1, op, value);
         }
 
         public CheckLE() {
diff --git a/elide-integration-tests/src/test/java/example/Filtered.java b/elide-integration-tests/src/test/java/example/Filtered.java
new file mode 100644
index 0000000000..d15729a1f3
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Filtered.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.Path;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.filter.expression.FilterExpression;
+import com.yahoo.elide.core.filter.predicates.FilterPredicate;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.type.Type;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Entity;
+
+/**
+ * Filtered permission check.
+ */
+@CreatePermission(expression = "filterCheck")
+@ReadPermission(expression = "Prefab.Role.None OR filterCheck OR filterCheck3 OR negativeIntegerUser")
+@UpdatePermission(expression = "filterCheck")
+@DeletePermission(expression = "filterCheck")
+@Include
+// Hibernate
+@Entity
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@ToString
+public class Filtered extends BaseId {
+    @ReadPermission(expression = "Prefab.Role.None") public transient boolean init = false;
+
+    static private FilterPredicate getPredicateOfId(long id) {
+        Path.PathElement path1 = new Path.PathElement(Filtered.class, long.class, "id");
+        Operator op = Operator.IN;
+        List<Object> value = new ArrayList<>();
+        value.add(id);
+        return new FilterPredicate(path1, op, value);
+    }
+
+    /**
+     * Filter for ID == 1.
+     */
+    static public class FilterCheck<T> extends FilterExpressionCheck<T> {
+        /* Limit reads to ID 1 */
+        @Override
+        public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
+            return getPredicateOfId(1L);
+        }
+    }
+
+    /**
+     * Filter for ID == 3.
+     */
+    static public class FilterCheck3<T> extends FilterExpressionCheck<T> {
+        /* Limit reads to ID 3 */
+        @Override
+        public FilterExpression getFilterExpression(Type entityClass, RequestScope requestScope) {
+            return getPredicateOfId(3L);
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/FunWithPermissions.java b/elide-integration-tests/src/test/java/example/FunWithPermissions.java
index f39a7cf258..f8dc427c22 100644
--- a/elide-integration-tests/src/test/java/example/FunWithPermissions.java
+++ b/elide-integration-tests/src/test/java/example/FunWithPermissions.java
@@ -5,22 +5,16 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -29,40 +23,56 @@
 /**
  * Permission checks test bean.
  */
-@CreatePermission(any = { Role.ALL.class })
-@ReadPermission(all = { Role.ALL.class })
-@UpdatePermission(any = { Role.NONE.class, Role.ALL.class })
-@DeletePermission(all = { Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "fun") // optional here because class has this name
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.None OR Prefab.Role.All")
+@DeletePermission(expression = "Prefab.Role.None AND Prefab.Role.All")
+@Include(name = "fun") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "fun")
-public class FunWithPermissions {
-    @JsonIgnore
-    private long id;
+public class FunWithPermissions extends BaseId {
     private String field1;
     private String field2;
+    private String field3;
+    private String field4;
+    private Set<Child> relation1;
+    private Set<Child> relation2;
+    private Child relation3;
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    public String field3;
+    @ReadPermission(expression = "negativeIntegerUser")
+    public String getField3() {
+        return field3;
+    }
 
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
-    public String field4;
+    public void setField3(String field3) {
+        this.field3 = field3;
+    }
 
-    private Set<Child> relation1;
+    @UpdatePermission(expression = "negativeIntegerUser")
+    public String getField4() {
+        return field4;
+    }
+
+    public void setField4(String field4) {
+        this.field4 = field4;
+    }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
+    public void setRelation2(Set<Child> relation2) {
+        this.relation2 = relation2;
+    }
+
+    @ReadPermission(expression = "negativeIntegerUser")
     @OneToMany(
             targetEntity = Child.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE }
     )
-    public Set<Child> relation2;
-
-
-    private Child relation3;
+    public Set<Child> getRelation2() {
+        return relation2;
+    }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
+    @UpdatePermission(expression = "negativeIntegerUser")
     @OneToOne (cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "child_id")
     public Child getRelation3() {
@@ -73,17 +83,7 @@ public void setRelation3(Child relation3) {
         this.relation3 = relation3;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @ReadPermission(any = { Role.NONE.class})
+    @ReadPermission(expression = "Prefab.Role.None")
     public String getField1() {
         return field1;
     }
@@ -92,7 +92,7 @@ public void setField1(String field1) {
         this.field1 = field1;
     }
 
-    @ReadPermission(all = { Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     public String getField2() {
         return field2;
     }
@@ -101,8 +101,8 @@ public void setField2(String field2) {
         this.field2 = field2;
     }
 
-    @ReadPermission(any = { NegativeIntegerUserCheck.class })
-    @UpdatePermission(any = { NegativeIntegerUserCheck.class })
+    @ReadPermission(expression = "negativeIntegerUser")
+    @UpdatePermission(expression = "negativeIntegerUser")
     @OneToMany(
             targetEntity = Child.class,
             cascade = { CascadeType.PERSIST, CascadeType.MERGE }
@@ -115,19 +115,49 @@ public void setRelation1(Set<Child> relation) {
         this.relation1 = relation;
     }
 
-    /* Verifies a chain of checks where all can succeed */
-    @ReadPermission(any = { NegativeIntegerUserCheck.class, Role.ALL.class })
-    public String field5;
+    private String field5;
+
+    @ReadPermission(expression = "Prefab.Role.All OR negativeIntegerUser")
+    public String getField5() {
+        return field5;
+    }
+
+    public void setField5(String field5) {
+        this.field5 = field5;
+    }
 
-    /* Verifies a chain of checks where the first can fail or all succeed */
-    @ReadPermission(all = { NegativeIntegerUserCheck.class, Role.ALL.class })
-    public String field6;
+    private String field6;
+
+    @ReadPermission(expression = "negativeIntegerUser AND Prefab.Role.All")
+    public String getField6() {
+        return field6;
+    }
+
+    public void setField6(String field6) {
+        this.field6 = field6;
+    }
+
+    private String field7;
 
     /* Verifies a chain of checks where the last can fail. */
-    @ReadPermission(all = { Role.ALL.class, Role.NONE.class })
-    public String field7;
+    @ReadPermission(expression = "Prefab.Role.All AND Prefab.Role.None")
+    public String getField7() {
+        return field7;
+    }
+
+    public void setField7(String field7) {
+        this.field7 = field7;
+    }
+
+    private String field8;
 
     /* Verifies a chain of checks where all can fail or the last can succeed. */
-    @ReadPermission(any = { Role.NONE.class, NegativeIntegerUserCheck.class })
-    public String field8;
+    @ReadPermission(expression = "Prefab.Role.None OR negativeIntegerUser")
+    public String getField8() {
+        return field8;
+    }
+
+    public void setField8(String field8) {
+        this.field8 = field8;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/Generate.java b/elide-integration-tests/src/test/java/example/Generate.java
new file mode 100644
index 0000000000..de448c8ed7
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Generate.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import org.hibernate.annotations.Generated;
+import org.hibernate.annotations.GenerationTime;
+import lombok.Setter;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Include
+public class Generate {
+    @Setter
+    private long id;
+
+    @Setter
+    private Date created;
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    @Generated(GenerationTime.INSERT)
+    @Column(updatable = false, insertable = false, columnDefinition = "timestamp default current_timestamp")
+    @Temporal(TemporalType.TIMESTAMP)
+    public Date getCreated() {
+        return created;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/Invoice.java b/elide-integration-tests/src/test/java/example/Invoice.java
new file mode 100644
index 0000000000..98f0e14368
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Invoice.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity(name = "invoice")
+@Include
+public class Invoice {
+    private long id;
+    private Set<LineItem> items;
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @OneToMany(cascade = { CascadeType.DETACH, CascadeType.REMOVE } , mappedBy = "invoice", targetEntity = LineItem.class)
+    public Set<LineItem> getItems() {
+        return items;
+    }
+
+    public void setItems(Set<LineItem> items) {
+        this.items = items;
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Invoice && id == ((Invoice) obj).id;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/Left.java b/elide-integration-tests/src/test/java/example/Left.java
index 485823ad53..a3a3eed204 100644
--- a/elide-integration-tests/src/test/java/example/Left.java
+++ b/elide-integration-tests/src/test/java/example/Left.java
@@ -5,20 +5,13 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import java.util.Set;
-
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -27,21 +20,20 @@
 /**
  * left bean.
  */
-@Include(rootLevel = true, type = "left") // optional here because class has this name
+@Include(name = "left") // optional here because class has this name
 @Entity
 @Table(name = "xleft")  // left is SQL keyword
-@DeletePermission(
-        any = {NegativeIntegerUserCheck.class}
-)
-public class Left {
-    @JsonIgnore
-    private long id;
+@DeletePermission(expression = "negativeIntegerUser")
+public class Left extends BaseId {
     private Set<Right> one2many;
     private Right one2one;
+    private NoDeleteEntity noDeleteOne2One;
+    private Set<Right> noInverseDelete;
+    private Right noUpdateOne2One;
+    private Set<Right> noInverseUpdate;
 
     @OneToOne(
             optional = false,
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "one2one",
             fetch = FetchType.LAZY
@@ -54,16 +46,11 @@ public void setOne2one(Right one2one) {
         this.one2one = one2one;
     }
 
-    public void setId(long id) {
-        this.id = id;
-    }
-
     public void setOne2many(Set<Right> one2many) {
         this.one2many = one2many;
     }
 
     @OneToMany(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "many2one"
     )
@@ -71,41 +58,50 @@ public Set<Right> getOne2many() {
         return one2many;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
+    @UpdatePermission(expression = "Prefab.Role.None")
     @OneToOne(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "noUpdateOne2One",
             fetch = FetchType.LAZY
     )
-    public Right noUpdateOne2One;
+    public Right getNoUpdateOne2One() {
+        return noUpdateOne2One;
+    }
+
+    public void setNoUpdateOne2One(Right noUpdateOne2One) {
+        this.noUpdateOne2One = noUpdateOne2One;
+    }
 
     @ManyToMany(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Right.class,
             mappedBy = "noUpdate"
     )
-    public Set<Right> noInverseUpdate;
+    public Set<Right> getNoInverseUpdate() {
+        return noInverseUpdate;
+    }
+
+    public void setNoInverseUpdate(Set<Right> noInverseUpdate) {
+        this.noInverseUpdate = noInverseUpdate;
+    }
 
     @OneToOne(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = NoDeleteEntity.class,
             fetch = FetchType.LAZY
     )
-    public NoDeleteEntity noDeleteOne2One;
+    public NoDeleteEntity getNoDeleteOne2One() {
+        return noDeleteOne2One;
+    }
 
-    @ManyToMany(
-        cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-        targetEntity = Right.class,
-        mappedBy = "allowDeleteAtFieldLevel"
-    )
-    public Set<Right> noInverseDelete;
+    public void setNoDeleteOne2One(NoDeleteEntity noDeleteOne2One) {
+        this.noDeleteOne2One = noDeleteOne2One;
+    }
+
+    @ManyToMany
+    public Set<Right> getNoInverseDelete() {
+        return noInverseDelete;
+    }
+
+    public void setNoInverseDelete(Set<Right> noInverseDelete) {
+        this.noInverseDelete = noInverseDelete;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/LineItem.java b/elide-integration-tests/src/test/java/example/LineItem.java
new file mode 100644
index 0000000000..1466292227
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/LineItem.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Include(rootLevel = false)
+public class LineItem {
+    private long id;
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    private Invoice invoice;
+
+    @ManyToOne(targetEntity = Invoice.class)
+    public Invoice getInvoice() {
+        return invoice;
+    }
+
+    public void setInvoice(Invoice invoice) {
+        this.invoice = invoice;
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof LineItem && id == ((LineItem) obj).id;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/MapColorShape.java b/elide-integration-tests/src/test/java/example/MapColorShape.java
index c6e3db0080..d81b3e3673 100644
--- a/elide-integration-tests/src/test/java/example/MapColorShape.java
+++ b/elide-integration-tests/src/test/java/example/MapColorShape.java
@@ -6,41 +6,24 @@
 package example;
 
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.MapKeyColumn;
 import javax.persistence.Table;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * Bean with Map of Enums.
  */
 @Entity
 @Table(name = "color_shape")
-@Include(rootLevel = true)
-@SharePermission(any = {Role.ALL.class})
-public class MapColorShape {
-    private long id;
+@Include
+public class MapColorShape extends BaseId {
     private Map<Color, Shape> colorShapeMap = new LinkedHashMap<>();
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
     @ElementCollection
     @MapKeyColumn(name = "color")
     @Column(name = "shape")
diff --git a/elide-integration-tests/src/test/java/example/NegativeChildIdCheck.java b/elide-integration-tests/src/test/java/example/NegativeChildIdCheck.java
index d9ecde02e0..9b65671850 100644
--- a/elide-integration-tests/src/test/java/example/NegativeChildIdCheck.java
+++ b/elide-integration-tests/src/test/java/example/NegativeChildIdCheck.java
@@ -5,9 +5,9 @@
  */
 package example;
 
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.checks.OperationCheck;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 
 import java.util.Optional;
 
diff --git a/elide-integration-tests/src/test/java/example/NegativeIntegerUserCheck.java b/elide-integration-tests/src/test/java/example/NegativeIntegerUserCheck.java
index 3508b5c772..a96c99aae3 100644
--- a/elide-integration-tests/src/test/java/example/NegativeIntegerUserCheck.java
+++ b/elide-integration-tests/src/test/java/example/NegativeIntegerUserCheck.java
@@ -5,8 +5,8 @@
  */
 package example;
 
-import com.yahoo.elide.security.User;
-import com.yahoo.elide.security.checks.UserCheck;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.core.security.checks.UserCheck;
 
 /**
  * Useful for testing permissions based on different users.
@@ -14,7 +14,7 @@
 public class NegativeIntegerUserCheck extends UserCheck {
     @Override
     public boolean ok(User user) {
-        Integer id = (Integer) user.getOpaqueUser();
+        Integer id = Integer.parseInt(user.getPrincipal().getName());
         return id >= 0;
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/NoCommitEntity.java b/elide-integration-tests/src/test/java/example/NoCommitEntity.java
index 028c4ac152..15ca10125e 100644
--- a/elide-integration-tests/src/test/java/example/NoCommitEntity.java
+++ b/elide-integration-tests/src/test/java/example/NoCommitEntity.java
@@ -8,44 +8,33 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
-import example.NoCommitEntity.NoCommitCheck;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+import lombok.Getter;
+import lombok.Setter;
 
+import java.util.Optional;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
-import java.util.Optional;
-
 /**
  * No Update test bean.
  */
-@CreatePermission(all = { Role.ALL.class, NoCommitCheck.class })
-@UpdatePermission(all = { Role.ALL.class, NoCommitCheck.class })
-@Include(rootLevel = true, type = "nocommit")
+@CreatePermission(expression = "Prefab.Role.All AND noCommit")
+@UpdatePermission(expression = "Prefab.Role.All AND noCommit")
+@Include(name = "nocommit")
 // Hibernate
 @Entity
 @Table(name = "nocommit")
-public class NoCommitEntity {
-    static public class NoCommitCheck<T> extends CommitCheck<T> {
+public class NoCommitEntity extends BaseId {
+    @Getter @Setter
+    private String value;
+
+    static public class NoCommitCheck<T> extends OperationCheck<T> {
         @Override
         public boolean ok(T record, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
             return false;
         }
     }
-
-    private long id;
-
-    @Id @GeneratedValue
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
 }
diff --git a/elide-integration-tests/src/test/java/example/NoCreateEntity.java b/elide-integration-tests/src/test/java/example/NoCreateEntity.java
index 5b1f0a4bbd..8a677d3a80 100644
--- a/elide-integration-tests/src/test/java/example/NoCreateEntity.java
+++ b/elide-integration-tests/src/test/java/example/NoCreateEntity.java
@@ -7,29 +7,17 @@
 
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
  * No Create test bean.
  */
-@CreatePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "nocreate") // optional here because class has this name
+@CreatePermission(expression = "Prefab.Role.None")
+@Include(name = "nocreate") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "nocreate")
-public class NoCreateEntity {
-    private long id;
-
-    @Id @GeneratedValue
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+public class NoCreateEntity extends BaseId {
 }
diff --git a/elide-integration-tests/src/test/java/example/NoDeleteEntity.java b/elide-integration-tests/src/test/java/example/NoDeleteEntity.java
index 9ca285580d..1fc4e63dd2 100644
--- a/elide-integration-tests/src/test/java/example/NoDeleteEntity.java
+++ b/elide-integration-tests/src/test/java/example/NoDeleteEntity.java
@@ -7,29 +7,17 @@
 
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
  * No Delete test bean.
  */
-@DeletePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "nodelete") // optional here because class has this name
+@DeletePermission(expression = "Prefab.Role.None")
+@Include(name = "nodelete") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "nodelete")
-public class NoDeleteEntity {
-    private long id;
-
-    @Id @GeneratedValue
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+public class NoDeleteEntity extends BaseId {
 }
diff --git a/elide-integration-tests/src/test/java/example/NoReadEntity.java b/elide-integration-tests/src/test/java/example/NoReadEntity.java
index 6550a7e0fb..fbba820c53 100644
--- a/elide-integration-tests/src/test/java/example/NoReadEntity.java
+++ b/elide-integration-tests/src/test/java/example/NoReadEntity.java
@@ -7,35 +7,28 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.checks.prefab.Role;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 /**
  * No Read test bean.
  */
-@ReadPermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "noread") // optional here because class has this name
+@ReadPermission(expression = "Prefab.Role.None")
+@Include(name = "noread") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "noread")
-public class NoReadEntity {
-    private long id;
-    public String field;
+public class NoReadEntity extends BaseId {
+    @Column
+    @Getter @Setter
+    protected String field;
 
     @OneToOne(fetch = FetchType.LAZY)
-    public Child child;
-
-    @Id @GeneratedValue
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+    protected Child child;
 }
diff --git a/elide-integration-tests/src/test/java/example/NoShareBiDirectional.java b/elide-integration-tests/src/test/java/example/NoShareBiDirectional.java
deleted file mode 100644
index 64f8d3c44d..0000000000
--- a/elide-integration-tests/src/test/java/example/NoShareBiDirectional.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-
-@Entity
-@Include(rootLevel = true, type = "noShareBid")
-@SharePermission(all = {Role.NONE.class})
-public class NoShareBiDirectional {
-    private Long id;
-    private NoShareBiDirectional other;
-
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @OneToOne(fetch = FetchType.LAZY)
-    public NoShareBiDirectional getOther() {
-        return other;
-    }
-
-    public void setOther(NoShareBiDirectional other) {
-        this.other = other;
-    }
-}
diff --git a/elide-integration-tests/src/test/java/example/NoTransferBiDirectional.java b/elide-integration-tests/src/test/java/example/NoTransferBiDirectional.java
new file mode 100644
index 0000000000..61d5b5ab88
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/NoTransferBiDirectional.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+@Entity
+@Include(name = "noShareBid")
+@NonTransferable
+public class NoTransferBiDirectional extends BaseId {
+    private NoTransferBiDirectional other;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    public NoTransferBiDirectional getOther() {
+        return other;
+    }
+
+    public void setOther(NoTransferBiDirectional other) {
+        this.other = other;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/NoUpdateEntity.java b/elide-integration-tests/src/test/java/example/NoUpdateEntity.java
index e9fd9b3f07..929e2e1347 100644
--- a/elide-integration-tests/src/test/java/example/NoUpdateEntity.java
+++ b/elide-integration-tests/src/test/java/example/NoUpdateEntity.java
@@ -7,34 +7,21 @@
 
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
+import java.util.Set;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import java.util.Set;
 
 /**
  * No Update test bean.
  */
-@UpdatePermission(all = { Role.NONE.class })
-@Include(rootLevel = true, type = "noupdate") // optional here because class has this name
+@UpdatePermission(expression = "Prefab.Role.None")
+@Include(name = "noupdate") // optional here because class has this name
 // Hibernate
 @Entity
 @Table(name = "noupdate")
-public class NoUpdateEntity {
-    private long id;
-
-    @OneToMany()
-    public Set<Child> children;
-
-    @Id @GeneratedValue
-    public long getId() {
-        return id;
-    }
-    public void setId(long id) {
-        this.id = id;
-    }
+public class NoUpdateEntity extends BaseId {
+    @OneToMany
+    protected Set<Child> children;
 }
diff --git a/elide-integration-tests/src/test/java/example/NotIncludedResource.java b/elide-integration-tests/src/test/java/example/NotIncludedResource.java
index 0cb795f94a..17a81b135f 100644
--- a/elide-integration-tests/src/test/java/example/NotIncludedResource.java
+++ b/elide-integration-tests/src/test/java/example/NotIncludedResource.java
@@ -8,28 +8,16 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
 
-@ReadPermission(any = {Role.ALL.class})
-@CreatePermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Role.ALL.class})
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
 @Entity
-public class NotIncludedResource {
-    private Long id;
+public class NotIncludedResource extends BaseId {
     private String someParams;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getSomeParams() {
         return someParams;
     }
diff --git a/elide-integration-tests/src/test/java/example/OneToOneNonRoot.java b/elide-integration-tests/src/test/java/example/OneToOneNonRoot.java
index 1f884e6ac5..38f9da6c7a 100644
--- a/elide-integration-tests/src/test/java/example/OneToOneNonRoot.java
+++ b/elide-integration-tests/src/test/java/example/OneToOneNonRoot.java
@@ -9,38 +9,22 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.PrimaryKeyJoinColumn;
 
 @Include(rootLevel = false)
-@ReadPermission(any = {Role.ALL.class})
-@CreatePermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Role.ALL.class})
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
 @Entity
-public class OneToOneNonRoot {
-    private Long id;
-
+public class OneToOneNonRoot extends BaseId {
     private String test;
 
     private OneToOneRoot root;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getTest() {
         return test;
     }
diff --git a/elide-integration-tests/src/test/java/example/OneToOneRoot.java b/elide-integration-tests/src/test/java/example/OneToOneRoot.java
index 03f14fbc86..bb643ef8f7 100644
--- a/elide-integration-tests/src/test/java/example/OneToOneRoot.java
+++ b/elide-integration-tests/src/test/java/example/OneToOneRoot.java
@@ -9,37 +9,21 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
-@Include(rootLevel = true)
-@ReadPermission(any = {Role.ALL.class})
-@CreatePermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Role.ALL.class})
+@Include
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
 @Entity
-public class OneToOneRoot {
-    private Long id;
-
+public class OneToOneRoot extends BaseId {
     private String name;
 
     private OneToOneNonRoot otherObject;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
diff --git a/elide-integration-tests/src/test/java/example/Parent.java b/elide-integration-tests/src/test/java/example/Parent.java
index e1b702210c..72f4fb9911 100644
--- a/elide-integration-tests/src/test/java/example/Parent.java
+++ b/elide-integration-tests/src/test/java/example/Parent.java
@@ -8,35 +8,32 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.Paginate;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.CommitCheck;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Role;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 import lombok.ToString;
 
-import javax.persistence.CascadeType;
+import java.util.Optional;
+import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.validation.constraints.NotNull;
-import java.util.Optional;
-import java.util.Set;
 
 /**
  * Parent test bean.
  */
-@CreatePermission(any = { Parent.InitCheck.class, Role.ALL.class })
-@ReadPermission(any = { Parent.InitCheckOp.class, Role.ALL.class })
-@SharePermission(any = { Role.ALL.class })
-@UpdatePermission(any = { Parent.InitCheck.class, Role.ALL.class, Role.NONE.class })
-@DeletePermission(any = { Parent.InitCheckOp.class, Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "parent") // optional here because class has this name
+@CreatePermission(expression = "parentInitCheck OR Prefab.Role.All")
+@ReadPermission(expression = "parentInitCheck OR Prefab.Role.All")
+@UpdatePermission(expression = "parentInitCheck OR Prefab.Role.All OR Prefab.Role.None")
+@DeletePermission(expression = "parentInitCheck OR Prefab.Role.All OR Prefab.Role.None")
+@Include(name = "parent") // optional here because class has this name
+@Paginate(maxLimit = 100000)
 // Hibernate
 @Entity
 @ToString
@@ -45,19 +42,17 @@ public class Parent extends BaseId {
     private Set<Parent> spouses;
     private String firstName;
     private String specialAttribute;
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
+    @ReadPermission(expression = "Prefab.Role.None") public transient boolean init = false;
 
     public void doInit() {
         init = true;
     }
 
-    @ReadPermission(any = { Role.ALL.class, Role.NONE.class })
-    @UpdatePermission(any = { Role.ALL.class, Role.NONE.class })
-
+    @ReadPermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+    @UpdatePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
     // Hibernate
     @ManyToMany(
-            targetEntity = Child.class,
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE }
+            targetEntity = Child.class
     )
     @JoinTable(
             name = "Parent_Child",
@@ -92,9 +87,10 @@ public String getFirstName() {
     public void setFirstName(String name) {
         this.firstName = name;
     }
+
     // Special attribute is to catch a corner case for patch extension
-    @ReadPermission(all = {Role.NONE.class})
-    @UpdatePermission(all = {SpecialValue.class})
+    @ReadPermission(expression = "Prefab.Role.None")
+    @UpdatePermission(expression = "parentSpecialValue")
     public String getSpecialAttribute() {
         return specialAttribute;
     }
@@ -103,26 +99,11 @@ public void setSpecialAttribute(String specialAttribute) {
         this.specialAttribute = specialAttribute;
     }
 
-    /**
-     * Initialization validation check.
-     */
-    static public class InitCheck extends CommitCheck<Parent> {
-        @Override
-        public boolean ok(Parent parent, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (parent.getChildren() != null && parent.getSpouses() != null) {
-                return true;
-            }
-            return false;
-        }
-    }
 
-    static public class InitCheckOp extends OperationCheck<Parent> {
+    static public class InitCheck extends OperationCheck<Parent> {
         @Override
         public boolean ok(Parent parent, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-            if (parent.getChildren() != null && parent.getSpouses() != null) {
-                return true;
-            }
-            return false;
+            return parent.getChildren() != null && parent.getSpouses() != null;
         }
     }
 
diff --git a/elide-integration-tests/src/test/java/example/Post.java b/elide-integration-tests/src/test/java/example/Post.java
index a6df9e1a30..823d6547a6 100644
--- a/elide-integration-tests/src/test/java/example/Post.java
+++ b/elide-integration-tests/src/test/java/example/Post.java
@@ -10,25 +10,24 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
 
 /**
  * Post test bean.
  */
-@CreatePermission(any = { Role.ALL.class })
-@ReadPermission(any = { Role.ALL.class })
-@UpdatePermission(any = { Role.ALL.class, Role.NONE.class })
-@DeletePermission(any = { Role.ALL.class, Role.NONE.class })
-@Include(rootLevel = true, type = "post") // optional here because class has this name
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+@DeletePermission(expression = "Prefab.Role.All OR Prefab.Role.None")
+@Include(name = "post") // optional here because class has this name
 // Hibernate
 @Entity
 public class Post extends BaseId {
     private String title;
     private int created;
 
-    @ReadPermission(all = { Role.NONE.class }) public transient boolean init = false;
+    @ReadPermission(expression = "Prefab.Role.None") public transient boolean init = false;
 
     public void doInit() {
         init = true;
diff --git a/elide-integration-tests/src/test/java/example/Price.java b/elide-integration-tests/src/test/java/example/Price.java
new file mode 100644
index 0000000000..c629ebb675
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Price.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+
+@Embeddable
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Price {
+    BigDecimal total;
+
+    @Embedded
+    Currency currency;
+}
diff --git a/elide-integration-tests/src/test/java/example/Publisher.java b/elide-integration-tests/src/test/java/example/Publisher.java
new file mode 100644
index 0000000000..1e4f01f8ac
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Publisher.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.FilterExpressionPath;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+/**
+ * Publisher for book/author example.
+ */
+@Entity
+@Include(rootLevel = false)
+public class Publisher extends BaseId {
+    private String name;
+    private Set<Book> books = new HashSet<>();
+    private Set<String> phoneNumbers = new HashSet<>();
+    private Editor editor;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @OneToMany(mappedBy = "publisher")
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+
+    @ManyToOne
+    @FilterExpressionPath("editor")
+    @ReadPermission(expression = "Field path editor check")
+    public Editor getEditor() {
+        return editor;
+    }
+
+    @ElementCollection(targetClass = String.class)
+    public Set<String> getPhoneNumbers() {
+        return phoneNumbers;
+    }
+
+    public void setPhoneNumbers(Set<String> phoneNumbers) {
+        this.phoneNumbers = phoneNumbers;
+    }
+
+    public void setEditor(Editor editor) {
+        this.editor = editor;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/ResourceWithInvalidRelationship.java b/elide-integration-tests/src/test/java/example/ResourceWithInvalidRelationship.java
index d86c5a7c6d..3ea06ac375 100644
--- a/elide-integration-tests/src/test/java/example/ResourceWithInvalidRelationship.java
+++ b/elide-integration-tests/src/test/java/example/ResourceWithInvalidRelationship.java
@@ -5,40 +5,24 @@
  */
 package example;
 
-        import com.yahoo.elide.annotation.CreatePermission;
-        import com.yahoo.elide.annotation.Include;
-        import com.yahoo.elide.annotation.ReadPermission;
-        import com.yahoo.elide.annotation.UpdatePermission;
-        import com.yahoo.elide.security.checks.prefab.Role;
-
-        import javax.persistence.Entity;
-        import javax.persistence.GeneratedValue;
-        import javax.persistence.GenerationType;
-        import javax.persistence.Id;
-        import javax.persistence.OneToOne;
-
-@Include(rootLevel = true)
-@ReadPermission(any = {Role.ALL.class})
-@CreatePermission(any = {Role.ALL.class})
-@UpdatePermission(any = {Role.ALL.class})
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Include
+@ReadPermission(expression = "Prefab.Role.All")
+@CreatePermission(expression = "Prefab.Role.All")
+@UpdatePermission(expression = "Prefab.Role.All")
 @Entity
-public class ResourceWithInvalidRelationship {
-    private Long id;
-
+public class ResourceWithInvalidRelationship extends BaseId {
     private String name;
 
     private NotIncludedResource notIncludedResource;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
diff --git a/elide-integration-tests/src/test/java/example/Right.java b/elide-integration-tests/src/test/java/example/Right.java
index 71a904fbb9..0cea9a14e1 100644
--- a/elide-integration-tests/src/test/java/example/Right.java
+++ b/elide-integration-tests/src/test/java/example/Right.java
@@ -5,19 +5,13 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
@@ -26,73 +20,78 @@
 /**
  * Right test bean.
  */
-@Include(rootLevel = true, type = "right") // optional here because class has this name
+@Include(name = "right") // optional here because class has this name
 @Entity
 @Table(name = "xright")     // right is SQL keyword
-public class Right {
-    @JsonIgnore
-    private long id;
+public class Right extends BaseId {
     private Left many2one;
     private Left one2one;
+    private Left noUpdateOne2One;
+    private Set<Left> noUpdate;
+    private Set<Left> noDelete;
 
+    @UpdatePermission(expression = "Prefab.Role.None")
     @OneToOne(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Left.class,
             fetch = FetchType.LAZY
     )
-    public Left getOne2one() {
-        return one2one;
-    }
-
-    public void setOne2one(Left one2one) {
-        this.one2one = one2one;
+    public Left getNoUpdateOne2One() {
+        return noUpdateOne2One;
     }
 
-    public void setMany2one(Left many2one) {
-        this.many2one = many2one;
+    public void setNoUpdateOne2One(Left noUpdateOne2One) {
+        this.noUpdateOne2One = noUpdateOne2One;
     }
 
-    @ManyToOne(
+    @UpdatePermission(expression = "Prefab.Role.None")
+    @ManyToMany(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-            targetEntity = Left.class,
-            fetch = FetchType.LAZY
+            targetEntity = Left.class
     )
-    public Left getMany2one() {
-        return many2one;
+    public Set<Left> getNoUpdate() {
+        return noUpdate;
+    }
+
+    public void setNoUpdate(Set<Left> noUpdate) {
+        this.noUpdate = noUpdate;
     }
 
-    public void setId(long id) {
-        this.id = id;
+    @ManyToMany(
+            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
+            targetEntity = Left.class
+    )
+    public Set<Left> getNoDelete() {
+        return noDelete;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
+    public void setNoDelete(Set<Left> noDelete) {
+        this.noDelete = noDelete;
     }
 
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
     @OneToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
             targetEntity = Left.class,
             fetch = FetchType.LAZY
-    )
-    public Left noUpdateOne2One;
 
-    @UpdatePermission(
-           any = {Role.NONE.class}
-    )
-    @ManyToMany(
-            cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-            targetEntity = Left.class
     )
-    public Set<Left> noUpdate;
+    public Left getOne2one() {
+        return one2one;
+    }
 
-    @ManyToMany(
+    public void setOne2one(Left one2one) {
+        this.one2one = one2one;
+    }
+
+    public void setMany2one(Left many2one) {
+        this.many2one = many2one;
+    }
+
+    @ManyToOne(
             cascade = { CascadeType.PERSIST, CascadeType.MERGE },
-            targetEntity = Left.class
+            targetEntity = Left.class,
+            fetch = FetchType.LAZY
     )
-    public Set<Left> noDelete;
+    public Left getMany2one() {
+        return many2one;
+    }
 }
diff --git a/elide-integration-tests/src/test/java/example/Shareable.java b/elide-integration-tests/src/test/java/example/Shareable.java
deleted file mode 100644
index a3e00ac8d9..0000000000
--- a/elide-integration-tests/src/test/java/example/Shareable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-import com.yahoo.elide.security.checks.prefab.Role;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * A shareable bean.
- */
-@Entity
-@SharePermission(any = {Role.ALL.class})
-@Table(name = "shareable")
-@Include(rootLevel = true, type = "shareable")
-public class Shareable {
-    private long id;
-    private Container container;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    public Container getContainer() {
-        return container;
-    }
-
-    public void setContainer(Container container) {
-        this.container = container;
-    }
-}
diff --git a/elide-integration-tests/src/test/java/example/SpecialRead.java b/elide-integration-tests/src/test/java/example/SpecialRead.java
index 6bdbff9daa..664b0db347 100644
--- a/elide-integration-tests/src/test/java/example/SpecialRead.java
+++ b/elide-integration-tests/src/test/java/example/SpecialRead.java
@@ -5,55 +5,50 @@
  */
 package example;
 
+import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import com.yahoo.elide.security.ChangeSpec;
-import com.yahoo.elide.security.PersistentResource;
-import com.yahoo.elide.security.RequestScope;
-import com.yahoo.elide.security.checks.OperationCheck;
-import com.yahoo.elide.security.checks.prefab.Common;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 
+import java.util.Optional;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import java.util.Optional;
 
 @Entity
-@Include(rootLevel = true, type = "specialread")
-@ReadPermission(all = {SpecialRead.SpecialValue.class})
-@UpdatePermission(all = {Common.UpdateOnCreate.class})
-public class SpecialRead {
-    public Long id;
+@Include(name = "specialread")
+@ReadPermission(expression = "specialValue")
+@UpdatePermission(expression = "Prefab.Role.None")
+@CreatePermission(expression = "Prefab.Role.All")
+public class SpecialRead extends BaseId {
+    private String value;
+    private Child child;
+
+    public String getValue() {
+        return value;
+    }
 
-    public String value;
+    public void setValue(String value) {
+        this.value = value;
+    }
 
     @ManyToOne(fetch = FetchType.LAZY)
-    public Child child;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
+    public Child getChild() {
+        return child;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setChild(Child child) {
+        this.child = child;
     }
 
     public static class SpecialValue extends OperationCheck<SpecialRead> {
         @Override
         public boolean ok(SpecialRead object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
             // Only able to read new objects with the special value
-            for (PersistentResource resource : requestScope.getNewResources()) {
-                if (resource.getObject() == object) {
-                    return "special value".equals(object.value);
-                }
-            }
-            return false;
+            return "special value".equals(object.value);
         }
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/TestCheckMappings.java b/elide-integration-tests/src/test/java/example/TestCheckMappings.java
new file mode 100644
index 0000000000..a723ca0876
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/TestCheckMappings.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.HashMap;
+
+/**
+ * Check mappings to be used by tests.
+ */
+public class TestCheckMappings {
+    public static final HashMap<String, Class<? extends Check>> MAPPINGS =
+            new HashMap<>(ImmutableMap.<String, Class<? extends Check>>builder()
+                    .put("Prefab.Role.All", Role.ALL.class)
+                    .put("Prefab.Role.None", Role.NONE.class)
+                    .put("adminRoleCheck", User.AdminRoleCheck.class)
+                    .put("initCheck", Child.InitCheck.class)
+                    .put("FailCheckOp", Child.FailCheckOp.class)
+                    .put("initCheckFilter", Child.InitCheckFilter.class)
+                    .put("parentInitCheck", Parent.InitCheck.class)
+                    .put("parentSpecialValue", Parent.SpecialValue.class)
+                    .put("negativeIntegerUser", NegativeIntegerUserCheck.class)
+                    .put("negativeChildId", NegativeChildIdCheck.class)
+                    .put("noCommit", NoCommitEntity.NoCommitCheck.class)
+                    .put("child4Parent5", Child4Parent5Check.class)
+                    .put("checkActsLikeFilter", AnotherFilterExpressionCheckObj.CheckActsLikeFilter.class)
+                    .put("noRead", CreateButNoRead.NOREAD.class)
+                    .put("checkLE", FilterExpressionCheckObj.CheckLE.class)
+                    .put("checkRestrictUser", FilterExpressionCheckObj.CheckRestrictUser.class)
+                    .put("specialValue", SpecialRead.SpecialValue.class)
+                    .put("Field path editor check", Editor.FieldPathFilterExpression.class)
+                    .build());
+}
diff --git a/elide-integration-tests/src/test/java/example/Transferable.java b/elide-integration-tests/src/test/java/example/Transferable.java
new file mode 100644
index 0000000000..8d62ea745c
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Transferable.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * A shareable bean.
+ */
+@Entity
+@Table(name = "transferable")
+@Include(name = "transferable")
+public class Transferable extends BaseId {
+    private Container container;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    public Container getContainer() {
+        return container;
+    }
+
+    public void setContainer(Container container) {
+        this.container = container;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/Unshareable.java b/elide-integration-tests/src/test/java/example/Unshareable.java
deleted file mode 100644
index 7ecc28a23e..0000000000
--- a/elide-integration-tests/src/test/java/example/Unshareable.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Licensed under the Apache License, Version 2.0
- * See LICENSE file in project root for terms.
- */
-package example;
-
-import com.yahoo.elide.annotation.Include;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * Unshareable bean.
- */
-@Entity
-@Table(name = "unshareable")
-@Include(rootLevel = true, type = "unshareable")
-public class Unshareable {
-    private long id;
-    private Container container;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    public Container getContainer() {
-        return container;
-    }
-
-    public void setContainer(Container container) {
-        this.container = container;
-    }
-}
diff --git a/elide-integration-tests/src/test/java/example/Untransferable.java b/elide-integration-tests/src/test/java/example/Untransferable.java
new file mode 100644
index 0000000000..711ca02074
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/Untransferable.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.NonTransferable;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * DisallowShare bean.
+ */
+@Entity
+@Table(name = "untransferable")
+@Include(name = "untransferable")
+@NonTransferable
+public class Untransferable extends BaseId {
+    private Container container;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    public Container getContainer() {
+        return container;
+    }
+
+    public void setContainer(Container container) {
+        this.container = container;
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/User.java b/elide-integration-tests/src/test/java/example/User.java
index be7b68240a..d4082aca3c 100644
--- a/elide-integration-tests/src/test/java/example/User.java
+++ b/elide-integration-tests/src/test/java/example/User.java
@@ -5,14 +5,15 @@
  */
 package example;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yahoo.elide.annotation.ComputedAttribute;
 import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
 
+import java.util.Optional;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.Transient;
 
 
@@ -20,10 +21,9 @@
  * Used to test computed attributes.
  */
 @Entity
-@Include(rootLevel = true)
-public class User {
-    @JsonIgnore
-    private long id;
+@Include
+public class User extends BaseId {
+    private int role;
 
     private String reversedPassword;
 
@@ -39,6 +39,7 @@ public String getPassword() {
 
     /**
      * Sets the password but first reverses it.
+     * @param password password to 'encrypt'
      */
     @ComputedAttribute
     @Transient
@@ -54,20 +55,26 @@ public String getReversedPassword() {
     }
 
     /**
-     * Sets the password.  This is intended for Hibernate
+     * Sets the password.  This is intended for Hibernate.
      * @param reversedPassword reversed password
      */
     public void setReversedPassword(String reversedPassword) {
         this.reversedPassword = reversedPassword;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public long getId() {
-        return id;
+    @UpdatePermission(expression = "adminRoleCheck")
+    public int getRole() {
+        return role;
     }
 
-    public void setId(long id) {
-        this.id = id;
+    public void setRole(int role) {
+        this.role = role;
+    }
+
+    static public class AdminRoleCheck extends OperationCheck<User> {
+        @Override
+        public boolean ok(User user, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
+            return (user.getRole() == 1);
+        }
     }
 }
diff --git a/elide-integration-tests/src/test/java/example/YetAnotherPermission.java b/elide-integration-tests/src/test/java/example/YetAnotherPermission.java
index 2af853d0d3..56ff98b38c 100644
--- a/elide-integration-tests/src/test/java/example/YetAnotherPermission.java
+++ b/elide-integration-tests/src/test/java/example/YetAnotherPermission.java
@@ -8,32 +8,17 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.ReadPermission;
-import com.yahoo.elide.security.checks.prefab.Role;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
-@CreatePermission(any = {Role.ALL.class })
-@ReadPermission(all = {Role.NONE.class })
-@Include(rootLevel = true)
+@CreatePermission(expression = "Prefab.Role.All")
+@ReadPermission(expression = "Prefab.Role.None")
+@Include
 @Entity
-public class YetAnotherPermission {
-    private Long id;
+public class YetAnotherPermission extends BaseId {
     private String hiddenName;
     private String youShouldBeAbleToRead;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getHiddenName() {
         return hiddenName;
     }
@@ -42,7 +27,7 @@ public void setHiddenName(String hiddenName) {
         this.hiddenName = hiddenName;
     }
 
-    @ReadPermission(any = {Role.ALL.class})
+    @ReadPermission(expression = "Prefab.Role.All")
     public String getYouShouldBeAbleToRead() {
         return youShouldBeAbleToRead;
     }
diff --git a/elide-integration-tests/src/test/java/example/embeddedid/Address.java b/elide-integration-tests/src/test/java/example/embeddedid/Address.java
new file mode 100644
index 0000000000..173bb026d7
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/embeddedid/Address.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.embeddedid;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import javax.persistence.Embeddable;
+
+@Embeddable
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Address implements Serializable {
+    private long number;
+    private String street;
+    private long zipCode;
+}
diff --git a/elide-integration-tests/src/test/java/example/embeddedid/AddressSerde.java b/elide-integration-tests/src/test/java/example/embeddedid/AddressSerde.java
new file mode 100644
index 0000000000..1292e57111
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/embeddedid/AddressSerde.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.embeddedid;
+
+import com.yahoo.elide.core.exceptions.InvalidValueException;
+import com.yahoo.elide.core.utils.coerce.converters.ElideTypeConverter;
+import com.yahoo.elide.core.utils.coerce.converters.Serde;
+
+import java.util.Base64;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@ElideTypeConverter(type = Address.class, name = "Address")
+public class AddressSerde implements Serde<String, Address> {
+    private static final Pattern ADDRESS_PATTERN =
+            Pattern.compile("Address\\(number=(\\d+), street=([a-zA-Z0-9 ]+), zipCode=(\\d+)\\)");
+
+    @Override
+    public Address deserialize(String val) {
+        byte[] decodedBytes = Base64.getDecoder().decode(val);
+        String decodedString = new String(decodedBytes);
+
+        Matcher matcher = ADDRESS_PATTERN.matcher(decodedString);
+        if (! matcher.matches()) {
+            throw new InvalidValueException(decodedString);
+        }
+        long number = Long.parseLong(matcher.group(1));
+        String street = matcher.group(2);
+        long zipCode = Long.parseLong(matcher.group(3));
+
+        return new Address(number, street, zipCode);
+    }
+
+    @Override
+    public String serialize(Address val) {
+        return Base64.getEncoder().encodeToString(val.toString().getBytes());
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/embeddedid/Building.java b/elide-integration-tests/src/test/java/example/embeddedid/Building.java
new file mode 100644
index 0000000000..2cfe925132
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/embeddedid/Building.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.embeddedid;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Set;
+import javax.persistence.Embedded;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+
+@Include
+@Data
+@Entity
+public class Building {
+    @EmbeddedId
+    @Embedded
+    private Address address;
+
+    private String name;
+
+    @OneToMany
+    @EqualsAndHashCode.Exclude
+    @ToString.Exclude
+    private Set<Building> neighbors;
+}
diff --git a/elide-integration-tests/src/test/java/example/models/BaseId.java b/elide-integration-tests/src/test/java/example/models/BaseId.java
new file mode 100644
index 0000000000..01fe9ebcf2
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/BaseId.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+import com.yahoo.elide.annotation.Exclude;
+
+import java.util.UUID;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Base class for Entities that provides a hashcode and equals that will be the same
+ * before and after an object is persisted to the DB.
+ */
+@MappedSuperclass
+public abstract class BaseId {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    protected long id;
+
+    @Exclude
+    protected String naturalKey = UUID.randomUUID().toString();
+
+    @Exclude
+    public String getNaturalKey() {
+        return naturalKey;
+    }
+
+    public void setNaturalKey(String naturalKey) {
+        this.naturalKey = naturalKey;
+    }
+
+    @Override
+    public int hashCode() {
+        return naturalKey.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof BaseId && naturalKey.equals(((BaseId) obj).naturalKey);
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/models/generics/Employee.java b/elide-integration-tests/src/test/java/example/models/generics/Employee.java
new file mode 100644
index 0000000000..d98702186b
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/generics/Employee.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+
+/**
+ * Helper class to test parameterized subclass/superclass hierarchies.
+ */
+@Include
+@Entity
+public class Employee extends Peon<Manager> {
+}
diff --git a/elide-integration-tests/src/test/java/example/models/generics/Manager.java b/elide-integration-tests/src/test/java/example/models/generics/Manager.java
new file mode 100644
index 0000000000..10a57b2a3a
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/generics/Manager.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import com.yahoo.elide.annotation.Include;
+
+import javax.persistence.Entity;
+
+/**
+ * Tests a parameterized superclass.
+ */
+@Include
+@Entity
+public class Manager extends Overlord<Employee> {
+}
diff --git a/elide-integration-tests/src/test/java/example/models/generics/Overlord.java b/elide-integration-tests/src/test/java/example/models/generics/Overlord.java
new file mode 100644
index 0000000000..9a4419f887
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/generics/Overlord.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import example.models.BaseId;
+
+import java.util.Set;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+
+
+/**
+ * Parameterized base class for testing.
+ * @param <T> Minion type
+ */
+@MappedSuperclass
+public class Overlord<T> extends BaseId {
+
+    @OneToMany
+    private Set<T> minions;
+}
diff --git a/elide-integration-tests/src/test/java/example/models/generics/Peon.java b/elide-integration-tests/src/test/java/example/models/generics/Peon.java
new file mode 100644
index 0000000000..86032c7eb5
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/generics/Peon.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
+
+import example.models.BaseId;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+
+
+/**
+ * Parameterized base class for testing.
+ * @param <T> Boss Type
+ */
+@MappedSuperclass
+public class Peon<T> extends BaseId {
+
+    @OneToOne
+    private T boss;
+}
diff --git a/elide-integration-tests/src/test/java/example/models/generics/package-info.java b/elide-integration-tests/src/test/java/example/models/generics/package-info.java
new file mode 100644
index 0000000000..882e8cd733
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/generics/package-info.java
@@ -0,0 +1,7 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.generics;
diff --git a/elide-integration-tests/src/test/java/example/models/triggers/Invoice.java b/elide-integration-tests/src/test/java/example/models/triggers/Invoice.java
new file mode 100644
index 0000000000..143bb4c65c
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/triggers/Invoice.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers;
+
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import example.models.BaseId;
+import example.models.triggers.services.BillingService;
+import lombok.Data;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+/**
+ * Invoice for a group of purchased items.
+ */
+@Entity(name = "customerInvoice")
+@Include(name = "customerInvoice")
+@Data
+public class Invoice extends BaseId {
+    @Transient
+    @Exclude
+    @Inject
+    private BillingService billingService;
+
+    private boolean complete = false;
+    private long total = 0;
+}
diff --git a/elide-integration-tests/src/test/java/example/models/triggers/InvoiceCompletionHook.java b/elide-integration-tests/src/test/java/example/models/triggers/InvoiceCompletionHook.java
new file mode 100644
index 0000000000..d609d530d2
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/triggers/InvoiceCompletionHook.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers;
+
+import com.yahoo.elide.annotation.LifeCycleHookBinding;
+import com.yahoo.elide.core.lifecycle.LifeCycleHook;
+import com.yahoo.elide.core.security.ChangeSpec;
+import com.yahoo.elide.core.security.RequestScope;
+import example.models.triggers.services.BillingService;
+
+import java.util.Optional;
+
+/**
+ * Test hook which runs when an Invoice is marked complete.
+ */
+public class InvoiceCompletionHook implements LifeCycleHook<Invoice> {
+
+    private BillingService billingService;
+
+    public InvoiceCompletionHook (BillingService billingService) {
+        this.billingService = billingService;
+    }
+
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
+                        Invoice invoice, RequestScope requestScope, Optional<ChangeSpec> changes) {
+        boolean completeNow = (Boolean) changes.get().getModified();
+        boolean completeBefore = (Boolean) changes.get().getOriginal();
+
+        if (completeNow == completeBefore) {
+            return;
+        }
+
+        if (completeNow) {
+            long surcharge = billingService.purchase(invoice);
+            invoice.setTotal(invoice.getTotal() + surcharge);
+        }
+    }
+}
diff --git a/elide-integration-tests/src/test/java/example/models/triggers/services/BillingService.java b/elide-integration-tests/src/test/java/example/models/triggers/services/BillingService.java
new file mode 100644
index 0000000000..2d5c257d7b
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/triggers/services/BillingService.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.triggers.services;
+
+import example.models.triggers.Invoice;
+
+/**
+ * Interface to make a financial transaction based on an Invoice.
+ */
+public interface BillingService {
+
+    /**
+     * Purchases the items in the invoice.
+     * @param invoice Contains a list of what to purchase
+     * @return surcharges to add to the total.
+     */
+    public long purchase(Invoice invoice);
+}
diff --git a/elide-integration-tests/src/test/java/example/models/versioned/BookV2.java b/elide-integration-tests/src/test/java/example/models/versioned/BookV2.java
new file mode 100644
index 0000000000..599f54a62e
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/versioned/BookV2.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.versioned;
+
+import com.yahoo.elide.annotation.Include;
+import example.models.BaseId;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Include(name = "book")
+@Entity
+@Data
+@Table(name = "book")
+public class BookV2 extends BaseId {
+
+    @Column(name = "title")
+    private String name;
+
+    private long publishDate = 0;
+}
diff --git a/elide-integration-tests/src/test/java/example/models/versioned/package-info.java b/elide-integration-tests/src/test/java/example/models/versioned/package-info.java
new file mode 100644
index 0000000000..19e619c268
--- /dev/null
+++ b/elide-integration-tests/src/test/java/example/models/versioned/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@ApiVersion(version = "1.0")
+package example.models.versioned;
+
+import com.yahoo.elide.annotation.ApiVersion;
diff --git a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.req.json b/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.req.json
deleted file mode 100644
index 96e28e477c..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data":{
-    "type":"auditEntity",
-    "id":"1",
-    "attributes":{
-      "value": "test abc"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.resp.json b/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.resp.json
deleted file mode 100644
index 29dfdc4ae6..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity.resp.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "auditEntity",
-    "id": "1",
-    "attributes": {
-      "value": "test abc"
-    },
-    "relationships": {
-      "otherEntity": {
-        "data": null
-      },
-      "inverses": {
-        "data": []
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.req.json b/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.req.json
deleted file mode 100644
index fec8e715ca..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.req.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data":{
-    "type":"auditEntity",
-    "id":"2",
-    "attributes":{
-      "value": "test def"
-    },
-    "relationships": {
-      "otherEntity": {
-        "data": {
-          "type": "auditEntity",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.resp.json b/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.resp.json
deleted file mode 100644
index ea2ab05edd..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntity2.resp.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "data":{
-    "type":"auditEntity",
-    "id":"2",
-    "attributes":{
-      "value": "test def"
-    },
-    "relationships": {
-      "otherEntity": {
-        "data": {
-          "type": "auditEntity",
-          "id": "1"
-        }
-      },
-      "inverses": {
-        "data": []
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntityInverse.req.json b/elide-integration-tests/src/test/resources/AuditIT/createAuditEntityInverse.req.json
deleted file mode 100644
index 6b200da484..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/createAuditEntityInverse.req.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "data": {
-    "type": "auditEntityInverse",
-    "id": "1",
-    "relationships": {
-      "entities": {
-        "data": [
-          {
-            "type": "auditEntity",
-            "id": "1"
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntity.req.json b/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntity.req.json
deleted file mode 100644
index fc007ecc34..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntity.req.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "auditEntity",
-    "id": "1",
-    "attributes": {
-      "value": "updated value"
-    },
-    "relationships": {
-      "otherEntity": {
-        "data": {
-          "type": "auditEntity",
-          "id": "2"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntityLineageDup.req.json b/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntityLineageDup.req.json
deleted file mode 100644
index 8857918aa9..0000000000
--- a/elide-integration-tests/src/test/resources/AuditIT/updateAuditEntityLineageDup.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data": {
-    "type": "auditEntity",
-    "id": "1",
-    "attributes": {
-      "value": "update id 1 through id 2"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/enders_game.json b/elide-integration-tests/src/test/resources/BookAuthorIT/enders_game.json
deleted file mode 100644
index 228d65514b..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/enders_game.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "data": {
-    "id": "-",
-    "type": "book",
-    "attributes": {
-      "title": "Ender's Game",
-      "genre": "Science Fiction",
-      "language": "English"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway.json b/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway.json
deleted file mode 100644
index ab0d125322..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data": {
-    "id": "-",
-    "type": "author",
-    "attributes": {
-      "name": "Ernest Hemingway"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway_relationship.json b/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway_relationship.json
deleted file mode 100644
index fb0451e1e3..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/ernest_hemingway_relationship.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": {
-    "id": "1",
-    "type": "author"
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/for_whom_the_bell_tolls.json b/elide-integration-tests/src/test/resources/BookAuthorIT/for_whom_the_bell_tolls.json
deleted file mode 100644
index 363f87d8dc..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/for_whom_the_bell_tolls.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "data": {
-    "id": "-",
-    "type": "book",
-    "attributes": {
-      "title": "For Whom the Bell Tolls",
-      "genre": "Literary Fiction",
-      "language": "English"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card.json b/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card.json
deleted file mode 100644
index 186d226ff2..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data": {
-    "id": "-",
-    "type": "author",
-    "attributes": {
-      "name": "Orson Scott Card"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card_relationship.json b/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card_relationship.json
deleted file mode 100644
index 0a187bccfb..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/orson_scott_card_relationship.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": {
-    "id": "2",
-    "type": "author"
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/BookAuthorIT/the_old_man_and_the_sea.json b/elide-integration-tests/src/test/resources/BookAuthorIT/the_old_man_and_the_sea.json
deleted file mode 100644
index a22b43e1f6..0000000000
--- a/elide-integration-tests/src/test/resources/BookAuthorIT/the_old_man_and_the_sea.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "data": {
-    "id": "-",
-    "type": "book",
-    "attributes": {
-      "title": "The Old Man and the Sea",
-      "genre": "Literary Fiction",
-      "language": "English"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/EmbeddedIT/testEmbedded.json b/elide-integration-tests/src/test/resources/EmbeddedIT/testEmbedded.json
deleted file mode 100644
index 8fef914904..0000000000
--- a/elide-integration-tests/src/test/resources/EmbeddedIT/testEmbedded.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "data":{
-        "type":"embedded",
-        "id":"1",
-        "attributes":{
-            "segmentIds":[
-                3,
-                4,
-                5
-            ]
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/EmbeddedIT/testOne2One.json b/elide-integration-tests/src/test/resources/EmbeddedIT/testOne2One.json
deleted file mode 100644
index 0b242e1351..0000000000
--- a/elide-integration-tests/src/test/resources/EmbeddedIT/testOne2One.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "data":{
-        "type":"right",
-        "id":"1",
-        "relationships":{
-            "noUpdate":{
-                "data":[]
-            },
-            "many2one":{
-                "data":null
-            },
-            "noUpdateOne2One":{
-                "data":null
-            },
-            "one2one":{
-                "data":{
-                    "type":"left",
-                    "id":"1"
-                }
-            },
-            "noDelete":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/InvalidAttributeException.req.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/InvalidAttributeException.req.json
new file mode 100644
index 0000000000..7cf2fe5029
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/InvalidAttributeException.req.json
@@ -0,0 +1,13 @@
+[
+  {
+    "op":"add",
+    "path":"/-",
+    "value":{
+      "type":"parent",
+      "id":"nice",
+      "attributes":{
+        "badAttr":"no val"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchError.req.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchError.req.json
new file mode 100644
index 0000000000..840ba97e69
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchError.req.json
@@ -0,0 +1,3 @@
+{
+  "query": "{invoice(sort: \"<script>\"){edges{node{id}}}"
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorObjectEncoded.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorObjectEncoded.json
new file mode 100644
index 0000000000..a0b27094a3
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorObjectEncoded.json
@@ -0,0 +1,7 @@
+{
+  "errors":[
+    {
+      "message": "Bad Request Body&#39;Can&#39;t parse query: {invoice(sort: &#34;&lt;script&gt;&#34;){edges{node{id}}}&#39;"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorResponseEncoded.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorResponseEncoded.json
new file mode 100644
index 0000000000..85019c586a
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLFetchErrorResponseEncoded.json
@@ -0,0 +1,5 @@
+{
+  "errors":[
+    "InvalidEntityBodyException: Bad Request Body&#39;Can&#39;t parse query: {invoice(sort: &#34;&lt;script&gt;&#34;){edges{node{id}}}&#39;"
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.json
new file mode 100644
index 0000000000..66fc135b75
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.json
@@ -0,0 +1,13 @@
+{
+  "data":null,
+  "errors":[
+    {
+      "message":"Exception while fetching data (/invoice) : Invalid value: 6&lt;script&gt;alert(1)&lt;/script&gt;",
+      "locations":[
+        {"line":1,"column":11}
+      ],
+      "path":["invoice"],
+      "extensions":{"classification":"DataFetchingException"}
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.req.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.req.json
new file mode 100644
index 0000000000..bf4893c077
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/graphQLMutationError.req.json
@@ -0,0 +1,3 @@
+{
+  "query": "mutation {invoice(op: UPSERT, data:{id: \"6<script>alert(1)</script>\"}){edges{node{id}}}}"
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidAttributeException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidAttributeException.json
new file mode 100644
index 0000000000..bf2dd56f8f
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidAttributeException.json
@@ -0,0 +1,8 @@
+[{
+  "errors": [
+    {
+      "detail": "Unknown attribute badAttr in parent",
+      "status": "404"
+    }
+  ]
+}]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollection.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollection.json
new file mode 100644
index 0000000000..ed9761c6a3
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollection.json
@@ -0,0 +1,7 @@
+{
+  "errors":[
+    {
+      "detail" : "Unknown collection unknown"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollectionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollectionErrorObject.json
new file mode 100644
index 0000000000..25d10427df
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidCollectionErrorObject.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail":"Unknown collection unknown"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.json
new file mode 100644
index 0000000000..317bbe0c2b
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail" : "Bad Request Body&#39;[{&#34;op&#34;:&#34;add&#34;,&#34;path&#34;:&#34;/parent&#34;,&#34;value&#34;:{&#34;id&#34;:&#34;23&#34;,&#34;type&#34;:&#34;parent&#34;},&#34;relationships&#34;:{&#34;spouses&#34;:{}}}]&#39;"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.req.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.req.json
new file mode 100644
index 0000000000..0bede8e421
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyException.req.json
@@ -0,0 +1,13 @@
+[
+  {
+    "op": "add",
+    "path": "/parent",
+    "value": {
+      "id": "23",
+      "type": "parent"
+    },
+    "relationships": {
+      "spouses": {}
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyExceptionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyExceptionErrorObject.json
new file mode 100644
index 0000000000..edfe2d345d
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidEntityBodyExceptionErrorObject.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail":"Bad Request Body&#39;[{&#34;op&#34;:&#34;add&#34;,&#34;path&#34;:&#34;/parent&#34;,&#34;value&#34;:{&#34;id&#34;:&#34;23&#34;,&#34;type&#34;:&#34;parent&#34;},&#34;relationships&#34;:{&#34;spouses&#34;:{}}}]&#39;"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierException.json
new file mode 100644
index 0000000000..56080988d4
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierException.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail" : "Unknown identifier 100 for parent"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierExceptionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierExceptionErrorObject.json
new file mode 100644
index 0000000000..6a919a51b0
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidObjectIdentifierExceptionErrorObject.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail":"Unknown identifier 100 for parent"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueException.json
new file mode 100644
index 0000000000..6327703261
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueException.json
@@ -0,0 +1,5 @@
+{
+  "errors": [
+    "InvalidValueException: Invalid value: a"
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionErrorObject.json
new file mode 100644
index 0000000000..48da95ed1f
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionErrorObject.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail":"Invalid value: a"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionVerbose.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionVerbose.json
new file mode 100644
index 0000000000..395060a6af
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/invalidValueExceptionVerbose.json
@@ -0,0 +1,7 @@
+{
+    "errors": [
+      {
+        "detail": "Invalid value: a\nError converting from &#39;String&#39; to &#39;Long&#39; For input string: &#34;a&#34;"
+      }
+    ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.json
new file mode 100644
index 0000000000..5301fa3fb8
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.json
@@ -0,0 +1,8 @@
+[{
+  "errors" : [
+    {
+      "detail": "Bad Request Body&#39;Could not parse patch extension value: {&#34;id&#34;:&#34;6&#34;,&#34;type&#34;:&#34;parent&#34;,&#34;notARelationship&#34;:{}}&#39;",
+      "status": "400"
+    }
+  ]
+}]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.req.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.req.json
new file mode 100644
index 0000000000..1386a15bb8
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionException.req.json
@@ -0,0 +1,11 @@
+[
+  {
+    "op": "add",
+    "path": "/-",
+    "value": {
+      "id": "6",
+      "type": "parent",
+      "notARelationship": {}
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionExceptionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionExceptionErrorObject.json
new file mode 100644
index 0000000000..9904934d0d
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/jsonPatchExtensionExceptionErrorObject.json
@@ -0,0 +1,8 @@
+[{
+  "errors": [
+    {
+      "detail": "Bad Request Body&#39;Could not parse patch extension value: {&#34;id&#34;:&#34;6&#34;,&#34;type&#34;:&#34;parent&#34;,&#34;notARelationship&#34;:{}}&#39;",
+      "status": "400"
+    }
+  ]
+}]
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionException.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionException.json
new file mode 100644
index 0000000000..b29cab2df3
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionException.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail" : "Unexpected character (&#39;&#34;&#39; (code 34)): was expecting comma to separate Object entries\n at [Source: (String)&#34;{&#34;data&#34;: {&#34;type&#34;: &#34;invoice&#34; &#34;id&#34;: 100}}&#34;; line: 1, column: 30]"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionExceptionErrorObject.json b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionExceptionErrorObject.json
new file mode 100644
index 0000000000..632b633cf6
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/EncodedErrorResponsesIT/transactionExceptionErrorObject.json
@@ -0,0 +1,7 @@
+{
+  "errors": [
+    {
+      "detail":"Unexpected character (&#39;&#34;&#39; (code 34)): was expecting comma to separate Object entries\n at [Source: (String)&#34;{&#34;data&#34;: {&#34;type&#34;: &#34;invoice&#34; &#34;id&#34;: 100}}&#34;; line: 1, column: 30]"
+    }
+  ]
+}
diff --git a/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch1.json b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch1.json
new file mode 100644
index 0000000000..6bcdfc4132
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch1.json
@@ -0,0 +1,99 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345678-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Ernest Hemingway",
+        "homeAddress": "main"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345678-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345678-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "The Old Man and the Sea",
+        "genre": "Literary Fiction",
+        "language": "English",
+        "awards": ["National Book Award", "Booker Prize"],
+        "price" : {
+          "total" : 10.0,
+          "currency" : {
+            "isoCode" : "USD"
+          }
+        }
+      },
+      "relationships": {
+        "publisher": {
+          "data": {
+            "type": "publisher",
+            "id": "12345678-1234-1234-1234-1234567890ae"
+          }
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "For Whom the Bell Tolls",
+        "genre": "Literary Fiction",
+        "language": "English",
+        "price" : {
+          "total" : 12.0,
+          "currency" : {
+            "isoCode" : "AED"
+          }
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345678-1234-1234-1234-1234567890ac/publisher",
+    "value": {
+      "type": "publisher",
+      "id": "12345678-1234-1234-1234-1234567890ae",
+      "attributes": {
+        "name": "Default publisher",
+        "phoneNumbers": ["999-987-8394", "987-654-3210"]
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345678-1234-1234-1234-1234567890ac/publisher/12345678-1234-1234-1234-1234567890ae/editor",
+    "value": {
+      "type": "editor",
+      "id": "12345678-1234-1234-1234-1234567890ba",
+      "attributes": {
+        "firstName": "John",
+        "lastName": "Doe"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch2.json b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch2.json
new file mode 100644
index 0000000000..cb3b8c1b7f
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch2.json
@@ -0,0 +1,40 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345678-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Thomas Harris"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345678-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "1"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "I'm OK - You're OK",
+        "genre": "Psychology & Counseling",
+        "language": "English"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch3.json b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch3.json
new file mode 100644
index 0000000000..52b6613376
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch3.json
@@ -0,0 +1,38 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345679-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Orson Scott Card"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345679-1234-1234-1234-1234567890ac"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345679-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Enders Game",
+        "genre": "Science Fiction",
+        "language": "English",
+        "publishDate": 1454638927412,
+        "awards": ["Pulitzer Prize"]
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch4.json b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch4.json
new file mode 100644
index 0000000000..b1622daaa3
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch4.json
@@ -0,0 +1,66 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345680-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Isaac Asimov"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345680-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345680-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345680-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Foundation",
+        "genre": "Science Fiction",
+        "language": "English",
+        "awards": ["BookBrowse Awards"]
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345680-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "The Roman Republic",
+        "genre": "History",
+        "language": "English",
+        "awards": []
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345680-1234-1234-1234-1234567890ad/chapters",
+    "value": {
+      "type": "chapter",
+      "id": "12345680-1234-1234-1234-1234567890ae",
+      "attributes": {
+        "title": "Viva la Roma!"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch5.json b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch5.json
new file mode 100644
index 0000000000..4a7d4f279f
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/FilterIT/book_author_publisher_patch5.json
@@ -0,0 +1,66 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345681-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Null Ned"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345681-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345681-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345681-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Life with Null Ned",
+        "language": "English",
+        "editorName": "Ed",
+        "awards": ["Pulitzer Prize", "Booker Prize"]
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345681-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "Life with Null Ned 2",
+        "genre": "Not Null",
+        "language": "English",
+        "editorName": "Eddy"
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345681-1234-1234-1234-1234567890ad/chapters",
+    "value": {
+      "type": "chapter",
+      "id": "12345680-1234-1234-1234-1234567890ae",
+      "attributes": {
+        "title": "Mamma mia I wantz some pizza!"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/META-INF/persistence.xml b/elide-integration-tests/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..47aa6021c9
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+             version="2.0">
+    <persistence-unit name="elide-tests">
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.cache.use_second_level_cache" value="false" />
+            <property name="hibernate.show_sql" value="false" />
+            <property name="hibernate.hbm2ddl.auto" value="create" />
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/Issue608.req.json b/elide-integration-tests/src/test/resources/ResourceIT/Issue608.req.json
new file mode 100644
index 0000000000..478dcd1f9b
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/Issue608.req.json
@@ -0,0 +1,37 @@
+[
+  {
+    "op": "add",
+    "path": "/-",
+    "value": {
+      "type": "parent",
+      "id": "12345678-1234-1234-1234-123456789ab1",
+      "attributes": {
+        "firstName": "Parent1"
+      }
+    }
+  },
+  {
+    "op": "replace",
+    "path": "/12345678-1234-1234-1234-123456789ab1",
+    "value": {
+      "type": "parent",
+      "id": "12345678-1234-1234-1234-123456789ab1",
+      "attributes": {
+        "firstName": "Corrected"
+      },
+      "relationships": {
+        "children": {
+          "data": [{"type": "child", "id": "12345678-1234-1234-1234-123456789ab2"}]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/12345678-1234-1234-1234-123456789ab1/children",
+    "value": {
+      "type": "child",
+      "id": "12345678-1234-1234-1234-123456789ab2"
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/Issue608.resp.json b/elide-integration-tests/src/test/resources/ResourceIT/Issue608.resp.json
new file mode 100644
index 0000000000..4973809057
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/Issue608.resp.json
@@ -0,0 +1,49 @@
+[
+  {
+    "data":{
+      "type":"parent",
+      "id":"5",
+      "attributes":{
+        "firstName":"Corrected"
+      },
+      "relationships":{
+        "children":{
+          "data":[
+            {
+              "type":"child",
+              "id":"6"
+            }
+          ]
+        },
+        "spouses":{
+          "data":[]
+        }
+      }
+    }
+  },
+  {
+    "data":null
+  },
+  {
+    "data":{
+      "type":"child",
+      "id":"6",
+      "attributes":{
+        "name":null
+      },
+      "relationships":{
+        "friends":{
+          "data":[]
+        },
+        "parents":{
+          "data":[
+            {
+              "type":"parent",
+              "id":"5"
+            }
+          ]
+        }
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.json b/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.json
deleted file mode 100644
index cb310a3fd4..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "data":{
-        "type":"child",
-        "id":"6",
-        "attributes":{
-            "name":null
-        },
-        "relationships":{
-            "friends":{
-                "data":[]
-            },
-            "parents":{
-                "data":[
-                    {
-                        "type":"parent",
-                        "id":"2"
-                    },
-                    {
-                        "type":"parent",
-                        "id":"5"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.req.json b/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.req.json
deleted file mode 100644
index d47fcc52ab..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/addRelationshipChild.req.json
+++ /dev/null
@@ -1 +0,0 @@
-{"data":[{"type":"parent","id":"2"}]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/addRelationships.2.json b/elide-integration-tests/src/test/resources/ResourceIT/addRelationships.2.json
index 4d300b7973..7bd00f3036 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/addRelationships.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/addRelationships.2.json
@@ -1,9 +1,9 @@
 {
     "data":{
         "type":"parent",
-        "id":"10",
+        "id":"1",
         "attributes":{
-            "firstName":"bart"
+            "firstName":null
         },
         "relationships":{
             "children":{
@@ -18,7 +18,7 @@
                     },
                     {
                         "type":"child",
-                        "id":"7"
+                        "id":"1"
                     }
                 ]
             },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.json b/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.json
deleted file mode 100644
index 87a0deb0e3..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdLong",
-        "id":1,
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.req.json b/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.req.json
deleted file mode 100644
index 87a0deb0e3..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdLong.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdLong",
-        "id":1,
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.json b/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.json
deleted file mode 100644
index d12148c8fb..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdString",
-        "id":"user1",
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.req.json b/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.req.json
deleted file mode 100644
index d12148c8fb..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdString.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdString",
-        "id":"user1",
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdWithoutId.req.json b/elide-integration-tests/src/test/resources/ResourceIT/assignedIdWithoutId.req.json
deleted file mode 100644
index b2ce50eb21..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/assignedIdWithoutId.req.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdString",
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/checkJsonApiPatchWithError.json b/elide-integration-tests/src/test/resources/ResourceIT/checkJsonApiPatchWithError.json
index 39a87bb24c..639d66be7e 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/checkJsonApiPatchWithError.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/checkJsonApiPatchWithError.json
@@ -1,11 +1,17 @@
-{
-    "errors":[
-        {
-            "detail":"Subsequent operation failed."
-        },
-        {
-            "detail":"Unknown attribute 'badAttr' in 'parent'",
-            "status":404
-        }
-    ]
-}
+[
+    {
+        "errors": [
+            {
+                "detail": "Subsequent operation failed."
+            }
+        ]
+    },
+    {
+        "errors": [
+            {
+                "detail":"Unknown attribute badAttr in parent",
+                "status":"404"
+            }
+        ]
+    }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.json b/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.json
index 5a645f592e..469ae09d9f 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"parent",
-            "id":"9",
+            "id":"5",
             "attributes":{
                 "firstName":"ron jon"
             },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.req.json
index 8519bd81ea..c3d5567f86 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/createAndRemoveParent.req.json
@@ -15,7 +15,7 @@
         "path":"/-",
         "value":{
             "type":"parent",
-            "id":"7"
+            "id":"4"
         }
     }
 ]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createAnotherFilterExpressionCheckObj.json b/elide-integration-tests/src/test/resources/ResourceIT/createAnotherFilterExpressionCheckObj.json
deleted file mode 100644
index df6ec5b478..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createAnotherFilterExpressionCheckObj.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "data":{
-        "type":"anotherFilterExpressionCheckObj",
-        "id":"1",
-        "attributes":{
-            "anotherName":"anotherObj1",
-            "createDate":"1999"
-        },
-        "relationships": {
-            "linkToParent": {
-                "data": {
-                    "type": "filterExpressionCheckObj",
-                    "id": "1"
-                }
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.bad.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.bad.req.json
deleted file mode 100644
index 89f21d0ad1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.bad.req.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "data":{
-    "type":"createButNoUpdate",
-    "id":"1",
-    "attributes":{
-      "textValue": "test",
-      "cannotModify": "This should fail this whole create"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.req.json
deleted file mode 100644
index b5e226e7d6..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data":{
-    "type":"createButNoUpdate",
-    "id":"1",
-    "attributes":{
-      "textValue": "test"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.resp.json b/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.resp.json
deleted file mode 100644
index abd549d463..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.resp.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "data":{
-    "type":"createButNoUpdate",
-    "id":"1",
-    "attributes":{
-      "cannotModify": "unmodified",
-      "textValue": "test"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.update.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.update.req.json
deleted file mode 100644
index 579c9471c5..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createButNoUpdate.update.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data":{
-    "type":"createButNoUpdate",
-    "id":"1",
-    "attributes":{
-      "textValue": "new value"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createChild.json b/elide-integration-tests/src/test/resources/ResourceIT/createChild.json
deleted file mode 100644
index f082e20c78..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createChild.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data":{
-        "type":"child",
-        "id":"required",
-        "relationships":{
-            "parents":{
-                "data":[
-                    {
-                        "type":"parent",
-                        "id":"1"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createChildNonRootable.json b/elide-integration-tests/src/test/resources/ResourceIT/createChildNonRootable.json
deleted file mode 100644
index b5e7b8c237..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createChildNonRootable.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"required",
-        "attributes":{
-            "firstName":"I should not be created :x"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.json b/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.json
index c332c5d617..8d1b6392ed 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"child",
-            "id":"8",
+            "id":"6",
             "attributes":{
                 "name":null
             },
@@ -14,7 +14,7 @@
                     "data":[
                         {
                             "type":"parent",
-                            "id":"7"
+                            "id":"4"
                         }
                     ]
                 }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.req.json
index 2aecd67e13..3f1337cfbe 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/createChildRelateExisting.req.json
@@ -1,7 +1,7 @@
 [
     {
         "op":"add",
-        "path":"/parent/7/children",
+        "path":"/parent/4/children",
         "value":{
             "type":"child",
             "id":"12345678-1234-1234-1234-123456789ab1",
@@ -10,7 +10,7 @@
                     "data":[
                         {
                             "type":"parent",
-                            "id":"7"
+                            "id":"4"
                         }
                     ]
                 }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createDependentPatchExt.json b/elide-integration-tests/src/test/resources/ResourceIT/createDependentPatchExt.json
index 6e521bf767..aed8bba51c 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/createDependentPatchExt.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/createDependentPatchExt.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"parent",
-            "id":"7",
+            "id":"5",
             "attributes":{
                 "firstName":"test parent"
             },
@@ -11,7 +11,7 @@
                     "data":[
                         {
                             "type":"child",
-                            "id":"7"
+                            "id":"6"
                         }
                     ]
                 },
@@ -24,7 +24,7 @@
     {
         "data":{
             "type":"child",
-            "id":"7",
+            "id":"6",
             "attributes":{
                 "name":null
             },
@@ -36,7 +36,7 @@
                     "data":[
                         {
                             "type":"parent",
-                            "id":"7"
+                            "id":"5"
                         }
                     ]
                 }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.1.json b/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.1.json
deleted file mode 100644
index 699ef374d6..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"filterExpressionCheckObj",
-        "id":"1",
-        "attributes":{
-            "name":"obj1"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.2.json b/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.2.json
deleted file mode 100644
index 4343b9fa5a..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"filterExpressionCheckObj",
-        "id":"2",
-        "attributes":{
-            "name":"obj2"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.3.json b/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.3.json
deleted file mode 100644
index fc12fe7668..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createFilterExpressionCheckObj.3.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"filterExpressionCheckObj",
-        "id":"3",
-        "attributes":{
-            "name":"obj3"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneNonRoot.json b/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneNonRoot.json
deleted file mode 100644
index 970ce5c02d..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneNonRoot.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"OneToOneNonRoot",
-        "id":"1",
-        "attributes":{
-            "test": "Other object"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneRoot.json b/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneRoot.json
deleted file mode 100644
index 4da6bdb629..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createOneToOneRoot.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"OneToOneRoot",
-        "id":"1",
-        "attributes":{
-            "name": "test123"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentBadUri.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentBadUri.json
deleted file mode 100644
index b5e7b8c237..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentBadUri.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"required",
-        "attributes":{
-            "firstName":"I should not be created :x"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.json
deleted file mode 100644
index 03d45070f5..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"5",
-        "attributes":{
-            "firstName":"I'm new here"
-        },
-        "relationships":{
-            "spouses":{
-                "data":[]
-            },
-            "children":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.req.json
deleted file mode 100644
index a2d1a4d035..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentNoRels.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"required",
-        "attributes":{
-            "firstName":"I'm new here"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.json
deleted file mode 100644
index 356b345ae4..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"6",
-        "attributes":{
-            "firstName":"omg. I have kidz."
-        },
-        "relationships":{
-            "spouses":{
-                "data":[]
-            },
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"2"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.req.json
deleted file mode 100644
index 5c6176b279..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithRels.req.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"required",
-        "attributes":{
-            "firstName":"omg. I have kidz."
-        },
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"2"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.json
deleted file mode 100644
index 0a87752648..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":12,
-        "attributes":{
-            "firstName":"omg. I have kidz."
-        },
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"2"
-                    }
-                ]
-            },
-            "spouses": {
-                "data": []
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.req.json
deleted file mode 100644
index 9d741e71c1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createParentWithoutId.req.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "attributes":{
-            "firstName":"omg. I have kidz."
-        },
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"2"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.json b/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.json
deleted file mode 100644
index 8a7d8f56f2..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data": [{
-    "type": "yetAnotherPermission",
-    "id": "1",
-    "attributes": {
-      "youShouldBeAbleToRead": "this!"
-    }
-  }]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.req.json b/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.req.json
deleted file mode 100644
index 1363900d07..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/createYetAnotherPermissionRead.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "data": {
-    "type": "yetAnotherPermission",
-    "id": "1",
-    "attributes": {
-      "youShouldBeAbleToRead": "this!"
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/elideBypassSecurity.json b/elide-integration-tests/src/test/resources/ResourceIT/elideBypassSecurity.json
deleted file mode 100644
index e9bd45a977..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/elideBypassSecurity.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "data":{
-        "type":"child",
-        "id":"1",
-        "attributes":{
-            "name":null
-        },
-        "relationships":{
-            "friends":{
-                "data":[]
-            },
-            "noReadAccess":{
-                "data":null
-            },
-            "parents":{
-                "data":[
-                    {
-                        "type":"parent",
-                        "id":"1"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failChild.json b/elide-integration-tests/src/test/resources/ResourceIT/failChild.json
deleted file mode 100644
index af5a33b831..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failChild.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["InvalidCollectionException: Unknown collection 'unknown'"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failFieldRequest.json b/elide-integration-tests/src/test/resources/ResourceIT/failFieldRequest.json
deleted file mode 100644
index 795a29edb0..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failFieldRequest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["InvalidCollectionException: Unknown collection 'id'"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdLong.req.json b/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdLong.req.json
deleted file mode 100644
index 26b210f0ce..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdLong.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdLong",
-        "id":2,
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdString.req.json b/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdString.req.json
deleted file mode 100644
index 63d478844c..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failPatchIdString.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"assignedIdString",
-        "id":"user2",
-        "attributes": {
-            "value": 22
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failRootCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/failRootCollection.json
deleted file mode 100644
index af5a33b831..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failRootCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["InvalidCollectionException: Unknown collection 'unknown'"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/failRootCollectionId.json b/elide-integration-tests/src/test/resources/ResourceIT/failRootCollectionId.json
deleted file mode 100644
index d2da9f59f1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/failRootCollectionId.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["InvalidObjectIdentifierException: Unknown identifier '6789' for Parent"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingId.req.json b/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingId.req.json
new file mode 100644
index 0000000000..79554f04cb
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingId.req.json
@@ -0,0 +1,27 @@
+[
+    {
+        "op":"add",
+        "path":"/book",
+        "value":{
+            "type":"book",
+            "relationships":{
+                "authors":{
+                    "data":[
+                        {
+                            "type":"author",
+                            "id":"authorId"
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    {
+        "op":"add",
+        "path":"/author",
+        "value":{
+            "id":"authorId",
+            "type":"author"
+        }
+    }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingPath.req.json b/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingPath.req.json
new file mode 100644
index 0000000000..0827639d23
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/invalidPatchMissingPath.req.json
@@ -0,0 +1,27 @@
+[
+    {
+        "op":"add",
+        "value":{
+            "type":"book",
+            "id":"bookId",
+            "relationships":{
+                "authors":{
+                    "data":[
+                        {
+                            "type":"author",
+                            "id":"authorId"
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    {
+        "op":"add",
+        "path":"/author",
+        "value":{
+            "id":"authorId",
+            "type":"author"
+        }
+    }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/nestedPatchCreate.resp.json b/elide-integration-tests/src/test/resources/ResourceIT/nestedPatchCreate.resp.json
index 1808ec75ed..50f659570f 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/nestedPatchCreate.resp.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/nestedPatchCreate.resp.json
@@ -2,7 +2,7 @@
   {
     "data": {
       "type": "parent",
-      "id": "13",
+      "id": "5",
       "attributes": {
         "firstName": "Parent1"
       },
@@ -11,7 +11,7 @@
           "data": [
             {
               "type": "child",
-              "id": "10"
+              "id": "6"
             }
           ]
         },
@@ -24,7 +24,7 @@
   {
     "data": {
       "type": "child",
-      "id": "10",
+      "id": "6",
       "attributes": {
         "name": null
       },
@@ -36,11 +36,11 @@
           "data": [
             {
               "type": "parent",
-              "id": "13"
+              "id": "5"
             },
             {
               "type": "parent",
-              "id": "14"
+              "id": "6"
             }
           ]
         }
@@ -50,7 +50,7 @@
   {
     "data": {
       "type": "parent",
-      "id": "14",
+      "id": "6",
       "attributes": {
         "firstName": "Parent2"
       },
@@ -59,7 +59,7 @@
           "data": [
             {
               "type": "child",
-              "id": "10"
+              "id": "6"
             }
           ]
         },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/noShareBiDirectional.req.json b/elide-integration-tests/src/test/resources/ResourceIT/noShareBiDirectional.req.json
deleted file mode 100644
index c6d5e9026c..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/noShareBiDirectional.req.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "data":{
-    "type":"noShareBid",
-    "id":"2",
-    "relationships":{
-      "other":{
-        "data":
-          {
-            "type":"noShareBid",
-            "id":"1"
-          }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootCreatedRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootCreatedRelationship.json
deleted file mode 100644
index e208cb9c62..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootCreatedRelationship.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "oneToOneNonRoot",
-    "id": "1",
-    "attributes": {
-      "test": "Other object"
-    },
-    "relationships": {
-      "root": {
-        "data": {
-          "type": "oneToOneRoot",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootUpdatedRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootUpdatedRelationship.json
deleted file mode 100644
index 69795c8a7c..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneNonRootUpdatedRelationship.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "oneToOneNonRoot",
-    "id": "2",
-    "attributes": {
-      "test": "Updated object"
-    },
-    "relationships": {
-      "root": {
-        "data": {
-          "type": "oneToOneRoot",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootCreatedRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootCreatedRelationship.json
deleted file mode 100644
index 4341992eb5..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootCreatedRelationship.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "oneToOneRoot",
-    "id": "1",
-    "attributes": {
-      "name": "test123"
-    },
-    "relationships": {
-      "otherObject": {
-        "data": {
-          "type": "oneToOneNonRoot",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootUpdatedRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootUpdatedRelationship.json
deleted file mode 100644
index 6c072dedcd..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/oneToOneRootUpdatedRelationship.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "oneToOneRoot",
-    "id": "1",
-    "attributes": {
-      "name": "test123"
-    },
-    "relationships": {
-      "otherObject": {
-        "data": {
-          "type": "oneToOneNonRoot",
-          "id": "2"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/parseFailure.json b/elide-integration-tests/src/test/resources/ResourceIT/parseFailure.json
deleted file mode 100644
index 82fde9c71a..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/parseFailure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["InvalidURLException: token recognition error at: '|'"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtAddUpdate.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtAddUpdate.json
index f0d7024eee..24f6ed716f 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtAddUpdate.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/patchExtAddUpdate.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"parent",
-            "id":"11",
+            "id":"5",
             "attributes":{
                 "firstName":null
             },
@@ -24,7 +24,7 @@
     {
         "data":{
             "type":"child",
-            "id":"9",
+            "id":"6",
             "attributes":{
                 "name":null
             },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.json
index 2f50b6efc0..3f7d8ca941 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.json
@@ -1 +1 @@
-{"errors":[{"detail":"Unknown identifier '1' for Parent","status":404}]}
+[{"errors":[{"detail":"Unknown identifier 10 for parent","status":"404"}]}]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.req.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.req.json
index db749f2140..aeae3632f2 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadDelete.req.json
@@ -1,6 +1,6 @@
 [
   {
     "op": "remove",
-    "path": "parent/1"
+    "path": "parent/10"
   }
 ]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.json
index a567fd37ca..3001797991 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.json
@@ -1 +1,4 @@
-{"errors":[{"detail":"Subsequent operation failed."},{"detail":"Subsequent operation failed."},{"detail":"Unknown identifier '99999' for Child","status":404},{"detail":"Operation not executed. Terminated by earlier failure."}]}
+[
+  {"errors":[{"detail":"Subsequent operation failed."}]},
+  {"errors":[{"detail":"Unknown identifier 99999 for child","status":"404"}]}
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.req.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.req.json
index 887b1a8e0f..ee1640fe8a 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadId.req.json
@@ -24,14 +24,6 @@
       }
     }
   },
-  {
-    "op": "remove",
-    "path": "parent",
-    "value": {
-      "type": "parent",
-      "id": "3"
-      }
-  },
   {
     "op": "add",
     "path": "parent/5d57b6ee-f538-4e49-8f35-edc00f6272d2/children",
@@ -58,13 +50,5 @@
         }
       }
     }
-  },
-  {
-    "op": "remove",
-    "path": "parent",
-    "value": {
-      "type": "parent",
-      "id": "4"
-      }
   }
 ]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadValue.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadValue.json
deleted file mode 100644
index 865d213e8c..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/patchExtBadValue.json
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":["Duplicate entry 'duplicate' for key 'name'"]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.1.json b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.1.json
index 9d04333c11..5acf20dd16 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.1.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.1.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"parent",
-            "id":"8",
+            "id":"5",
             "attributes":{
                 "firstName":"Im going to be immediately deleted"
             },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.2.req.json b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.2.req.json
index 2802f8e1ae..1d812ce843 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.2.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.2.req.json
@@ -4,7 +4,7 @@
         "path":"/-",
         "value":{
             "type":"parent",
-            "id":"8"
+            "id":"5"
         }
     }
 ]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.direct.json b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.direct.json
index ef6926a6e3..3edba7190f 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeObject.direct.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/removeObject.direct.json
@@ -1,7 +1,7 @@
 {
     "data":{
         "type":"parent",
-        "id":"8",
+        "id":"5",
         "attributes":{
             "firstName":"Im going to be immediately deleted"
         },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.json b/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.json
deleted file mode 100644
index 9316c35d77..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"child",
-        "id":"6",
-        "attributes":{
-            "name":null
-        },
-        "relationships":{
-            "friends":{
-                "data":[]
-            },
-            "parents":{
-                "data":[
-                    {
-                        "type":"parent",
-                        "id":"5"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.req.json b/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.req.json
deleted file mode 100644
index d47fcc52ab..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeRelationshipChild.req.json
+++ /dev/null
@@ -1 +0,0 @@
-{"data":[{"type":"parent","id":"2"}]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.2.json b/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.2.json
index f7862ec985..86e89968ea 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.2.json
@@ -1,9 +1,9 @@
 {
     "data":{
         "type":"parent",
-        "id":"10",
+        "id":"2",
         "attributes":{
-            "firstName":"bart"
+            "firstName":"John"
         },
         "relationships":{
             "spouses":{
@@ -13,7 +13,7 @@
                 "data":[
                     {
                         "type":"child",
-                        "id":"7"
+                        "id":"3"
                     }
                 ]
             }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.req.json b/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.req.json
index fd64249a3f..e070be1d27 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/removeSingleRelationship.req.json
@@ -5,7 +5,7 @@
         "value":[
             {
                 "type":"child",
-                "id":"5"
+                "id":"2"
             }
         ]
     }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.2.json b/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.2.json
index c33ae3ca6e..edd32b6653 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.2.json
@@ -1,7 +1,7 @@
 {
     "data":{
         "type":"parent",
-        "id":"7",
+        "id":"1",
         "attributes":{
             "firstName":"I've been modified =-o"
         },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.req.json b/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.req.json
index d74f26a0cb..5aa0430f7b 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/replaceAttributesAndRelationship.req.json
@@ -1,9 +1,9 @@
 [
     {
         "op":"replace",
-        "path":"/7",
+        "path":"/1",
         "value":{
-            "id":"7",
+            "id":"1",
             "type":"parent",
             "attributes":{
                 "firstName":"I've been modified =-o"
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.json
deleted file mode 100644
index 08504c47a0..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "data":{
-        "type":"fun",
-        "id":"1",
-        "attributes":{
-            "field6":null,
-            "field8":null,
-            "field3":null,
-            "field2":null,
-            "field5":null,
-            "field4":null
-        },
-        "relationships":{
-            "relation3":{
-                "data":null
-            },
-            "relation2":{
-                "data":[]
-            },
-            "relation1":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.req.json
deleted file mode 100644
index eb017cd130..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.2.req.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "data":{
-        "type":"fun",
-        "id":"1",
-        "relationships":{
-            "relation3":{
-                "data":null
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.json
deleted file mode 100644
index 68fe666de1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "data":{
-        "type":"fun",
-        "id":"1",
-        "attributes":{
-            "field6":null,
-            "field8":null,
-            "field3":null,
-            "field2":null,
-            "field5":null,
-            "field4":null
-        },
-        "relationships":{
-            "relation3":{
-                "data":{
-                    "type":"child",
-                    "id":"2"
-                }
-            },
-            "relation2":{
-                "data":[]
-            },
-            "relation1":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.req.json
deleted file mode 100644
index 14d2b12cc1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddAndRemoveOneToOneRelationship.req.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "data":{
-        "type":"fun",
-        "id":"1",
-        "relationships":{
-            "relation3":{
-                "data":{
-                    "type":"child",
-                    "id":"2"
-                }
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.1.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.1.json
index d1c30b3ee0..9368657774 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.1.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.1.json
@@ -2,7 +2,7 @@
     {
         "data":{
             "type":"parent",
-            "id":"10",
+            "id":"5",
             "attributes":{
                 "firstName":"bart"
             },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.2.json b/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.2.json
index 3287c63029..a22e98dc94 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testAddRoot.2.json
@@ -1,7 +1,7 @@
 {
     "data":{
         "type":"parent",
-        "id":"10",
+        "id":"5",
         "attributes":{
             "firstName":"bart"
         },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testChild.json b/elide-integration-tests/src/test/resources/ResourceIT/testChild.json
deleted file mode 100644
index 9d4f5ebfc8..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testChild.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"child",
-        "id":"1",
-        "attributes":{
-            "name":null
-        },
-        "relationships":{
-            "friends":{
-                "data":[]
-            },
-            "parents":{
-                "data":[
-                    {
-                        "type":"parent",
-                        "id":"1"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.json b/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.json
deleted file mode 100644
index 67354bcda1..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "data":{
-        "type":"user",
-        "id":"1",
-        "attributes":{
-            "password":"",
-            "reversedPassword":"dog"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.req.json
deleted file mode 100644
index 2fbfea3e18..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testComputedAttribute.req.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"user",
-        "id":"1",
-        "attributes":{
-            "password":"god"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdCollection.json
deleted file mode 100644
index 2b35b3a4e5..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdCollection.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-  "data": [
-    {
-      "type": "parent",
-      "id": "2",
-      "attributes": {
-        "firstName": "syzygy"
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "3",
-      "attributes": {
-        "firstName": "Link"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "4"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "4",
-      "attributes": {
-        "firstName": "Unknown"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "4"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "5",
-      "attributes": {
-        "firstName": "I'm new here"
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "6",
-      "attributes": {
-        "firstName": "omg. I have kidz."
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "9",
-      "attributes": {
-        "firstName": "ron jon"
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "10",
-      "attributes": {
-        "firstName": "bart"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "4"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "11",
-      "attributes": {
-        "firstName": null
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": [
-            {
-              "type": "parent",
-              "id": "2"
-            }
-          ]
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "12",
-      "attributes": {
-        "firstName": "omg. I have kidz."
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    }
-  ],
-  "included": [
-    {
-      "type": "child",
-      "id": "4",
-      "attributes": {
-        "name": null
-      },
-      "relationships": {
-        "friends": {
-          "data": []
-        },
-        "parents": {
-          "data": [
-            {
-              "type": "parent",
-              "id": "3"
-            },
-            {
-              "type": "parent",
-              "id": "4"
-            },
-            {
-              "type": "parent",
-              "id": "10"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdIncluded.json b/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdIncluded.json
deleted file mode 100644
index 8c4861d846..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdIncluded.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "data": {
-    "type": "parent",
-    "id": "10",
-    "attributes": {
-      "firstName": "bart"
-    },
-    "relationships": {
-      "children": {
-        "data": [
-          {
-            "type": "child",
-            "id": "4"
-          },
-          {
-            "type": "child",
-            "id": "5"
-          }
-        ]
-      },
-      "spouses": {
-        "data": []
-      }
-    }
-  },
-  "included": [
-    {
-      "type": "child",
-      "id": "4",
-      "attributes": {
-        "name": null
-      },
-      "relationships": {
-        "friends": {
-          "data": []
-        },
-        "parents": {
-          "data": [
-            {
-              "type": "parent",
-              "id": "3"
-            },
-            {
-              "type": "parent",
-              "id": "4"
-            },
-            {
-              "type": "parent",
-              "id": "10"
-            }
-          ]
-        }
-      }
-    },
-    {
-      "type": "child",
-      "id": "5",
-      "attributes": {
-        "name": null
-      },
-      "relationships": {
-        "friends": {
-          "data": []
-        },
-        "parents": {
-          "data": [
-            {
-              "type": "parent",
-              "id": "3"
-            },
-            {
-              "type": "parent",
-              "id": "4"
-            },
-            {
-              "type": "parent",
-              "id": "10"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdRels.json b/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdRels.json
deleted file mode 100644
index b0a45388f2..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testFilterIdRels.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "data": [
-    {
-      "type": "child",
-      "id": "4"
-    }
-  ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testFiltered.json b/elide-integration-tests/src/test/resources/ResourceIT/testFiltered.json
deleted file mode 100644
index 2ac43edd3e..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testFiltered.json
+++ /dev/null
@@ -1 +0,0 @@
-{"data":[{"type":"filtered","id":"1"},{"type":"filtered","id":"3"}]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetMultipleIncludeOnCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetMultipleIncludeOnCollection.json
deleted file mode 100644
index 199e0bc7b7..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetMultipleIncludeOnCollection.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"1",
-            "attributes":{
-                "firstName":null
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        },
-                        {
-                            "type":"child",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"6",
-            "attributes":{
-                "firstName":"omg. I have kidz."
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"2",
-            "attributes":{
-                "firstName":"syzygy"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        },
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"3",
-            "attributes":{
-                "firstName":"Link"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"5"
-                        },
-                        {
-                            "type":"child",
-                            "id":"4"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"4",
-            "attributes":{
-                "firstName":"Unknown"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"5",
-            "attributes":{
-                "firstName":"I'm new here"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        }
-                    ]
-                }
-            }
-        }
-    ],
-    "included":[
-        {
-            "type":"child",
-            "id":"6",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"1"
-                        },
-                        {
-                            "type":"parent",
-                            "id":"5"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"1",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"2",
-            "attributes":{
-                "name":"Child-ID2"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        }
-                    ]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"6"
-                        },
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"3",
-            "attributes":{
-                "name":"Child-ID3"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"5",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"3"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"4",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"3"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetNestedSingleInclude.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetNestedSingleInclude.json
deleted file mode 100644
index 5cc758e0ed..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetNestedSingleInclude.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"2",
-        "attributes":{
-            "firstName":"syzygy"
-        },
-        "relationships":{
-            "spouses":{
-                "data":[]
-            },
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"3"
-                    },
-                    {
-                        "type":"child",
-                        "id":"2"
-                    }
-                ]
-            }
-        }
-    },
-    "included":[
-        {
-            "type":"child",
-            "id":"3",
-            "attributes":{
-                "name":"Child-ID3"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"2",
-            "attributes":{
-                "name":"Child-ID2"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        }
-                    ]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"6"
-                        },
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetRelEmptyColl.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetRelEmptyColl.json
deleted file mode 100644
index f93ccdf4b7..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetRelEmptyColl.json
+++ /dev/null
@@ -1 +0,0 @@
-{"data":[]}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetReverseSortCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetReverseSortCollection.json
deleted file mode 100644
index fa19ebe852..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetReverseSortCollection.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "data": [
-    {
-      "type": "parent",
-      "id": "4",
-      "attributes": {
-        "firstName": "Unknown"
-      },
-      "relationships": {
-        "children": {
-          "data": []
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "2",
-      "attributes": {
-        "firstName": "syzygy"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "2"
-            },
-            {
-              "type": "child",
-              "id": "3"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "6",
-      "attributes": {
-        "firstName": "omg. I have kidz."
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "2"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "3",
-      "attributes": {
-        "firstName": "Link"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "4"
-            },
-            {
-              "type": "child",
-              "id": "5"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "5",
-      "attributes": {
-        "firstName": "I'm new here"
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "6"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    },
-    {
-      "type": "parent",
-      "id": "1",
-      "attributes": {
-        "firstName": null
-      },
-      "relationships": {
-        "children": {
-          "data": [
-            {
-              "type": "child",
-              "id": "1"
-            },
-            {
-              "type": "child",
-              "id": "6"
-            }
-          ]
-        },
-        "spouses": {
-          "data": []
-        }
-      }
-    }
-  ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnCollection.json
deleted file mode 100644
index 97d156bb45..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnCollection.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"1",
-            "attributes":{
-                "firstName":null
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        },
-                        {
-                            "type":"child",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"2",
-            "attributes":{
-                "firstName":"syzygy"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"2"
-                        },
-                        {
-                            "type":"child",
-                            "id":"3"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"3",
-            "attributes":{
-                "firstName":"Link"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"4"
-                        },
-                        {
-                            "type":"child",
-                            "id":"5"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"4",
-            "attributes":{
-                "firstName":"Unknown"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"5",
-            "attributes":{
-                "firstName":"I'm new here"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"6",
-            "attributes":{
-                "firstName":"omg. I have kidz."
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        }
-    ],
-    "included":[
-        {
-            "type":"child",
-            "id":"6",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"1"
-                        },
-                        {
-                            "type":"parent",
-                            "id":"5"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"1",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"2",
-            "attributes":{
-                "name":"Child-ID2"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        }
-                    ]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        },
-                        {
-                            "type":"parent",
-                            "id":"6"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"3",
-            "attributes":{
-                "name":"Child-ID3"
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"4",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"3"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"child",
-            "id":"5",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"3"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnRelationship.json
deleted file mode 100644
index 18bf72d617..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetSingleIncludeOnRelationship.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data":[
-        {
-            "type":"child",
-            "id":"1"
-        }
-    ],
-    "included":[
-        {
-            "type":"child",
-            "id":"1",
-            "attributes":{
-                "name":null
-            },
-            "relationships":{
-                "friends":{
-                    "data":[]
-                },
-                "parents":{
-                    "data":[
-                        {
-                            "type":"parent",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetSortCollection.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetSortCollection.json
deleted file mode 100644
index 6cbd3815f2..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetSortCollection.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"1",
-            "attributes":{
-                "firstName":null
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        },
-                        {
-                            "type":"child",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"6",
-            "attributes":{
-                "firstName":"omg. I have kidz."
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"2",
-            "attributes":{
-                "firstName":"syzygy"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        },
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"3",
-            "attributes":{
-                "firstName":"Link"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"5"
-                        },
-                        {
-                            "type":"child",
-                            "id":"4"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"4",
-            "attributes":{
-                "firstName":"Unknown"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"5",
-            "attributes":{
-                "firstName":"I'm new here"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testGetWithTrailingSlash.json b/elide-integration-tests/src/test/resources/ResourceIT/testGetWithTrailingSlash.json
deleted file mode 100644
index 6cbd3815f2..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testGetWithTrailingSlash.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"1",
-            "attributes":{
-                "firstName":null
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        },
-                        {
-                            "type":"child",
-                            "id":"1"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"6",
-            "attributes":{
-                "firstName":"omg. I have kidz."
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"2",
-            "attributes":{
-                "firstName":"syzygy"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"3"
-                        },
-                        {
-                            "type":"child",
-                            "id":"2"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"3",
-            "attributes":{
-                "firstName":"Link"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"5"
-                        },
-                        {
-                            "type":"child",
-                            "id":"4"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"4",
-            "attributes":{
-                "firstName":"Unknown"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[]
-                }
-            }
-        },
-        {
-            "type":"parent",
-            "id":"5",
-            "attributes":{
-                "firstName":"I'm new here"
-            },
-            "relationships":{
-                "spouses":{
-                    "data":[]
-                },
-                "children":{
-                    "data":[
-                        {
-                            "type":"child",
-                            "id":"6"
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrList.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrList.json
deleted file mode 100644
index b551be14c2..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrList.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"3",
-            "attributes":{
-                "firstName":"Senor"
-            }
-        },
-        {
-            "type":"parent",
-            "id":"11",
-            "attributes":{
-                "firstName":"woot"
-            }
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrNoUpdateSingle.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrNoUpdateSingle.json
deleted file mode 100644
index 87cefbf337..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrNoUpdateSingle.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"2",
-        "attributes":{
-            "firstName":"syzygy"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrSingle.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrSingle.json
deleted file mode 100644
index 87cefbf337..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchAttrSingle.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"2",
-        "attributes":{
-            "firstName":"syzygy"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchDeferredOnCreate.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchDeferredOnCreate.json
index 00848421a7..89535edf76 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchDeferredOnCreate.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testPatchDeferredOnCreate.json
@@ -1,5 +1,7 @@
 {
   "errors": [
-    "ForbiddenAccessException"
+    {
+      "detail" : "ReadPermission Denied"
+    }
   ]
 }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoCommit.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoCommit.req.json
index 9b273efe1a..51245932af 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoCommit.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoCommit.req.json
@@ -4,7 +4,10 @@
         "path":"/nocommit",
         "value":{
             "type":"nocommit",
-            "id":"12345678-1234-1234-1234-123456789ab1"
+            "id":"12345678-1234-1234-1234-123456789ab1",
+            "attributes":{
+                "value":"value"
+            }
         }
     }
 ]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.req.json
index 367e3d4055..b30855a8a4 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.req.json
@@ -3,7 +3,7 @@
     "op": "add",
     "path": "/-",
     "value": {
-      "type": "specialRead",
+      "type": "specialread",
       "id": "12345678-1234-1234-1234-123456789ab1",
       "attributes": {
         "value": "special value"
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.resp.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.resp.json
index a22b985ab4..5211966c8c 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.resp.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/testPatchExtNoReadPermForNew.resp.json
@@ -10,7 +10,7 @@
         "child": {
           "data": {
             "type": "child",
-            "id": "11"
+            "id": "6"
           }
         }
       }
@@ -19,7 +19,7 @@
   {
     "data": {
       "type": "child",
-      "id": "11",
+      "id": "6",
       "attributes": {
         "name": null
       },
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateDirect.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateDirect.json
deleted file mode 100644
index 354f6d7eb8..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateDirect.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "data":[
-        {
-            "type":"child",
-            "id":"4"
-        },
-        {
-            "type":"child",
-            "id":"5"
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateSingle.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateSingle.json
deleted file mode 100644
index 7ab3fd5745..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelNoUpdateSingle.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"4"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.json
deleted file mode 100644
index ec320a1688..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "attributes":{
-            "firstName":"Unknown"
-        },
-        "relationships":{
-            "spouses":{
-                "data":[]
-            },
-            "children":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.req.json
deleted file mode 100644
index f185d391c5..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelRemoveColl.req.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "relationships":{
-            "children":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelSetDirect.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelSetDirect.json
deleted file mode 100644
index 354f6d7eb8..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRelSetDirect.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "data":[
-        {
-            "type":"child",
-            "id":"4"
-        },
-        {
-            "type":"child",
-            "id":"5"
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.json
deleted file mode 100644
index 747f8cdd1d..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "attributes":{
-            "firstName":"Unknown"
-        },
-        "relationships":{
-            "spouses":{
-                "data":[]
-            },
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"4"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.req.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.req.json
deleted file mode 100644
index 7ab3fd5745..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchRemoveRelSingle.req.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"4"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPatchSetRel.json b/elide-integration-tests/src/test/resources/ResourceIT/testPatchSetRel.json
deleted file mode 100644
index 71a79e680d..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPatchSetRel.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"4",
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"4"
-                    },
-                    {
-                        "type":"child",
-                        "id":"5"
-                    }
-                ]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testPostWithInvalidRelationship.json b/elide-integration-tests/src/test/resources/ResourceIT/testPostWithInvalidRelationship.json
deleted file mode 100644
index e96791ff5f..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testPostWithInvalidRelationship.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "data": {
-    "type": "resourceWithInvalidRelationship",
-    "id": "1",
-    "attributes": {
-      "name": "test123"
-    },
-    "relationships": {
-      "notIncludedResouce": {
-        "data": {
-          "type": "notIncludedResource",
-          "id": "1"
-        }
-      }
-    }
-  }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionId.json b/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionId.json
deleted file mode 100644
index c28b01b2b3..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionId.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "data":{
-        "type":"parent",
-        "id":"1",
-        "attributes":{
-            "firstName":null
-        },
-        "relationships":{
-            "children":{
-                "data":[
-                    {
-                        "type":"child",
-                        "id":"1"
-                    }
-                ]
-            },
-            "spouses":{
-                "data":[]
-            }
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionRelationships.json b/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionRelationships.json
deleted file mode 100644
index 7ebec426be..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testRootCollectionRelationships.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "data":[
-        {
-            "type":"child",
-            "id":"1"
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/testSubCollectionRelationships.json b/elide-integration-tests/src/test/resources/ResourceIT/testSubCollectionRelationships.json
deleted file mode 100644
index 0f756c6491..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/testSubCollectionRelationships.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "data":[
-        {
-            "type":"parent",
-            "id":"1"
-        }
-    ]
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.2.json b/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.2.json
index 086cffa2af..69f3b918e9 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.2.json
@@ -1,7 +1,7 @@
 {
     "data":{
         "type":"child",
-        "id":"8",
+        "id":"1",
         "attributes":{
             "name":null
         },
@@ -13,7 +13,7 @@
                 "data":[
                     {
                         "type":"parent",
-                        "id":"5"
+                        "id":"4"
                     }
                 ]
             }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.req.json b/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.req.json
index a5ef0ed5d8..c41257b551 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/updateChildRelationToExisting.req.json
@@ -1,16 +1,16 @@
 [
     {
         "op":"replace",
-        "path":"/7/children/8",
+        "path":"/1/children/1",
         "value":{
             "type":"child",
-            "id":"8",
+            "id":"1",
             "relationships":{
                 "parents":{
                     "data":[
                         {
                             "type":"parent",
-                            "id":"5"
+                            "id":"4"
                         }
                     ]
                 }
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/updateOneToOneNonRoot.json b/elide-integration-tests/src/test/resources/ResourceIT/updateOneToOneNonRoot.json
deleted file mode 100644
index a751c22634..0000000000
--- a/elide-integration-tests/src/test/resources/ResourceIT/updateOneToOneNonRoot.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "data":{
-        "type":"OneToOneNonRoot",
-        "id":"2",
-        "attributes":{
-            "test": "Updated object"
-        }
-    }
-}
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.2.json b/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.2.json
index 2d72737bae..1f5d6f9e26 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.2.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.2.json
@@ -1,9 +1,9 @@
 {
     "data":{
         "type":"parent",
-        "id":"10",
+        "id":"1",
         "attributes":{
-            "firstName":"bart"
+            "firstName":null
         },
         "relationships":{
             "spouses":{
@@ -13,7 +13,7 @@
                 "data":[
                     {
                         "type":"child",
-                        "id":"7"
+                        "id":"1"
                     },
                     {
                         "type":"child",
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.req.json b/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.req.json
index 899eebcd67..3d45f4b07c 100644
--- a/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.req.json
+++ b/elide-integration-tests/src/test/resources/ResourceIT/updateRelationshipDirect.req.json
@@ -5,7 +5,7 @@
         "value":[
             {
                 "type":"child",
-                "id":"7"
+                "id":"1"
             },
             {
                 "type":"child",
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.req.json b/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.req.json
new file mode 100644
index 0000000000..9e400d9bab
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.req.json
@@ -0,0 +1,14 @@
+[
+  {
+    "op": "add",
+    "path": "/-",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-123456789ab1",
+      "attributes": {
+        "name": "A new book.",
+        "publishDate" : 1234
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.resp.json b/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.resp.json
new file mode 100644
index 0000000000..8c3cf8ceb0
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/ResourceIT/versionedPatchExtension.resp.json
@@ -0,0 +1,12 @@
+[
+  {
+    "data": {
+      "type": "book",
+      "id": "3",
+      "attributes": {
+        "name": "A new book.",
+        "publishDate": 1234
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher1.json b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher1.json
new file mode 100644
index 0000000000..560a693ebf
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher1.json
@@ -0,0 +1,117 @@
+[
+
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345678-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Ernest Hemingway",
+        "homeAddress": "main"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345678-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345678-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "The Old Man and the Sea",
+        "genre": "Literary Fiction",
+        "language": "English",
+        "price": {
+          "total": 10.0,
+          "currency" : {
+            "isoCode" : "USD"
+          }
+        }
+      },
+      "relationships": {
+        "publisher": {
+          "data": {
+            "type": "publisher",
+            "id": "12345678-1234-1234-1234-1234567890ae"
+          }
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345678-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "For Whom the Bell Tolls",
+        "genre": "Literary Fiction",
+        "language": "English",
+        "price": {
+          "total": 9.0,
+          "currency" : {
+            "isoCode" : "AED"
+          }
+        }
+      },
+      "relationships": {
+        "publisher": {
+          "data": {
+            "type": "publisher",
+            "id": "12345678-1234-1234-1234-1234567890af"
+          }
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345678-1234-1234-1234-1234567890ac/publisher",
+    "value": {
+      "type": "publisher",
+      "id": "12345678-1234-1234-1234-1234567890ae",
+      "attributes": {
+        "name": "Default publisher"
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345678-1234-1234-1234-1234567890ad/publisher",
+    "value": {
+      "type": "publisher",
+      "id": "12345678-1234-1234-1234-1234567890af",
+      "attributes": {
+        "name": "Super Publisher"
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book/12345678-1234-1234-1234-1234567890ad/publisher/12345678-1234-1234-1234-1234567890af/editor",
+    "value": {
+      "type": "editor",
+      "id": "12345678-1234-1234-1234-1234567890ba",
+      "attributes": {
+        "firstName": "John",
+        "lastName": "Doe"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher2.json b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher2.json
new file mode 100644
index 0000000000..a28294e0ed
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher2.json
@@ -0,0 +1,55 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345679-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Orson Scott Card"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345679-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "23451234-1234-1234-1234-1234567890ac"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345679-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Enders Game",
+        "genre": "Science Fiction",
+        "language": "English",
+        "publishDate": 1454638927412
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "23451234-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Enders Shadow",
+        "genre": "Science Fiction",
+        "language": "English",
+        "publishDate": 1464638927412
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher3.json b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher3.json
new file mode 100644
index 0000000000..e509a7b4cc
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher3.json
@@ -0,0 +1,53 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345680-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Isaac Asimov"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345680-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345680-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345680-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Foundation",
+        "genre": "Science Fiction",
+        "language": "English"
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345680-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "The Roman Republic",
+        "genre": "History",
+        "language": "English"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher4.json b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher4.json
new file mode 100644
index 0000000000..df73473b64
--- /dev/null
+++ b/elide-integration-tests/src/test/resources/SortingIT/addAuthorBookPublisher4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "op": "add",
+    "path": "/author",
+    "value": {
+      "id": "12345681-1234-1234-1234-1234567890ab",
+      "type": "author",
+      "attributes": {
+        "name": "Null Ned"
+      },
+      "relationships": {
+        "books": {
+          "data": [
+            {
+              "type": "book",
+              "id": "12345681-1234-1234-1234-1234567890ac"
+            },
+            {
+              "type": "book",
+              "id": "12345681-1234-1234-1234-1234567890ad"
+            }
+          ]
+        }
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345681-1234-1234-1234-1234567890ac",
+      "attributes": {
+        "title": "Life with Null Ned",
+        "language": "English"
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "12345681-1234-1234-1234-1234567890ad",
+      "attributes": {
+        "title": "Life with Null Ned 2",
+        "genre": "Not Null",
+        "language": "English"
+      }
+    }
+  }
+]
diff --git a/elide-integration-tests/src/test/resources/hibernate.cfg.xml b/elide-integration-tests/src/test/resources/hibernate.cfg.xml
index e1fb9de958..b6f10963d2 100644
--- a/elide-integration-tests/src/test/resources/hibernate.cfg.xml
+++ b/elide-integration-tests/src/test/resources/hibernate.cfg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2015, Yahoo Inc.
+  ~ Copyright 2017, Yahoo Inc.
   ~ Licensed under the Apache License, Version 2.0
   ~ See LICENSE file in project root for terms.
   -->
@@ -9,18 +9,17 @@
     "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
     "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
-    <!-- MySQL session factory -->
+    <!-- H2 session factory -->
     <session-factory>
         <!-- local connection properties -->
         <!-- this is what we normally use -->
-        <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-        <!-- dialect for Mysql -->
-        <property name="dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property>
-
+        <property name="hibernate.connection.driver_class">org.h2.Driver</property>
+        <!-- dialect for H2 -->
+        <property name="dialect">org.hibernate.dialect.H2Dialect</property>
         <property name="hibernate.jdbc.batch_size">50</property>
         <property name="hibernate.jdbc.fetch_size">50</property>
 
-        <property name="hibernate.show_sql">true</property>
+        <property name="hibernate.show_sql">false</property>
 
         <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
 
@@ -30,5 +29,8 @@
         <property name="hibernate.bytecode.use_reflection_optimizer">false</property>
 
         <property name="hibernate.current_session_context_class">thread</property>
+
+        <property name="hibernate.c3p0.unreturnedConnectionTimeout">60</property>
+        <property name="hibernate.c3p0.debugUnreturnedConnectionStackTraces">true</property>
     </session-factory>
 </hibernate-configuration>
diff --git a/elide-intellij-codestyle.xml b/elide-intellij-codestyle.xml
index 8c790a71b0..47ded9c562 100644
--- a/elide-intellij-codestyle.xml
+++ b/elide-intellij-codestyle.xml
@@ -10,6 +10,8 @@
       <emptyLine />
       <package name="com" withSubpackages="true" static="false" />
       <emptyLine />
+      <package name="example" withSubpackages="true" static="false" />
+      <emptyLine />
       <package name="org" withSubpackages="true" static="false" />
       <emptyLine />
       <package name="" withSubpackages="true" static="false" />
@@ -29,6 +31,8 @@
         <emptyLine />
         <package name="com" withSubpackages="true" static="false" />
         <emptyLine />
+        <package name="example" withSubpackages="true" static="false" />
+        <emptyLine />
         <package name="org" withSubpackages="true" static="false" />
         <emptyLine />
         <package name="" withSubpackages="true" static="false" />
diff --git a/elide-logo.svg b/elide-logo.svg
new file mode 100644
index 0000000000..1913423f53
--- /dev/null
+++ b/elide-logo.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="122px" height="42px" viewBox="0 0 122 42" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+    <title>elide-logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="elide-logo" fill-rule="nonzero" fill="#273646">
+            <polygon id="Shape" points="0 3 0 41 27 41 27 37.9131653 3.68674699 37.9131653 3.68674699 22.9047619 25.2650602 22.9047619 25.2650602 19.8179272 3.68674699 19.8179272 3.68674699 6.08683473 26.7289157 6.08683473 26.7289157 3"></polygon>
+            <rect id="Rectangle-path" x="31" y="3" width="3" height="38"></rect>
+            <path d="M51.0001821,18 C57.0757794,18 62,19.3429452 62,20.9998634 C62,21.7684054 60.9418699,22.4691991 59.200053,22.9998938 C57.185417,23.6139989 54.2579844,24.0000911 51.0001821,24.0000911 C47.7423798,24.0000911 44.8153115,23.6139989 42.8010398,22.9998938 C41.0592228,22.4691991 40,21.7684054 40,20.9998634 C40,19.3429452 44.9249491,18 51.0001821,18 Z M62,39.0001366 C62,40.6566906 57.0757794,42 51.0001821,42 C44.9249491,42 40,40.6566906 40,39.0001366 L40,34.9997116 C40,36.6569941 44.9249491,37.9995751 51.0001821,37.9995751 C57.0757794,37.9995751 62,36.6569941 62,34.9997116 L62,39.0001366 Z M62,33.0000455 C62,34.6569638 57.0757794,36.0002732 51.0001821,36.0002732 C44.9249491,36.0002732 40,34.6565995 40,33.0000455 L40,28.9999848 C40,30.6569031 44.9249491,31.999484 51.0001821,31.999484 C57.0757794,31.999484 62,30.6569031 62,28.9999848 L62,33.0000455 Z M62,26.9999545 C62,28.6568727 57.0757794,30.0001821 51.0001821,30.0001821 C44.9249491,30.0001821 40,28.6568727 40,26.9999545 L40,22.9998938 C40,24.656812 44.9249491,25.9997572 51.0001821,25.9997572 C57.0757794,25.9997572 62,24.656812 62,22.9998938 L62,26.9999545 Z" id="database"></path>
+            <path d="M56.5066284,16 L44.410678,16 C43.1957803,16 42.1566705,15.5523949 41.2940749,14.6575613 C40.4314794,13.7627278 40,12.6851599 40,11.4248575 C40,10.3653747 40.307992,9.42909622 40.9243392,8.616399 C41.5406864,7.80370178 42.3328216,7.26943908 43.301471,7.01361089 L43.301471,6.84933829 C43.301471,4.94965384 43.94869,3.33330194 45.2427649,1.99990581 C46.5368398,0.666509678 48.0906014,0 49.9040497,0 C51.312532,0 52.584815,0.424622051 53.7205356,1.27386615 C54.8562561,2.12311025 55.6527496,3.23270381 56.1107424,4.60264682 C57.730606,4.47492111 59.1169333,4.97263693 60.2700873,6.09579428 C61.4232414,7.21895163 62,8.61187774 62,10.2741958 C62,11.8449583 61.4631932,13.1919182 60.3892163,14.3150756 C59.3152395,15.4382329 58.0208013,16 56.5066284,16 Z M44.3049874,9.12315735 C43.7416671,9.12315735 43.248444,9.35148118 42.8260446,9.80812886 C42.4036452,10.2647765 42.1922639,10.8035605 42.1922639,11.4248575 C42.1922639,12.0457778 42.4080036,12.5800405 42.8391197,13.0276456 C43.2705991,13.474874 43.7943308,13.6986766 44.410678,13.6986766 L56.5066284,13.6986766 C57.4222508,13.6986766 58.201674,13.3652334 58.8441715,12.6987237 C59.486669,12.032214 59.8080993,11.2240381 59.8080993,10.2741958 C59.8080993,9.3243536 59.486669,8.51580088 58.8441715,7.8492912 C58.201674,7.18278152 57.4222508,6.84933829 56.5066284,6.84933829 C56.2425833,6.84933829 55.9433081,6.90397024 55.6088026,7.01361089 L54.4204183,7.37003721 L54.2355505,6.10973485 C54.0419659,5.01370508 53.5400261,4.104931 52.7300943,3.38341261 C51.9201624,2.66189422 50.9780265,2.30132341 49.9040497,2.30132341 C48.6891519,2.30132341 47.6504053,2.74440729 46.7874466,3.63019828 C45.924851,4.51598926 45.4933716,5.58903593 45.4933716,6.84933829 C45.4933716,7.0686196 45.5286019,7.37907973 45.5990623,7.78071869 L45.8631073,9.15066171 L44.3049874,9.12315735 Z" id="cloud"></path>
+            <path d="M92,41.25 L92,3 L88.6911765,3 L88.6911765,18.8571429 L88.5861345,18.8571429 C88.2359944,17.8571429 87.7370448,16.9821429 87.0892857,16.2321429 C86.4415266,15.4821429 85.697479,14.8482143 84.8571429,14.3303571 C84.0168067,13.8125 83.1151961,13.4285714 82.1523109,13.1785714 C81.1894258,12.9285714 80.2002801,12.8035714 79.1848739,12.8035714 C77.1190476,12.8035714 75.3245798,13.1964286 73.8014706,13.9821429 C72.2783613,14.7678571 71.0091036,15.8303571 69.9936975,17.1696429 C68.9782913,18.5089286 68.2254902,20.0625 67.7352941,21.8303571 C67.245098,23.5982143 67,25.4642857 67,27.4285714 C67,29.3928571 67.245098,31.2589286 67.7352941,33.0267857 C68.2254902,34.7946429 68.9782913,36.3482143 69.9936975,37.6875 C71.0091036,39.0267857 72.2783613,40.0803571 73.8014706,40.8482143 C75.3245798,41.6160714 77.1190476,42 79.1848739,42 C80.1652661,42 81.1544118,41.8571429 82.1523109,41.5714286 C83.1502101,41.2857143 84.0868347,40.8839286 84.9621849,40.3660714 C85.837535,39.8482143 86.6165966,39.2142857 87.2993697,38.4642857 C87.9821429,37.7142857 88.4985994,36.8928571 88.8487395,36 L88.9537815,36 L88.9537815,41.25 L92,41.25 Z M70.3088235,27.4285714 C70.3088235,26 70.4751401,24.5803571 70.8077731,23.1696429 C71.1404062,21.7589286 71.6656162,20.5 72.3834034,19.3928571 C73.1011905,18.2857143 74.0203081,17.3839286 75.1407563,16.6875 C76.2612045,15.9910714 77.6092437,15.6428571 79.1848739,15.6428571 C80.9355742,15.6428571 82.414916,15.9910714 83.6228992,16.6875 C84.8308824,17.3839286 85.8112745,18.2857143 86.5640756,19.3928571 C87.3168768,20.5 87.8595938,21.7589286 88.1922269,23.1696429 C88.5248599,24.5803571 88.6911765,26 88.6911765,27.4285714 C88.6911765,28.8571429 88.5248599,30.2767857 88.1922269,31.6875 C87.8595938,33.0982143 87.3168768,34.3571429 86.5640756,35.4642857 C85.8112745,36.5714286 84.8308824,37.4732143 83.6228992,38.1696429 C82.414916,38.8660714 80.9355742,39.2142857 79.1848739,39.2142857 C77.6092437,39.2142857 76.2612045,38.8660714 75.1407563,38.1696429 C74.0203081,37.4732143 73.1011905,36.5714286 72.3834034,35.4642857 C71.6656162,34.3571429 71.1404062,33.0982143 70.8077731,31.6875 C70.4751401,30.2767857 70.3088235,28.8571429 70.3088235,27.4285714 Z" id="Shape"></path>
+            <path d="M118.562694,25.6110092 L100.421788,25.6110092 C100.566625,24.369419 100.865353,23.1544343 101.31797,21.966055 C101.770588,20.7776758 102.377095,19.7311927 103.137492,18.8266055 C103.89789,17.9220183 104.821229,17.1948012 105.907511,16.6449541 C106.993793,16.095107 108.243017,15.8201835 109.655183,15.8201835 C111.03114,15.8201835 112.262259,16.095107 113.348541,16.6449541 C114.434823,17.1948012 115.358163,17.9220183 116.11856,18.8266055 C116.878957,19.7311927 117.46736,20.7688073 117.883768,21.9394495 C118.300176,23.1100917 118.526485,24.333945 118.562694,25.6110092 Z M100.421788,28.4311927 L121.984482,28.4311927 C122.0569,26.5155963 121.875854,24.6266055 121.441341,22.7642202 C121.006828,20.9018349 120.291693,19.2522936 119.295934,17.8155963 C118.300176,16.3788991 117.00569,15.2171254 115.412477,14.3302752 C113.819263,13.4434251 111.900166,13 109.655183,13 C107.44641,13 105.536365,13.4168196 103.925047,14.2504587 C102.313729,15.0840979 101.001138,16.183792 99.987275,17.5495413 C98.973412,18.9152905 98.222067,20.4672783 97.7332402,22.2055046 C97.2444134,23.9437309 97,25.7174312 97,27.5266055 C97,29.4776758 97.2444134,31.3311927 97.7332402,33.087156 C98.222067,34.8431193 98.973412,36.3862385 99.987275,37.7165138 C101.001138,39.046789 102.313729,40.0932722 103.925047,40.8559633 C105.536365,41.6186544 107.44641,42 109.655183,42 C113.203704,42 115.946565,41.1486239 117.883768,39.4458716 C119.82097,37.7431193 121.151666,35.3308869 121.875854,32.2091743 L118.454066,32.2091743 C117.910925,34.3376147 116.933271,36.040367 115.521105,37.3174312 C114.108939,38.5944954 112.153631,39.2330275 109.655183,39.2330275 C108.02576,39.2330275 106.631699,38.8960245 105.472998,38.2220183 C104.314298,37.5480122 103.354749,36.6966361 102.594351,35.6678899 C101.833954,34.6391437 101.281761,33.47737 100.937772,32.1825688 C100.593782,30.8877676 100.421788,29.6373089 100.421788,28.4311927 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/elide-model-config/README.md b/elide-model-config/README.md
new file mode 100644
index 0000000000..6c3ae13cd9
--- /dev/null
+++ b/elide-model-config/README.md
@@ -0,0 +1,31 @@
+## Validation for Dynamic Config
+
+Validate the config files in local before deployment.
+
+To build and run:
+```text
+1. mvn clean install
+2. Execute Jar File :
+   a) java -cp elide-spring/elide-spring-boot-autoconfigure/target/elide-spring-boot-autoconfigure-*.jar DynamicConfigValidator --configDir <Path for Config Directory>
+      java -cp elide-standalone/target/elide-standalone-*.jar DynamicConfigValidator --configDir <Path for Config Directory>
+   b) java -cp elide-spring/elide-spring-boot-autoconfigure/target/elide-spring-boot-autoconfigure-*.jar       DynamicConfigValidator --help
+      java -cp elide-standalone/target/elide-standalone-*.jar DynamicConfigValidator --help
+```
+Expected Configs Directory Structure:
+```text
+├── CONFIG_DIR/
+│   ├── models
+│   │   ├── tables
+│   │   │   ├── table1.hjson
+│   │   │   ├── table2.hjson
+│   │   │   ├── ...
+│   │   │   ├── tableN.hjson
+│   │   ├── security.hjson (optional)
+│   │   ├── variables.hjson (optional)
+│   ├── db
+│   │   ├── sql (optional)
+│   │   │   ├── db1.hjson
+│   │   │   ├── ...
+│   │   │   ├── dbN.hjson
+│   │   ├── variables.hjson (optional)
+```
diff --git a/elide-model-config/pom.xml b/elide-model-config/pom.xml
new file mode 100644
index 0000000000..545fab04d1
--- /dev/null
+++ b/elide-model-config/pom.xml
@@ -0,0 +1,192 @@
+<!--
+  ~ Copyright 2020, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-model-config</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Dynamic Model Config</name>
+    <description>Elide Dynamic Model Config</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <artifactId>elide-parent-pom</artifactId>
+        <groupId>com.yahoo.elide</groupId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <hjson.version>3.0.0</hjson.version>
+        <handlebars.version>4.3.0</handlebars.version>
+        <json-schema-validator.version>2.2.14</json-schema-validator.version>
+        <commons-io.version>2.11.0</commons-io.version>
+        <commons-cli.version>1.5.0</commons-cli.version>
+        <commons-compress.version>1.21</commons-compress.version>
+        <spring-core.verions>5.3.18</spring-core.verions>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons-cli.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${commons-compress.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-core.verions}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- For JPA @Id annotation -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.java-json-tools</groupId>
+            <artifactId>json-schema-validator</artifactId>
+            <version>${json-schema-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hjson</groupId>
+            <artifactId>hjson</artifactId>
+            <version>${hjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.stefanbirkner</groupId>
+            <artifactId>system-lambda</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars-helpers</artifactId>
+            <version>${handlebars.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/Config.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/Config.java
new file mode 100644
index 0000000000..01d030269f
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/Config.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+/**
+ * Dynamic Config enum.
+ */
+public enum Config {
+
+    TABLE("table",
+          "models/tables/",
+          "/elideTableSchema.json"),
+
+    SECURITY("security",
+             "models/security.hjson",
+             "/elideSecuritySchema.json"),
+
+    MODELVARIABLE("variable",
+                  "models/variables.hjson",
+                  "/elideVariableSchema.json"),
+
+    DBVARIABLE("variable",
+               "db/variables.hjson",
+               "/elideVariableSchema.json"),
+
+    SQLDBConfig("sqldbconfig",
+                "db/sql/",
+                "/elideDBConfigSchema.json"),
+
+    NAMESPACEConfig("namespaceconfig",
+            "models/namespaces/",
+            "/elideNamespaceConfigSchema.json");
+
+    private final String configType;
+    private final String configPath;
+    private final String configSchema;
+
+    private Config(String configType, String configPath, String configSchema) {
+        this.configPath = configPath;
+        this.configType = configType;
+        this.configSchema = configSchema;
+    }
+
+    public String getConfigType() {
+        return configType;
+    }
+
+    public String getConfigPath() {
+        return configPath;
+    }
+
+    public String getConfigSchema() {
+        return configSchema;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DBPasswordExtractor.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DBPasswordExtractor.java
new file mode 100644
index 0000000000..bc187f3cd4
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DBPasswordExtractor.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import com.yahoo.elide.modelconfig.model.DBConfig;
+
+/**
+ * Interface for providing password extractor implementation.
+ */
+public interface DBPasswordExtractor {
+    /**
+     * Extract password for connecting to DB.
+     * @param config DB Config POJO.
+     * @return String DB Connection Password.
+     */
+    String getDBPassword(DBConfig config);
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DraftV4LibraryWithElideFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DraftV4LibraryWithElideFormatAttr.java
new file mode 100644
index 0000000000..29bb16f4bc
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DraftV4LibraryWithElideFormatAttr.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import com.yahoo.elide.modelconfig.jsonformats.ElideArgumentNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideCardinalityFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideFieldNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideFieldTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideGrainTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJDBCUrlFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJoinKindFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJoinTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideNamespaceNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideRSQLFilterFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideRoleFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideTimeFieldTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.JavaClassNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.JavaClassNameWithExtFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateArgsPropertiesKeyword;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateDimPropertiesKeyword;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateTimeDimPropertiesKeyword;
+import com.github.fge.jsonschema.library.DraftV4Library;
+import com.github.fge.jsonschema.library.Library;
+import lombok.Getter;
+
+/**
+ * Augment the {@link DraftV4Library} with custom format attributes and keywords.
+ */
+public class DraftV4LibraryWithElideFormatAttr {
+    @Getter
+    private Library library;
+
+    public DraftV4LibraryWithElideFormatAttr() {
+        library = DraftV4Library.get().thaw()
+                        .addFormatAttribute(ElideFieldNameFormatAttr.FORMAT_NAME, new ElideFieldNameFormatAttr())
+                        .addFormatAttribute(ElideArgumentNameFormatAttr.FORMAT_NAME, new ElideArgumentNameFormatAttr())
+                        .addFormatAttribute(ElideCardinalityFormatAttr.FORMAT_NAME, new ElideCardinalityFormatAttr())
+                        .addFormatAttribute(ElideFieldTypeFormatAttr.FORMAT_NAME, new ElideFieldTypeFormatAttr())
+                        .addFormatAttribute(ElideGrainTypeFormatAttr.FORMAT_NAME, new ElideGrainTypeFormatAttr())
+                        .addFormatAttribute(ElideJoinTypeFormatAttr.FORMAT_NAME, new ElideJoinTypeFormatAttr())
+                        .addFormatAttribute(ElideJoinKindFormatAttr.FORMAT_NAME, new ElideJoinKindFormatAttr())
+                        .addFormatAttribute(ElideTimeFieldTypeFormatAttr.FORMAT_NAME,
+                                        new ElideTimeFieldTypeFormatAttr())
+                        .addFormatAttribute(ElideNameFormatAttr.FORMAT_NAME, new ElideNameFormatAttr())
+                        .addFormatAttribute(ElideNamespaceNameFormatAttr.FORMAT_NAME,
+                                        new ElideNamespaceNameFormatAttr())
+                        .addFormatAttribute(ElideRSQLFilterFormatAttr.FORMAT_NAME, new ElideRSQLFilterFormatAttr())
+                        .addFormatAttribute(JavaClassNameWithExtFormatAttr.FORMAT_NAME,
+                                        new JavaClassNameWithExtFormatAttr())
+                        .addFormatAttribute(ElideJDBCUrlFormatAttr.FORMAT_NAME, new ElideJDBCUrlFormatAttr())
+                        .addFormatAttribute(JavaClassNameFormatAttr.FORMAT_NAME, new JavaClassNameFormatAttr())
+                        .addFormatAttribute(ElideRoleFormatAttr.FORMAT_NAME, new ElideRoleFormatAttr())
+                        .addKeyword(new ValidateDimPropertiesKeyword().getKeyword())
+                        .addKeyword(new ValidateTimeDimPropertiesKeyword().getKeyword())
+                        .addKeyword(new ValidateArgsPropertiesKeyword().getKeyword())
+                        .freeze();
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigHelpers.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigHelpers.java
new file mode 100644
index 0000000000..3198dc448f
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigHelpers.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import com.yahoo.elide.modelconfig.model.ElideDBConfig;
+import com.yahoo.elide.modelconfig.model.ElideNamespaceConfig;
+import com.yahoo.elide.modelconfig.model.ElideSecurityConfig;
+import com.yahoo.elide.modelconfig.model.ElideTableConfig;
+import com.yahoo.elide.modelconfig.parser.handlebars.HandlebarsHydrator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import org.apache.commons.lang3.StringUtils;
+import org.hjson.JsonValue;
+import org.hjson.ParseException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+/**
+ * Util class for Dynamic config helper module.
+ */
+public class DynamicConfigHelpers {
+
+    /**
+     * format config file path.
+     * @param basePath : path to hjson config.
+     * @return formatted file path.
+     */
+    public static String formatFilePath(String basePath) {
+        if (StringUtils.isNotBlank(basePath) && !basePath.endsWith("/")) {
+            basePath += "/";
+        }
+        return basePath;
+    }
+
+    /**
+     * converts variables hjson string to map of variables.
+     * @param config HJSON file content.
+     * @param schemaValidator JSON schema validator.
+     * @return Map of Variables
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> stringToVariablesPojo(String fileName, String config,
+                    DynamicConfigSchemaValidator schemaValidator) throws IOException {
+        Map<String, Object> variables = new HashMap<>();
+        String jsonConfig = hjsonToJson(config);
+        try {
+            if (schemaValidator.verifySchema(Config.MODELVARIABLE, jsonConfig, fileName)) {
+                variables = getModelPojo(jsonConfig, Map.class);
+            }
+        } catch (ProcessingException e) {
+            log.error("Error Validating Variable config : " + e.getMessage());
+            throw new IOException(e);
+        }
+        return variables;
+    }
+
+    /**
+     * Generates ElideTableConfig Pojo from input String.
+     * @param content : input string
+     * @param variables : variables to resolve.
+     * @param schemaValidator JSON schema validator.
+     * @return ElideTableConfig Pojo
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    public static ElideTableConfig stringToElideTablePojo(String fileName, String content,
+                    Map<String, Object> variables, DynamicConfigSchemaValidator schemaValidator) throws IOException {
+        ElideTableConfig table = new ElideTableConfig();
+        String jsonConfig = hjsonToJson(resolveVariables(content, variables));
+        try {
+            if (schemaValidator.verifySchema(Config.TABLE, jsonConfig, fileName)) {
+                table = getModelPojo(jsonConfig, ElideTableConfig.class);
+            }
+        } catch (ProcessingException e) {
+            log.error("Error Validating Table config : " + e.getMessage());
+            throw new IOException(e);
+        }
+        return table;
+    }
+
+    /**
+     * Generates ElideDBConfig Pojo from input String.
+     * @param content : input string
+     * @param variables : variables to resolve.
+     * @param schemaValidator JSON schema validator.
+     * @return ElideDBConfig Pojo
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    public static ElideDBConfig stringToElideDBConfigPojo(String fileName, String content,
+                    Map<String, Object> variables, DynamicConfigSchemaValidator schemaValidator) throws IOException {
+        ElideDBConfig dbconfig = new ElideDBConfig();
+        String jsonConfig = hjsonToJson(resolveVariables(content, variables));
+        try {
+            if (schemaValidator.verifySchema(Config.SQLDBConfig, jsonConfig, fileName)) {
+                dbconfig = getModelPojo(jsonConfig, ElideDBConfig.class);
+            }
+        } catch (ProcessingException e) {
+            log.error("Error Validating DB config : " + e.getMessage());
+            throw new IOException(e);
+        }
+        return dbconfig;
+    }
+
+    /**
+     * Generates ElideNamespaceConfig Pojo from input String.
+     * @param content : input string
+     * @param variables : variables to resolve.
+     * @param schemaValidator JSON schema validator.
+     * @return ElideNamespaceConfig Pojo
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    public static ElideNamespaceConfig stringToElideNamespaceConfigPojo(String fileName, String content,
+                    Map<String, Object> variables, DynamicConfigSchemaValidator schemaValidator) throws IOException {
+        ElideNamespaceConfig namespaceconfig = new ElideNamespaceConfig();
+        String jsonConfig = hjsonToJson(resolveVariables(content, variables));
+        try {
+            if (schemaValidator.verifySchema(Config.NAMESPACEConfig, jsonConfig, fileName)) {
+                namespaceconfig = getModelPojo(jsonConfig, ElideNamespaceConfig.class);
+            }
+        } catch (ProcessingException e) {
+            log.error("Error Validating DB config : " + e.getMessage());
+            throw new IOException(e);
+        }
+        return namespaceconfig;
+    }
+
+    /**
+     * Generates ElideSecurityConfig Pojo from input String.
+     * @param content : input string
+     * @param variables : variables to resolve.
+     * @param schemaValidator JSON schema validator.
+     * @return ElideSecurityConfig Pojo
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    public static ElideSecurityConfig stringToElideSecurityPojo(String fileName, String content,
+                    Map<String, Object> variables, DynamicConfigSchemaValidator schemaValidator) throws IOException {
+        String jsonConfig = hjsonToJson(resolveVariables(content, variables));
+        try {
+            if (schemaValidator.verifySchema(Config.SECURITY, jsonConfig, fileName)) {
+                return getModelPojo(jsonConfig, ElideSecurityConfig.class);
+            }
+        } catch (ProcessingException e) {
+            log.error("Error Validating Security config : " + e.getMessage());
+            throw new IOException(e);
+        }
+        return null;
+    }
+
+    /**
+     * resolves variables in table and security config.
+     * @param jsonConfig of table or security
+     * @param variables map from config
+     * @return json string with resolved variables
+     * @throws IOException If an I/O error or a processing error occurs.
+     */
+    public static String resolveVariables(String jsonConfig, Map<String, Object> variables) throws IOException {
+        HandlebarsHydrator hydrator = new HandlebarsHydrator();
+        return hydrator.hydrateConfigTemplate(jsonConfig, variables);
+    }
+
+    private static String hjsonToJson(String hjson) {
+        try {
+            return JsonValue.readHjson(hjson).toString();
+        } catch (ParseException e) {
+            throw new IllegalStateException("Invalid Hjson Syntax: " + e.getMessage());
+        }
+    }
+
+    private static <T> T getModelPojo(String jsonConfig, final Class<T> configPojo) throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
+        return objectMapper.readValue(jsonConfig, configPojo);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidator.java
new file mode 100644
index 0000000000..ca7f409e81
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidator.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.github.fge.jsonschema.cfg.ValidationConfiguration;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.LogLevel;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.library.Library;
+import com.github.fge.jsonschema.main.JsonSchema;
+import com.github.fge.jsonschema.main.JsonSchemaFactory;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+/**
+ * Dynamic Model Schema validation.
+ */
+@Slf4j
+public class DynamicConfigSchemaValidator {
+
+    private JsonSchema tableSchema;
+    private JsonSchema securitySchema;
+    private JsonSchema variableSchema;
+    private JsonSchema dbConfigSchema;
+    private JsonSchema namespaceConfigSchema;
+    private static String NEWLINE = System.lineSeparator();
+
+    public DynamicConfigSchemaValidator() {
+
+        Library library = new DraftV4LibraryWithElideFormatAttr().getLibrary();
+
+        MessageBundle bundle = new MessageBundleWithElideMessages().getMsgBundle();
+
+        ValidationConfiguration cfg = ValidationConfiguration.newBuilder()
+                        .setDefaultLibrary("http://my.site/myschema#", library)
+                        .setValidationMessages(bundle)
+                        .freeze();
+
+        JsonSchemaFactory factory = JsonSchemaFactory.newBuilder()
+                        .setValidationConfiguration(cfg)
+                        .freeze();
+
+        tableSchema = loadSchema(factory, Config.TABLE.getConfigSchema());
+        securitySchema = loadSchema(factory, Config.SECURITY.getConfigSchema());
+        variableSchema = loadSchema(factory, Config.MODELVARIABLE.getConfigSchema());
+        dbConfigSchema = loadSchema(factory, Config.SQLDBConfig.getConfigSchema());
+        namespaceConfigSchema = loadSchema(factory, Config.NAMESPACEConfig.getConfigSchema());
+    }
+
+    /**
+     * Verify config against schema.
+     * @param configType {@link Config} type.
+     * @param jsonConfig HJSON file content as JSON string.
+     * @param fileName Name of HJSON file.
+     * @return whether config is valid
+     * @throws IOException If an I/O error occurs.
+     * @throws ProcessingException If a processing error occurred during validation.
+     */
+    public boolean verifySchema(Config configType, String jsonConfig, String fileName)
+                    throws IOException, ProcessingException {
+        ProcessingReport results = null;
+        switch (configType) {
+        case TABLE :
+            results = this.tableSchema.validate(new ObjectMapper().readTree(jsonConfig), true);
+            break;
+        case SECURITY :
+            results = this.securitySchema.validate(new ObjectMapper().readTree(jsonConfig), true);
+            break;
+        case MODELVARIABLE :
+        case DBVARIABLE :
+            results = this.variableSchema.validate(new ObjectMapper().readTree(jsonConfig), true);
+            break;
+        case SQLDBConfig :
+            results = this.dbConfigSchema.validate(new ObjectMapper().readTree(jsonConfig), true);
+            break;
+        case NAMESPACEConfig :
+            results = this.namespaceConfigSchema.validate(new ObjectMapper().readTree(jsonConfig), true);
+            break;
+        default :
+            log.error("Not a valid config type :" + configType);
+            break;
+        }
+        if (results == null || !results.isSuccess()) {
+            throw new IllegalStateException("Schema validation failed for: " + fileName + getErrorMessages(results));
+        }
+        return true;
+    }
+
+    private static String getErrorMessages(ProcessingReport report) {
+        if (report == null) {
+            return null;
+        }
+        List<String> list = new ArrayList<>();
+        report.forEach(msg -> addEmbeddedMessages(msg.asJson(), list, 0));
+
+        return NEWLINE + String.join(NEWLINE, list);
+    }
+
+    private static void addEmbeddedMessages(JsonNode root, List<String> list, int depth) {
+
+        if (root.has("level") && root.has("message")) {
+            String level = root.get("level").asText();
+
+            if (level.equalsIgnoreCase(LogLevel.ERROR.name()) || level.equalsIgnoreCase(LogLevel.FATAL.name())) {
+                String msg = root.get("message").asText();
+                String instancePointer = extractPointer(root, "instance");
+                String schemaPointer = extractPointer(root, "schema");
+
+                if (StringUtils.isNoneBlank(instancePointer, schemaPointer)) {
+                    msg = "Instance[" + instancePointer + "] failed to validate against schema[" + schemaPointer + "]. "
+                                    + msg;
+                }
+                list.add((depth == 0) ? "[ERROR]" + NEWLINE + msg
+                                : String.format("%" + (4 * depth + msg.length()) + "s", msg));
+
+                if (root.has("reports")) {
+                    Iterator<Entry<String, JsonNode>> fields = root.get("reports").fields();
+                    while (fields.hasNext()) {
+                        ArrayNode arrayNode = (ArrayNode) fields.next().getValue();
+                        for (int i = 0; i < arrayNode.size(); i++) {
+                            addEmbeddedMessages(arrayNode.get(i), list, depth + 1);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static String extractPointer(JsonNode root, String fieldName) {
+        String pointer = null;
+        if (root.has(fieldName)) {
+            JsonNode node = root.get(fieldName);
+            if (node.has("pointer")) {
+                pointer = node.get("pointer").asText();
+            }
+        }
+
+        return pointer;
+    }
+
+    private static JsonSchema loadSchema(JsonSchemaFactory factory, String resource) {
+
+        try (InputStream is = DynamicConfigHelpers.class.getResourceAsStream(resource)) {
+            return factory.getJsonSchema(new ObjectMapper().readTree(is));
+        } catch (IOException | ProcessingException e) {
+            log.error("Error loading schema file " + resource + " to verify");
+            throw new IllegalStateException(e.getMessage());
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfiguration.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfiguration.java
new file mode 100644
index 0000000000..40da6f6bbb
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfiguration.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig;
+
+import com.yahoo.elide.modelconfig.model.DBConfig;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import com.yahoo.elide.modelconfig.model.Table;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Returns the model, security role, and database connection configurations derived from HJSON
+ * files or other dynamic configuration systems.
+ */
+public interface DynamicConfiguration {
+
+    /**
+     * Returns the set of dynamically configured tables.
+     * @return a set of tables.
+     */
+    default Set<Table> getTables() {
+        return new HashSet<>();
+    }
+
+    /**
+     * Return the set of role names leveraged by dynamic models.
+     * @return a set of role names.
+     */
+    default Set<String> getRoles() {
+        return new HashSet<>();
+    }
+
+    /**
+     * Returns a set of database connection configurations.
+     * @return a set of database configurations.
+     */
+    default Set<DBConfig> getDatabaseConfigurations() {
+        return new HashSet<>();
+    }
+
+    /**
+     * Returns a set of Namespace configurations.
+     * @return a set of Namespace configurations.
+     */
+    default Set<NamespaceConfig> getNamespaceConfigurations() {
+        return new HashSet<>();
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/MessageBundleWithElideMessages.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/MessageBundleWithElideMessages.java
new file mode 100644
index 0000000000..ade9e09e65
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/MessageBundleWithElideMessages.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import com.yahoo.elide.modelconfig.jsonformats.ElideArgumentNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideCardinalityFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideFieldNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideFieldTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideGrainTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJDBCUrlFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJoinKindFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideJoinTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideNamespaceNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideRSQLFilterFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideRoleFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ElideTimeFieldTypeFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.JavaClassNameFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.JavaClassNameWithExtFormatAttr;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateArgsPropertiesValidator;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateDimPropertiesValidator;
+import com.yahoo.elide.modelconfig.jsonformats.ValidateTimeDimPropertiesValidator;
+import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import com.github.fge.msgsimple.load.MessageBundles;
+import com.github.fge.msgsimple.source.MapMessageSource;
+import lombok.Getter;
+
+/**
+ * Augment the {@link MessageBundle} with error messages for custom format attributes and keywords.
+ */
+public class MessageBundleWithElideMessages {
+    @Getter
+    private MessageBundle msgBundle;
+
+    public MessageBundleWithElideMessages() {
+        this.msgBundle = MessageBundles.getBundle(JsonSchemaValidationBundle.class).thaw()
+                        .appendSource(MapMessageSource.newBuilder()
+
+                                        // For Format errors
+                                        .put(ElideFieldNameFormatAttr.FORMAT_KEY, ElideFieldNameFormatAttr.FORMAT_MSG)
+                                        .put(ElideFieldNameFormatAttr.NAME_KEY, ElideFieldNameFormatAttr.NAME_MSG)
+                                        .put(ElideArgumentNameFormatAttr.FORMAT_KEY,
+                                                        ElideArgumentNameFormatAttr.FORMAT_MSG)
+                                        .put(ElideArgumentNameFormatAttr.NAME_KEY, ElideArgumentNameFormatAttr.NAME_MSG)
+                                        .put(ElideCardinalityFormatAttr.TYPE_KEY, ElideCardinalityFormatAttr.TYPE_MSG)
+                                        .put(ElideFieldTypeFormatAttr.TYPE_KEY, ElideFieldTypeFormatAttr.TYPE_MSG)
+                                        .put(ElideGrainTypeFormatAttr.TYPE_KEY, ElideGrainTypeFormatAttr.TYPE_MSG)
+                                        .put(ElideJoinTypeFormatAttr.TYPE_KEY, ElideJoinTypeFormatAttr.TYPE_MSG)
+                                        .put(ElideJoinKindFormatAttr.TYPE_KEY, ElideJoinKindFormatAttr.TYPE_MSG)
+                                        .put(ElideTimeFieldTypeFormatAttr.TYPE_KEY,
+                                                        ElideTimeFieldTypeFormatAttr.TYPE_MSG)
+                                        .put(ElideNameFormatAttr.FORMAT_KEY, ElideNameFormatAttr.FORMAT_MSG)
+                                        .put(ElideNamespaceNameFormatAttr.FORMAT_KEY,
+                                                        ElideNamespaceNameFormatAttr.FORMAT_KEY_MSG)
+                                        .put(ElideNamespaceNameFormatAttr.FORMAT_ADDITIONAL_KEY,
+                                                ElideNamespaceNameFormatAttr.FORMAT_ADDITIONAL_KEY_MSG)
+                                        .put(ElideRSQLFilterFormatAttr.FORMAT_KEY, ElideRSQLFilterFormatAttr.FORMAT_MSG)
+                                        .put(JavaClassNameWithExtFormatAttr.FORMAT_KEY,
+                                                        JavaClassNameWithExtFormatAttr.FORMAT_MSG)
+                                        .put(JavaClassNameFormatAttr.FORMAT_KEY, JavaClassNameFormatAttr.FORMAT_MSG)
+                                        .put(ElideJDBCUrlFormatAttr.FORMAT_KEY, ElideJDBCUrlFormatAttr.FORMAT_MSG)
+                                        .put(ElideRoleFormatAttr.FORMAT_KEY, ElideRoleFormatAttr.FORMAT_MSG)
+
+                                        // for Keyword errors
+                                        .put(ValidateDimPropertiesValidator.ATMOST_ONE_KEY,
+                                                        ValidateDimPropertiesValidator.ATMOST_ONE_MSG)
+                                        .put(ValidateDimPropertiesValidator.ADDITIONAL_KEY,
+                                                        ValidateDimPropertiesValidator.ADDITIONAL_MSG)
+                                        .put(ValidateTimeDimPropertiesValidator.ADDITIONAL_KEY,
+                                                        ValidateTimeDimPropertiesValidator.ADDITIONAL_MSG)
+                                        .put(ValidateArgsPropertiesValidator.ATMOST_ONE_KEY,
+                                                        ValidateArgsPropertiesValidator.ATMOST_ONE_MSG)
+                                        .build())
+                        .freeze();
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/io/FileLoader.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/io/FileLoader.java
new file mode 100644
index 0000000000..44e0600bde
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/io/FileLoader.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.io;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import com.yahoo.elide.modelconfig.DynamicConfigHelpers;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+/**
+ * Responsible for loading HJSON configuration either from the classpath or from the file system.
+ */
+@Slf4j
+public class FileLoader {
+    private static final Pattern TABLE_FILE = Pattern.compile("models/tables/[^/]+\\.hjson");
+    private static final Pattern NAME_SPACE_FILE = Pattern.compile("models/namespaces/[^/]+\\.hjson");
+    private static final Pattern DB_FILE = Pattern.compile("db/sql/[^/]+\\.hjson");
+    private static final String CLASSPATH_PATTERN = "classpath*:";
+    private static final String FILEPATH_PATTERN = "file:";
+    private static final String RESOURCES = "resources";
+    private static final int RESOURCES_LENGTH = 9; //"resources".length()
+
+    private static final String HJSON_EXTN = "**/*.hjson";
+
+    private final PathMatchingResourcePatternResolver resolver;
+
+    private static final Function<Resource, String> CONTENT_PROVIDER = (resource) -> {
+        try {
+            return IOUtils.toString(resource.getInputStream(), UTF_8);
+        } catch (IOException e) {
+            log.error ("Error converting stream to String: {}", e.getMessage());
+            throw new IllegalStateException(e);
+        }
+    };
+
+    @Getter
+    private final String rootPath;
+    private final String rootURL;
+
+    @Getter
+    private boolean writeable;
+
+    /**
+     * Constructor.
+     * @param rootPath The file system (or classpath) root directory path for configuration.
+     */
+    public FileLoader(String rootPath) {
+        this.resolver = new PathMatchingResourcePatternResolver(this.getClass().getClassLoader());
+
+        String pattern = CLASSPATH_PATTERN + DynamicConfigHelpers.formatFilePath(formatClassPath(rootPath));
+
+        boolean classPathExists = false;
+        try {
+            classPathExists = (resolver.getResources(pattern).length != 0);
+        } catch (IOException e) {
+            //NOOP
+        }
+
+        if (classPathExists) {
+            this.rootURL = pattern;
+            writeable = false;
+        } else {
+            File config = new File(rootPath);
+            if (!config.exists()) {
+                log.error ("Config path does not exist: {}", config);
+                throw new IllegalStateException(rootPath + " : config path does not exist");
+            }
+
+            writeable = Files.isWritable(config.toPath());
+            this.rootURL = FILEPATH_PATTERN + DynamicConfigHelpers.formatFilePath(config.getAbsolutePath());
+        }
+
+        this.rootPath = rootPath;
+    }
+
+    /**
+     * Load resources from the filesystem/classpath.
+     * @return A map from the path to the resource.
+     * @throws IOException If something goes boom.
+     */
+    public Map<String, ConfigFile> loadResources() throws IOException {
+        Map<String, ConfigFile> resourceMap = new LinkedHashMap<>();
+        int configDirURILength = resolver.getResources(this.rootURL)[0].getURI().toString().length();
+
+        Resource[] hjsonResources = resolver.getResources(this.rootURL + HJSON_EXTN);
+        for (Resource resource : hjsonResources) {
+            if (! resource.exists()) {
+                log.error("Missing resource during HJSON configuration load: {}", resource.getURI());
+                continue;
+            }
+            String path = resource.getURI().toString().substring(configDirURILength);
+            resourceMap.put(path, ConfigFile.builder()
+                    .type(toType(path))
+                    .contentProvider(() -> CONTENT_PROVIDER.apply(resource))
+                    .path(path)
+                    .version(NO_VERSION)
+                    .build());
+        }
+
+        return resourceMap;
+    }
+
+    /**
+     * Load a single resource from the filesystem/classpath.
+     * @return The file content.
+     * @throws IOException If something goes boom.
+     */
+    public ConfigFile loadResource(String relativePath) throws IOException {
+        Resource[] hjsonResources = resolver.getResources(this.rootURL + relativePath);
+        if (hjsonResources.length == 0 || ! hjsonResources[0].exists()) {
+            return null;
+        }
+
+        return ConfigFile.builder()
+                .type(toType(relativePath))
+                .contentProvider(() -> CONTENT_PROVIDER.apply(hjsonResources[0]))
+                .path(relativePath)
+                .version(NO_VERSION)
+                .build();
+    }
+
+    /**
+     * Remove src/.../resources/ from class path for configs directory.
+     * @param filePath class path for configs directory.
+     * @return formatted class path for configs directory.
+     */
+    static String formatClassPath(String filePath) {
+        if (filePath.indexOf(RESOURCES + "/") > -1) {
+            return filePath.substring(filePath.indexOf(RESOURCES + "/") + RESOURCES_LENGTH + 1);
+        } else if (filePath.indexOf(RESOURCES) > -1) {
+            return filePath.substring(filePath.indexOf(RESOURCES) + RESOURCES_LENGTH);
+        }
+        return filePath;
+    }
+
+    public static ConfigFile.ConfigFileType toType(String path) {
+        String lowerCasePath = path.toLowerCase(Locale.ROOT);
+        if (lowerCasePath.endsWith("db/variables.hjson")) {
+            return ConfigFile.ConfigFileType.VARIABLE;
+        } else if (lowerCasePath.endsWith("models/variables.hjson")) {
+            return ConfigFile.ConfigFileType.VARIABLE;
+        } else if (lowerCasePath.equals("models/security.hjson")) {
+            return ConfigFile.ConfigFileType.SECURITY;
+        } else if (DB_FILE.matcher(lowerCasePath).matches()) {
+            return ConfigFile.ConfigFileType.DATABASE;
+        } else if (TABLE_FILE.matcher(lowerCasePath).matches()) {
+            return ConfigFile.ConfigFileType.TABLE;
+        } else if (NAME_SPACE_FILE.matcher(lowerCasePath).matches()) {
+            return ConfigFile.ConfigFileType.NAMESPACE;
+        } else {
+            return ConfigFile.ConfigFileType.UNKNOWN;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideArgumentNameFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideArgumentNameFormatAttr.java
new file mode 100644
index 0000000000..7e4ff4c2a6
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideArgumentNameFormatAttr.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+/**
+ * Format specifier for {@code elideArgumentName} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid Elide Argument Name.
+ * </p>
+ */
+public class ElideArgumentNameFormatAttr extends AbstractFormatAttribute {
+
+    public static final String FORMAT_NAME = "elideArgumentName";
+    public static final String NAME_KEY = "elideArgumentName.error.name";
+    public static final String NAME_MSG = "Argument name [%s] is not allowed. Argument name cannot be 'grain'.";
+    public static final String FORMAT_KEY = "elideArgumentName.error.format";
+    public static final String FORMAT_MSG = "Argument name [%s] is not allowed. Name must start with an alphabetic "
+                    + "character and can include alaphabets, numbers and '_' only.";
+
+    public ElideArgumentNameFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!ElideNameFormatAttr.NAME_FORMAT_REGEX.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+
+        if (input.equalsIgnoreCase("grain")) {
+            report.error(newMsg(data, bundle, NAME_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideCardinalityFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideCardinalityFormatAttr.java
new file mode 100644
index 0000000000..13343e39d7
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideCardinalityFormatAttr.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideCardiality} format attribute.
+ * <p>
+ * This specifier will check if a string instance is one of {@code Tiny, Small, Medium, Large, Huge}.
+ * </p>
+ */
+public class ElideCardinalityFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern CARDINALITY_PATTERN = Pattern.compile("^(?i)(Tiny|Small|Medium|Large|Huge)$");
+
+    public static final String FORMAT_NAME = "elideCardiality";
+    public static final String TYPE_KEY = "elideCardiality.error.enum";
+    public static final String TYPE_MSG = "Cardinality type [%s] is not allowed. Supported value is one of "
+                    + "[Tiny, Small, Medium, Large, Huge].";
+
+    public ElideCardinalityFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!CARDINALITY_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldNameFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldNameFormatAttr.java
new file mode 100644
index 0000000000..6c98c0eb9b
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldNameFormatAttr.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideFieldName} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid Elide Field Name.
+ * </p>
+ */
+public class ElideFieldNameFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern FIELD_NAME_FORMAT_REGEX = Pattern.compile("^[a-z][0-9A-Za-z_]*$");
+    private static final Set<String> RESERVED_KEYWORDS_FOR_COLUMN_NAME = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+
+    static {
+        RESERVED_KEYWORDS_FOR_COLUMN_NAME.add("id");
+        RESERVED_KEYWORDS_FOR_COLUMN_NAME.add("sql");
+    }
+
+    public static final String FORMAT_NAME = "elideFieldName";
+    public static final String NAME_KEY = "elideFieldName.error.name";
+    public static final String NAME_MSG =
+                    "Field name [%s] is not allowed. Field name cannot be one of " + RESERVED_KEYWORDS_FOR_COLUMN_NAME;
+    public static final String FORMAT_KEY = "elideFieldName.error.format";
+    public static final String FORMAT_MSG = "Field name [%s] is not allowed. Field name must start with "
+                    + "lower case alphabet and can include alaphabets, numbers and '_' only.";
+
+    public ElideFieldNameFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!FIELD_NAME_FORMAT_REGEX.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+
+        if (RESERVED_KEYWORDS_FOR_COLUMN_NAME.contains(input)) {
+            report.error(newMsg(data, bundle, NAME_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldTypeFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldTypeFormatAttr.java
new file mode 100644
index 0000000000..4c7584dd35
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideFieldTypeFormatAttr.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideFieldType} format attribute.
+ * <p>
+ * This specifier will check if a string instance is one of {@code Integer, Decimal, Money, Text, Coordinate, Boolean}.
+ * </p>
+ */
+public class ElideFieldTypeFormatAttr extends AbstractFormatAttribute {
+    public static final Pattern FIELD_TYPE_PATTERN =
+            Pattern.compile("^(?i)(Integer|Decimal|Money|Text|Coordinate|Boolean|Enum_Text|Enum_Ordinal)$");
+
+    public static final String FORMAT_NAME = "elideFieldType";
+    public static final String TYPE_KEY = "elideFieldType.error.enum";
+    public static final String TYPE_MSG = "Field type [%s] is not allowed. Supported value is one of "
+            + "[Integer, Decimal, Money, Text, Coordinate, Boolean, Enum_Text, Enum_Ordinal].";
+
+    public ElideFieldTypeFormatAttr() {
+        this(FORMAT_NAME);
+    }
+
+    public ElideFieldTypeFormatAttr(String formatName) {
+        super(formatName, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+            throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!FIELD_TYPE_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideGrainTypeFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideGrainTypeFormatAttr.java
new file mode 100644
index 0000000000..e3bb8215c8
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideGrainTypeFormatAttr.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideGrainType} format attribute.
+ * <p>
+ * This specifier will check if a string instance is one of
+ * {@code Second, Minute, Hour, Day, IsoWeek, Week, Month, Quarter, Year}.
+ * </p>
+ */
+public class ElideGrainTypeFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern GRAIN_TYPE_PATTERN =
+            Pattern.compile("^(?i)(Second|Minute|Hour|Day|IsoWeek|Week|Month|Quarter|Year)$");
+
+    public static final String FORMAT_NAME = "elideGrainType";
+    public static final String TYPE_KEY = "elideGrainType.error.enum";
+    public static final String TYPE_MSG = "Grain type [%s] is not allowed. Supported value is one of "
+            + "[Second, Minute, Hour, Day, IsoWeek, Week, Month, Quarter, Year].";
+
+    public ElideGrainTypeFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+            throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!GRAIN_TYPE_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJDBCUrlFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJDBCUrlFormatAttr.java
new file mode 100644
index 0000000000..9cb8275942
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJDBCUrlFormatAttr.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+/**
+ * Format specifier for {@code elideJdbcUrl} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid JDBC url.
+ * </p>
+ */
+public class ElideJDBCUrlFormatAttr extends AbstractFormatAttribute {
+
+    public static final String FORMAT_NAME = "elideJdbcUrl";
+    public static final String FORMAT_KEY = "elideJdbcUrl.error.format";
+    public static final String FORMAT_MSG = "Input value [%s] is not a valid JDBC url, it must start with 'jdbc:'.";
+
+    public ElideJDBCUrlFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!input.startsWith("jdbc:")) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinKindFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinKindFormatAttr.java
new file mode 100644
index 0000000000..a45212fdd4
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinKindFormatAttr.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideJoinKind} format attribute.
+ * <p>
+ * This specifier will check if a string instance is one of {@code ToOne, ToMany}.
+ * </p>
+ */
+public class ElideJoinKindFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern JOIN_KIND_PATTERN = Pattern.compile("^(?i)(ToOne|ToMany)$");
+
+    public static final String FORMAT_NAME = "elideJoinKind";
+    public static final String TYPE_KEY = "elideJoinKind.error.enum";
+    public static final String TYPE_MSG = "Join kind [%s] is not allowed. Supported value is one of [ToOne, ToMany].";
+
+    public ElideJoinKindFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!JOIN_KIND_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinTypeFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinTypeFormatAttr.java
new file mode 100644
index 0000000000..0200e4ed40
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideJoinTypeFormatAttr.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideJoinType} format attribute.
+ * <p>
+ * This specifier will check if a string instance is one of {@code left, inner, full, cross}.
+ * </p>
+ */
+public class ElideJoinTypeFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern JOIN_TYPE_PATTERN = Pattern.compile("^(?i)(left|inner|full|cross)$");
+
+    public static final String FORMAT_NAME = "elideJoinType";
+    public static final String TYPE_KEY = "elideJoinType.error.enum";
+    public static final String TYPE_MSG =
+                    "Join type [%s] is not allowed. Supported value is one of [left, inner, full, cross].";
+
+    public ElideJoinTypeFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!JOIN_TYPE_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNameFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNameFormatAttr.java
new file mode 100644
index 0000000000..5d60adb495
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNameFormatAttr.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideName} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid Elide Name.
+ * </p>
+ */
+public class ElideNameFormatAttr extends AbstractFormatAttribute {
+    public static final Pattern NAME_FORMAT_REGEX = Pattern.compile("^[A-Za-z][0-9A-Za-z_]*$");
+
+    public static final String FORMAT_NAME = "elideName";
+    public static final String FORMAT_KEY = "elideName.error.format";
+    public static final String FORMAT_MSG =
+                    "Name [%s] is not allowed. Name must start with an alphabetic character and can include "
+                    + "alaphabets, numbers and '_' only.";
+
+    public ElideNameFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!NAME_FORMAT_REGEX.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNamespaceNameFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNamespaceNameFormatAttr.java
new file mode 100644
index 0000000000..6ecfc0a84a
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideNamespaceNameFormatAttr.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideNamespaceName} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid Elide Name.
+ * </p>
+ */
+public class ElideNamespaceNameFormatAttr extends AbstractFormatAttribute {
+    public static final Pattern NAME_FORMAT_REGEX = ElideNameFormatAttr.NAME_FORMAT_REGEX;
+
+    public static final String FORMAT_NAME = "elideNamespaceName";
+    public static final String FORMAT_KEY = "elideNamespaceName.error.format";
+    public static final String FORMAT_ADDITIONAL_KEY = "elideNamespaceName.error.additional";
+    public static final String FORMAT_KEY_MSG =
+                    "Name [%s] is not allowed. Name must start with an alphabetic character and can include "
+                    + "alaphabets, numbers and '_' only.";
+    public static final String FORMAT_ADDITIONAL_KEY_MSG =
+            "Name [%s] clashes with the 'default' namespace. Either change the case or pick a different namespace "
+            + "name.";
+    public static final String DEFAULT_NAME = "default";
+
+    public ElideNamespaceNameFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!NAME_FORMAT_REGEX.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+
+        if (!input.equals(DEFAULT_NAME) && input.toLowerCase(Locale.ENGLISH).equals(DEFAULT_NAME)) {
+            report.error(newMsg(data, bundle, FORMAT_ADDITIONAL_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRSQLFilterFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRSQLFilterFormatAttr.java
new file mode 100644
index 0000000000..f9f586b4f7
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRSQLFilterFormatAttr.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import static com.yahoo.elide.core.filter.dialect.RSQLFilterDialect.getDefaultOperatorsWithIsnull;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import cz.jirutka.rsql.parser.RSQLParser;
+import cz.jirutka.rsql.parser.RSQLParserException;
+
+/**
+ * Format specifier for {@code elideRSQLFilter} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid RSQL filter.
+ * </p>
+ */
+public class ElideRSQLFilterFormatAttr extends AbstractFormatAttribute {
+
+    public static final String FORMAT_NAME = "elideRSQLFilter";
+    public static final String FORMAT_KEY = "elideRSQLFilter.error.format";
+    public static final String FORMAT_MSG = "Input value[%s] is not a valid RSQL filter expression. Please visit page "
+                    + "https://elide.io/pages/guide/v5/11-graphql.html#operators for samples.";
+
+    public ElideRSQLFilterFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        try {
+            new RSQLParser(getDefaultOperatorsWithIsnull()).parse(input);
+        } catch (RSQLParserException e) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRoleFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRoleFormatAttr.java
new file mode 100644
index 0000000000..e030391f22
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideRoleFormatAttr.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideRole} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid Elide role.
+ * </p>
+ */
+public class ElideRoleFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern ROLE_FORMAT_REGEX = Pattern.compile("^[A-Za-z][0-9A-Za-z. ]*$");
+
+    public static final String FORMAT_NAME = "elideRole";
+    public static final String FORMAT_KEY = "elideRole.error.format";
+    public static final String FORMAT_MSG =
+                    "Role [%s] is not allowed. Role must start with an alphabetic character and can include "
+                    + "alaphabets, numbers, spaces and '.' only.";
+
+    public ElideRoleFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!ROLE_FORMAT_REGEX.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideTimeFieldTypeFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideTimeFieldTypeFormatAttr.java
new file mode 100644
index 0000000000..6558d09ae5
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ElideTimeFieldTypeFormatAttr.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code elideTimeFieldType} format attribute.
+ * <p>
+ * This specifier will check if a string instance is {@code Time}.
+ * </p>
+ */
+public class ElideTimeFieldTypeFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern TIME_FIELD_TYPE_PATTERN = Pattern.compile("^(?i)(Time)$");
+
+    public static final String FORMAT_NAME = "elideTimeFieldType";
+    public static final String TYPE_KEY = "elideTimeFieldType.error.enum";
+    public static final String TYPE_MSG = "Field type [%s] is not allowed. Field type must be "
+                    + "[Time] for any time dimension.";
+
+    public ElideTimeFieldTypeFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!TIME_FIELD_TYPE_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, TYPE_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameFormatAttr.java
new file mode 100644
index 0000000000..268186d356
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameFormatAttr.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code javaClassName} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid JAVA Class Name.
+ * </p>
+ */
+public class JavaClassNameFormatAttr extends AbstractFormatAttribute {
+    private static final String ID_PATTERN = "\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
+    public static final Pattern CLASS_NAME_FORMAT_PATTERN = Pattern.compile(ID_PATTERN + "(\\." + ID_PATTERN + ")*");
+
+    public static final String FORMAT_NAME = "javaClassName";
+    public static final String FORMAT_KEY = "javaClassName.error.format";
+    public static final String FORMAT_MSG = "Input value[%s] is not a valid Java class name.";
+
+    public JavaClassNameFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!CLASS_NAME_FORMAT_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameWithExtFormatAttr.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameWithExtFormatAttr.java
new file mode 100644
index 0000000000..d31255dfe5
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/JavaClassNameWithExtFormatAttr.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.format.AbstractFormatAttribute;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+
+import java.util.regex.Pattern;
+
+/**
+ * Format specifier for {@code javaClassNameWithExt} format attribute.
+ * <p>
+ * This specifier will check if a string instance is a valid JAVA Class Name with {@code .class} extension.
+ * </p>
+ */
+public class JavaClassNameWithExtFormatAttr extends AbstractFormatAttribute {
+    private static final Pattern CLASS_NAME_FORMAT_PATTERN =
+            Pattern.compile("^(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+class$");
+
+    public static final String FORMAT_NAME = "javaClassNameWithExt";
+    public static final String FORMAT_KEY = "javaClassNameWithExt.error.format";
+    public static final String FORMAT_MSG = "Input value[%s] is not a valid Java class name with .class extension.";
+
+    public JavaClassNameWithExtFormatAttr() {
+        super(FORMAT_NAME, NodeType.STRING);
+    }
+
+    @Override
+    public void validate(final ProcessingReport report, final MessageBundle bundle, final FullData data)
+                    throws ProcessingException {
+        final String input = data.getInstance().getNode().textValue();
+
+        if (!CLASS_NAME_FORMAT_PATTERN.matcher(input).matches()) {
+            report.error(newMsg(data, bundle, FORMAT_KEY).putArgument("value", input));
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesKeyword.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesKeyword.java
new file mode 100644
index 0000000000..f4bce95ab6
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesKeyword.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.keyword.syntax.checkers.AbstractSyntaxChecker;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.core.tree.SchemaTree;
+import com.github.fge.jsonschema.keyword.digest.AbstractDigester;
+import com.github.fge.jsonschema.library.Keyword;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import lombok.Getter;
+
+import java.util.Collection;
+
+/**
+ * Creates custom keyword for {@code validateArgumentProperties}.
+ */
+public class ValidateArgsPropertiesKeyword {
+
+    @Getter
+    private Keyword keyword;
+
+    public ValidateArgsPropertiesKeyword() {
+        keyword = Keyword.newBuilder(ValidateArgsPropertiesValidator.KEYWORD)
+                        .withSyntaxChecker(new ValidateArgsPropertiesSyntaxChecker())
+                        .withDigester(new ValidateArgsPropertiesDigester())
+                        .withValidatorClass(ValidateArgsPropertiesValidator.class)
+                        .freeze();
+    }
+
+    /**
+     * Defines custom SyntaxChecker for {@code validateArgumentProperties}.
+     */
+    private class ValidateArgsPropertiesSyntaxChecker extends AbstractSyntaxChecker {
+
+        public ValidateArgsPropertiesSyntaxChecker() {
+            super(ValidateArgsPropertiesValidator.KEYWORD, NodeType.BOOLEAN);
+        }
+
+        @Override
+        protected void checkValue(Collection<JsonPointer> pointers, MessageBundle bundle, ProcessingReport report,
+                        SchemaTree tree) throws ProcessingException {
+            // AbstractSyntaxChecker has already verified that value is of type Boolean
+            // No additional Checks Required
+        }
+    }
+
+    /**
+     * Defines custom Digester for {@code validateArgumentProperties}.
+     */
+    private class ValidateArgsPropertiesDigester extends AbstractDigester {
+
+        public ValidateArgsPropertiesDigester() {
+            super(ValidateArgsPropertiesValidator.KEYWORD, NodeType.OBJECT);
+        }
+
+        @Override
+        public JsonNode digest(final JsonNode schema) {
+            final ObjectNode node = FACTORY.objectNode();
+            node.put(keyword, schema.get(keyword).asBoolean(true));
+
+            return node;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesValidator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesValidator.java
new file mode 100644
index 0000000000..98bbbc6750
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateArgsPropertiesValidator.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.processing.Processor;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * Defines custom Keyword Validator for {@code validateArgumentProperties}.
+ * <p>
+ * This validator checks not both {@code tableSource} and {@code values} property is defined for any argument.
+ * </p>
+ */
+public class ValidateArgsPropertiesValidator extends AbstractKeywordValidator {
+
+    public static final String KEYWORD = "validateArgumentProperties";
+    public static final String ATMOST_ONE_KEY = "validateArgumentProperties.error.atmostOne";
+    public static final String ATMOST_ONE_MSG =
+                    "tableSource and values cannot both be defined for an argument. Choose One or None.";
+
+    private boolean validate;
+
+    public ValidateArgsPropertiesValidator(final JsonNode digest) {
+        super(KEYWORD);
+        validate = digest.get(keyword).booleanValue();
+    }
+
+    @Override
+    public void validate(Processor<FullData, FullData> processor, ProcessingReport report, MessageBundle bundle,
+                    FullData data) throws ProcessingException {
+
+        if (validate) {
+            JsonNode instance = data.getInstance().getNode();
+            Set<String> fields = Sets.newHashSet(instance.fieldNames());
+
+            if (fields.contains("values") && fields.contains("tableSource")) {
+                report.error(newMsg(data, bundle, ATMOST_ONE_KEY));
+            }
+
+        }
+    }
+
+    @Override
+    public String toString() {
+        return keyword;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesKeyword.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesKeyword.java
new file mode 100644
index 0000000000..6b4bda6da9
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesKeyword.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.keyword.syntax.checkers.AbstractSyntaxChecker;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.core.tree.SchemaTree;
+import com.github.fge.jsonschema.keyword.digest.AbstractDigester;
+import com.github.fge.jsonschema.library.Keyword;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import lombok.Getter;
+
+import java.util.Collection;
+
+/**
+ * Creates custom keyword for {@code validateDimensionProperties}.
+ */
+public class ValidateDimPropertiesKeyword {
+
+    @Getter
+    private Keyword keyword;
+
+    public ValidateDimPropertiesKeyword() {
+        keyword = Keyword.newBuilder(ValidateDimPropertiesValidator.KEYWORD)
+                        .withSyntaxChecker(new ValidateDimPropertiesSyntaxChecker())
+                        .withDigester(new ValidateDimPropertiesDigester())
+                        .withValidatorClass(ValidateDimPropertiesValidator.class)
+                        .freeze();
+    }
+
+    /**
+     * Defines custom SyntaxChecker for {@code validateDimensionProperties}.
+     */
+    private class ValidateDimPropertiesSyntaxChecker extends AbstractSyntaxChecker {
+
+        public ValidateDimPropertiesSyntaxChecker() {
+            super(ValidateDimPropertiesValidator.KEYWORD, NodeType.BOOLEAN);
+        }
+
+        @Override
+        protected void checkValue(Collection<JsonPointer> pointers, MessageBundle bundle, ProcessingReport report,
+                        SchemaTree tree) throws ProcessingException {
+            // AbstractSyntaxChecker has already verified that value is of type Boolean
+            // No additional Checks Required
+        }
+    }
+
+    /**
+     * Defines custom Digester for {@code validateDimensionProperties}.
+     */
+    private class ValidateDimPropertiesDigester extends AbstractDigester {
+
+        public ValidateDimPropertiesDigester() {
+            super(ValidateDimPropertiesValidator.KEYWORD, NodeType.OBJECT);
+        }
+
+        @Override
+        public JsonNode digest(final JsonNode schema) {
+            final ObjectNode node = FACTORY.objectNode();
+            node.put(keyword, schema.get(keyword).asBoolean(true));
+            return node;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesValidator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesValidator.java
new file mode 100644
index 0000000000..718a1430f1
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateDimPropertiesValidator.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.processing.Processor;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * Defines custom Keyword Validator for {@code validateDimensionProperties}.
+ * <p>
+ * This validator checks neither additional properties are defined for any dimension nor not both {@code tableSource}
+ * and {@code values} property is defined for any dimension.
+ * </p>
+ */
+public class ValidateDimPropertiesValidator extends AbstractKeywordValidator {
+
+    public static final Set<String> COMMON_DIM_PROPERTIES = ImmutableSet.of("name", "friendlyName",
+                    "description", "category", "hidden", "readAccess", "definition", "cardinality", "tags", "type",
+                    "arguments", "filterTemplate");
+    private static final Set<String> ADDITIONAL_DIM_PROPERTIES = ImmutableSet.of("values", "tableSource");
+
+    public static final String KEYWORD = "validateDimensionProperties";
+    public static final String ATMOST_ONE_KEY = "validateDimensionProperties.error.atmostOne";
+    public static final String ATMOST_ONE_MSG =
+                    "tableSource and values cannot both be defined for a dimension. Choose One or None.";
+    public static final String ADDITIONAL_KEY = "validateDimensionProperties.error.addtional";
+    public static final String ADDITIONAL_MSG = "Properties: %s are not allowed for dimensions.";
+
+    private boolean validate;
+
+    public ValidateDimPropertiesValidator(final JsonNode digest) {
+        super(KEYWORD);
+        validate = digest.get(keyword).booleanValue();
+    }
+
+    @Override
+    public void validate(Processor<FullData, FullData> processor, ProcessingReport report, MessageBundle bundle,
+                    FullData data) throws ProcessingException {
+
+        if (validate) {
+            JsonNode instance = data.getInstance().getNode();
+            Set<String> fields = Sets.newHashSet(instance.fieldNames());
+
+            if (fields.contains("values") && fields.contains("tableSource")) {
+                report.error(newMsg(data, bundle, ATMOST_ONE_KEY));
+            }
+
+            fields.removeAll(COMMON_DIM_PROPERTIES);
+            fields.removeAll(ADDITIONAL_DIM_PROPERTIES);
+            if (!fields.isEmpty()) {
+                report.error(newMsg(data, bundle, ADDITIONAL_KEY).putArgument("value", fields.toString()));
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return keyword;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesKeyword.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesKeyword.java
new file mode 100644
index 0000000000..b985843e1f
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesKeyword.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.keyword.syntax.checkers.AbstractSyntaxChecker;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.core.tree.SchemaTree;
+import com.github.fge.jsonschema.keyword.digest.AbstractDigester;
+import com.github.fge.jsonschema.library.Keyword;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import lombok.Getter;
+
+import java.util.Collection;
+
+/**
+ * Creates custom keyword for {@code validateTimeDimensionProperties}.
+ */
+public class ValidateTimeDimPropertiesKeyword {
+
+    @Getter
+    private Keyword keyword;
+
+    public ValidateTimeDimPropertiesKeyword() {
+        keyword = Keyword.newBuilder(ValidateTimeDimPropertiesValidator.KEYWORD)
+                        .withSyntaxChecker(new ValidateTimeDimPropertiesSyntaxChecker())
+                        .withDigester(new ValidateTimeDimPropertiesDigester())
+                        .withValidatorClass(ValidateTimeDimPropertiesValidator.class)
+                        .freeze();
+    }
+
+    /**
+     * Defines custom SyntaxChecker for {@code validateTimeDimensionProperties}.
+     */
+    private class ValidateTimeDimPropertiesSyntaxChecker extends AbstractSyntaxChecker {
+
+        public ValidateTimeDimPropertiesSyntaxChecker() {
+            super(ValidateTimeDimPropertiesValidator.KEYWORD, NodeType.BOOLEAN);
+        }
+
+        @Override
+        protected void checkValue(Collection<JsonPointer> pointers, MessageBundle bundle, ProcessingReport report,
+                        SchemaTree tree) throws ProcessingException {
+            // AbstractSyntaxChecker has already verified that value is of type Boolean
+            // No additional Checks Required
+        }
+    }
+
+    /**
+     * Defines custom Digester for {@code validateTimeDimensionProperties}.
+     */
+    private class ValidateTimeDimPropertiesDigester extends AbstractDigester {
+
+        public ValidateTimeDimPropertiesDigester() {
+            super(ValidateTimeDimPropertiesValidator.KEYWORD, NodeType.OBJECT);
+        }
+
+        @Override
+        public JsonNode digest(final JsonNode schema) {
+            final ObjectNode node = FACTORY.objectNode();
+            node.put(keyword, schema.get(keyword).asBoolean(true));
+            return node;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesValidator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesValidator.java
new file mode 100644
index 0000000000..c99202b847
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/jsonformats/ValidateTimeDimPropertiesValidator.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.jsonformats;
+
+import static com.yahoo.elide.modelconfig.jsonformats.ValidateDimPropertiesValidator.COMMON_DIM_PROPERTIES;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.processing.Processor;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator;
+import com.github.fge.jsonschema.processors.data.FullData;
+import com.github.fge.msgsimple.bundle.MessageBundle;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * Defines custom Keyword Validator for {@code validateTimeDimensionProperties}.
+ * <p>
+ * This validator checks no additional properties are defined for any time dimension.
+ * </p>
+ */
+public class ValidateTimeDimPropertiesValidator extends AbstractKeywordValidator {
+
+    private static final Set<String> ADDITIONAL_TIME_DIM_PROPERTIES = ImmutableSet.of("grains");
+
+    public static final String KEYWORD = "validateTimeDimensionProperties";
+    public static final String ADDITIONAL_KEY = "validateTimeDimensionProperties.error.addtional";
+    public static final String ADDITIONAL_MSG = "Properties: %s are not allowed for time dimensions.";
+
+    private boolean validate;
+
+    public ValidateTimeDimPropertiesValidator(final JsonNode digest) {
+        super(KEYWORD);
+        validate = digest.get(keyword).booleanValue();
+    }
+
+    @Override
+    public void validate(Processor<FullData, FullData> processor, ProcessingReport report, MessageBundle bundle,
+                    FullData data) throws ProcessingException {
+
+        if (validate) {
+            JsonNode instance = data.getInstance().getNode();
+            Set<String> fields = Sets.newHashSet(instance.fieldNames());
+
+            fields.removeAll(COMMON_DIM_PROPERTIES);
+            fields.removeAll(ADDITIONAL_TIME_DIM_PROPERTIES);
+            if (!fields.isEmpty()) {
+                report.error(newMsg(data, bundle, ADDITIONAL_KEY).putArgument("value", fields.toString()));
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return keyword;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java
new file mode 100644
index 0000000000..9416c753a0
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Argument Model.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "description",
+    "type",
+    "values",
+    "tableSource",
+    "default"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Argument implements Named {
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("values")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> values = new LinkedHashSet<>();
+
+    @JsonProperty("tableSource")
+    private TableSource tableSource;
+
+    @JsonProperty("default")
+    private Object defaultValue;
+
+    /**
+     * Returns description of the argument.
+     * If null, returns the name
+     * @return description
+     */
+    public String getDescription() {
+        return (this.description == null ? getName() : this.description);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/DBConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/DBConfig.java
new file mode 100644
index 0000000000..1d04b1c999
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/DBConfig.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * DB Config JSON.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "url",
+    "driver",
+    "user",
+    "dialect",
+    "propertyMap"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class DBConfig implements Named {
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("url")
+    private String url;
+
+    @JsonProperty("driver")
+    private String driver;
+
+    @JsonProperty("user")
+    private String user;
+
+    @JsonProperty("dialect")
+    private String dialect;
+
+    @JsonProperty("propertyMap")
+    @JsonDeserialize(as = HashMap.class)
+    private Map<String, Object> propertyMap = new HashMap<>();
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java
new file mode 100644
index 0000000000..0b801d31c4
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.Singular;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Dimensions represent labels for measures.
+ * Dimensions are used to filter and group measures.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "friendlyName",
+    "description",
+    "category",
+    "hidden",
+    "readAccess",
+    "definition",
+    "cardinality",
+    "type",
+    "grains",
+    "tags",
+    "arguments",
+    "values",
+    "tableSource",
+    "filterTemplate"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Dimension implements Named {
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("friendlyName")
+    private String friendlyName;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("category")
+    private String category;
+
+    @JsonProperty("hidden")
+    @Builder.Default
+    private Boolean hidden = false;
+
+    @JsonProperty("readAccess")
+    @Builder.Default
+    private String readAccess = "Prefab.Role.All";
+
+    @JsonProperty("definition")
+    private String definition;
+
+    @JsonProperty("cardinality")
+    private String cardinality;
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("grains")
+    @Singular
+    private List<Grain> grains = new ArrayList<>();
+
+    @JsonProperty("tags")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> tags = new LinkedHashSet<>();
+
+    @JsonProperty("arguments")
+    @Singular
+    private List<Argument> arguments = new ArrayList<>();
+
+    @JsonProperty("values")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> values = new LinkedHashSet<>();
+
+    @JsonProperty("tableSource")
+    private TableSource tableSource;
+
+    @JsonProperty("filterTemplate")
+    private String filterTemplate;
+
+    /**
+     * Returns description of the dimension.
+     * If null, returns the name.
+     * @return description
+     */
+    public String getDescription() {
+        return (this.description == null ? getName() : this.description);
+    }
+
+    /**
+     * Checks if this dimension has provided argument.
+     * @param argName Name of the {@link Argument} to  check for.
+     * @return true if this dimension has provided argument.
+     */
+    public boolean hasArgument(String argName) {
+        return hasName(this.arguments, argName);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideDBConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideDBConfig.java
new file mode 100644
index 0000000000..9ab5863076
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideDBConfig.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Elide DB POJO.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "dbconfigs"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class ElideDBConfig {
+
+    @JsonProperty("dbconfigs")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<DBConfig> dbconfigs = new LinkedHashSet<>();
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideNamespaceConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideNamespaceConfig.java
new file mode 100644
index 0000000000..ffa623df6b
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideNamespaceConfig.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import static com.yahoo.elide.modelconfig.model.NamespaceConfig.DEFAULT;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Elide Namespace POJO.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "namespaces"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class ElideNamespaceConfig {
+
+    @JsonProperty("namespaces")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<NamespaceConfig> namespaceconfigs = new LinkedHashSet<>();
+
+    /**
+     * Checks if a namespace exists with the given name.
+     * @param name namespace Name
+     * @return true if a dynamic namespace exists with the given name.
+     */
+    public boolean hasNamespace(String name, String version) {
+        String nameLower = name.toLowerCase(Locale.ENGLISH);
+        if (nameLower.equals(DEFAULT)) {
+            return true;
+        }
+
+        return namespaceconfigs
+                .stream()
+                .filter(namespace -> namespace.getApiVersion().equals(version))
+                .map(Named::getName)
+                .anyMatch(name::equals);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSQLDBConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSQLDBConfig.java
new file mode 100644
index 0000000000..3860b55d0b
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSQLDBConfig.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+/**
+ * Elide SQL DB POJO.
+ */
+public class ElideSQLDBConfig extends ElideDBConfig {
+
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSecurityConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSecurityConfig.java
new file mode 100644
index 0000000000..69699385e0
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideSecurityConfig.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Elide Security POJO.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "roles",
+    "rules"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class ElideSecurityConfig {
+
+    @JsonProperty("roles")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> roles = new LinkedHashSet<>();
+
+    @JsonProperty("rules")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<Rule> rules = new LinkedHashSet<>();
+
+    public boolean hasCheckDefined(String role) {
+
+        return roles
+                   .stream()
+                   .anyMatch(role::equals);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideTableConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideTableConfig.java
new file mode 100644
index 0000000000..1dbd73a0a5
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/ElideTableConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Elide Table POJO.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "tables"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class ElideTableConfig {
+
+    @JsonProperty("tables")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<Table> tables = new LinkedHashSet<>();
+
+    /**
+     * Checks if a dynamic model exists with the given name.
+     * @param name Model Name
+     * @return true if a dynamic model exists with the given name.
+     */
+    public boolean hasTable(String name) {
+        return tables
+                   .stream()
+                   .map(Named::getGlobalName)
+                   .anyMatch(name::equals);
+    }
+
+    /**
+     * Provides the dynamic model with the given name.
+     * @param name Model Name
+     * @return dynamic model with the given name.
+     */
+    public Table getTable(String name) {
+        return tables
+                   .stream()
+                   .filter(t -> t.getGlobalName().equals(name))
+                   .findFirst()
+                   .orElse(null);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Grain.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Grain.java
new file mode 100644
index 0000000000..0b9d821a33
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Grain.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * Grain can have SQL expressions that can substitute column
+ * with the dimension definition expression.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "type",
+    "sql"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Grain {
+
+
+    @JsonProperty("type")
+    private Grain.GrainType type;
+
+    @JsonProperty("sql")
+    private String sql;
+
+    public enum GrainType {
+
+        DAY("DAY"),
+        HOUR("HOUR"),
+        ISOWEEK("ISOWEEK"),
+        MINUTE("MINUTE"),
+        MONTH("MONTH"),
+        QUARTER("QUARTER"),
+        SECOND("SECOND"),
+        WEEK("WEEK"),
+        YEAR("YEAR");
+
+        private final String value;
+
+        private GrainType(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java
new file mode 100644
index 0000000000..55627f1c73
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import static com.yahoo.elide.modelconfig.model.NamespaceConfig.DEFAULT;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * Joins describe the SQL expression necessary to join two physical tables.
+ * Joins can be used when defining dimension columns that reference other tables.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "namespace",
+    "to",
+    "type",
+    "kind",
+    "definition"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Join implements Named {
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("namespace")
+    private String namespace = DEFAULT;
+
+    @JsonProperty("to")
+    private String to;
+
+    @JsonProperty("type")
+    private Join.Type type;
+
+    @JsonProperty("kind")
+    private Join.Kind kind = Join.Kind.TOONE;
+
+    @JsonProperty("definition")
+    private String definition;
+
+    /**
+     * Returns the destination table of the join.
+     * @return The global name of the destination join table.
+     */
+    public String getTo() {
+        if (namespace == null || namespace.isEmpty() || namespace.equals(DEFAULT)) {
+            return to;
+        }
+
+        return namespace + "_" + to;
+    }
+
+    public enum Kind {
+
+        TOONE("toOne"),
+        TOMANY("toMany");
+
+        private final String value;
+
+        private Kind(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+    }
+
+    public enum Type {
+
+        LEFT("left"),
+        INNER("inner"),
+        FULL("full"),
+        CROSS("cross");
+
+        private final String value;
+
+        private Type(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java
new file mode 100644
index 0000000000..046c161dab
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.Singular;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Measures represent metrics that can be aggregated at query time.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "friendlyName",
+    "description",
+    "category",
+    "hidden",
+    "readAccess",
+    "definition",
+    "maker",
+    "type",
+    "tags",
+    "arguments",
+    "filterTemplate"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Measure implements Named {
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("friendlyName")
+    private String friendlyName;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("category")
+    private String category;
+
+    @JsonProperty("hidden")
+    @Builder.Default
+    private Boolean hidden = false;
+
+    @JsonProperty("readAccess")
+    @Builder.Default
+    private String readAccess = "Prefab.Role.All";
+
+    @JsonProperty("definition")
+    private String definition;
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("maker")
+    private String maker;
+
+    @JsonProperty("tags")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> tags = new LinkedHashSet<>();
+
+    @JsonProperty("arguments")
+    @Singular
+    private List<Argument> arguments = new ArrayList<>();
+
+    @JsonProperty("filterTemplate")
+    private String filterTemplate;
+
+    /**
+     * Returns description of the measure.
+     * If null, returns the name.
+     * @return description
+     */
+    public String getDescription() {
+        return (this.description == null ? getName() : this.description);
+    }
+
+    /**
+     * Checks if this measure has provided argument.
+     * @param argName Name of the {@link Argument} to  check for.
+     * @return true if this measure has provided argument.
+     */
+    public boolean hasArgument(String argName) {
+        return hasName(this.arguments, argName);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Named.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Named.java
new file mode 100644
index 0000000000..a0022c5fbc
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Named.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import java.util.Collection;
+
+public interface Named {
+    /**
+     * Get the name local to its parent.
+     * @return the local name
+     */
+    String getName();
+
+    /**
+     * Get the globally unique name .
+     * @return the global name
+     */
+    default String getGlobalName() {
+        return getName();
+    }
+
+    /**
+     * Checks if the collection has an object with given name.
+     * @param collection of object with name property
+     * @param name to search for in given collection
+     * @return true if the collection has an object with given name.
+     */
+    default boolean hasName(Collection<? extends Named> collection, String name) {
+        return collection
+                        .stream()
+                        .map(Named::getGlobalName)
+                        .anyMatch(name::equals);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/NamespaceConfig.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/NamespaceConfig.java
new file mode 100644
index 0000000000..d14358c8ca
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/NamespaceConfig.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * Namespace Config JSON.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "friendlyName",
+    "readAccess",
+    "description",
+    "apiVersion"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class NamespaceConfig implements Named {
+
+    public static String DEFAULT = "default";
+
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("friendlyName")
+    private String friendlyName;
+
+    @Builder.Default
+    @JsonProperty("readAccess")
+    private String readAccess = "Prefab.Role.All";
+
+    @JsonProperty("description")
+    private String description;
+
+    @Builder.Default
+    @JsonProperty("apiVersion")
+    private String apiVersion = EntityDictionary.NO_VERSION;
+
+    /**
+     * Returns description of the namespace object.
+     * If null, returns the name.
+     * @return description
+     */
+    public String getDescription() {
+        return (this.description == null ? getName() : this.description);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Rule.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Rule.java
new file mode 100644
index 0000000000..b05fea1512
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Rule.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * Rules are a list of RSQL filter expression templates that
+ * support property expansion on the principal object.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "type",
+    "filter",
+    "name"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+public class Rule {
+
+    @JsonProperty("type")
+    private Rule.Type type;
+
+    @JsonProperty("filter")
+    private String filter;
+
+    @JsonProperty("name")
+    private String name;
+
+    public enum Type {
+
+        FILTER("filter");
+        private final String value;
+
+        private Type(String value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        @Override
+        public String toString() {
+            return this.value;
+        }
+    }
+
+    public enum Filter {
+
+        FILTER("filter");
+        private final String value;
+
+        private Filter(String value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        @Override
+        public String toString() {
+            return this.value;
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java
new file mode 100644
index 0000000000..b7fd5ec2b4
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import static com.yahoo.elide.modelconfig.model.NamespaceConfig.DEFAULT;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.google.common.collect.Streams;
+import org.apache.commons.lang3.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.Singular;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Table Model JSON.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "friendlyName",
+    "schema",
+    "isFact",
+    "hidden",
+    "description",
+    "cardinality",
+    "readAccess",
+    "namespace",
+    "joins",
+    "measures",
+    "dimensions",
+    "tags",
+    "hints",
+    "arguments",
+    "extend",
+    "sql",
+    "table",
+    "dbConnectionName",
+    "filterTemplate"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Table implements Named {
+    @JsonProperty("name")
+    private String name;
+
+    @JsonProperty("friendlyName")
+    private String friendlyName;
+
+    @JsonProperty("schema")
+    private String schema;
+
+    @JsonProperty("dbConnectionName")
+    private String dbConnectionName;
+
+    @Builder.Default
+    @JsonProperty("isFact")
+    private Boolean isFact = true;
+
+    @Builder.Default
+    @JsonProperty("hidden")
+    private Boolean hidden = false;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("category")
+    private String category;
+
+    @JsonProperty("filterTemplate")
+    private String filterTemplate;
+
+    @JsonProperty("cardinality")
+    private String cardinality;
+
+    @Builder.Default
+    @JsonProperty("readAccess")
+    private String readAccess = "Prefab.Role.All";
+
+    @Builder.Default
+    @JsonProperty("namespace")
+    private String namespace = DEFAULT;
+
+    @JsonProperty("joins")
+    @Singular
+    private List<Join> joins = new ArrayList<>();
+
+    @JsonProperty("measures")
+    @Singular
+    private List<Measure> measures = new ArrayList<>();
+
+    @JsonProperty("dimensions")
+    @Singular
+    private List<Dimension> dimensions = new ArrayList<>();
+
+    @Builder.Default
+    @JsonProperty("tags")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> tags = new LinkedHashSet<>();
+
+    @Builder.Default
+    @JsonProperty("hints")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> hints = new LinkedHashSet<>();
+
+    @JsonProperty("arguments")
+    @Singular
+    private List<Argument> arguments = new ArrayList<>();
+
+    @JsonProperty("extend")
+    private String extend;
+
+    @JsonProperty("sql")
+    private String sql;
+
+    @JsonProperty("table")
+    private String table;
+
+    /**
+     * Returns description of the table object.
+     * If null, returns the name.
+     * @return description
+     */
+    public String getDescription() {
+        return (this.description == null ? getName() : this.description);
+    }
+
+    /**
+     * Checks if this model has provided field.
+     * @param fieldName Name of the {@link Dimension} or {@link Measure} to check for.
+     * @return true if this model has provided field.
+     */
+    public boolean hasField(String fieldName) {
+        return hasName(this.dimensions, fieldName) || hasName(this.measures, fieldName);
+    }
+
+    /**
+     * Provides the Field details for provided field name.
+     * @param fieldName Name of {@link Dimension} or {@link Measure} to retrieve.
+     * @return Field for provided field name.
+     */
+    public Named getField(String fieldName) {
+        return Streams.concat(this.dimensions.stream(), this.measures.stream())
+                        .filter(col -> col.getName().equals(fieldName))
+                        .findFirst()
+                        .orElse(null);
+    }
+
+    /**
+     * Checks if this model has provided argument.
+     * @param argName Name of the {@link Argument} to  check for.
+     * @return true if this model has provided argument.
+     */
+    public boolean hasArgument(String argName) {
+        return hasName(this.arguments, argName);
+    }
+
+    /**
+     * Checks if this model has provided join field.
+     * @param joinName Name of the {@link Join} to check for.
+     * @return true if this model has provided join field.
+     */
+    public boolean hasJoinField(String joinName) {
+        return hasName(this.joins, joinName);
+    }
+
+    /**
+     * Provides the Join details for provided join name.
+     * @param joinName Name of the {@link Join} to retrieve.
+     * @return Join for provided join name.
+     */
+    public Join getJoin(String joinName) {
+        return this.joins.stream()
+                        .filter(join -> join.getName().equals(joinName))
+                        .findFirst()
+                        .orElse(null);
+    }
+
+    /**
+     * Checks if this model has a parent model.
+     * @return true if this model extends another model
+     */
+    public boolean hasParent() {
+        return StringUtils.isNotBlank(this.extend);
+    }
+
+    /**
+     * Provides the parent model for this model.
+     * @param elideTableConfig {@link ElideTableConfig}
+     * @return Parent model for this model
+     */
+    public Table getParent(ElideTableConfig elideTableConfig) {
+        return elideTableConfig.getTable(getGlobalExtend());
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getGlobalName() {
+        return getModelName(name, namespace);
+    }
+
+    /**
+     * Return the globally unique table name for the inherited table.
+     * @return The globally unique name for the inherited table or null.
+     */
+    public String getGlobalExtend() {
+        if (extend == null || extend.isEmpty()) {
+            return extend;
+        }
+        return getModelName(extend, namespace);
+    }
+
+    public static String getModelName(String tableName, String namespace) {
+        if (namespace == null || namespace.isEmpty() || namespace.equals(DEFAULT)) {
+            return tableName;
+        }
+
+        return namespace + "_" + tableName;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/TableSource.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/TableSource.java
new file mode 100644
index 0000000000..c0500100c1
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/TableSource.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+import static com.yahoo.elide.modelconfig.model.NamespaceConfig.DEFAULT;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * TableSource is a reference to another table's columns where the values for a dimension or argument can
+ * queried.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "table",
+    "namespace",
+    "column",
+    "suggestionColumns"
+})
+@Data
+@EqualsAndHashCode()
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TableSource {
+
+    @JsonProperty("table")
+    private String table;
+
+    @JsonProperty("namespace")
+    private String namespace = DEFAULT;
+
+    @JsonProperty("column")
+    private String column;
+
+    @JsonProperty("suggestionColumns")
+    @JsonDeserialize(as = LinkedHashSet.class)
+    private Set<String> suggestionColumns = new LinkedHashSet<>();
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Type.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Type.java
new file mode 100644
index 0000000000..0ad2a7873a
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Type.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.model;
+
+/**
+ * Data Type of the field.
+ */
+public class Type {
+    public final static String TIME = "TIME";
+    public final static String INTEGER = "INTEGER";
+    public final static String DECIMAL = "DECIMAL";
+    public final static String MONEY = "MONEY";
+    public final static String TEXT = "TEXT";
+    public final static String ENUM_ORDINAL = "ENUM_ORDINAL";
+    public final static String ENUM_TEXT = "ENUM_TEXT";
+    public final static String COORDINATE = "COORDINATE";
+    public final static String BOOLEAN = "BOOLEAN";
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydrator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydrator.java
new file mode 100644
index 0000000000..78debaf879
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydrator.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.parser.handlebars;
+
+import com.github.jknack.handlebars.Context;
+import com.github.jknack.handlebars.EscapingStrategy;
+import com.github.jknack.handlebars.EscapingStrategy.Hbs;
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Class for handlebars hydration.
+ */
+public class HandlebarsHydrator {
+
+    public static final String HANDLEBAR_START_DELIMITER = "<%";
+    public static final String HANDLEBAR_END_DELIMITER = "%>";
+    public static final EscapingStrategy MY_ESCAPING_STRATEGY = new Hbs(new String[][]{
+        {"\"", "&quot;" },
+        {"`", "&#x60;" },
+        {"\n", " " }
+    });
+
+    private final Handlebars handlebars;
+
+    public HandlebarsHydrator() {
+        TemplateLoader loader = new ClassPathTemplateLoader("/templates");
+        this.handlebars = new Handlebars(loader).with(MY_ESCAPING_STRATEGY);
+    }
+
+    /**
+     * Method to replace variables in hjson config.
+     * @param config hjson config string
+     * @param replacements Map of variable key value pairs
+     * @return hjson config string with variables replaced
+     * @throws IOException IOException
+     */
+    public String hydrateConfigTemplate(String config, Map<String, Object> replacements) throws IOException {
+
+        Context context = Context.newBuilder(replacements).build();
+        Template template = handlebars.compileInline(config, HANDLEBAR_START_DELIMITER, HANDLEBAR_END_DELIMITER);
+
+        return template.apply(context);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStore.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStore.java
new file mode 100644
index 0000000000..f681055840
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStore.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.store;
+
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.modelconfig.io.FileLoader;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import com.yahoo.elide.modelconfig.validator.Validator;
+
+/**
+ * Elide DataStore which loads/persists HJSON configuration files as Elide models.
+ */
+public class ConfigDataStore implements DataStore {
+
+    public static final String VALIDATE_ONLY_HEADER = "ValidateOnly";
+
+    private final FileLoader fileLoader;
+    private final Validator validator;
+
+    public ConfigDataStore(
+            String configRoot,
+            Validator validator
+    ) {
+        this.fileLoader = new FileLoader(configRoot);
+        this.validator = validator;
+    }
+
+    @Override
+    public void populateEntityDictionary(EntityDictionary dictionary) {
+        dictionary.bindEntity(ClassType.of(ConfigFile.class));
+    }
+
+    @Override
+    public ConfigDataStoreTransaction beginTransaction() {
+        return new ConfigDataStoreTransaction(fileLoader, false, validator);
+    }
+
+    @Override
+    public ConfigDataStoreTransaction beginReadTransaction() {
+        return new ConfigDataStoreTransaction(fileLoader, true, validator);
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTransaction.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTransaction.java
new file mode 100644
index 0000000000..9a56c785a8
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTransaction.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.store;
+
+import static com.yahoo.elide.modelconfig.store.ConfigDataStore.VALIDATE_ONLY_HEADER;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.datastore.DataStoreIterableBuilder;
+import com.yahoo.elide.core.datastore.DataStoreTransaction;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.modelconfig.io.FileLoader;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import com.yahoo.elide.modelconfig.validator.Validator;
+
+import org.apache.commons.io.FileUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Elide DataStoreTransaction which loads/persists HJSON configuration files as Elide models.
+ */
+@Slf4j
+public class ConfigDataStoreTransaction implements DataStoreTransaction {
+    private final FileLoader fileLoader;
+    private final Set<Runnable> todo;
+    private final Set<ConfigFile> dirty;
+    private final Set<String> deleted;
+    private final Validator validator;
+    private final boolean readOnly;
+
+    public ConfigDataStoreTransaction(
+            FileLoader fileLoader,
+            boolean readOnly,
+            Validator validator
+    ) {
+        this.fileLoader = fileLoader;
+        this.readOnly = readOnly || !fileLoader.isWriteable();
+        this.dirty = new LinkedHashSet<>();
+        this.deleted = new LinkedHashSet<>();
+        this.todo = new LinkedHashSet<>();
+        this.validator = validator;
+    }
+
+    @Override
+    public <T> void save(T entity, RequestScope scope) {
+        ConfigFile file = (ConfigFile) entity;
+
+        boolean canWrite;
+        if (scope.isNewResource(file)) {
+            canWrite = canCreate(file.getPath());
+        } else {
+            canWrite = canModify(file.getPath());
+        }
+
+        if (readOnly || !canWrite) {
+            log.error("Attempt to modify a read only configuration");
+            throw new UnsupportedOperationException("Configuration is read only.");
+        }
+
+        dirty.add(file);
+        todo.add(() -> updateFile(file.getPath(), file.getContent()));
+    }
+
+    @Override
+    public <T> void delete(T entity, RequestScope scope) {
+        ConfigFile file = (ConfigFile) entity;
+        if (readOnly || !canModify(file.getPath())) {
+            log.error("Attempt to modify a read only configuration");
+            throw new UnsupportedOperationException("Configuration is read only.");
+        }
+        dirty.add(file);
+        deleted.add(file.getPath());
+        todo.add(() -> deleteFile(file.getPath()));
+    }
+
+    @Override
+    public void flush(RequestScope scope) {
+        if (!readOnly) {
+            Map<String, ConfigFile> resources;
+            try {
+                resources = fileLoader.loadResources();
+            } catch (IOException e) {
+                log.error("Error reading configuration resources: {}", e.getMessage());
+                throw new IllegalStateException(e);
+            }
+
+            for (ConfigFile file : dirty) {
+                resources.put(file.getPath(), file);
+            }
+
+            for (String path: deleted) {
+                resources.remove(path);
+            }
+
+            try {
+                validator.validate(resources);
+            } catch (Exception e) {
+                log.error("Error validating configuration: {}", e.getMessage());
+                throw new BadRequestException(e.getMessage());
+            }
+        }
+    }
+
+    @Override
+    public void commit(RequestScope scope) {
+        boolean validateOnly = scope.getRequestHeaderByName(VALIDATE_ONLY_HEADER) != null;
+
+        if (! validateOnly) {
+            for (Runnable runnable : todo) {
+                runnable.run();
+            }
+        }
+    }
+
+    @Override
+    public <T> void createObject(T entity, RequestScope scope) {
+        ConfigFile file = (ConfigFile) entity;
+
+        if (readOnly || !canCreate(file.getPath())) {
+            log.error("Attempt to modify a read only configuration");
+            throw new UnsupportedOperationException("Configuration is read only.");
+        }
+        dirty.add(file);
+        todo.add(() -> {
+
+            //We have to assign the ID here during commit so it gets sent back in the response.
+            file.setId(ConfigFile.toId(file.getPath(), file.getVersion()));
+
+            createFile(file.getPath());
+            updateFile(file.getPath(), file.getContent());
+        });
+    }
+
+    @Override
+    public <T> T loadObject(EntityProjection entityProjection, Serializable id, RequestScope scope) {
+        String path = ConfigFile.fromId(id.toString());
+
+        try {
+            return (T) fileLoader.loadResource(path);
+        } catch (IOException e) {
+            log.error("Error reading configuration resources for {} : {}", id, e.getMessage());
+            return null;
+        }
+    }
+
+    @Override
+    public <T> DataStoreIterable<T> loadObjects(EntityProjection entityProjection, RequestScope scope) {
+        try {
+            Map<String, ConfigFile> resources = fileLoader.loadResources();
+
+            return new DataStoreIterableBuilder(resources.values()).allInMemory().build();
+        } catch (IOException e) {
+            log.error("Error reading configuration resources: {}", e.getMessage());
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public void cancel(RequestScope scope) {
+        todo.clear();
+        dirty.clear();
+        deleted.clear();
+    }
+
+    @Override
+    public void close() throws IOException {
+        //NOOP
+    }
+
+    private boolean canCreate(String filePath) {
+        Path path = Path.of(fileLoader.getRootPath(), filePath);
+        File directory = path.toFile().getParentFile();
+
+        while (directory != null && !directory.exists()) {
+            directory = directory.getParentFile();
+        }
+
+        return (directory != null && Files.isWritable(directory.toPath()));
+    }
+
+    private boolean canModify(String filePath) {
+        Path path = Path.of(fileLoader.getRootPath(), filePath);
+        File file = path.toFile();
+        return !file.exists() || Files.isWritable(file.toPath());
+    }
+
+    private void deleteFile(String path) {
+        Path deletePath = Path.of(fileLoader.getRootPath(), path);
+        File file = deletePath.toFile();
+
+        if (! file.exists()) {
+            return;
+        }
+
+        if (! file.delete()) {
+            log.error("Error deleting file: {}", file.getPath());
+            throw new IllegalStateException("Unable to delete: " + path);
+        }
+    }
+
+    private void updateFile(String path, String content) {
+        Path updatePath = Path.of(fileLoader.getRootPath(), path);
+        File file = updatePath.toFile();
+
+        try {
+            FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            log.error("Error updating file: {} with message: {}", file.getPath(), e.getMessage());
+            throw new IllegalStateException(e);
+        }
+    }
+    private void createFile(String path) {
+        Path createPath = Path.of(fileLoader.getRootPath(), path);
+        File file = createPath.toFile();
+
+        if (file.exists()) {
+            log.debug("File already exits: {}", file.getPath());
+            return;
+        }
+
+        try {
+            File parentDirectory = file.getParentFile();
+            Files.createDirectories(Path.of(parentDirectory.getPath()));
+
+            boolean created = file.createNewFile();
+            if (!created) {
+                log.error("Unable to create file: {}", file.getPath());
+                throw new IllegalStateException("Unable to create file: " + path);
+            }
+        } catch (IOException e) {
+            log.error("Error creating file: {} with message: {}", file.getPath(), e.getMessage());
+            throw new IllegalStateException(e);
+        }
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigChecks.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigChecks.java
new file mode 100644
index 0000000000..ccff7f56e1
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigChecks.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.store.models;
+
+import com.yahoo.elide.core.security.checks.prefab.Role;
+
+/**
+ * Utility class which contains a set of check labels.  Clients need to define checks for these
+ * labels and bind them to the dictionary at boot.
+ */
+public class ConfigChecks {
+    public static final String CAN_READ_CONFIG = "Can Read Config";
+    public static final String CAN_UPDATE_CONFIG = "Can Update Config";
+    public static final String CAN_DELETE_CONFIG = "Can Delete Config";
+    public static final String CAN_CREATE_CONFIG = "Can Create Config";
+
+    public static class CanNotRead extends Role.NONE {
+
+    };
+    public static class CanNotUpdate extends Role.NONE {
+
+    };
+    public static class CanNotCreate extends Role.NONE {
+
+    };
+    public static class CanNotDelete extends Role.NONE {
+
+    };
+    public static class CanRead extends Role.ALL {
+
+    };
+    public static class CanUpdate extends Role.ALL {
+
+    };
+    public static class CanCreate extends Role.ALL {
+
+    };
+    public static class CanDelete extends Role.ALL {
+
+    };
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigFile.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigFile.java
new file mode 100644
index 0000000000..0aee3b77c0
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/store/models/ConfigFile.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.store.models;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.core.security.checks.prefab.Role.NONE_ROLE;
+import com.yahoo.elide.annotation.ComputedAttribute;
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Exclude;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Base64;
+import java.util.Objects;
+import java.util.function.Supplier;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * Represents an HJSON configuration file for dynamic Elide models.
+ */
+@Include(name = "config")
+@Data
+@NoArgsConstructor
+@ReadPermission(expression = ConfigChecks.CAN_READ_CONFIG)
+@UpdatePermission(expression = ConfigChecks.CAN_UPDATE_CONFIG)
+@DeletePermission(expression = ConfigChecks.CAN_DELETE_CONFIG)
+@CreatePermission(expression = ConfigChecks.CAN_CREATE_CONFIG)
+public class ConfigFile {
+
+    public enum ConfigFileType {
+        NAMESPACE,
+        TABLE,
+        VARIABLE,
+        DATABASE,
+        SECURITY,
+        UNKNOWN;
+    }
+
+    @Id
+    @GeneratedValue
+    private String id; //Base64 encoded path-version
+
+    @UpdatePermission(expression = NONE_ROLE)
+    private String path;
+
+    private String version;
+
+    @Exclude
+    private Supplier<String> contentProvider;
+
+    @Exclude
+    private String content;
+
+    @ComputedAttribute
+    public String getContent() {
+        if (content == null) {
+            if (contentProvider == null) {
+                return null;
+            }
+            content = contentProvider.get();
+        }
+
+        return content;
+    }
+
+    private ConfigFileType type;
+
+    @Builder
+    public ConfigFile(
+            String path,
+            String version,
+            ConfigFileType type,
+            Supplier<String> contentProvider) {
+
+        this.id = toId(path, version);
+
+        this.path = path;
+        if (version == null) {
+            this.version = NO_VERSION;
+        } else {
+            this.version = version;
+        }
+        this.contentProvider = contentProvider;
+        this.type = type;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ConfigFile that = (ConfigFile) o;
+        return Objects.equals(path, that.path) && Objects.equals(version, that.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(path, version);
+    }
+
+    public static String toId(String path, String version) {
+        String id;
+        if (version == null || version.isEmpty()) {
+            id = path;
+        } else {
+            id = path + "-" + version;
+        }
+        return Base64.getEncoder().encodeToString(id.getBytes());
+    }
+
+    public static String fromId(String id) {
+        String idString;
+        try {
+            idString = URLDecoder.decode(id, "UTF-8");
+            idString = new String(Base64.getDecoder().decode(idString.getBytes()));
+        } catch (IllegalArgumentException | UnsupportedEncodingException e) {
+            throw new BadRequestException("Invalid ID: " + id);
+        }
+
+        int hyphenIndex = idString.lastIndexOf(".hjson-");
+
+        String path;
+        if (hyphenIndex < 0) {
+            path = idString;
+        } else {
+            path = idString.substring(0, idString.lastIndexOf('-'));
+        }
+
+        return path;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidator.java
new file mode 100644
index 0000000000..96aa43d4fe
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidator.java
@@ -0,0 +1,873 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.validator;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.EntityPermissions;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.FilterExpressionCheck;
+import com.yahoo.elide.core.security.checks.UserCheck;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.modelconfig.Config;
+import com.yahoo.elide.modelconfig.DynamicConfigHelpers;
+import com.yahoo.elide.modelconfig.DynamicConfigSchemaValidator;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.modelconfig.io.FileLoader;
+import com.yahoo.elide.modelconfig.model.Argument;
+import com.yahoo.elide.modelconfig.model.DBConfig;
+import com.yahoo.elide.modelconfig.model.Dimension;
+import com.yahoo.elide.modelconfig.model.ElideDBConfig;
+import com.yahoo.elide.modelconfig.model.ElideNamespaceConfig;
+import com.yahoo.elide.modelconfig.model.ElideSQLDBConfig;
+import com.yahoo.elide.modelconfig.model.ElideSecurityConfig;
+import com.yahoo.elide.modelconfig.model.ElideTableConfig;
+import com.yahoo.elide.modelconfig.model.Join;
+import com.yahoo.elide.modelconfig.model.Measure;
+import com.yahoo.elide.modelconfig.model.Named;
+import com.yahoo.elide.modelconfig.model.NamespaceConfig;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.TableSource;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.collections.CollectionUtils;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+/**
+ * Util class to validate and parse the config files. Optionally compiles config files.
+ */
+public class DynamicConfigValidator implements DynamicConfiguration, Validator {
+
+    private static final Set<String> SQL_DISALLOWED_WORDS = new HashSet<>(
+            Arrays.asList("DROP", "TRUNCATE", "DELETE", "INSERT", "UPDATE", "ALTER", "COMMENT", "CREATE", "DESCRIBE",
+                    "SHOW", "USE", "GRANT", "REVOKE", "CONNECT", "LOCK", "EXPLAIN", "CALL", "MERGE", "RENAME"));
+    private static final String SQL_SPLIT_REGEX = "\\s+";
+    private static final String SEMI_COLON = ";";
+    private static final Pattern HANDLEBAR_REGEX = Pattern.compile("<%(.*?)%>");
+    private static final String RESOURCES = "resources";
+    private static final int RESOURCES_LENGTH = 9; //"resources".length()
+    private static final String CLASSPATH_PATTERN = "classpath*:";
+    private static final String FILEPATH_PATTERN = "file:";
+    private static final String HJSON_EXTN = "**/*.hjson";
+
+    @Getter private final ElideTableConfig elideTableConfig = new ElideTableConfig();
+    @Getter private ElideSecurityConfig elideSecurityConfig;
+    @Getter private Map<String, Object> modelVariables;
+    private Map<String, Object> dbVariables;
+    @Getter private final ElideDBConfig elideSQLDBConfig = new ElideSQLDBConfig();
+    @Getter private final ElideNamespaceConfig elideNamespaceConfig = new ElideNamespaceConfig();
+    private final DynamicConfigSchemaValidator schemaValidator = new DynamicConfigSchemaValidator();
+    private final EntityDictionary dictionary;
+    private final FileLoader fileLoader;
+
+    private static final Pattern FILTER_VARIABLE_PATTERN = Pattern.compile(".*?\\{\\{(\\w+)\\}\\}");
+
+    public DynamicConfigValidator(ClassScanner scanner, String configDir) {
+        dictionary = EntityDictionary.builder().scanner(scanner).build();
+        fileLoader = new FileLoader(configDir);
+
+        initialize();
+    }
+
+    private void initialize() {
+        Set<Class<?>> annotatedClasses =
+                        dictionary.getScanner().getAnnotatedClasses(Arrays.asList(Include.class, SecurityCheck.class));
+
+        annotatedClasses.forEach(cls -> {
+            if (cls.getAnnotation(Include.class) != null) {
+                dictionary.bindEntity(cls);
+            } else {
+                dictionary.addSecurityCheck(cls);
+            }
+        });
+    }
+
+    public static void main(String[] args) {
+        Options options = prepareOptions();
+
+        try {
+            CommandLine cli = new DefaultParser().parse(options, args);
+
+            if (cli.hasOption("help")) {
+                printHelp(options);
+                System.exit(0);
+            }
+            if (!cli.hasOption("configDir")) {
+                printHelp(options);
+                System.err.println("Missing required option");
+                System.exit(1);
+            }
+            String configDir = cli.getOptionValue("configDir");
+
+            DynamicConfigValidator dynamicConfigValidator =
+                    new DynamicConfigValidator(DefaultClassScanner.getInstance(), configDir);
+            dynamicConfigValidator.readAndValidateConfigs();
+            System.out.println("Configs Validation Passed!");
+            System.exit(0);
+
+        } catch (Exception e) {
+            String msg = isBlank(e.getMessage()) ? "Process Failed!" : e.getMessage();
+            System.err.println(msg);
+            System.exit(2);
+        }
+    }
+
+    @Override
+    public void validate(Map<String, ConfigFile> resourceMap) {
+
+        resourceMap.forEach((path, file) -> {
+            if (file.getContent() == null || file.getContent().isEmpty()) {
+                throw new BadRequestException(String.format("Null or empty file content for %s", file.getPath()));
+            }
+
+            //Validate that all the files are ones we know about and are safe to manipulate...
+            if (file.getType().equals(ConfigFile.ConfigFileType.UNKNOWN)) {
+                throw new BadRequestException(String.format("Unrecognized File: %s", file.getPath()));
+            }
+
+            if (path.contains("..")) {
+                throw new BadRequestException(String.format("Parent directory traversal not allowed: %s",
+                        file.getPath()));
+            }
+
+            //Validate that the file types and file paths match...
+            if (! file.getType().equals(FileLoader.toType(path))) {
+                throw new BadRequestException(String.format("File type %s does not match file path: %s",
+                        file.getType(), file.getPath()));
+            }
+        });
+
+        readConfigs(resourceMap);
+        validateConfigs();
+    }
+
+    /**
+     * Read and validate config files under config directory.
+     * @throws IOException IOException
+     */
+    public void readAndValidateConfigs() throws IOException {
+        Map<String, ConfigFile> loadedFiles = fileLoader.loadResources();
+
+        validate(loadedFiles);
+    }
+
+    public void readConfigs() throws IOException {
+        readConfigs(fileLoader.loadResources());
+    }
+
+    public void readConfigs(Map<String, ConfigFile> resourceMap) {
+        this.modelVariables = readVariableConfig(Config.MODELVARIABLE, resourceMap);
+        this.elideSecurityConfig = readSecurityConfig(resourceMap);
+        this.dbVariables = readVariableConfig(Config.DBVARIABLE, resourceMap);
+        this.elideSQLDBConfig.setDbconfigs(readDbConfig(resourceMap));
+        this.elideTableConfig.setTables(readTableConfig(resourceMap));
+        this.elideNamespaceConfig.setNamespaceconfigs(readNamespaceConfig(resourceMap));
+        populateInheritance(this.elideTableConfig);
+    }
+
+    public void validateConfigs() {
+        validateSecurityConfig();
+        boolean configurationExists = validateRequiredConfigsProvided();
+
+        if (configurationExists) {
+            validateNameUniqueness(this.elideSQLDBConfig.getDbconfigs(),
+                    "Multiple DB configs found with the same name: ");
+            validateNameUniqueness(this.elideTableConfig.getTables(),
+                    "Multiple Table configs found with the same name: ");
+            validateTableConfig();
+            validateNameUniqueness(this.elideNamespaceConfig.getNamespaceconfigs(),
+                    "Multiple Namespace configs found with the same name: ");
+            validateNamespaceConfig();
+            validateJoinedTablesDBConnectionName(this.elideTableConfig);
+        }
+    }
+
+    @Override
+    public Set<Table> getTables() {
+        return elideTableConfig.getTables();
+    }
+
+    @Override
+    public Set<String> getRoles() {
+        return elideSecurityConfig.getRoles();
+    }
+
+    @Override
+    public Set<DBConfig> getDatabaseConfigurations() {
+        return elideSQLDBConfig.getDbconfigs();
+    }
+
+    @Override
+    public Set<NamespaceConfig> getNamespaceConfigurations() {
+        return elideNamespaceConfig.getNamespaceconfigs();
+    }
+
+    private static void validateInheritance(ElideTableConfig tables) {
+        tables.getTables().stream().forEach(table -> validateInheritance(tables, table, new HashSet<>()));
+    }
+
+    private static void validateInheritance(ElideTableConfig tables, Table table, Set<Table> visited) {
+        visited.add(table);
+
+        if (!table.hasParent()) {
+            return;
+        }
+        Table parent = table.getParent(tables);
+        if (parent == null) {
+            throw new IllegalStateException(
+                    "Undefined model: " + table.getExtend() + " is used as a Parent(extend) for another model.");
+        }
+        if (visited.contains(parent)) {
+            throw new IllegalStateException(
+                    String.format("Inheriting from table '%s' creates an illegal cyclic dependency.",
+                            parent.getName()));
+        }
+        validateInheritance(tables, parent, visited);
+    }
+
+    private void populateInheritance(ElideTableConfig elideTableConfig) {
+        //ensures validation is run before populate always.
+        validateInheritance(this.elideTableConfig);
+
+        Set<Table> processed = new HashSet<>();
+        elideTableConfig.getTables().stream().forEach(table -> populateInheritance(table, processed));
+    }
+
+    private void populateInheritance(Table table, Set<Table> processed) {
+        if (processed.contains(table)) {
+            return;
+        }
+
+        processed.add(table);
+
+        if (!table.hasParent()) {
+            return;
+        }
+
+        Table parent = table.getParent(this.elideTableConfig);
+        if (!processed.contains(parent)) {
+            populateInheritance(parent, processed);
+        }
+
+        Map<String, Measure> measures = getInheritedMeasures(parent, attributesListToMap(table.getMeasures()));
+        table.setMeasures(new ArrayList<>(measures.values()));
+
+        Map<String, Dimension> dimensions = getInheritedDimensions(parent, attributesListToMap(table.getDimensions()));
+        table.setDimensions(new ArrayList<>(dimensions.values()));
+
+        Map<String, Join> joins = getInheritedJoins(parent, attributesListToMap(table.getJoins()));
+        table.setJoins(new ArrayList<>(joins.values()));
+
+        String schema = getInheritedSchema(parent, table.getSchema());
+        table.setSchema(schema);
+
+        String dbConnectionName = getInheritedConnection(parent, table.getDbConnectionName());
+        table.setDbConnectionName(dbConnectionName);
+
+        String sql = getInheritedSql(parent, table.getSql());
+        table.setSql(sql);
+
+        String tableName = getInheritedTable(parent, table.getTable());
+        table.setTable(tableName);
+
+        List<Argument> arguments = getInheritedArguments(parent, table.getArguments());
+        table.setArguments(arguments);
+        // isFact, isHidden, ReadAccess, namespace have default Values in schema, so can not be inherited.
+        // Other properties (tags, cardinality, etc.) have been categorized as non-inheritable too.
+    }
+
+    private <T extends Named> Map<String, T> attributesListToMap(List<T> attributes) {
+        return attributes.stream().collect(Collectors.toMap(T::getName, attribute -> attribute));
+    }
+
+    @FunctionalInterface
+    public interface Inheritance<T> {
+        public T inherit();
+    }
+
+    private Map<String, Measure> getInheritedMeasures(Table table, Map<String, Measure> measures) {
+        Inheritance action = () -> {
+            table.getMeasures().forEach(measure -> {
+                if (!measures.containsKey(measure.getName())) {
+                    measures.put(measure.getName(), measure);
+                }
+            });
+            return measures;
+        };
+
+        action.inherit();
+        return measures;
+    }
+
+    private Map<String, Dimension> getInheritedDimensions(Table table, Map<String, Dimension> dimensions) {
+        Inheritance action = () -> {
+            table.getDimensions().forEach(dimension -> {
+                if (!dimensions.containsKey(dimension.getName())) {
+                    dimensions.put(dimension.getName(), dimension);
+                }
+            });
+            return dimensions;
+        };
+
+        action.inherit();
+        return dimensions;
+    }
+
+    private Map<String, Join> getInheritedJoins(Table table, Map<String, Join> joins) {
+        Inheritance action = () -> {
+            table.getJoins().forEach(join -> {
+                if (!joins.containsKey(join.getName())) {
+                    joins.put(join.getName(), join);
+                }
+            });
+            return joins;
+        };
+
+        action.inherit();
+        return joins;
+    }
+
+    private <T> T getInheritedAttribute(Inheritance action, T property) {
+        return property == null ? (T) action.inherit() : property;
+    }
+
+    private <T> Collection<T> getInheritedAttribute(Inheritance action, Collection<T> property) {
+        return CollectionUtils.isEmpty(property) ? (Collection<T>) action.inherit() : property;
+    }
+
+    private String getInheritedSchema(Table table, String schema) {
+        Inheritance action = table::getSchema;
+
+        return getInheritedAttribute(action, schema);
+    }
+
+    private String getInheritedConnection(Table table, String connection) {
+        Inheritance action = table::getDbConnectionName;
+
+        return getInheritedAttribute(action, connection);
+    }
+
+    private String getInheritedSql(Table table, String sql) {
+        Inheritance action = table::getSql;
+
+        return getInheritedAttribute(action, sql);
+    }
+
+    private String getInheritedTable(Table table, String tableName) {
+        Inheritance action = table::getTable;
+
+        return getInheritedAttribute(action, tableName);
+    }
+
+    private List<Argument> getInheritedArguments(Table table, List<Argument> arguments) {
+        Inheritance action = table::getArguments;
+
+        return (List<Argument>) getInheritedAttribute(action, arguments);
+    }
+
+    /**
+     * Read variable file config.
+     * @param config Config Enum
+     * @return Map<String, Object> A map containing all the variables if variable config exists else empty map
+     */
+    private Map<String, Object> readVariableConfig(Config config, Map<String, ConfigFile> resourceMap) {
+
+        return resourceMap
+                        .entrySet()
+                        .stream()
+                        .filter(entry -> entry.getKey().startsWith(config.getConfigPath()))
+                        .map(entry -> {
+                            try {
+                                return DynamicConfigHelpers.stringToVariablesPojo(entry.getKey(),
+                                                entry.getValue().getContent(), schemaValidator);
+                            } catch (IOException e) {
+                                throw new IllegalStateException(e);
+                            }
+                        })
+                        .findFirst()
+                        .orElse(new HashMap<>());
+    }
+
+    /**
+     * Read and validates security config file.
+     */
+    private ElideSecurityConfig readSecurityConfig(Map<String, ConfigFile> resourceMap) {
+
+        return resourceMap
+                        .entrySet()
+                        .stream()
+                        .filter(entry -> entry.getKey().startsWith(Config.SECURITY.getConfigPath()))
+                        .map(entry -> {
+                            try {
+                                String content = entry.getValue().getContent();
+                                validateConfigForMissingVariables(content, this.modelVariables);
+                                return DynamicConfigHelpers.stringToElideSecurityPojo(entry.getKey(),
+                                                content, this.modelVariables, schemaValidator);
+                            } catch (IOException e) {
+                                throw new IllegalStateException(e);
+                            }
+                        })
+                        .findAny()
+                        .orElse(new ElideSecurityConfig());
+    }
+
+    /**
+     * Read and validates db config files.
+     * @return Set<DBConfig> Set of SQL DB Configs
+     */
+    private Set<DBConfig> readDbConfig(Map<String, ConfigFile> resourceMap) {
+
+        return resourceMap
+                        .entrySet()
+                        .stream()
+                        .filter(entry -> entry.getKey().startsWith(Config.SQLDBConfig.getConfigPath()))
+                        .map(entry -> {
+                            try {
+                                String content = entry.getValue().getContent();
+                                validateConfigForMissingVariables(content, this.dbVariables);
+                                return DynamicConfigHelpers.stringToElideDBConfigPojo(entry.getKey(),
+                                                content, this.dbVariables, schemaValidator);
+                            } catch (IOException e) {
+                                throw new IllegalStateException(e);
+                            }
+                        })
+                        .flatMap(dbconfig -> dbconfig.getDbconfigs().stream())
+                        .collect(Collectors.toSet());
+    }
+
+    /**
+     * Read and validates namespace config files.
+     * @return Set<NamespaceConfig> Set of Namespace Configs
+     */
+    private Set<NamespaceConfig> readNamespaceConfig(Map<String, ConfigFile> resourceMap) {
+
+        return resourceMap
+                        .entrySet()
+                        .stream()
+                        .filter(entry -> entry.getKey().startsWith(Config.NAMESPACEConfig.getConfigPath()))
+                        .map(entry -> {
+                            try {
+                                String content = entry.getValue().getContent();
+                                validateConfigForMissingVariables(content, this.modelVariables);
+                                String fileName = entry.getKey();
+                                return DynamicConfigHelpers.stringToElideNamespaceConfigPojo(fileName,
+                                                content, this.modelVariables, schemaValidator);
+                            } catch (IOException e) {
+                                throw new IllegalStateException(e);
+                            }
+                        })
+                        .flatMap(namespaceconfig -> namespaceconfig.getNamespaceconfigs().stream())
+                        .collect(Collectors.toSet());
+    }
+
+    /**
+     * Read and validates table config files.
+     */
+    private Set<Table> readTableConfig(Map<String, ConfigFile> resourceMap) {
+
+        return resourceMap
+                        .entrySet()
+                        .stream()
+                        .filter(entry -> entry.getKey().startsWith(Config.TABLE.getConfigPath()))
+                        .map(entry -> {
+                            try {
+                                String content = entry.getValue().getContent();
+                                validateConfigForMissingVariables(content, this.modelVariables);
+                                return DynamicConfigHelpers.stringToElideTablePojo(entry.getKey(),
+                                                content, this.modelVariables, schemaValidator);
+                            } catch (IOException e) {
+                                throw new IllegalStateException(e);
+                            }
+                        })
+                        .flatMap(table -> table.getTables().stream())
+                        .collect(Collectors.toSet());
+    }
+
+    /**
+     * Checks if neither Table nor DB config files provided.
+     */
+    private boolean validateRequiredConfigsProvided() {
+        return !(this.elideTableConfig.getTables().isEmpty() && this.elideSQLDBConfig.getDbconfigs().isEmpty());
+    }
+
+    /**
+     * Extracts any handlebar variables in config file and checks if they are
+     * defined in variable config. Throw exception for undefined variables.
+     * @param config config file
+     * @param variables A map of defined variables
+     */
+    private static void validateConfigForMissingVariables(String config, Map<String, Object> variables) {
+        Matcher regexMatcher = HANDLEBAR_REGEX.matcher(config);
+        while (regexMatcher.find()) {
+            String str = regexMatcher.group(1).trim();
+            if (!variables.containsKey(str)) {
+                throw new IllegalStateException(str + " is used as a variable in either table or security config files "
+                        + "but is not defined in variables config file.");
+            }
+        }
+    }
+
+    /**
+     * Validate table configs.
+     * @return boolean true if all provided table properties passes validation
+     */
+    private boolean validateTableConfig() {
+        Set<String> extractedFieldChecks = new HashSet<>();
+        Set<String> extractedTableChecks = new HashSet<>();
+        PermissionExpressionVisitor visitor = new PermissionExpressionVisitor();
+
+        for (Table table : elideTableConfig.getTables()) {
+
+            validateSql(table.getSql());
+            validateArguments(table, table.getArguments(), table.getFilterTemplate());
+            //TODO - once tables support versions - replace NO_VERSION with apiVersion
+            validateNamespaceExists(table.getNamespace(), NO_VERSION);
+            Set<String> tableFields = new HashSet<>();
+
+            table.getDimensions().forEach(dim -> {
+                validateFieldNameUniqueness(tableFields, dim.getName(), table.getName());
+                validateSql(dim.getDefinition());
+                validateTableSource(dim.getTableSource());
+                validateArguments(table, dim.getArguments(), dim.getFilterTemplate());
+                extractChecksFromExpr(dim.getReadAccess(), extractedFieldChecks, visitor);
+            });
+
+            table.getMeasures().forEach(measure -> {
+                validateFieldNameUniqueness(tableFields, measure.getName(), table.getName());
+                validateSql(measure.getDefinition());
+                validateArguments(table, measure.getArguments(), measure.getFilterTemplate());
+                extractChecksFromExpr(measure.getReadAccess(), extractedFieldChecks, visitor);
+            });
+
+            table.getJoins().forEach(join -> {
+                validateFieldNameUniqueness(tableFields, join.getName(), table.getName());
+                validateSql(join.getDefinition());
+                validateModelExists(join.getTo());
+                //TODO - once tables support versions - replace NO_VERSION with apiVersion
+                validateNamespaceExists(join.getNamespace(), NO_VERSION);
+            });
+
+            extractChecksFromExpr(table.getReadAccess(), extractedTableChecks, visitor);
+        }
+
+        validateChecks(extractedTableChecks, extractedFieldChecks);
+
+        return true;
+    }
+
+    /**
+     * Validate namespace configs.
+     * @return boolean true if all provided namespace properties passes validation
+     */
+    private boolean validateNamespaceConfig() {
+        Set<String> extractedChecks = new HashSet<>();
+        PermissionExpressionVisitor visitor = new PermissionExpressionVisitor();
+
+        for (NamespaceConfig namespace : elideNamespaceConfig.getNamespaceconfigs()) {
+            extractChecksFromExpr(namespace.getReadAccess(), extractedChecks, visitor);
+        }
+
+        validateChecks(extractedChecks, Collections.EMPTY_SET);
+
+        return true;
+    }
+
+    private void validateArguments(Table table, List<Argument> arguments, String requiredFilter) {
+        List<Argument> allArguments = new ArrayList<>(arguments);
+
+        /* Check for table arguments added in the required filter template */
+        if (requiredFilter != null) {
+            Matcher matcher = FILTER_VARIABLE_PATTERN.matcher(requiredFilter);
+            while (matcher.find()) {
+                allArguments.add(Argument.builder()
+                        .name(matcher.group(1))
+                        .build());
+            }
+        }
+
+        validateNameUniqueness(allArguments, "Multiple Arguments found with the same name: ");
+        arguments.forEach(arg -> validateTableSource(arg.getTableSource()));
+    }
+
+    private void validateChecks(Set<String> tableChecks, Set<String> fieldChecks) {
+
+        if (tableChecks.isEmpty() && fieldChecks.isEmpty()) {
+            return; // Nothing to validate
+        }
+
+        Set<String> staticChecks = dictionary.getCheckIdentifiers();
+
+        List<String> undefinedChecks = Stream.concat(tableChecks.stream(), fieldChecks.stream())
+                        .filter(check -> !(elideSecurityConfig.hasCheckDefined(check) || staticChecks.contains(check)))
+                        .sorted()
+                        .collect(Collectors.toList());
+
+        if (!undefinedChecks.isEmpty()) {
+            throw new IllegalStateException("Found undefined security checks: " + undefinedChecks);
+        }
+
+        tableChecks.stream()
+                .filter(check -> dictionary.getCheckMappings().containsKey(check))
+                .forEach(check -> {
+                    Class<? extends Check> checkClass = dictionary.getCheck(check);
+                    //Validates if the permission check either user Check or FilterExpressionCheck Check
+                    if (!(UserCheck.class.isAssignableFrom(checkClass)
+                            || FilterExpressionCheck.class.isAssignableFrom(checkClass))) {
+                        throw new IllegalStateException("Table or Namespace cannot have Operation Checks. Given: "
+                                + checkClass);
+                    }
+                });
+        fieldChecks.stream()
+                .filter(check -> dictionary.getCheckMappings().containsKey(check))
+                .forEach(check -> {
+                    Class<? extends Check> checkClass = dictionary.getCheck(check);
+                    //Validates if the permission check is User check
+                    if (!UserCheck.class.isAssignableFrom(checkClass)) {
+                        throw new IllegalStateException("Field can only have User checks or Roles. Given: "
+                                + checkClass);
+                    }
+                });
+    }
+
+    private static void extractChecksFromExpr(String readAccess, Set<String> extractedChecks,
+                    PermissionExpressionVisitor visitor) {
+        if (isNotBlank(readAccess)) {
+            ParseTree root = EntityPermissions.parseExpression(readAccess);
+            extractedChecks.addAll(visitor.visit(root));
+        }
+    }
+
+    private static void validateFieldNameUniqueness(Set<String> alreadyFoundFields, String fieldName,
+                    String tableName) {
+        if (!alreadyFoundFields.add(fieldName.toLowerCase(Locale.ENGLISH))) {
+            throw new IllegalStateException(String.format("Duplicate!! Field name: %s is not unique for table: %s",
+                            fieldName, tableName));
+        }
+    }
+
+    /**
+     * Validates tableSource is in format: modelName.logicalColumnName and refers to a defined model and a defined
+     * column with in that model.
+     */
+    private void validateTableSource(TableSource tableSource) {
+        if (tableSource == null) {
+            return; // Nothing to validate
+        }
+
+        String modelName = Table.getModelName(tableSource.getTable(), tableSource.getNamespace());
+
+        if (elideTableConfig.hasTable(modelName)) {
+            Table lookupTable = elideTableConfig.getTable(modelName);
+            if (!lookupTable.hasField(tableSource.getColumn())) {
+                throw new IllegalStateException("Invalid tableSource : "
+                        + tableSource
+                        + " . Field : "
+                        + tableSource.getColumn()
+                        + " is undefined for hjson model: "
+                        + tableSource.getTable());
+            }
+            return;
+        }
+
+        //TODO - once tables support versions - replace NO_VERSION with apiVersion
+        if (hasStaticModel(modelName, NO_VERSION)) {
+            if (!hasStaticField(modelName, NO_VERSION, tableSource.getColumn())) {
+                throw new IllegalStateException("Invalid tableSource : " + tableSource
+                        + " . Field : " + tableSource.getColumn()
+                        + " is undefined for non-hjson model: " + tableSource.getTable());
+            }
+            return;
+        }
+
+        throw new IllegalStateException("Invalid tableSource : " + tableSource
+                + " . Undefined model: " + tableSource.getTable());
+    }
+
+    /**
+     * Validates join clause does not refer to a Table which is not in the same DBConnection. If joined table is not
+     * part of dynamic configuration, then ignore
+     */
+    private static void validateJoinedTablesDBConnectionName(ElideTableConfig elideTableConfig) {
+
+        for (Table table : elideTableConfig.getTables()) {
+            if (!table.getJoins().isEmpty()) {
+
+                Set<String> joinedTables = table.getJoins()
+                        .stream()
+                        //TODO - NOT SURE
+                        .map(Join::getTo)
+                        .collect(Collectors.toSet());
+
+                Set<String> connections = elideTableConfig.getTables()
+                        .stream()
+                        .filter(t -> joinedTables.contains(t.getGlobalName()))
+                        .map(Table::getDbConnectionName)
+                        .collect(Collectors.toSet());
+
+                if (connections.size() > 1 || (connections.size() == 1
+                                && !Objects.equals(table.getDbConnectionName(), connections.iterator().next()))) {
+                    throw new IllegalStateException("DBConnection name mismatch between table: " + table.getName()
+                                    + " and tables in its Join Clause.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Validates table (or db connection) name is unique across all the dynamic table (or db connection) configs.
+     */
+    public static void validateNameUniqueness(Collection<? extends Named> configs, String errorMsg) {
+
+        Set<String> names = new HashSet<>();
+        configs.forEach(obj -> {
+            if (!names.add(obj.getGlobalName().toLowerCase(Locale.ENGLISH))) {
+                throw new IllegalStateException(errorMsg + obj.getGlobalName());
+            }
+        });
+    }
+
+    /**
+     * Check if input sql definition contains either semicolon or any of disallowed
+     * keywords. Throw exception if check fails.
+     */
+    private static void validateSql(String sqlDefinition) {
+        if (isNotBlank(sqlDefinition) && (sqlDefinition.contains(SEMI_COLON)
+                || containsDisallowedWords(sqlDefinition, SQL_SPLIT_REGEX, SQL_DISALLOWED_WORDS))) {
+            throw new IllegalStateException("sql/definition provided in table config contain either '" + SEMI_COLON
+                    + "' or one of these words: " + Arrays.toString(SQL_DISALLOWED_WORDS.toArray()));
+        }
+    }
+
+    /**
+     * Validate role name provided in security config.
+     * @return boolean true if all role name passes validation else throw exception
+     */
+    private boolean validateSecurityConfig() {
+        Set<String> alreadyDefinedRoles = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        alreadyDefinedRoles.addAll(dictionary.getCheckIdentifiers());
+
+        elideSecurityConfig.getRoles().forEach(role -> {
+            if (alreadyDefinedRoles.contains(role)) {
+                throw new IllegalStateException(String.format(
+                                "Duplicate!! Role name: '%s' is already defined. Please use different role.", role));
+            }
+            alreadyDefinedRoles.add(role);
+        });
+
+        return true;
+    }
+
+    private void validateModelExists(String name) {
+        if (!(elideTableConfig.hasTable(name) || hasStaticModel(name, NO_VERSION))) {
+            throw new IllegalStateException(
+                            "Model: " + name + " is neither included in dynamic models nor in static models");
+        }
+    }
+
+    private void validateNamespaceExists(String name, String version) {
+        if (!elideNamespaceConfig.hasNamespace(name, version)) {
+            throw new IllegalStateException(
+                            "Namespace: " + name + " is not included in dynamic configs");
+        }
+    }
+
+    /**
+     * Checks if any word in the input string matches any of the disallowed words.
+     * @param str input string to validate
+     * @param splitter regex for splitting input string
+     * @param keywords Set of disallowed words
+     * @return boolean true if any word in the input string matches any of the
+     *         disallowed words else false
+     */
+    private static boolean containsDisallowedWords(String str, String splitter, Set<String> keywords) {
+        return isNotBlank(str)
+                && Arrays.stream(str.trim().toUpperCase(Locale.ENGLISH).split(splitter)).anyMatch(keywords::contains);
+    }
+
+    /**
+     * Define Arguments.
+     */
+    private static final Options prepareOptions() {
+        Options options = new Options();
+        options.addOption(new Option("h", "help", false, "Print a help message and exit."));
+        options.addOption(new Option("c", "configDir", true,
+                "Path for Configs Directory.\n"
+                        + "Expected Directory Structure under Configs Directory:\n"
+                        + "./models/security.hjson(optional)\n"
+                        + "./models/variables.hjson(optional)\n"
+                        + "./models/tables/(optional)\n"
+                        + "./models/tables/table1.hjson\n"
+                        + "./models/tables/table2.hjson\n"
+                        + "./models/tables/tableN.hjson\n"
+                        + "./db/variables.hjson(optional)\n"
+                        + "./db/sql/(optional)\n"
+                        + "./db/sql/db1.hjson\n"
+                        + "./db/sql/db2.hjson\n"
+                        + "./db/sql/dbN.hjson\n"));
+
+        return options;
+    }
+
+    /**
+     * Print Help.
+     */
+    private static void printHelp(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp(
+                "java -cp <Jar File> com.yahoo.elide.modelconfig.validator.DynamicConfigValidator",
+                options);
+    }
+
+    private boolean hasStaticField(String modelName, String version, String fieldName) {
+        Type<?> modelType = dictionary.getEntityClass(modelName, version);
+        if (modelType == null) {
+            return false;
+        }
+
+        try {
+            return (modelType.getDeclaredField(fieldName) != null);
+        } catch (NoSuchFieldException e) {
+            return false;
+        }
+    }
+
+    private boolean hasStaticModel(String modelName, String version) {
+        Type<?> modelType = dictionary.getEntityClass(modelName, version);
+        return modelType != null;
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/PermissionExpressionVisitor.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/PermissionExpressionVisitor.java
new file mode 100644
index 0000000000..22e451e7b9
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/PermissionExpressionVisitor.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.validator;
+
+import com.yahoo.elide.generated.parsers.ExpressionBaseVisitor;
+import com.yahoo.elide.generated.parsers.ExpressionParser;
+import lombok.AllArgsConstructor;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Expression Visitor.
+ */
+@AllArgsConstructor
+public class PermissionExpressionVisitor extends ExpressionBaseVisitor<Set<String>> {
+
+    @Override
+    public Set<String> visitNOT(ExpressionParser.NOTContext ctx) {
+        return visit(ctx.expression());
+    }
+
+    @Override
+    public Set<String> visitOR(ExpressionParser.ORContext ctx) {
+        Set<String> visit = visit(ctx.left);
+        visit.addAll(visit(ctx.right));
+        return visit;
+    }
+
+    @Override
+    public Set<String> visitAND(ExpressionParser.ANDContext ctx) {
+        Set<String> visit = visit(ctx.left);
+        visit.addAll(visit(ctx.right));
+        return visit;
+    }
+
+    @Override
+    public Set<String> visitPAREN(ExpressionParser.PARENContext ctx) {
+        return visit(ctx.expression());
+    }
+
+    @Override
+    public Set<String> visitPermissionClass(ExpressionParser.PermissionClassContext ctx) {
+        return new HashSet<>(Arrays.asList(ctx.getText()));
+    }
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/Validator.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/Validator.java
new file mode 100644
index 0000000000..098b4e5244
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/validator/Validator.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.validator;
+
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+
+import java.util.Map;
+
+/**
+ * Used to validate configuration.
+ */
+@FunctionalInterface
+public interface Validator {
+
+    /**
+     * Validate a full set of configurations.  Throws an exception if there is an error.
+     * @param resourceMap Maps the path to the resource content.
+     */
+    void validate(Map<String, ConfigFile> resourceMap);
+}
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifier.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifier.java
new file mode 100644
index 0000000000..66b4b25f7f
--- /dev/null
+++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifier.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.verify;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.cert.Certificate;
+import java.util.Base64;
+
+/**
+ * Util class to Verify model tar.gz file's RSA signature with available public key in key store.
+ */
+@Slf4j
+public class DynamicConfigVerifier {
+
+    /**
+     * Main Method to Verify Signature of Model Tar file.
+     * @param args : expects 3 arguments.
+     */
+    public static void main(String[] args) {
+
+        Options options = prepareOptions();
+
+        try {
+            CommandLine cli = new DefaultParser().parse(options, args);
+
+            if (cli.hasOption("help")) {
+                printHelp(options);
+                return;
+            }
+            if (!cli.hasOption("tarFile") || !cli.hasOption("signatureFile") || !cli.hasOption("publicKeyName")) {
+                printHelp(options);
+                System.err.println("Missing required option");
+                System.exit(1);
+            }
+
+            String modelTarFile = cli.getOptionValue("tarFile");
+            String signatureFile = cli.getOptionValue("signatureFile");
+            String publicKeyName = cli.getOptionValue("publicKeyName");
+
+            if (verify(readTarContents(modelTarFile), signatureFile, getPublicKey(publicKeyName))) {
+                System.out.println("Successfully Validated " + modelTarFile);
+            } else {
+                System.err.println("Could not verify " + modelTarFile + " with details provided");
+                System.exit(2);
+            }
+        } catch (Exception e) {
+            System.err.println(e.getMessage());
+            System.exit(3);
+        }
+    }
+
+    /**
+     * Verify signature of tar.gz.
+     * @param fileContent : content Of all config files
+     * @param signature : file containing signature
+     * @param publicKey : public key name
+     * @return whether the file can be verified by given key and signature
+     * @throws NoSuchAlgorithmException If no Provider supports a Signature implementation for the SHA256withRSA
+     *         algorithm.
+     * @throws InvalidKeyException If the {@code publicKey} is invalid.
+     * @throws SignatureException If Signature object is not initialized properly.
+     */
+    public static boolean verify(String fileContent, String signature, PublicKey publicKey)
+            throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+
+        Signature publicSignature;
+
+        publicSignature = Signature.getInstance("SHA256withRSA");
+        publicSignature.initVerify(publicKey);
+        publicSignature.update(fileContent.getBytes(StandardCharsets.UTF_8));
+        byte[] signatureBytes = Base64.getDecoder().decode(signature);
+        return publicSignature.verify(signatureBytes);
+    }
+
+    /**
+     * Read Content of all files.
+     * @param archiveFile : tar.gz file path
+     * @return appended content of all files in tar
+     * @throws FileNotFoundException If {@code archiveFile} does not exist.
+     * @throws IOException If an I/O error occurs.
+     */
+    public static String readTarContents(String archiveFile) throws FileNotFoundException, IOException {
+        StringBuffer sb = new StringBuffer();
+        BufferedReader br = null;
+
+        try (TarArchiveInputStream archiveInputStream = new TarArchiveInputStream(
+                new GzipCompressorInputStream(new BufferedInputStream(new FileInputStream(archiveFile))))) {
+            TarArchiveEntry entry = archiveInputStream.getNextTarEntry();
+            while (entry  != null) {
+                br = new BufferedReader(new InputStreamReader(archiveInputStream));
+                String line;
+                while ((line = br.readLine()) != null) {
+                    sb.append(line);
+                }
+                entry = archiveInputStream.getNextTarEntry();
+            }
+        } finally {
+            if (br != null) {
+               br.close();
+            }
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Retrieve public key from Key Store.
+     * @param keyName : name of the public key
+     * @return publickey
+     */
+    private static PublicKey getPublicKey(String keyName) throws KeyStoreException {
+        PublicKey publicKey = null;
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        Certificate cert = keyStore.getCertificate(keyName);
+        publicKey = cert.getPublicKey();
+        return publicKey;
+    }
+
+    /**
+     * Define Arguments.
+     */
+    private static final Options prepareOptions() {
+        Options options = new Options();
+        options.addOption(new Option("h", "help", false, "Print a help message and exit."));
+        options.addOption(new Option("t", "tarFile", true, "Path of the tar.gz file"));
+        options.addOption(new Option("s", "signatureFile", true, "Path of the file containing the signature"));
+        options.addOption(new Option("p", "publicKeyName", true, "Name of public key in keystore"));
+        return options;
+    }
+
+    /**
+     * Print Help.
+     */
+    private static void printHelp(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp(
+                "java -cp <Jar File> com.yahoo.elide.contrib.dynamicconfighelpers.verify.DynamicConfigVerifier",
+                options);
+    }
+}
diff --git a/elide-model-config/src/main/resources/elideDBConfigSchema.json b/elide-model-config/src/main/resources/elideDBConfigSchema.json
new file mode 100644
index 0000000000..371cbc2627
--- /dev/null
+++ b/elide-model-config/src/main/resources/elideDBConfigSchema.json
@@ -0,0 +1,128 @@
+{
+    "$schema": "https://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "title": "Elide DB Config Root Schema",
+    "description": "Elide database connection config json/hjson schema",
+    "required": [
+        "dbconfigs"
+    ],
+    "additionalProperties": false,
+    "properties": {
+        "dbconfigs": {
+            "type": "array",
+            "title": "Elide DB Config Collection",
+            "description": "An array of Elide database connection configs.",
+            "uniqueItems": true,
+            "minItems": 1,
+            "items": {
+                "type": "object",
+                "title": "Elide DB Config",
+                "description": "Elide database connection config",
+                "required": [
+                    "name",
+                    "url",
+                    "driver",
+                    "user",
+                    "dialect"
+                ],
+                "additionalProperties": false,
+                "properties": {
+                    "name": {
+                        "type": "string",
+                        "title": "DB Connection Name",
+                        "description": "Name of the database connection. This will be used for the persistent unit name.",
+                        "format": "elideName",
+                        "examples": [
+                            "MySQLConnection"
+                        ]
+                    },
+                    "url": {
+                        "type": "string",
+                        "title": "JDBC URL",
+                        "description": "JDBC URL for the database connection i.e. javax.persistence.jdbc.URL",
+                        "format": "elideJdbcUrl",
+                        "examples": [
+                            "jdbc:mysql://localhost/elide?serverTimezone=UTC"
+                        ]
+                    },
+                    "driver": {
+                        "type": "string",
+                        "title": "JDBC Driver Name",
+                        "description": "JDBC Driver for the database connection i.e. javax.persistence.jdbc.driver",
+                        "format": "javaClassName",
+                        "examples": [
+                            "com.mysql.jdbc.Driver"
+                        ]
+                    },
+                    "user": {
+                        "type": "string",
+                        "title": "DB Username",
+                        "description": "Username for the database connection i.e. javax.persistence.jdbc.user",
+                        "examples": [
+                            "guest1"
+                        ]
+                    },
+                    "dialect": {
+                        "type": "string",
+                        "title": "Elide Dialect",
+                        "description": "The Elide Dialect to use for query generation.",
+                        "format": "javaClassName",
+                        "examples": [
+                            "com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect"
+                        ]
+                    },
+                    "propertyMap": {
+                        "type": "object",
+                        "title": "Additional Properties Map",
+                        "description": "A map of additional Hibernate properties and persistence properties",
+                        "default": {},
+                        "patternProperties": {
+                            "^([A-Za-z0-9_]+[.]?)+$": {
+                                "type": [
+                                    "string",
+                                    "number",
+                                    "boolean",
+                                    "array",
+                                    "object"
+                                ]
+                            }
+                        },
+                        "additionalProperties": false,
+                        "examples": [
+                            {
+                                "hibernate.show_sql": true,
+                                "hibernate.default_batch_fetch_size": 100,
+                                "hibernate.hbm2ddl.auto": "create"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    },
+    "examples": [
+        {
+            "dbconfigs": [
+                {
+                    "name": "MyDB2Connection",
+                    "url": "jdbc:db2://localhost/elide?serverTimezone=UTC&",
+                    "driver": "com.mysql.jdbc.Driver",
+                    "user": "elide",
+                    "dialect": "PrestoDB",
+                    "propertyMap": {
+                        "hibernate.show_sql": true,
+                        "hibernate.default_batch_fetch_size": 100.1,
+                        "hibernate.hbm2ddl.auto": "create"
+                    }
+                },
+                {
+                    "name": "MySQLConnection",
+                    "url": "jdbc:mysql://localhost/elide?serverTimezone=UTC",
+                    "driver": "com.mysql.jdbc.Driver",
+                    "user": "guest1",
+                    "dialect": "com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.HiveDialect"
+                }
+            ]
+        }
+    ]
+}
diff --git a/elide-model-config/src/main/resources/elideNamespaceConfigSchema.json b/elide-model-config/src/main/resources/elideNamespaceConfigSchema.json
new file mode 100644
index 0000000000..98ff167149
--- /dev/null
+++ b/elide-model-config/src/main/resources/elideNamespaceConfigSchema.json
@@ -0,0 +1,79 @@
+{
+    "$schema": "https://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "title": "Elide Namespace Config Root Schema",
+    "description": "Elide Namespace config json/hjson schema",
+    "required": [
+        "namespaces"
+    ],
+    "additionalProperties": false,
+    "properties": {
+        "namespaces": {
+            "type": "array",
+            "title": "Elide Namespace Config Collection",
+            "description": "An array of Elide Namespace configs.",
+            "uniqueItems": true,
+            "minItems": 1,
+            "items": {
+                "type": "object",
+                "title": "Elide Namespace Config",
+                "description": "Elide Namespace config",
+                "required": [
+                    "name"
+                ],
+                "additionalProperties": false,
+                "properties": {
+                    "name": {
+                        "type": "string",
+                        "title": "Namespace Name",
+                        "description": "Name of the Namespace. This can used for grouping the tables by subject area.",
+                        "format": "elideNamespaceName",
+                        "examples": [
+                            "MyNamespace"
+                        ]
+                    },
+                    "friendlyName": {
+                        "title": "Namespace friendly name",
+                        "description": "The friendly name of the Namespace. This will be displayed in the UI.  If not provided, this defaults to the name",
+                        "type": "string"
+                    },
+                    "description": {
+                        "title": "Namespace description",
+                        "description": "A long description of the Namespace.",
+                        "type": "string"
+                    },
+                    "readAccess": {
+                        "title": "Namespace read access",
+                        "description": "Read permission for the Namespace.",
+                        "type": "string",
+                        "default": "Prefab.Role.All"
+                    },
+                    "apiVersion": {
+                        "title": "Namespace apiVersion",
+                        "description": "Api Version for the Namespace.",
+                        "type": "string",
+                        "default": ""
+                    }
+                }
+            }
+        }
+    },
+    "examples": [
+        {
+            "namespaces": [
+                {
+                    "name": "MyNamespace",
+                    "friendlyName": "My Namespace",
+                    "readAccess": "User is Admin",
+                    "description": "A description of the MyNamespace namespace"
+                },
+                {
+                    "name": "AnotherNamespace",
+                    "friendlyName": "Another Namespace",
+                    "readAccess": "User is Editor",
+                    "description": "A description of the AnotherNamespace namespace"
+                }
+            ]
+        }
+    ]
+}
diff --git a/elide-model-config/src/main/resources/elideSecuritySchema.json b/elide-model-config/src/main/resources/elideSecuritySchema.json
new file mode 100644
index 0000000000..fa27e55313
--- /dev/null
+++ b/elide-model-config/src/main/resources/elideSecuritySchema.json
@@ -0,0 +1,54 @@
+{
+    "$schema": "https://json-schema.org/draft-04/schema#",
+    "description": "Elide Security config json/hjson schema",
+    "type": "object",
+    "properties": {
+        "roles": {
+            "title": "Security Roles",
+            "description": "List of Roles that will map to security checks",
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+                "type": "string",
+                "format": "elideRole"
+            }
+        },
+        "rules": {
+            "title": "Security Rules",
+            "description": "List of RSQL filter expression templates",
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+                "properties": {
+                    "type": {
+                        "title": "Rule Type",
+                        "description": "Type of security rule",
+                        "type": "string",
+                        "enum": [
+                            "filter"
+                        ]
+                    },
+                    "filter": {
+                        "title": "Rule Filter",
+                        "description": "Rule filter expression",
+                        "type": "string",
+                        "enum": [
+                            "filter"
+                        ]
+                    },
+                    "name": {
+                        "title": "Rule Name",
+                        "description": "Name of the security rule",
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "filter",
+                    "name"
+                ],
+                "additionalProperties": false
+            }
+        }
+    },
+    "additionalProperties": false
+}
diff --git a/elide-model-config/src/main/resources/elideTableSchema.json b/elide-model-config/src/main/resources/elideTableSchema.json
new file mode 100644
index 0000000000..a868ba40cc
--- /dev/null
+++ b/elide-model-config/src/main/resources/elideTableSchema.json
@@ -0,0 +1,600 @@
+{
+    "$schema": "https://json-schema.org/draft-04/schema#",
+    "definitions": {
+        "argument" : {
+            "title" : "Arguments",
+            "description" : "Arguments are supported for table, measures and dimensions.",
+            "type" : "object",
+            "properties": {
+                "name": {
+                    "title": "Argument name",
+                    "description": "Name must start with an alphabetic character and can include alaphabets, numbers and '_' only.",
+                    "type": "string",
+                    "format": "elideArgumentName"
+                },
+                "description": {
+                    "title": "Argument description",
+                    "description": "A long description for this Argument.",
+                    "type": "string"
+                },
+                "type": {
+                    "title": "Argument type",
+                    "description": "Must be one of Integer, Decimal, Money, Text, Coordinate, Boolean",
+                    "type": "string",
+                    "format": "elideFieldType"
+                },
+                "values": {
+                    "title": "Argument values",
+                    "description": "An array of valid string values for this Argument",
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "tableSource": {
+                    "$ref": "#/definitions/tableSource"
+                },
+                "default": {
+                    "title": "Default argument value",
+                    "description": "Default value for this argument.",
+                    "type": [
+                        "string",
+                        "number",
+                        "boolean"
+                    ]
+                }
+            },
+            "required": [
+                "name",
+                "type",
+                "default"
+            ],
+            "validateArgumentProperties": true,
+            "additionalProperties": false
+        },
+        "join": {
+            "title": "Join",
+            "description": "Joins describe the SQL expression necessary to join two physical tables. Joins can be used when defining dimension columns that reference other tables.",
+            "type": "object",
+            "properties": {
+                "name": {
+                    "title": "Join name",
+                    "description": "The name of the join relationship.",
+                    "type": "string",
+                    "format": "elideFieldName"
+                },
+                "namespace": {
+                        "title": "Join Namespace",
+                        "description": "Namespace for the Join.",
+                        "type": "string",
+                        "format": "elideNamespaceName",
+                        "default": "default"
+                },
+                "to": {
+                    "title": "Join table name",
+                    "description": "The name of the table that is being joined to",
+                    "type": "string",
+                    "format": "elideName"
+                },
+                "type": {
+                    "title": "Type of Join",
+                    "description": "Type of the join - left, inner, full or cross",
+                    "type": "string",
+                    "format": "elideJoinType"
+                },
+                "kind": {
+                    "title": "Kind of Join",
+                    "description": "Kind of the join - toOne or toMany",
+                    "type": "string",
+                    "format": "elideJoinKind"
+                },
+                "definition": {
+                    "title": "Join definition SQL",
+                    "description": "Templated SQL expression that represents the ON clause of the join",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "to"
+            ],
+            "additionalProperties": false
+        },
+        "tableSource": {
+            "title": "Table Source",
+            "description": "Provides information about where a column or argument values can be found.",
+            "type": "object",
+            "properties": {
+                "table": {
+                    "title": "Source table",
+                    "description": "The source table that contains the colum or argument values.",
+                    "type": "string",
+                    "format": "elideName"
+                },
+                "namespace": {
+                    "title": "Source table namespace",
+                    "description": "Namespace for the source table.",
+                    "type": "string",
+                    "format": "elideNamespaceName",
+                    "default": "default"
+                },
+                "column": {
+                    "title": "Primary source table column name",
+                    "description": "The column that provides a unique list of values for the given column or argument",
+                    "type": "string",
+                    "format": "elideFieldName"
+                },
+                "suggestionColumns": {
+                    "title": "Secondary search columns",
+                    "description": "Secondary columns that can be searched to locate the primary column(s)",
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string",
+                        "format": "elideFieldName"
+                    }
+                }
+            },
+            "required": [
+                "table",
+                "column"
+            ],
+            "additionalProperties": false
+        },
+        "measure": {
+            "title": "Measure",
+            "description": "Metric definitions are extensible objects that contain a type field and one or more additional attributes. Each type is tied to logic in Elide that generates a metric function.",
+            "type": "object",
+            "properties": {
+                "name": {
+                    "title": "Metric name",
+                    "description": "The name of the metric. This will be the same as the POJO field name.",
+                    "type": "string",
+                    "format": "elideFieldName"
+                },
+                "friendlyName": {
+                    "title": "Metric friendly name",
+                    "description": "The friendly name of the metric. This will be displayed in the UI.  If not provided, this defaults to the name",
+                    "type": "string"
+                },
+                "description": {
+                    "title": "Metric description",
+                    "description": "A long description of the metric.",
+                    "type": "string"
+                },
+                "category": {
+                    "title": "Measure group category",
+                    "description": "Category for grouping",
+                    "type": "string"
+                },
+                "hidden": {
+                    "title": "Hide/Show measure",
+                    "description": "Whether this metric is exposed via API metadata",
+                    "type": "boolean",
+                    "default": false
+                },
+                "readAccess": {
+                    "title": "Measure read access",
+                    "description": "Read permission for the metric.",
+                    "type": "string",
+                    "default": "Prefab.Role.All"
+                },
+                "definition": {
+                    "title": "Metric definition",
+                    "description": "The definition of the metric",
+                    "type": "string"
+                },
+                "maker": {
+                    "title": "Metric Projection Maker",
+                    "description": "Registers a custom function to create a projection for this metric",
+                    "type": "string",
+                    "format": "javaClassName"
+                },
+                "type": {
+                    "title": "Measure field type",
+                    "description": "The data type of the measure field",
+                    "type": "string",
+                    "format": "elideFieldType"
+                },
+                "tags": {
+                    "title": "Measure tags",
+                    "description": "An array of string based tags for measures",
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "arguments": {
+                    "title": "Measure arguments",
+                    "description": "An array of supported arguments for measure",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/argument"
+                    }
+                },
+                "filterTemplate": {
+                    "title": "Required RSQL Filter Template",
+                    "description": "Client queries must include a filter conforming to this RSQL template.",
+                    "type": "string",
+                    "format": "elideRSQLFilter"
+                }
+            },
+            "oneOf": [
+                {
+                    "required": [
+                        "name",
+                        "type",
+                        "definition"
+                    ]
+                },
+                {
+                    "required": [
+                        "name",
+                        "type",
+                        "maker"
+                    ]
+                }
+            ],
+            "additionalProperties": false
+        },
+        "dimensionRef": {
+            "title": "Dimension",
+            "description": "Dimensions represent labels for measures. Dimensions are used to filter and group measures.",
+            "type": "object",
+            "properties": {
+                "name": {
+                    "title": "Dimension name",
+                    "description": "The name of the dimension. This will be the same as the POJO field name.",
+                    "type": "string",
+                    "format": "elideFieldName"
+                },
+                "friendlyName": {
+                    "title": "Dimension friendly name",
+                    "description": "The friendly name of the dimension. This will be displayed in the UI.  If not provided, this defaults to the name",
+                    "type": "string"
+                },
+                "description": {
+                    "title": "Dimension description",
+                    "description": "A long description of the dimension.",
+                    "type": "string"
+                },
+                "category": {
+                    "title": "Dimension group category",
+                    "description": "Category for grouping dimension",
+                    "type": "string"
+                },
+                "hidden": {
+                    "title": "Hide/Show dimension",
+                    "description": "Whether this dimension is exposed via API metadata",
+                    "type": "boolean",
+                    "default": false
+                },
+                "readAccess": {
+                    "title": "Dimension read access",
+                    "description": "Read permission for the dimension.",
+                    "type": "string",
+                    "default": "Prefab.Role.All"
+                },
+                "definition": {
+                    "title": "Dimension definition",
+                    "description": "The definition of the dimension",
+                    "type": "string"
+                },
+                "cardinality": {
+                    "title": "Dimension cardinality",
+                    "description": "Dimension cardinality: (tiny, small, medium, large, huge). The relative sizes are decided by the table designer(s).",
+                    "type": "string",
+                    "format": "elideCardiality"
+                },
+                "tags": {
+                    "title": "Dimension tags",
+                    "description": "An array of string based tags for dimensions",
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "arguments": {
+                    "title": "Dimension arguments",
+                    "description": "An array of supported arguments for dimensions",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/argument"
+                    }
+                },
+                "filterTemplate": {
+                    "title": "Required RSQL Filter Template",
+                    "description": "Client queries must include a filter conforming to this RSQL template.",
+                    "type": "string",
+                    "format": "elideRSQLFilter"
+                }
+            }
+        },
+        "dimension": {
+            "title": "Dimension",
+            "description": "Dimensions represent labels for measures. Dimensions are used to filter and group measures.",
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/definitions/dimensionRef"
+                },
+                {
+                    "properties": {
+                        "type": {
+                            "title": "Dimension field type",
+                            "description": "The data type of the dimension field",
+                            "type": "string",
+                            "format": "elideFieldType"
+                        },
+                        "values": {
+                            "title": "Dimension values",
+                            "description": "An array of valid string values for this dimension",
+                            "type": "array",
+                            "uniqueItems": true,
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "tableSource": {
+                            "$ref": "#/definitions/tableSource"
+                        }
+                    }
+                }
+            ],
+            "validateDimensionProperties": true,
+            "required": [
+                "name",
+                "type",
+                "definition"
+            ]
+        },
+        "timeDimension": {
+            "title": "Time Dimension",
+            "description": "Time Dimensions represent labels for measures. Dimensions are used to filter and group measures.",
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/definitions/dimensionRef"
+                },
+                {
+                    "properties": {
+                        "type": {
+                            "title": "Dimension field type",
+                            "description": "The data type of the dimension field",
+                            "type": "string",
+                            "format": "elideTimeFieldType"
+                        },
+                        "grains" : {
+                            "title" : "Time Dimension grains",
+                            "description" : "Time Dimension granularity and Sqls",
+                            "type" : "array",
+                            "items" : {
+                                "title": "Grains",
+                                "description": "Grains can have SQL expressions that can substitute column with the dimension definition expression",
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "title": "Time granularity",
+                                        "description": "Indicates grain time granularity",
+                                        "type": "string",
+                                        "format": "elideGrainType"
+                                    },
+                                    "sql": {
+                                        "title": "Grain SQL",
+                                        "description": "Grain SQL query",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false
+                            },
+                            "default" : []
+                        }
+                    }
+                }
+            ],
+            "validateTimeDimensionProperties": true,
+            "required": [
+                "name",
+                "type",
+                "definition"
+            ]
+        }
+    },
+    "type": "object",
+    "title": "Elide Table Root Schema",
+    "description": "Elide Table config json/hjson schema",
+    "properties": {
+        "tables": {
+            "type": "array",
+            "title": "Elide Model Collection",
+            "description": "An array of Elide table configs.",
+            "uniqueItems": true,
+            "minItems": 1,
+            "items": {
+                "type": "object",
+                "title": "Elide Model",
+                "description": "Elide Table Config",
+                "properties": {
+                    "name": {
+                        "title": "Table Model Name",
+                        "description": "The name of the model. This will be the same as the POJO class name.",
+                        "type": "string",
+                        "format": "elideName"
+                    },
+                    "friendlyName": {
+                        "title": "Table friendly name",
+                        "description": "The friendly name of the table. This will be displayed in the UI.  If not provided, this defaults to the name",
+                        "type": "string"
+                    },
+                    "filterTemplate": {
+                        "title": "Required RSQL Filter Template",
+                        "description": "Client queries must include a filter conforming to this RSQL template.",
+                        "type": "string",
+                        "format": "elideRSQLFilter"
+                    },
+                    "isFact": {
+                        "title": "Is Fact Table",
+                        "description": "Whether this table is a fact",
+                        "type": "boolean",
+                        "default": true
+                    },
+                    "hidden": {
+                        "title": "Hide/Show Table",
+                        "description": "Whether this table is exposed via API metadata",
+                        "type": "boolean",
+                        "default": false
+                    },
+                    "description": {
+                        "title": "Table Model description",
+                        "description": "A long description of the model.",
+                        "type": "string"
+                    },
+                    "cardinality": {
+                        "title": "Table cardinality",
+                        "description": "Table cardinality: (tiny, small, medium, large, huge). The relative sizes are decided by the table designer(s).",
+                        "type": "string",
+                        "format": "elideCardiality"
+                    },
+                    "readAccess": {
+                        "title": "Table read access",
+                        "description": "Read permission for the table.",
+                        "type": "string",
+                        "default": "Prefab.Role.All"
+                    },
+                    "namespace": {
+                        "title": "Table Namespace",
+                        "description": "Namespace for the table.",
+                        "type": "string",
+                        "format": "elideNamespaceName",
+                        "default": "default"
+                    },
+                    "hints": {
+                        "title": "Optimizer Hints",
+                        "description": "An array of hint names to control the optimizer",
+                        "type": "array",
+                        "uniqueItems": true,
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "joins": {
+                        "title": "Table joins",
+                        "description": "Describes SQL joins to other tables for column references.",
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/join"
+                        }
+                    },
+                    "measures": {
+                        "title": "Table measures",
+                        "description": "Zero or more metric definitions.",
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/measure"
+                        }
+                    },
+                    "dimensions": {
+                        "title": "Table dimensions",
+                        "description": "One or more dimension definitions.",
+                        "type": "array",
+                        "items": {
+                            "oneOf": [
+                                {
+                                    "$ref": "#/definitions/dimension"
+                                },
+                                {
+                                    "$ref": "#/definitions/timeDimension"
+                                }
+                            ]
+                        }
+                    },
+                    "tags": {
+                        "title": "Table tags",
+                        "description": "An array of string based tags",
+                        "type": "array",
+                        "uniqueItems": true,
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "arguments": {
+                        "title": "Table arguments",
+                        "description": "An array of supported arguments for tables.",
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/argument"
+                        }
+                    }
+                },
+                "oneOf": [
+                    {
+                        "properties": {
+                            "sql": {
+                                "title": "Table SQL",
+                                "description": "SQL query which is used to populate the table.",
+                                "type": "string"
+                            },
+                            "dbConnectionName": {
+                                "title": "DB Connection Name",
+                                "description": "The database connection name for this model.",
+                                "type": "string",
+                                "format": "elideName"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "sql",
+                            "dimensions"
+                        ]
+                    },
+                    {
+                        "properties": {
+                            "schema": {
+                                "title": "Table Schema",
+                                "description": "The database or schema where the model lives.",
+                                "type": "string"
+                            },
+                            "table": {
+                                "title": "Table name",
+                                "description": "The physical table name where the model lives.",
+                                "type": "string"
+                            },
+                            "dbConnectionName": {
+                                "title": "DB Connection Name",
+                                "description": "The database connection name for this model.",
+                                "type": "string",
+                                "format": "elideName"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "table",
+                            "dimensions"
+                        ]
+                    },
+                    {
+                        "properties": {
+                            "extend": {
+                                "title": "Table Extends",
+                                "description": "Extends another logical table.",
+                                "type": "string",
+                                "format": "elideName"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "extend"
+                        ]
+                    }
+                ]
+            }
+        }
+    },
+    "required": [
+        "tables"
+    ],
+    "additionalProperties": false
+}
diff --git a/elide-model-config/src/main/resources/elideVariableSchema.json b/elide-model-config/src/main/resources/elideVariableSchema.json
new file mode 100644
index 0000000000..3b8d46d1a8
--- /dev/null
+++ b/elide-model-config/src/main/resources/elideVariableSchema.json
@@ -0,0 +1,18 @@
+{
+    "$schema": "https://json-schema.org/draft-04/schema#",
+    "description": "Elide Variable config json/hjson schema",
+    "type": "object",
+    "patternProperties": {
+        "^([A-Za-z0-9_]+[.]?)+$": {
+            "type": [
+                "string",
+                "number",
+                "boolean",
+                "array",
+                "object"
+            ]
+        }
+    },
+    "additionalProperties": false,
+    "minProperties": 1
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidatorTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidatorTest.java
new file mode 100644
index 0000000000..7ec2d9c74f
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/DynamicConfigSchemaValidatorTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.hjson.JsonValue;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+public class DynamicConfigSchemaValidatorTest {
+
+    private DynamicConfigSchemaValidator testClass = new DynamicConfigSchemaValidator();
+
+    @Test
+    public void testValidSecuritySchemas() throws Exception {
+        String jsonConfig = loadHjsonFromClassPath("/validator/valid/models/security.hjson");
+        assertTrue(testClass.verifySchema(Config.SECURITY, jsonConfig, "security.hjson"));
+    }
+
+    @Test
+    public void testInvalidSecuritySchema() throws Exception {
+        String jsonConfig = loadHjsonFromClassPath("/validator/invalid_schema/security_invalid.hjson");
+        Exception e = assertThrows(IllegalStateException.class,
+                () -> testClass.verifySchema(Config.SECURITY, jsonConfig, "security_invalid.hjson"));
+        String expectedMessage = "Schema validation failed for: security_invalid.hjson\n"
+                        + "[ERROR]\n"
+                        + "object instance has properties which are not allowed by the schema: [\"cardinality\",\"description\",\"name\",\"schema$\",\"table\"]";
+        assertEquals(expectedMessage, e.getMessage());
+    }
+
+    @Test
+    public void testValidVariableSchema() throws Exception {
+        String jsonConfig = loadHjsonFromClassPath("/validator/valid/models/variables.hjson");
+        assertTrue(testClass.verifySchema(Config.MODELVARIABLE, jsonConfig, "variables.hjson"));
+    }
+
+    @Test
+    public void testInvalidVariableSchema() throws Exception {
+        String jsonConfig = loadHjsonFromClassPath("/validator/invalid_schema/variables_invalid.hjson");
+        Exception e = assertThrows(IllegalStateException.class,
+                () -> testClass.verifySchema(Config.MODELVARIABLE, jsonConfig, "variables.hjson"));
+        String expectedMessage = "Schema validation failed for: variables.hjson\n"
+                        + "[ERROR]\n"
+                        + "object instance has properties which are not allowed by the schema: [\"schema$\"]\n"
+                        + "[ERROR]\n"
+                        + "Instance[/cardinality] failed to validate against schema[/patternProperties/^([A-Za-z0-9_]+[.]?)+$]. instance type (null) does not match any allowed primitive type (allowed: [\"array\",\"boolean\",\"integer\",\"number\",\"object\",\"string\"])";
+        assertEquals(expectedMessage, e.getMessage());
+    }
+
+    // Table config test
+    @DisplayName("Valid Table config")
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "/validator/valid/models/tables/player_stats.hjson",
+            "/validator/valid/models/tables/player_stats_extends.hjson"})
+    public void testValidTableSchema(String resource) throws Exception {
+        String jsonConfig = loadHjsonFromClassPath(resource);
+        String fileName = getFileName(resource);
+        assertTrue(testClass.verifySchema(Config.TABLE, jsonConfig, fileName));
+    }
+
+    @DisplayName("Invalid Table config")
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "/validator/invalid_schema/table_invalid.hjson",
+            "/validator/invalid_schema/invalid_dimension_data_source.hjson",
+            "/validator/invalid_schema/invalid_query_plan_classname.hjson",
+            "/validator/invalid_schema/invalid_table_filter.hjson"})
+    public void testInvalidTableSchema(String resource) throws Exception {
+        String jsonConfig = loadHjsonFromClassPath(resource);
+        String fileName = getFileName(resource);
+        Exception e = assertThrows(IllegalStateException.class,
+                () -> testClass.verifySchema(Config.TABLE, jsonConfig, fileName));
+        assertTrue(e.getMessage().startsWith("Schema validation failed for: " + fileName));
+    }
+
+    @DisplayName("Invalid Table config")
+    @ParameterizedTest
+    @ValueSource(strings = {"/validator/invalid_schema/table_schema_with_multiple_errors.hjson"})
+    public void testInvalidTableSchemaMultipleErrors(String resource) throws Exception {
+        String jsonConfig = loadHjsonFromClassPath(resource);
+        String fileName = getFileName(resource);
+        Exception e = assertThrows(IllegalStateException.class,
+                        () -> testClass.verifySchema(Config.TABLE, jsonConfig, fileName));
+        String expectedMessage = "Schema validation failed for: table_schema_with_multiple_errors.hjson\n"
+                        + "[ERROR]\n"
+                        + "object instance has properties which are not allowed by the schema: [\"name\"]\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/arguments/0] failed to validate against schema[/definitions/argument]. object has missing required properties ([\"default\"])\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/arguments/0/type] failed to validate against schema[/definitions/argument/properties/type]. Field type [Number] is not allowed. Supported value is one of [Integer, Decimal, Money, Text, Coordinate, Boolean, Enum_Text, Enum_Ordinal].\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/arguments/1] failed to validate against schema[/definitions/argument]. object has missing required properties ([\"default\"])\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/arguments/1/name] failed to validate against schema[/definitions/argument/properties/name]. Argument name [Grain] is not allowed. Argument name cannot be 'grain'.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/arguments/2] failed to validate against schema[/definitions/argument]. tableSource and values cannot both be defined for an argument. Choose One or None.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/cardinality] failed to validate against schema[/properties/tables/items/properties/cardinality]. Cardinality type [Extra Large] is not allowed. Supported value is one of [Tiny, Small, Medium, Large, Huge].\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/dimensions/0] failed to validate against schema[/properties/tables/items/properties/dimensions/items]. instance failed to match exactly one schema (matched 0 out of 2)\n"
+                        + "    Instance[/tables/0/dimensions/0] failed to validate against schema[/definitions/dimension]. instance failed to match all required schemas (matched only 0 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/0/cardinality] failed to validate against schema[/definitions/dimensionRef/properties/cardinality]. Cardinality type [Extra small] is not allowed. Supported value is one of [Tiny, Small, Medium, Large, Huge].\n"
+                        + "        Instance[/tables/0/dimensions/0/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [id] is not allowed. Field name cannot be one of [id, sql]\n"
+                        + "        Instance[/tables/0/dimensions/0/type] failed to validate against schema[/definitions/dimension/allOf/1/properties/type]. Field type [Float] is not allowed. Supported value is one of [Integer, Decimal, Money, Text, Coordinate, Boolean, Enum_Text, Enum_Ordinal].\n"
+                        + "    Instance[/tables/0/dimensions/0] failed to validate against schema[/definitions/timeDimension]. instance failed to match all required schemas (matched only 0 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/0/cardinality] failed to validate against schema[/definitions/dimensionRef/properties/cardinality]. Cardinality type [Extra small] is not allowed. Supported value is one of [Tiny, Small, Medium, Large, Huge].\n"
+                        + "        Instance[/tables/0/dimensions/0/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [id] is not allowed. Field name cannot be one of [id, sql]\n"
+                        + "        Instance[/tables/0/dimensions/0/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/type]. Field type [Float] is not allowed. Field type must be [Time] for any time dimension.\n"
+                        + "    Instance[/tables/0/dimensions/0] failed to validate against schema[/definitions/timeDimension]. Properties: [tableSource] are not allowed for time dimensions.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/dimensions/1] failed to validate against schema[/properties/tables/items/properties/dimensions/items]. instance failed to match exactly one schema (matched 0 out of 2)\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/dimension]. instance failed to match all required schemas (matched only 1 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/1/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [_region] is not allowed. Field name must start with lower case alphabet and can include alaphabets, numbers and '_' only.\n"
+                        + "        Instance[/tables/0/dimensions/1/tags] failed to validate against schema[/definitions/dimensionRef/properties/tags]. instance type (string) does not match any allowed primitive type (allowed: [\"array\"])\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/dimension]. tableSource and values cannot both be defined for a dimension. Choose One or None.\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/timeDimension]. instance failed to match all required schemas (matched only 0 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/1/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [_region] is not allowed. Field name must start with lower case alphabet and can include alaphabets, numbers and '_' only.\n"
+                        + "        Instance[/tables/0/dimensions/1/tags] failed to validate against schema[/definitions/dimensionRef/properties/tags]. instance type (string) does not match any allowed primitive type (allowed: [\"array\"])\n"
+                        + "        Instance[/tables/0/dimensions/1/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/type]. Field type [Text] is not allowed. Field type must be [Time] for any time dimension.\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/timeDimension]. Properties: [values, tableSource] are not allowed for time dimensions.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/dimensions/2] failed to validate against schema[/properties/tables/items/properties/dimensions/items]. instance failed to match exactly one schema (matched 0 out of 2)\n"
+                        + "    Instance[/tables/0/dimensions/2] failed to validate against schema[/definitions/dimension]. instance failed to match all required schemas (matched only 1 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/2/type] failed to validate against schema[/definitions/dimension/allOf/1/properties/type]. Field type [TIMEX] is not allowed. Supported value is one of [Integer, Decimal, Money, Text, Coordinate, Boolean, Enum_Text, Enum_Ordinal].\n"
+                        + "    Instance[/tables/0/dimensions/2] failed to validate against schema[/definitions/dimension]. Properties: [grains] are not allowed for dimensions.\n"
+                        + "    Instance[/tables/0/dimensions/2] failed to validate against schema[/definitions/timeDimension]. instance failed to match all required schemas (matched only 1 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/2/grains/0/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/grains/items/properties/type]. Grain type [Days] is not allowed. Supported value is one of [Second, Minute, Hour, Day, IsoWeek, Week, Month, Quarter, Year].\n"
+                        + "        Instance[/tables/0/dimensions/2/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/type]. Field type [TIMEX] is not allowed. Field type must be [Time] for any time dimension.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/filterTemplate] failed to validate against schema[/properties/tables/items/properties/filterTemplate]. Input value[countryIsoCode={{code}};startTime=={{start}}] is not a valid RSQL filter expression. Please visit page https://elide.io/pages/guide/v5/11-graphql.html#operators for samples.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/measures/0] failed to validate against schema[/definitions/measure]. instance failed to match exactly one schema (matched 2 out of 2)\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/measures/0/maker] failed to validate against schema[/definitions/measure/properties/maker]. Input value[com.yahoo.elide.datastores.aggregation.query@DefaultMetricProjectionMaker.class] is not a valid Java class name.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/name] failed to validate against schema[/properties/tables/items/properties/name]. Name [Country@10] is not allowed. Name must start with an alphabetic character and can include alaphabets, numbers and '_' only.";
+
+        assertEquals(expectedMessage, e.getMessage());
+    }
+
+    // DB config test
+    @DisplayName("Valid DB config")
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "/validator/valid/db/sql/multiple_db_no_variables.hjson",
+            "/validator/valid/db/sql/single_db.hjson"})
+    public void testValidDbSchema(String resource) throws Exception {
+        String jsonConfig = loadHjsonFromClassPath(resource);
+        String fileName = getFileName(resource);
+        assertTrue(testClass.verifySchema(Config.SQLDBConfig, jsonConfig, fileName));
+    }
+
+    @Test
+    public void testInvalidDbSchema() throws Exception {
+        String jsonConfig = loadHjsonFromClassPath("/validator/invalid_schema/db_invalid.hjson");
+        Exception e = assertThrows(IllegalStateException.class,
+                () -> testClass.verifySchema(Config.SQLDBConfig, jsonConfig, "db_invalid.hjson"));
+        String expectedMessage = "Schema validation failed for: db_invalid.hjson\n"
+                        + "[ERROR]\n"
+                        + "Instance[/dbconfigs/0/driver] failed to validate against schema[/properties/dbconfigs/items/properties/driver]. Input value[11COM.ibm.db2.jdbc.net.DB2Driver] is not a valid Java class name.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/dbconfigs/0/name] failed to validate against schema[/properties/dbconfigs/items/properties/name]. Name [11MyDB2Connection] is not allowed. Name must start with an alphabetic character and can include alaphabets, numbers and '_' only.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/dbconfigs/0/propertyMap/hibernate.show_sql] failed to validate against schema[/properties/dbconfigs/items/properties/propertyMap/patternProperties/^([A-Za-z0-9_]+[.]?)+$]. instance type (null) does not match any allowed primitive type (allowed: [\"array\",\"boolean\",\"integer\",\"number\",\"object\",\"string\"])\n"
+                        + "[ERROR]\n"
+                        + "Instance[/dbconfigs/1/dialect] failed to validate against schema[/properties/dbconfigs/items/properties/dialect]. instance type (integer) does not match any allowed primitive type (allowed: [\"string\"])\n"
+                        + "[ERROR]\n"
+                        + "Instance[/dbconfigs/1/url] failed to validate against schema[/properties/dbconfigs/items/properties/url]. Input value [ojdbc:mysql://localhost/testdb?serverTimezone=UTC] is not a valid JDBC url, it must start with 'jdbc:'.";
+        assertEquals(expectedMessage, e.getMessage());
+    }
+
+    private String loadHjsonFromClassPath(String resource) throws Exception {
+        Reader reader = new InputStreamReader(
+                DynamicConfigSchemaValidatorTest.class.getResourceAsStream(resource));
+        return JsonValue.readHjson(reader).toString();
+    }
+
+    private String getFileName(String resource) throws Exception {
+        String file = DynamicConfigSchemaValidatorTest.class.getResource(resource).getFile();
+        return file.substring(file.lastIndexOf('/') + 1);
+    }
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/io/FileLoaderTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/io/FileLoaderTest.java
new file mode 100644
index 0000000000..83777629a0
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/io/FileLoaderTest.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.io;
+
+import static com.yahoo.elide.modelconfig.io.FileLoader.formatClassPath;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+public class FileLoaderTest {
+
+    @Test
+    public void testFormatClassPath() {
+        assertEquals("anydir", formatClassPath("src/test/resources/anydir"));
+        assertEquals("anydir/configs", formatClassPath("src/test/resources/anydir/configs"));
+        assertEquals("src/test/resourc", formatClassPath("src/test/resourc"));
+        assertEquals("", formatClassPath("src/test/resources/"));
+        assertEquals("", formatClassPath("src/test/resources"));
+        assertEquals("anydir/configs", formatClassPath("src/test/resourcesanydir/configs"));
+    }
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydratorTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydratorTest.java
new file mode 100644
index 0000000000..127e558fd2
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/parser/handlebars/HandlebarsHydratorTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.parser.handlebars;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public class HandlebarsHydratorTest {
+
+    private static final String CONFIG_PATH = "src/test/resources/validator/valid";
+
+    private static final String VALID_TABLE_WITH_VARIABLES = "{\n"
+            + "  tables: [{\n"
+            + "      name: <% name %>\n"
+            + "      namespace: PlayerNamespace\n"
+            + "      friendlyName: Player Statistics\n"
+            + "      table: <% table %>\n"
+            + "      schema: gamedb\n"
+            + "      description:\n"
+            + "      // newlines are replaced by single space in handlebar if no helper function is applied\n"
+            + "      '''\n"
+            + "      A long description\n"
+            + "      with newline\n"
+            + "       and additional space at start of this line.\n"
+            + "      '''\n"
+            + "      category: Table Category\n"
+            + "      cardinality : lARge\n"
+            + "      hidden : false\n"
+            + "      readAccess : (user AND member) OR (admin AND NOT gu.est user)\n"
+            + "      filterTemplate : countryIsoCode=={{code}}\n"
+            + "      tags: ['GAME', 'PLAYER',  '''\n"
+            + "      A tag\n"
+            + "      with newline\n"
+            + "      ''']\n"
+            + "      hints: ['NoAggregateBeforeJoin']\n"
+            + "      arguments: [\n"
+            + "          {\n"
+            + "             name: scoreFormat\n"
+            + "             type: TEXT\n"
+            + "             default: 999999D00\n"
+            + "          }\n"
+            + "          {\n"
+            + "             name: countryCode\n"
+            + "             type: TEXT\n"
+            + "             tableSource: {\n"
+            + "                 table: Country\n"
+            + "                 column: isoCode\n"
+            + "             }\n"
+            + "             default: US\n"
+            + "          }\n"
+            + "      ]\n"
+            + "      joins: [\n"
+            + "          {\n"
+            + "             name: playerCountry\n"
+            + "             to: Country\n"
+            + "             type: Cross\n"
+            + "          },\n"
+            + "          {\n"
+            + "             name: playerTeam\n"
+            + "             to: Team\n"
+            + "             kind: Tomany\n"
+            + "             type: left\n"
+            + "             definition: '{{playerTeam.id}} = {{ team_id}}'\n"
+            + "          }\n"
+            + "      ]\n"
+            + "\n"
+            + "      measures : [\n"
+            + "          {\n"
+            + "          name : highScore\n"
+            + "          friendlyName : High Score\n"
+            + "          type : INteGER\n"
+            + "          description : very awesome score\n"
+            + "          definition: 'MAX({{score}})'\n"
+            + "          tags: ['PUBLIC']\n"
+            + "          },\n"
+            + "          {\n"
+            + "          name : newHighScore\n"
+            + "          type : INteGER\n"
+            + "          description : very awesome score\n"
+            + "          definition: 'MAX({{score}})'\n"
+            + "          tags: ['PUBLIC']\n"
+            + "          }\n"
+            + "      ]\n"
+            + "      dimensions : [\n"
+            + "         {\n"
+            + "           name : countryIsoCode\n"
+            + "           friendlyName : Country ISO Code\n"
+            + "           type : TEXT\n"
+            + "           category : country detail\n"
+            + "           definition : '{{playerCountry.isoCode}}'\n"
+            + "           values : ['US', 'HK']\n"
+            + "           tags: ['PRIVATE']\n"
+            + "           cardinality: Small\n"
+            + "         },\n"
+            + "         {\n"
+            + "           name : teamRegion\n"
+            + "           type : TEXT\n"
+            + "           definition : '{{playerTeam.region}}'\n"
+            + "           tableSource: {\n"
+            + "              table: PlayerStatsChild\n"
+            + "              namespace: PlayerNamespace\n"
+            + "              column: teamRegion\n"
+            + "           }\n"
+            + "         },\n"
+            + "         {\n"
+            + "           name : createdOn\n"
+            + "           friendlyName : Created On\n"
+            + "           type : TIME\n"
+            + "           definition : '{{create_on}}'\n"
+            + "           filterTemplate : 'createdOn=={{createdOn}}'\n"
+            + "           grains:\n"
+            + "            [{\n"
+            + "             type : DaY\n"
+            + "             sql :  '''\n"
+            + "             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')\n"
+            + "             '''\n"
+            + "            }]\n"
+            + "         },\n"
+            + "         {\n"
+            + "           name : updatedOn\n"
+            + "           type : TIme\n"
+            + "           definition : '{{updated_on}}'\n"
+            + "         }\n"
+            + "      ]\n"
+            + "  }]\n"
+            + "}\n";
+
+    private DynamicConfigValidator testClass;
+    private HandlebarsHydrator hydrator;
+
+    @BeforeAll
+    public void setup() throws IOException {
+        hydrator = new HandlebarsHydrator();
+        testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(), CONFIG_PATH);
+        testClass.readConfigs();
+    }
+
+    @Test
+    public void testConfigHydration() throws IOException {
+        File file = new File(CONFIG_PATH);
+        String hjsonPath = file.getAbsolutePath() + "/models/tables/player_stats.hjson";
+        String content = new String(Files.readAllBytes(Paths.get(hjsonPath)));
+
+        assertEquals(content, hydrator.hydrateConfigTemplate(
+                VALID_TABLE_WITH_VARIABLES, testClass.getModelVariables()));
+    }
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTest.java
new file mode 100644
index 0000000000..df8a2805a4
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/store/ConfigDataStoreTest.java
@@ -0,0 +1,502 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.modelconfig.store;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.modelconfig.store.ConfigDataStore.VALIDATE_ONLY_HEADER;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType.DATABASE;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType.NAMESPACE;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType.SECURITY;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType.TABLE;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType.VARIABLE;
+import static com.yahoo.elide.modelconfig.store.models.ConfigFile.toId;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.yahoo.elide.core.RequestScope;
+import com.yahoo.elide.core.datastore.DataStoreIterable;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.request.EntityProjection;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import com.yahoo.elide.modelconfig.validator.Validator;
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+@Slf4j
+public class ConfigDataStoreTest {
+
+    @Test
+    public void testLoadObjects() {
+        String configRoot = "src/test/resources/validator/valid";
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigDataStoreTransaction tx = store.beginReadTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        DataStoreIterable<ConfigFile> loaded = tx.loadObjects(EntityProjection.builder()
+                        .type(ClassType.of(ConfigFile.class)).build(), scope);
+
+        List<ConfigFile> configFiles = Lists.newArrayList(loaded.iterator());
+
+        Supplier<String> contentProvider = () ->
+                "{\n"
+                        + "  dbconfigs:\n"
+                        + "  [\n"
+                        + "    {\n"
+                        + "      name: MyDB2Connection\n"
+                        + "      url: jdbc:db2:localhost:50000/testdb\n"
+                        + "      driver: COM.ibm.db2.jdbc.net.DB2Driver\n"
+                        + "      user: guestdb2\n"
+                        + "      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PrestoDBDialect\n"
+                        + "      propertyMap:\n"
+                        + "      {\n"
+                        + "        hibernate.show_sql: true\n"
+                        + "        hibernate.default_batch_fetch_size: 100.1\n"
+                        + "        hibernate.hbm2ddl.auto: create\n"
+                        + "      }\n"
+                        + "    }\n"
+                        + "    {\n"
+                        + "      name: MySQLConnection\n"
+                        + "      url: jdbc:mysql://localhost/testdb?serverTimezone=UTC\n"
+                        + "      driver: com.mysql.jdbc.Driver\n"
+                        + "      user: guestmysql\n"
+                        + "      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.HiveDialect\n"
+                        + "    }\n"
+                        + "  ]\n"
+                        + "}\n";
+
+        assertEquals(10, configFiles.size());
+        assertTrue(compare(ConfigFile.builder()
+                .version("")
+                .type(ConfigFile.ConfigFileType.DATABASE)
+                .contentProvider(contentProvider)
+                .path("db/sql/multiple_db_no_variables.hjson")
+                .build(), configFiles.get(1)));
+
+        assertEquals("db/sql/multiple_db.hjson", configFiles.get(0).getPath());
+        assertEquals(DATABASE, configFiles.get(0).getType());
+
+        assertEquals("db/sql/single_db.hjson", configFiles.get(2).getPath());
+        assertEquals(DATABASE, configFiles.get(2).getType());
+
+        assertEquals("db/variables.hjson", configFiles.get(3).getPath());
+        assertEquals(VARIABLE, configFiles.get(3).getType());
+
+        assertEquals("models/namespaces/player.hjson", configFiles.get(4).getPath());
+        assertEquals(NAMESPACE, configFiles.get(4).getType());
+
+        assertEquals("models/security.hjson", configFiles.get(5).getPath());
+        assertEquals(SECURITY, configFiles.get(5).getType());
+
+        assertEquals("models/tables/player_stats.hjson", configFiles.get(6).getPath());
+        assertEquals(TABLE, configFiles.get(6).getType());
+
+        assertEquals("models/tables/player_stats_extends.hjson", configFiles.get(7).getPath());
+        assertEquals(TABLE, configFiles.get(7).getType());
+
+        assertEquals("models/tables/referred_model.hjson", configFiles.get(8).getPath());
+        assertEquals(TABLE, configFiles.get(8).getType());
+
+        assertEquals("models/variables.hjson", configFiles.get(9).getPath());
+        assertEquals(VARIABLE, configFiles.get(9).getType());
+    }
+
+    @Test
+    public void testCreate(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigFile newFile = createFile("test", store, false);
+
+        ConfigDataStoreTransaction readTx = store.beginReadTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        ConfigFile loaded = readTx.loadObject(EntityProjection.builder().type(ClassType.of(ConfigFile.class)).build(),
+                toId("models/tables/test.hjson", NO_VERSION), scope);
+
+        assertTrue(compare(newFile, loaded));
+    }
+
+    @Test
+    public void testCreateReadOnly() {
+
+        //This path is read only (Classpath)...
+        String configRoot = "src/test/resources/validator/valid";
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        assertThrows(UnsupportedOperationException.class,
+                () -> createFile("test", store, false));
+    }
+
+    @Test
+    public void testCreateInvalid(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        assertThrows(BadRequestException.class,
+                () -> createInvalidFile(configRoot, store));
+    }
+
+    @Test
+    public void testCreateValidateOnly(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigDataStoreTransaction readTx = store.beginReadTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        ConfigFile loaded = readTx.loadObject(EntityProjection.builder().type(ClassType.of(ConfigFile.class)).build(),
+                toId("models/tables/test.hjson", NO_VERSION), scope);
+
+        assertNull(loaded);
+    }
+
+    @Test
+    public void testUpdate(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        createFile("test", store, false);
+        ConfigFile updateFile = updateFile(configRoot, store);
+
+        ConfigDataStoreTransaction readTx = store.beginReadTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        ConfigFile loaded = readTx.loadObject(EntityProjection.builder().type(ClassType.of(ConfigFile.class)).build(),
+                toId("models/tables/test.hjson", NO_VERSION), scope);
+
+        assertTrue(compare(updateFile, loaded));
+    }
+
+    @Test
+    public void testUpdateWithPermissionError(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigFile createdFile = createFile("test", store, false);
+
+        String createdFilePath = Path.of(configPath.toFile().getPath(), createdFile.getPath()).toFile().getPath();
+
+        File file = new File(createdFilePath);
+        boolean blockFailed = blockWrites(file);
+
+        if (blockFailed) {
+            //We can't actually test because setting permissions isn't working.
+            return;
+        }
+
+        assertThrows(UnsupportedOperationException.class, () -> updateFile(configRoot, store));
+    }
+
+    @Test
+    public void testDeleteWithPermissionError(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigFile createdFile = createFile("test", store, false);
+
+        String createdFilePath = Path.of(configPath.toFile().getPath(), createdFile.getPath()).toFile().getPath();
+
+        File file = new File(createdFilePath);
+        boolean blockFailed = blockWrites(file);
+
+        if (blockFailed) {
+            //We can't actually test because setting permissions isn't working.
+            return;
+        }
+
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        assertThrows(UnsupportedOperationException.class, () -> tx.delete(createdFile, scope));
+    }
+
+    @Test
+    public void testCreateWithPermissionError(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        File file = configPath.toFile();
+        boolean blockFailed = blockWrites(file);
+
+        if (blockFailed) {
+            //We can't actually test because setting permissions isn't working.
+            return;
+        }
+
+        assertThrows(UnsupportedOperationException.class, () -> createFile("test", store, false));
+    }
+
+    @Test
+    public void testDelete(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+
+        ConfigFile newFile = createFile("test", store, false);
+
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+        tx.delete(newFile, scope);
+
+        tx.flush(scope);
+        tx.commit(scope);
+
+        ConfigDataStoreTransaction readTx = store.beginReadTransaction();
+
+        ConfigFile loaded = readTx.loadObject(EntityProjection.builder().type(ClassType.of(ConfigFile.class)).build(),
+                toId("models/tables/test.hjson", NO_VERSION), scope);
+
+        assertNull(loaded);
+    }
+
+    @Test
+    public void testMultipleFileOperations(@TempDir Path configPath) {
+        String configRoot = configPath.toFile().getPath();
+
+        Validator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(), configRoot);
+        ConfigDataStore store = new ConfigDataStore(configRoot, validator);
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        String [] tables = {"table1", "table2", "table3"};
+
+        for (String tableName : tables) {
+            Supplier<String> contentProvider = () -> String.format("{            \n"
+                    + "  tables: [{     \n"
+                    + "      name: %s\n"
+                    + "      table: test\n"
+                    + "      schema: test\n"
+                    + "      measures : [\n"
+                    + "         {\n"
+                    + "          name : measure\n"
+                    + "          type : INTEGER\n"
+                    + "          definition: 'MAX({{$measure}})'\n"
+                    + "         }\n"
+                    + "      ]      \n"
+                    + "      dimensions : [\n"
+                    + "         {\n"
+                    + "           name : dimension\n"
+                    + "           type : TEXT\n"
+                    + "           definition : '{{$dimension}}'\n"
+                    + "         }\n"
+                    + "      ]\n"
+                    + "  }]\n"
+                    + "}", tableName);
+
+            ConfigFile newFile = ConfigFile.builder()
+                    .type(TABLE)
+                    .contentProvider(contentProvider)
+                    .path(String.format("models/tables/%s.hjson", tableName))
+                    .build();
+
+
+            tx.createObject(newFile, scope);
+        }
+
+        ConfigFile invalid = ConfigFile.builder().path("/tmp").contentProvider((() -> "Invalid")).build();
+        tx.createObject(invalid, scope);
+
+        tx.delete(invalid, scope);
+
+        tx.flush(scope);
+        tx.commit(scope);
+
+        ConfigDataStoreTransaction readTx = store.beginReadTransaction();
+        DataStoreIterable<ConfigFile> loaded = readTx.loadObjects(EntityProjection.builder()
+                .type(ClassType.of(ConfigFile.class)).build(), scope);
+
+        List<ConfigFile> configFiles = Lists.newArrayList(loaded.iterator());
+
+        assertEquals(3, configFiles.size());
+
+        assertEquals("models/tables/table1.hjson", configFiles.get(0).getPath());
+        assertEquals(TABLE, configFiles.get(0).getType());
+
+        assertEquals("models/tables/table2.hjson", configFiles.get(1).getPath());
+        assertEquals(TABLE, configFiles.get(1).getType());
+
+        assertEquals("models/tables/table3.hjson", configFiles.get(2).getPath());
+        assertEquals(TABLE, configFiles.get(2).getType());
+    }
+
+    protected ConfigFile createFile(String tableName, ConfigDataStore store, boolean validateOnly) {
+        Supplier<String> contentProvider = () -> String.format("{            \n"
+                + "  tables: [{     \n"
+                + "      name: %s\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}", tableName);
+
+        ConfigFile newFile = ConfigFile.builder()
+                .type(TABLE)
+                .contentProvider(contentProvider)
+                .path(String.format("models/tables/%s.hjson", tableName))
+                .build();
+
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        if (validateOnly) {
+            when(scope.getRequestHeaderByName(eq(VALIDATE_ONLY_HEADER))).thenReturn("true");
+        }
+
+        tx.createObject(newFile, scope);
+        tx.save(newFile, scope);
+        tx.flush(scope);
+        tx.commit(scope);
+
+        return newFile;
+    }
+
+    protected ConfigFile updateFile(String configRoot, ConfigDataStore store) {
+        Supplier<String> contentProvider = () -> "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test2\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        ConfigFile updatedFile = ConfigFile.builder()
+                .type(TABLE)
+                .contentProvider(contentProvider)
+                .path("models/tables/test.hjson")
+                .build();
+
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        tx.save(updatedFile, scope);
+        tx.flush(scope);
+        tx.commit(scope);
+
+        return updatedFile;
+    }
+
+    protected ConfigFile createInvalidFile(String configRoot, ConfigDataStore store) {
+        Supplier<String> contentProvider = () -> "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INVALID_TYPE\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        ConfigFile newFile = ConfigFile.builder()
+                .type(TABLE)
+                .contentProvider(contentProvider)
+                .path("models/tables/test.hjson")
+                .build();
+
+        ConfigDataStoreTransaction tx = store.beginTransaction();
+        RequestScope scope = mock(RequestScope.class);
+
+        tx.createObject(newFile, scope);
+        tx.save(newFile, scope);
+        tx.flush(scope);
+        tx.commit(scope);
+
+        return newFile;
+    }
+
+    protected boolean compare(ConfigFile a, ConfigFile b) {
+        return a.equals(b) && a.getContent().equals(b.getContent()) && a.getType().equals(b.getType());
+    }
+
+    protected boolean blockWrites(File file) {
+        Set<PosixFilePermission> perms = new HashSet<>();
+
+        try {
+            //Windows doesn't like this.
+            Files.setPosixFilePermissions(file.toPath(), perms);
+        } catch (Exception e) {
+            file.setWritable(false, false);
+        }
+
+        return Files.isWritable(file.toPath());
+    }
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidatorTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidatorTest.java
new file mode 100644
index 0000000000..b964d62fb9
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/validator/DynamicConfigValidatorTest.java
@@ -0,0 +1,482 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.validator;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.catchSystemExit;
+import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErr;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.exceptions.BadRequestException;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.modelconfig.model.Argument;
+import com.yahoo.elide.modelconfig.model.Table;
+import com.yahoo.elide.modelconfig.model.Type;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+public class DynamicConfigValidatorTest {
+
+    @Test
+    public void testValidInheritanceConfig() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+
+        testClass.readConfigs();
+        Table parent = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStats");
+        Table child = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStatsChild");
+
+        // parent class dim + 3 new in child class + 2 overridden
+        assertEquals(parent.getDimensions().size(), 4);
+        assertEquals(child.getDimensions().size(), parent.getDimensions().size() + 3);
+
+        // parent class measure + 1 new in child class
+        assertEquals(parent.getMeasures().size(), 2);
+        assertEquals(child.getMeasures().size(), parent.getMeasures().size() + 1);
+
+        // parent class sql/table
+        assertEquals("player_stats", child.getTable());
+        assertNull(child.getSql());
+        assertEquals("gamedb", child.getSchema());
+        assertNull(child.getDbConnectionName());
+        assertTrue(child.getIsFact());
+        assertEquals(2, child.getArguments().size());
+        assertEquals(parent.getArguments(), child.getArguments());
+
+        // no new joins in child class, will inherit parent class joins
+        assertEquals(parent.getJoins().size(), child.getJoins().size());
+    }
+
+    @Test
+    public void testValidNamespace() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+        testClass.readConfigs();
+        Table parent = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStats");
+        Table child = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStatsChild");
+        Table referred = testClass.getElideTableConfig().getTable("Country");
+
+        assertEquals("PlayerNamespace", child.getNamespace());
+        assertEquals("PlayerNamespace", parent.getNamespace());
+        assertEquals("default", referred.getNamespace()); // Namespace in HJson "default".
+    }
+
+    @Test
+    public void testHelpArgumnents() throws Exception {
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "-h" }));
+            assertEquals(0, exitStatus);
+        });
+
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--help" }));
+            assertEquals(0, exitStatus);
+        });
+    }
+
+    @Test
+    public void testNoArgumnents() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator.main(null));
+            assertEquals(1, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing required option"));
+    }
+
+    @Test
+    public void testOneEmptyArgument() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator.main(new String[] { "" }));
+            assertEquals(1, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing required option"));
+    }
+
+    @Test
+    public void testMissingArgumentValue() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator.main(new String[] { "--configDir" }));
+            assertEquals(2, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing argument for option"));
+
+        error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator.main(new String[] { "-c" }));
+            assertEquals(2, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing argument for option"));
+    }
+
+    @Test
+    public void testMissingConfigDir() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing" }));
+            assertEquals(2, exitStatus);
+        });
+
+        assertTrue(error.contains("config path does not exist"));
+    }
+
+    @Test
+    public void testValidConfigDir() throws Exception {
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/valid"}));
+            assertEquals(0, exitStatus);
+        });
+    }
+
+    @Test
+    public void testMissingVariableConfig() throws Exception {
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing_variable"}));
+            assertEquals(0, exitStatus);
+        });
+    }
+
+    @Test
+    public void testMissingSecurityConfig() throws Exception {
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing_security"}));
+            assertEquals(0, exitStatus);
+        });
+    }
+
+    @Test
+    public void testMissingTableConfig() throws Exception {
+        tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing_table_config"}));
+            assertEquals(0, exitStatus);
+        });
+    }
+
+    @Test
+    public void testBadVariableConfig() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_variable"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Invalid Hjson Syntax: Found '[' where a key name was "
+                + "expected (check your syntax or use quotes if the key name includes {}[],: or whitespace) at 3:7\n",
+                error);
+    }
+
+    @Test
+    public void testInheritanceCycle() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_cyclic_inheritance" }));
+            assertEquals(2, exitStatus);
+        });
+
+        assertTrue(error.contains("Inheriting from table"));
+        assertTrue(error.contains("creates an illegal cyclic dependency."));
+    }
+
+    @Test
+    public void testMissingInheritanceModel() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing_inheritance" }));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Undefined model: B is used as a Parent(extend) for another model.\n", error);
+    }
+
+    @Test
+    public void testBadSecurityConfig() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_security"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Invalid Hjson Syntax: Found '[' where a key name was expected "
+                + "(check your syntax or use quotes if the key name includes {}[],: or whitespace) at 3:11\n",
+                error);
+    }
+
+    @Test
+    public void testDuplicateSecurityRoleConfig() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/duplicate_security_role"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Duplicate!! Role name: 'prefab.role.all' is already defined. Please use different role.\n", error);
+    }
+
+    @Test
+    public void testBadSecurityRoleConfig() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_security_role"}));
+            assertEquals(2, exitStatus);
+        });
+
+        String expectedError = "Schema validation failed for: models/security.hjson\n"
+                        + "[ERROR]\n"
+                        + "Instance[/roles/0] failed to validate against schema[/properties/roles/items]. Role [admin,] is not allowed. Role must start with an alphabetic character and can include alaphabets, numbers, spaces and '.' only.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/roles/1] failed to validate against schema[/properties/roles/items]. Role [guest,] is not allowed. Role must start with an alphabetic character and can include alaphabets, numbers, spaces and '.' only.\n";
+        assertEquals(expectedError, error);
+    }
+
+    @Test
+    public void testBadSecurityChecks() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_security_check"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Found undefined security checks: [guest, member, user]\n", error);
+    }
+
+    @Test
+    public void testNamespaceBadDefaultName() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_default_namespace"}));
+            assertEquals(2, exitStatus);
+        });
+
+        String expected = "Schema validation failed for: models/namespaces/test_namespace.hjson\n"
+                + "[ERROR]\n"
+                + "Instance[/namespaces/0/name] failed to validate against schema[/properties/namespaces/items/properties/name]. Name [Default] clashes with the 'default' namespace. Either change the case or pick a different namespace name.\n";
+        assertEquals(expected, error);
+    }
+
+    @Test
+    public void testNamespaceBadSecurityChecks() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/namespace_bad_security_check"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Found undefined security checks: [namespaceRead]\n", error);
+    }
+
+    @Test
+    public void testMissingNamespace() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/missing_namespace"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("Namespace: TestNamespace is not included in dynamic configs\n", error);
+    }
+
+    @Test
+    public void testBadTableConfigJoinType() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_table_join_type"}));
+            assertEquals(2, exitStatus);
+        });
+        String expected = "Schema validation failed for: models/tables/table1.hjson\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/joins/0/kind] failed to validate against schema[/definitions/join/properties/kind]. Join kind [toAll] is not allowed. Supported value is one of [ToOne, ToMany].\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/joins/1/type] failed to validate against schema[/definitions/join/properties/type]. Join type [full outer] is not allowed. Supported value is one of [left, inner, full, cross].\n";
+
+        assertEquals(expected, error);
+    }
+
+    @Test
+    public void testBadDimName() throws Exception {
+        String expectedMessage = "Schema validation failed for: models/tables/table1.hjson\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/dimensions/0] failed to validate against schema[/properties/tables/items/properties/dimensions/items]. instance failed to match exactly one schema (matched 0 out of 2)\n"
+                        + "    Instance[/tables/0/dimensions/0] failed to validate against schema[/definitions/dimension]. instance failed to match all required schemas (matched only 1 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/0/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [id] is not allowed. Field name cannot be one of [id, sql]\n"
+                        + "    Instance[/tables/0/dimensions/0] failed to validate against schema[/definitions/timeDimension]. instance failed to match all required schemas (matched only 0 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/0/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [id] is not allowed. Field name cannot be one of [id, sql]\n"
+                        + "        Instance[/tables/0/dimensions/0/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/type]. Field type [Text] is not allowed. Field type must be [Time] for any time dimension.\n"
+                        + "[ERROR]\n"
+                        + "Instance[/tables/0/dimensions/1] failed to validate against schema[/properties/tables/items/properties/dimensions/items]. instance failed to match exactly one schema (matched 0 out of 2)\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/dimension]. instance failed to match all required schemas (matched only 1 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/1/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [_region] is not allowed. Field name must start with lower case alphabet and can include alaphabets, numbers and '_' only.\n"
+                        + "    Instance[/tables/0/dimensions/1] failed to validate against schema[/definitions/timeDimension]. instance failed to match all required schemas (matched only 0 out of 2)\n"
+                        + "        Instance[/tables/0/dimensions/1/name] failed to validate against schema[/definitions/dimensionRef/properties/name]. Field name [_region] is not allowed. Field name must start with lower case alphabet and can include alaphabets, numbers and '_' only.\n"
+                        + "        Instance[/tables/0/dimensions/1/type] failed to validate against schema[/definitions/timeDimension/allOf/1/properties/type]. Field type [Text] is not allowed. Field type must be [Time] for any time dimension.\n";
+
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_dim_name"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals(expectedMessage, error);
+    }
+
+    @Test
+    public void testBadTableConfigSQL() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_table_sql"}));
+            assertEquals(2, exitStatus);
+        });
+
+        assertTrue(error.startsWith("sql/definition provided in table config contain either ';' or one of these words"));
+    }
+
+    @Test
+    public void testBadJoinModel() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() ->
+                    DynamicConfigValidator.main(new String[] { "--configDir", "src/test/resources/validator/bad_join_model"}));
+            assertEquals(2, exitStatus);
+        });
+        assertTrue(error.contains(" is neither included in dynamic models nor in static models"));
+    }
+
+    @Test
+    public void testUndefinedVariable() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator
+                    .main(new String[]{"--configDir", "src/test/resources/validator/undefined_handlebar"}));
+
+            assertEquals(2, exitStatus);
+        });
+
+        assertEquals("foobar is used as a variable in either table or security config files "
+                        + "but is not defined in variables config file.\n", error);
+    }
+
+    public void testBadTableSource() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator
+                    .main(new String[]{"--configDir", "src/test/resources/validator/bad_tablesource"}));
+
+            assertEquals(2, exitStatus);
+        });
+        assertEquals("Invalid tableSource : Team.teamRegion . Field : teamRegion is undefined for hjson model: Team",
+                        error);
+    }
+
+    @Test
+    public void testDuplicateDBConfigName() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator
+                    .main(new String[]{"--configDir", "src/test/resources/validator/duplicate_dbconfigname"}));
+
+            assertEquals(2, exitStatus);
+        });
+
+        //Java 11 introduces (and prints) the following deprecation warning:
+        //"Warning: Nashorn engine is planned to be removed from a future JDK release"
+        assertTrue(error.contains("Multiple DB configs found with the same name: OracleConnection\n"));
+    }
+
+    @Test
+    public void testJoinedTablesDBConnectionNameMismatch() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigValidator
+                    .main(new String[]{"--configDir", "src/test/resources/validator/mismatch_dbconfig"}));
+
+            assertEquals(2, exitStatus);
+        });
+        assertTrue(error.contains("DBConnection name mismatch between table: "));
+        assertTrue(error.contains(" and tables in its Join Clause."));
+    }
+
+    @Test
+    public void testDuplicateArgumentName() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+        testClass.readConfigs();
+        Table playerStatsTable = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStats");
+
+        // PlayerStats table already has argument 'countryCode' with type 'TEXT'.
+        // Adding another argument 'countryCode' with type 'INTEGER'.
+        playerStatsTable.getArguments().add(Argument.builder().name("countryCode").type(Type.INTEGER).build());
+        Exception e = assertThrows(IllegalStateException.class, () -> testClass.validateConfigs());
+        assertEquals("Multiple Arguments found with the same name: countryCode", e.getMessage());
+    }
+
+    @Test
+    public void testDuplicateArgumentNameInColumnFilter() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/duplicate_column_args");
+        testClass.readConfigs();
+
+        Exception e = assertThrows(IllegalStateException.class, () -> testClass.validateConfigs());
+        assertEquals("Multiple Arguments found with the same name: foo", e.getMessage());
+    }
+
+    @Test
+    public void testDuplicateArgumentNameInTableFilter() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+        testClass.readConfigs();
+        Table playerStatsTable = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStats");
+
+        // PlayerStats table already has a filter argument 'code' with type 'TEXT'.
+        playerStatsTable.getArguments().add(Argument.builder().name("code").type(Type.TEXT).build());
+        Exception e = assertThrows(IllegalStateException.class, () -> testClass.validateConfigs());
+        assertEquals("Multiple Arguments found with the same name: code", e.getMessage());
+    }
+
+    @Test
+    public void testDuplicateArgumentNameInComplexTableFilter() throws Exception {
+        DynamicConfigValidator testClass = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+        testClass.readConfigs();
+        Table playerStatsTable = testClass.getElideTableConfig().getTable("PlayerNamespace_PlayerStats");
+
+        // PlayerStats table already has a filter argument 'code' with type 'TEXT'.
+        playerStatsTable.getArguments().add(Argument.builder().name("code").type(Type.TEXT).build());
+        playerStatsTable.setFilterTemplate("foo=={{bar}};blah=={{code}}");
+        Exception e = assertThrows(IllegalStateException.class, () -> testClass.validateConfigs());
+        assertEquals("Multiple Arguments found with the same name: code", e.getMessage());
+    }
+
+    @Test
+    public void testPathAndConfigFileTypeMismatches() {
+        DynamicConfigValidator validator = new DynamicConfigValidator(DefaultClassScanner.getInstance(),
+                "src/test/resources/validator/valid");
+
+        Map<String, ConfigFile> resources = Map.of("blah/foo",
+                ConfigFile.builder().path("blah/foo").type(ConfigFile.ConfigFileType.SECURITY).build());
+
+        assertThrows(BadRequestException.class, () -> validator.validate(resources));
+
+        Map<String, ConfigFile> resources2 = Map.of("models/variables.hjson",
+                ConfigFile.builder().path("models/variables.hjson").type(ConfigFile.ConfigFileType.TABLE).build());
+
+        assertThrows(BadRequestException.class, () -> validator.validate(resources2));
+
+        Map<String, ConfigFile> resources3 = Map.of("models/tables/referred_model.hjson",
+                ConfigFile.builder().path("models/tables/referred_model.hjson").type(ConfigFile.ConfigFileType.NAMESPACE).build());
+
+        assertThrows(BadRequestException.class, () -> validator.validate(resources3));
+
+        Map<String, ConfigFile> resources4 = Map.of("models/tables/referred_model.hjson",
+            ConfigFile.builder().path("models/tables/referred_model.hjson").type(ConfigFile.ConfigFileType.DATABASE).build());
+
+        assertThrows(BadRequestException.class, () -> validator.validate(resources4));
+    }
+}
diff --git a/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifierTest.java b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifierTest.java
new file mode 100644
index 0000000000..1b26b7336a
--- /dev/null
+++ b/elide-model-config/src/test/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifierTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.modelconfig.verify;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.catchSystemExit;
+import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErr;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.util.Base64;
+
+public class DynamicConfigVerifierTest {
+
+    private static KeyPair kp;
+    private static String signature;
+    private static String tarContent = null;
+    private static final String TAR_FILE_PATH = "src/test/resources/configs.tar.gz";
+
+    @BeforeAll
+    public static void setUp() throws Exception {
+        createTarGZ();
+        kp = generateKeyPair();
+        tarContent = DynamicConfigVerifier.readTarContents(TAR_FILE_PATH);
+        signature = sign(tarContent, kp.getPrivate());
+    }
+
+    @AfterAll
+    public static void after() {
+        FileUtils.deleteQuietly(FileUtils.getFile(TAR_FILE_PATH));
+    }
+
+    @Test
+    public void testValidSignature() throws Exception {
+        assertTrue(DynamicConfigVerifier.verify(tarContent, signature, kp.getPublic()));
+    }
+
+    @Test
+    public void testInvalidSignature() throws Exception {
+        assertFalse(DynamicConfigVerifier.verify("invalid-signature", signature, kp.getPublic()));
+    }
+
+    @Test
+    public void testHelpArguments() {
+        assertDoesNotThrow(() -> DynamicConfigVerifier.main(new String[] { "-h" }));
+        assertDoesNotThrow(() -> DynamicConfigVerifier.main(new String[] { "--help" }));
+    }
+
+    @Test
+    public void testNoArguments() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigVerifier.main(null));
+            assertEquals(1, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing required option"));
+    }
+
+    @Test
+    public void testOneEmptyArguments() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigVerifier.main(new String[] { "" }));
+            assertEquals(1, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing required option"));
+    }
+
+    @Test
+    public void testMissingArgumentValue() throws Exception {
+        String error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigVerifier.main(new String[] { "--tarFile" }));
+            assertEquals(3, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing argument for option"));
+
+        error = tapSystemErr(() -> {
+            int exitStatus = catchSystemExit(() -> DynamicConfigVerifier.main(new String[] { "-t" }));
+            assertEquals(3, exitStatus);
+        });
+
+        assertTrue(error.startsWith("Missing argument for option"));
+    }
+
+    private static KeyPair generateKeyPair() throws Exception {
+        KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
+        generator.initialize(2048, new SecureRandom());
+        return generator.generateKeyPair();
+    }
+
+    private static String sign(String data, PrivateKey privateKey) throws Exception {
+        Signature privateSignature = Signature.getInstance("SHA256withRSA");
+        privateSignature.initSign(privateKey);
+        privateSignature.update(data.getBytes(StandardCharsets.UTF_8));
+        byte[] signature = privateSignature.sign();
+        return Base64.getEncoder().encodeToString(signature);
+    }
+
+    private static void createTarGZ() throws FileNotFoundException, IOException {
+        TarArchiveOutputStream tarOutputStream = null;
+        try {
+            String configPath  = "src/test/resources/configs/";
+            tarOutputStream = new TarArchiveOutputStream(new GzipCompressorOutputStream(
+                    new BufferedOutputStream(new FileOutputStream(new File(TAR_FILE_PATH)))));
+            addFileToTarGz(tarOutputStream, configPath, "");
+        } finally {
+            tarOutputStream.finish();
+            tarOutputStream.close();
+        }
+    }
+
+    private static void addFileToTarGz(TarArchiveOutputStream tOut, String path, String base) throws IOException {
+        File f = new File(path);
+        String entryName = base + f.getName();
+        TarArchiveEntry tarEntry = new TarArchiveEntry(f, entryName);
+        tOut.putArchiveEntry(tarEntry);
+
+        if (f.isFile()) {
+            IOUtils.copy(new FileInputStream(f), tOut);
+            tOut.closeArchiveEntry();
+        } else {
+            tOut.closeArchiveEntry();
+            File[] children = f.listFiles();
+            if (children != null) {
+                for (File child : children) {
+                    addFileToTarGz(tOut, child.getAbsolutePath(), entryName + "/");
+                }
+            }
+        }
+    }
+}
diff --git a/elide-model-config/src/test/resources/logback.xml b/elide-model-config/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5880836a3b
--- /dev/null
+++ b/elide-model-config/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2020, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableA.hjson b/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableA.hjson
new file mode 100644
index 0000000000..02e07ddc69
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableA.hjson
@@ -0,0 +1,18 @@
+{
+  tables:
+  [
+    {
+      name: A
+      extend: B
+      description: A extends B (which extends A) - an invalid cycle.
+      measures : [
+          {
+            name : count
+            type : Integer
+            description : A simple count
+            definition: 'COUNT(*)'
+          }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableB.hjson b/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableB.hjson
new file mode 100644
index 0000000000..e6e0d67a64
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_cyclic_inheritance/models/tables/tableB.hjson
@@ -0,0 +1,18 @@
+{
+  tables:
+  [
+    {
+      name: B
+      extend: A
+      description: B extends A (which extends B) - an invalid cycle.
+      measures : [
+          {
+            name : count
+            type : Integer
+            description : A simple count
+            definition: 'COUNT(*)'
+          }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_default_namespace/models/namespaces/test_namespace.hjson b/elide-model-config/src/test/resources/validator/bad_default_namespace/models/namespaces/test_namespace.hjson
new file mode 100644
index 0000000000..c8f346d7ad
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_default_namespace/models/namespaces/test_namespace.hjson
@@ -0,0 +1,10 @@
+{
+  namespaces:
+  [
+    {
+      name: Default
+      description: Namespace for Test
+      friendlyName: Default
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_default_namespace/models/tables/namespace_test_model.hjson b/elide-model-config/src/test/resources/validator/bad_default_namespace/models/tables/namespace_test_model.hjson
new file mode 100644
index 0000000000..18b3a48769
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_default_namespace/models/tables/namespace_test_model.hjson
@@ -0,0 +1,28 @@
+{
+  tables: [{
+      name: NameSpaceTestModel
+## default namespace
+      table: test
+      category: Table Category
+      cardinality : lARge
+      hidden : false
+
+      measures : [
+          {
+          name : testMeasure
+          friendlyName : Test Measure
+          type : INteGER
+          description : Test Measure
+          definition: 'MAX({{measure}})'
+          tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : datetime
+           type : TIme
+           definition : '{{datetime}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_dim_name/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_dim_name/models/tables/table1.hjson
new file mode 100644
index 0000000000..7d47c31f05
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_dim_name/models/tables/table1.hjson
@@ -0,0 +1,23 @@
+{
+  tables: [
+    {
+      name: Country
+      table: country
+      cardinality: Small
+      dimensions:
+      [
+        {
+          name: id
+          type: Text
+          definition: '{{id}}'
+        }
+        {
+          // unsupported: name starts with '_'
+          name: _region
+          type: Text
+          definition: '{{region}}'
+        }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_join_model/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_join_model/models/tables/table1.hjson
new file mode 100644
index 0000000000..ae0feded83
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_join_model/models/tables/table1.hjson
@@ -0,0 +1,26 @@
+{
+  tables: [{
+      name: PlayerStats
+      sql: PlayerStats
+      schema: gamedb
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      joins: [
+          {
+             name: playerCountry
+             // undefined model PlayerContinent
+             to: PlayerContinent
+             kind: toOne
+             definition: '{{id}} = {{playerCountry.country_id}}'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           definition : '{{playerCountry.isoCode}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_security/models/security.hjson b/elide-model-config/src/test/resources/validator/bad_security/models/security.hjson
new file mode 100644
index 0000000000..7c916b3847
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_security/models/security.hjson
@@ -0,0 +1,19 @@
+{
+    // colon missing after roles
+    roles  [
+        admin
+        guest
+        dev
+        ]
+    rules: [
+        {
+            type: filter
+            filter: filter
+            name: User belongs to company
+        },
+        {
+            filter: filter
+            name: Principal is owner
+        },
+    ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_security_check/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_security_check/models/tables/table1.hjson
new file mode 100644
index 0000000000..56312824a1
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_security_check/models/tables/table1.hjson
@@ -0,0 +1,23 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: PlayerStats
+      // undefined security role: guest
+      readAccess : guest
+      dimensions : [
+         {
+           name : name
+           type : TEXT
+           definition : '{{name}}'
+           // undefined security roles: user & member
+           readAccess : user AND member
+         },
+         {
+           name : region
+           type : TEXT
+           definition : '{{region}}'
+           readAccess : Prefab.Role.None
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_security_role/models/security.hjson b/elide-model-config/src/test/resources/validator/bad_security_role/models/security.hjson
new file mode 100644
index 0000000000..cda5836658
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_security_role/models/security.hjson
@@ -0,0 +1,19 @@
+{
+    // comma after admin is wrong, admin should be in quotes if using comma
+    roles:  [
+        admin,
+        guest,
+        dev
+        ]
+    rules: [
+        {
+            type: filter
+            filter: filter
+            name: User belongs to company
+        },
+        {
+            filter: filter
+            name: Principal is owner
+        },
+    ]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_table_join_type/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_table_join_type/models/tables/table1.hjson
new file mode 100644
index 0000000000..ebf05dd975
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_table_join_type/models/tables/table1.hjson
@@ -0,0 +1,58 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      schema: gamedb
+      description:
+      '''
+      A long description
+      '''
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      joins: [
+          {
+             name: playerCountry
+             to: country
+             // Invalid Join Kind
+             kind: toAll
+             definition: '{{playerCountry.id}} = {{country_id}}'
+          },
+          {
+             name: playerTeam
+             to: team
+             kind: toMany
+             // Invalid Join Type
+             type: full outer
+             definition: '{{playerTeam.id}} = {{team_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          definition: 'MAX({{score}})'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           definition : '{{playerCountry.isoCode}}'
+         },
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+           [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_table_sql/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_table_sql/models/tables/table1.hjson
new file mode 100644
index 0000000000..301b0ec04c
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_table_sql/models/tables/table1.hjson
@@ -0,0 +1,56 @@
+{
+  tables: [{
+      name: PlayerStats
+      // Sql has disallowed words
+      sql: Truncate Table PlayerStats
+      schema: gamedb
+      description:
+      '''
+      A long description
+      '''
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      joins: [
+          {
+             name: playerCountry
+             to: country
+             kind: toOne
+             definition: '{{playerCountry.id}} = {{country_id}}'
+          },
+          {
+             name: playerTeam
+             to: team
+             kind: toMany
+             definition: '{{playerTeam.id}} = {{team_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          definition: 'MAX({{score}})'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           definition : '{{playerCountry.isoCode}}'
+         },
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_tablesource/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/bad_tablesource/models/tables/table1.hjson
new file mode 100644
index 0000000000..eb16d4f8cc
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_tablesource/models/tables/table1.hjson
@@ -0,0 +1,35 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      joins: [
+          {
+             name: playerTeam
+             to: Team
+             kind: toMany
+             definition: '{{playerTeam.id}} = {{ team_id}}'
+          }
+      ]
+      dimensions : [
+         {
+           name : teamRegion
+           type : TEXT
+           definition : '{{playerTeam.region}}'
+           // undefined column teamRegion
+           tableSource: Team.teamRegion
+         }
+      ]
+  }
+  {
+      name: Team
+      table: team
+      cardinality: small
+      dimensions: [
+         {
+           name: region
+           type: TEXT
+           definition: '{{region}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/bad_variable/models/variables.hjson b/elide-model-config/src/test/resources/validator/bad_variable/models/variables.hjson
new file mode 100644
index 0000000000..a4cd13c9d7
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/bad_variable/models/variables.hjson
@@ -0,0 +1,4 @@
+{
+   // Missing colon
+   foo [1, 2, 3]
+}
diff --git a/elide-model-config/src/test/resources/validator/duplicate_column_args/models/tables/table.hjson b/elide-model-config/src/test/resources/validator/duplicate_column_args/models/tables/table.hjson
new file mode 100644
index 0000000000..8a6e6952a1
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/duplicate_column_args/models/tables/table.hjson
@@ -0,0 +1,28 @@
+{
+    tables: [{
+        name: Player
+        table: player
+        schema: playerdb
+        description:
+        '''
+        A long description
+        '''
+        cardinality : large
+        measures : [
+        {
+            name : highScore
+            type : "INTEGER"
+            definition: 'MAX({{score}})'
+            //'foo' here conflicts with the argument 'foo' below.
+            filterTemplate: highScore>{{foo}}
+            arguments: [
+                {
+                    name: foo
+                    type: TEXT
+                    default: foobar
+                }
+            ]
+        }]
+        dimensions: []
+    }]
+}
diff --git a/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db1.hjson b/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db1.hjson
new file mode 100644
index 0000000000..15821c1e51
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db1.hjson
@@ -0,0 +1,12 @@
+{
+  dbconfigs:
+  [
+    {
+      name: OracleConnection
+      url: jdbc:oracle:thin:@localhost:1521:testdb
+      driver: oracle.jdbc.driver.OracleDriver
+      user: guestoracle
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db2.hjson b/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db2.hjson
new file mode 100644
index 0000000000..22734b2646
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/duplicate_dbconfigname/db/sql/db2.hjson
@@ -0,0 +1,15 @@
+{
+  dbconfigs:
+  [
+    {
+      name: OracleConnection
+      url: jdbc:oracle:thin:@localhost:1521:testdb
+      driver: oracle.jdbc.driver.OracleDriver
+      user: guestoracle
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect
+      "propertyMap": {
+        "hibernate.show_sql": true,
+      }
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/duplicate_security_role/models/security.hjson b/elide-model-config/src/test/resources/validator/duplicate_security_role/models/security.hjson
new file mode 100644
index 0000000000..3b2d15b9ce
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/duplicate_security_role/models/security.hjson
@@ -0,0 +1,6 @@
+{
+    roles:  [
+        Admin User
+        prefab.role.all
+        ]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/db_invalid.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/db_invalid.hjson
new file mode 100644
index 0000000000..683e1a64a7
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/db_invalid.hjson
@@ -0,0 +1,25 @@
+{
+  dbconfigs:
+  [
+    {
+      name: 11MyDB2Connection
+      url: jdbc:db2:localhost:50000/testdb
+      driver: 11COM.ibm.db2.jdbc.net.DB2Driver
+      user: guestdb2
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PrestoDBDialec
+      propertyMap:
+      {
+        hibernate.show_sql: null
+        hibernate.default_batch_fetch_size: 100.1
+        hibernate.hbm2ddl.auto: create
+      }
+    }
+    {
+      name: MySQLConnection
+      url: ojdbc:mysql://localhost/testdb?serverTimezone=UTC
+      driver: com.mysql.jdbc.Driver
+      user: guestmysql
+      dialect: 1234
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/invalid_dimension_data_source.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_dimension_data_source.hjson
new file mode 100644
index 0000000000..7789322115
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_dimension_data_source.hjson
@@ -0,0 +1,61 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      schema: gamedb
+      description:
+      '''
+      A long description
+      '''
+      category: Table Category
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      filterTemplate : countryIsoCode=={{code}}
+      joins: [
+          {
+             name: playerCountry
+             to: country
+             kind: toOne
+             definition: '{{playerCountry.id}} = {{country_id}}'
+          },
+          {
+             name: playerTeam
+             to: team
+             kind: toMany
+             definition: '{{playerTeam.id}} = {{team_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           category : country detail
+           definition : '{{playerCountry.isoCode}}'
+           values : ['US', 'HK']
+           tableSource : 'playerCountry.isoCode'
+         }
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/invalid_query_plan_classname.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_query_plan_classname.hjson
new file mode 100644
index 0000000000..af6d1baaae
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_query_plan_classname.hjson
@@ -0,0 +1,64 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      schema: gamedb
+      description:
+      '''
+      A long description
+      '''
+      category: Table Category
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      filterTemplate : countryIsoCode=={{code}}
+      tags: ['GAME', 'PLAYER']
+      joins: [
+          {
+             name: playerCountry
+             to: country
+             kind: toOne
+             definition: '${to}.id = ${from}.country_id'
+          },
+          {
+             name: playerTeam
+             to: team
+             kind: toMany
+             definition: '${to}.id = ${from}.team_id'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          maker: 'a.b'
+          tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           category : country detail
+           definition : '{{playerCountry.isoCode}}'
+           values : ['US', 'HK']
+           tags: ['PRIVATE']
+         },
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/invalid_table_filter.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_table_filter.hjson
new file mode 100644
index 0000000000..85bfada8f0
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/invalid_table_filter.hjson
@@ -0,0 +1,61 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      schema: gamedb
+      description:
+      '''
+      A long description
+      '''
+      category: Table Category
+      cardinality : large
+      hidden : false
+      readAccess : A user is admin or is a player in the game
+      filterTemplate : countryIsoCode={{code}  #Invalid Operator
+      joins: [
+          {
+             name: playerCountry
+             to: country
+             kind: toOne
+             definition: '{{playerCountry.id}} = {{country_id}}'
+          },
+          {
+             name: playerTeam
+             to: team
+             kind: toMany
+             definition: '{{playerTeam.id}} = {{team_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           category : country detail
+           definition : '{{playerCountry.isoCode}}'
+           values : ['US', 'HK']
+           tableSource : 'playerCountry.isoCode'
+         }
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/security_invalid.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/security_invalid.hjson
new file mode 100644
index 0000000000..d166716f97
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/security_invalid.hjson
@@ -0,0 +1,11 @@
+{
+  //Comment
+  name : book
+  table : book
+  schema$ : [123]
+  description :
+  '''
+  valid schema for a book
+  '''
+  cardinality : small
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/table_invalid.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/table_invalid.hjson
new file mode 100644
index 0000000000..d166716f97
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/table_invalid.hjson
@@ -0,0 +1,11 @@
+{
+  //Comment
+  name : book
+  table : book
+  schema$ : [123]
+  description :
+  '''
+  valid schema for a book
+  '''
+  cardinality : small
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/table_schema_with_multiple_errors.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/table_schema_with_multiple_errors.hjson
new file mode 100644
index 0000000000..6da4c945d7
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/table_schema_with_multiple_errors.hjson
@@ -0,0 +1,110 @@
+{
+  // unsupported: additional property 'name'
+  name: Geography
+  tables:
+  [
+    {
+      // unsupported: name contains '@'
+      name: Country@10
+      table: country
+      // unsupported: cardinality value
+      cardinality: Extra Large
+      filterTemplate: countryIsoCode={{code}};startTime=={{start}}
+      arguments:
+      [
+        {
+          name: PI
+          // unsupported: argument type
+          type: Number
+        }
+        {
+          // unsupported: grain is not allowed
+          name: Grain
+          type: Boolean
+        }
+        {
+          // both tableSource and values are not supported. Choose One or None
+          name: aggregation
+          description: Aggregation
+          type : TEXT
+          values: ['SUM', 'MIN', 'MAX']
+          tableSource:  {
+              table: abc
+              column: def
+          }
+          default: SUM
+        }
+      ]
+      measures:
+      [
+        {
+          name : highScore
+          type : INTEGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          // unsupported: class name (@ is not allowed)
+          maker: 'com.yahoo.elide.datastores.aggregation.query@DefaultMetricProjectionMaker.class'
+          tags: ['PUBLIC']
+        }
+      ]
+      dimensions:
+      [
+        {
+          // unsupported: field name is 'id'
+          name: id
+          // unsupported: field type
+          type: Float
+          definition: "{{id}}"
+          // unsupported: cardinality value
+          cardinality: Extra small
+          tableSource: {
+             table: abc
+             column: def
+          }
+        }
+        {
+          // unsupported: field name starts with '_'
+          name: _region
+          type: Text
+          definition: "{{region}}"
+          // unsupported: either values or table source is allowed not both
+          values:
+          [
+            US
+            HK
+          ]
+          tableSource: {
+              table: abc
+              column: def
+          }
+          // unsupported: tags should be array
+          tags: PRIVATE
+        }
+        {
+          name: createdOn
+          // unsupported field type
+          type: TIMEX
+          definition: "{{create_on}}"
+          grains:
+          [{
+            // unsupported grain type
+            type: Days
+          }]
+        }
+        {
+          name: updatedOn
+          type: Time
+          definition: "{{updated_on}}"
+          grains: [{
+              type: month
+          }]
+        }
+        {
+          name: modifiedOn
+          type: Time
+          definition: "{{modified_on}}"
+        }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/invalid_schema/variables_invalid.hjson b/elide-model-config/src/test/resources/validator/invalid_schema/variables_invalid.hjson
new file mode 100644
index 0000000000..bf620b8f90
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/invalid_schema/variables_invalid.hjson
@@ -0,0 +1,11 @@
+{
+  //Comment
+  name : book
+  table : book
+  schema$ : [123]
+  description :
+  '''
+  valid schema for a book
+  '''
+  cardinality : null
+}
diff --git a/elide-model-config/src/test/resources/validator/mismatch_dbconfig/models/tables/table1.hjson b/elide-model-config/src/test/resources/validator/mismatch_dbconfig/models/tables/table1.hjson
new file mode 100644
index 0000000000..231264fe49
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/mismatch_dbconfig/models/tables/table1.hjson
@@ -0,0 +1,64 @@
+{
+  tables: [{
+      name: PlayerStats
+      table: player_stats
+      schema: gamedb
+      dbConnectionName: MySQLConnection
+      description:
+      '''
+      A long description
+      '''
+      cardinality : large
+      hidden : false
+      joins: [
+          {
+             name: playerCountry
+             to: Country
+             kind: toOne
+             definition: '{{playerCountry.id}} = {{country_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          type : INTEGER
+          definition: 'MAX({{score}})'
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           type : TEXT
+           definition : '{{playerCountry.isoCode}}'
+         },
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : DAY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         }
+      ]
+  }
+  {
+      name: Country
+      table: country
+      // connection name not same as parent table
+      dbConnectionName: OracleConnection
+      dimensions:
+      [
+        {
+          name: countryName
+          type: TEXT
+          definition: '{{countryName}}'
+        }
+      ]
+  }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_configs/models/tables/.gitignore b/elide-model-config/src/test/resources/validator/missing_configs/models/tables/.gitignore
new file mode 100644
index 0000000000..e59dea8c0b
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_configs/models/tables/.gitignore
@@ -0,0 +1 @@
+Empty Directory
diff --git a/elide-model-config/src/test/resources/validator/missing_inheritance/models/tables/tableA.hjson b/elide-model-config/src/test/resources/validator/missing_inheritance/models/tables/tableA.hjson
new file mode 100644
index 0000000000..6c18efa5ab
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_inheritance/models/tables/tableA.hjson
@@ -0,0 +1,18 @@
+{
+  tables:
+  [
+    {
+      name: A
+      extend: B
+      description: A extends B (which doesn't exist)
+      measures : [
+          {
+            name : count
+            type : Integer
+            description : A simple count
+            definition: 'COUNT(*)'
+          }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_namespace/models/tables/namespace_test_model.hjson b/elide-model-config/src/test/resources/validator/missing_namespace/models/tables/namespace_test_model.hjson
new file mode 100644
index 0000000000..d6af68a52a
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_namespace/models/tables/namespace_test_model.hjson
@@ -0,0 +1,28 @@
+{
+  tables: [{
+      name: NameSpaceTestModel
+      namespace: TestNamespace
+      table: test
+      category: Table Category
+      cardinality : lARge
+      hidden : false
+
+      measures : [
+          {
+          name : testMeasure
+          friendlyName : Test Measure
+          type : INteGER
+          description : Test Measure
+          definition: 'MAX({{measure}})'
+          tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : datetime
+           type : TIme
+           definition : '{{datetime}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_security/models/tables/table2.hjson b/elide-model-config/src/test/resources/validator/missing_security/models/tables/table2.hjson
new file mode 100644
index 0000000000..220881b497
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_security/models/tables/table2.hjson
@@ -0,0 +1,34 @@
+{
+    // should work fine if missing security.hjson not provided.
+    tables: [{
+        name: Player
+        table: player
+        schema: playerdb
+        description:
+        '''
+        A long description
+        '''
+        cardinality : large
+        measures : [
+            {
+            name : highScore
+            type : "<%measure_type%>"
+            definition: 'MAX({{score}})'
+            }
+        ]
+        dimensions : [
+            {
+                name : createdOn
+                type : TIME
+                definition : '{{create_on}}'
+                grains:
+                [{
+                    type : DAY
+                    sql :  '''
+                    PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+                    '''
+                }]
+            }
+        ]
+    }]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_security/models/variables.hjson b/elide-model-config/src/test/resources/validator/missing_security/models/variables.hjson
new file mode 100644
index 0000000000..e7316ff732
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_security/models/variables.hjson
@@ -0,0 +1,9 @@
+{
+   foo: [1, 2, 3]
+   bar: blah
+   hour: hour_replace
+   measure_type: INTEGER
+   name: PlayerStats
+   table: player_stats
+   role: member
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_table_config/db/sql/db2.hjson b/elide-model-config/src/test/resources/validator/missing_table_config/db/sql/db2.hjson
new file mode 100644
index 0000000000..15821c1e51
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_table_config/db/sql/db2.hjson
@@ -0,0 +1,12 @@
+{
+  dbconfigs:
+  [
+    {
+      name: OracleConnection
+      url: jdbc:oracle:thin:@localhost:1521:testdb
+      driver: oracle.jdbc.driver.OracleDriver
+      user: guestoracle
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_table_config/models/variables.hjson b/elide-model-config/src/test/resources/validator/missing_table_config/models/variables.hjson
new file mode 100644
index 0000000000..e7316ff732
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_table_config/models/variables.hjson
@@ -0,0 +1,9 @@
+{
+   foo: [1, 2, 3]
+   bar: blah
+   hour: hour_replace
+   measure_type: INTEGER
+   name: PlayerStats
+   table: player_stats
+   role: member
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_variable/models/security.hjson b/elide-model-config/src/test/resources/validator/missing_variable/models/security.hjson
new file mode 100644
index 0000000000..31a87c3135
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_variable/models/security.hjson
@@ -0,0 +1,18 @@
+{
+    roles : [
+        admin
+        guest
+        dev
+        ]
+    rules: [
+        {
+            type: filter
+            filter: filter
+            name: User belongs to company
+        },
+        {
+            filter: filter
+            name: Principal is owner
+        },
+    ]
+}
diff --git a/elide-model-config/src/test/resources/validator/missing_variable/models/tables/table2.hjson b/elide-model-config/src/test/resources/validator/missing_variable/models/tables/table2.hjson
new file mode 100644
index 0000000000..d0992dc6b0
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/missing_variable/models/tables/table2.hjson
@@ -0,0 +1,34 @@
+{
+    // should work fine if missing variables.hjson not provided.
+    tables: [{
+        name: Player
+        table: player
+        schema: playerdb
+        description:
+        '''
+        A long description
+        '''
+        cardinality : large
+        measures : [
+            {
+            name : highScore
+            type : "INTEGER"
+            definition: 'MAX({{score}})'
+            }
+        ]
+        dimensions : [
+            {
+                name : createdOn
+                type : TIME
+                definition : '{{create_on}}'
+                grains:
+                [{
+                    type : DAY
+                    sql :  '''
+                    PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+                    '''
+                }]
+            }
+        ]
+    }]
+}
diff --git a/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/namespaces/test_namespace.hjson b/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/namespaces/test_namespace.hjson
new file mode 100644
index 0000000000..3d4e2e5bd5
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/namespaces/test_namespace.hjson
@@ -0,0 +1,11 @@
+{
+  namespaces:
+  [
+    {
+      name: TestNamespace
+      description: Namespace for Test
+      friendlyName: TestNamespace
+      readAccess: namespaceRead
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/tables/namespace_test_model.hjson b/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/tables/namespace_test_model.hjson
new file mode 100644
index 0000000000..d6af68a52a
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/namespace_bad_security_check/models/tables/namespace_test_model.hjson
@@ -0,0 +1,28 @@
+{
+  tables: [{
+      name: NameSpaceTestModel
+      namespace: TestNamespace
+      table: test
+      category: Table Category
+      cardinality : lARge
+      hidden : false
+
+      measures : [
+          {
+          name : testMeasure
+          friendlyName : Test Measure
+          type : INteGER
+          description : Test Measure
+          definition: 'MAX({{measure}})'
+          tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : datetime
+           type : TIme
+           definition : '{{datetime}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/undefined_handlebar/models/security.hjson b/elide-model-config/src/test/resources/validator/undefined_handlebar/models/security.hjson
new file mode 100644
index 0000000000..158c841975
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/undefined_handlebar/models/security.hjson
@@ -0,0 +1,19 @@
+{
+    roles : [
+        admin
+        guest
+        // foobar is undefined
+        <% foobar %>
+        ]
+    rules: [
+        {
+            type: filter
+            filter: filter
+            name: User belongs to company
+        },
+        {
+            filter: filter
+            name: Principal is owner
+        },
+    ]
+}
diff --git a/elide-model-config/src/test/resources/validator/undefined_handlebar/models/variables.hjson b/elide-model-config/src/test/resources/validator/undefined_handlebar/models/variables.hjson
new file mode 100644
index 0000000000..6fe582b908
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/undefined_handlebar/models/variables.hjson
@@ -0,0 +1,3 @@
+{
+   foo: [1, 2, 3]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db.hjson b/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db.hjson
new file mode 100644
index 0000000000..8bea0682d8
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db.hjson
@@ -0,0 +1,25 @@
+{
+  dbconfigs:
+  [
+    {
+      name: MyDB2Connection
+      url: jdbc:db2:localhost:50000/testdb
+      driver: COM.ibm.db2.jdbc.net.DB2Driver
+      user: guestdb2
+      dialect: <% db2_dialect %>
+      propertyMap:
+      {
+        hibernate.show_sql: true
+        hibernate.default_batch_fetch_size: 100.1
+        hibernate.hbm2ddl.auto: create
+      }
+    }
+    {
+      name: MySQLConnection
+      url: jdbc:mysql://localhost/testdb?serverTimezone=UTC
+      driver: com.mysql.jdbc.Driver
+      user: guestmysql
+      dialect: <%mysql_dialect%>
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db_no_variables.hjson b/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db_no_variables.hjson
new file mode 100644
index 0000000000..ea04948623
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/db/sql/multiple_db_no_variables.hjson
@@ -0,0 +1,25 @@
+{
+  dbconfigs:
+  [
+    {
+      name: MyDB2Connection
+      url: jdbc:db2:localhost:50000/testdb
+      driver: COM.ibm.db2.jdbc.net.DB2Driver
+      user: guestdb2
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PrestoDBDialect
+      propertyMap:
+      {
+        hibernate.show_sql: true
+        hibernate.default_batch_fetch_size: 100.1
+        hibernate.hbm2ddl.auto: create
+      }
+    }
+    {
+      name: MySQLConnection
+      url: jdbc:mysql://localhost/testdb?serverTimezone=UTC
+      driver: com.mysql.jdbc.Driver
+      user: guestmysql
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.HiveDialect
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/db/sql/single_db.hjson b/elide-model-config/src/test/resources/validator/valid/db/sql/single_db.hjson
new file mode 100644
index 0000000000..15821c1e51
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/db/sql/single_db.hjson
@@ -0,0 +1,12 @@
+{
+  dbconfigs:
+  [
+    {
+      name: OracleConnection
+      url: jdbc:oracle:thin:@localhost:1521:testdb
+      driver: oracle.jdbc.driver.OracleDriver
+      user: guestoracle
+      dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.H2Dialect
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/db/variables.hjson b/elide-model-config/src/test/resources/validator/valid/db/variables.hjson
new file mode 100644
index 0000000000..cebe194634
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/db/variables.hjson
@@ -0,0 +1,4 @@
+{
+    mysql_dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.HiveDialect
+    db2_dialect: com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.impl.PrestoDBDialect
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/namespaces/player.hjson b/elide-model-config/src/test/resources/validator/valid/models/namespaces/player.hjson
new file mode 100644
index 0000000000..312874ca77
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/namespaces/player.hjson
@@ -0,0 +1,10 @@
+{
+  namespaces:
+  [
+    {
+      name: PlayerNamespace
+      description: Namespace for Player Schema Tables
+      friendlyName: Player
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/security.hjson b/elide-model-config/src/test/resources/validator/valid/models/security.hjson
new file mode 100644
index 0000000000..8ded2b9020
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/security.hjson
@@ -0,0 +1,19 @@
+{
+    roles : [
+        admin
+        gu.est user
+        member
+        user
+        ]
+    rules: [
+        {
+            type: filter
+            filter: filter
+            name: User belongs to company
+        },
+        {
+            filter: filter
+            name: Principal is owner
+        },
+    ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats.hjson b/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats.hjson
new file mode 100644
index 0000000000..ee687c99f9
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats.hjson
@@ -0,0 +1,115 @@
+{
+  tables: [{
+      name: PlayerStats
+      namespace: PlayerNamespace
+      friendlyName: Player Statistics
+      table: player_stats
+      schema: gamedb
+      description:
+      // newlines are replaced by single space in handlebar if no helper function is applied
+      '''
+      A long description
+      with newline
+       and additional space at start of this line.
+      '''
+      category: Table Category
+      cardinality : lARge
+      hidden : false
+      readAccess : (user AND member) OR (admin AND NOT gu.est user)
+      filterTemplate : countryIsoCode=={{code}}
+      tags: ['GAME', 'PLAYER',  '''
+      A tag
+      with newline
+      ''']
+      hints: ['NoAggregateBeforeJoin']
+      arguments: [
+          {
+             name: scoreFormat
+             type: TEXT
+             default: 999999D00
+          }
+          {
+             name: countryCode
+             type: TEXT
+             tableSource: {
+                 table: Country
+                 column: isoCode
+             }
+             default: US
+          }
+      ]
+      joins: [
+          {
+             name: playerCountry
+             to: Country
+             type: Cross
+          },
+          {
+             name: playerTeam
+             to: Team
+             kind: Tomany
+             type: left
+             definition: '{{playerTeam.id}} = {{ team_id}}'
+          }
+      ]
+
+      measures : [
+          {
+          name : highScore
+          friendlyName : High Score
+          type : INteGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          tags: ['PUBLIC']
+          },
+          {
+          name : newHighScore
+          type : INteGER
+          description : very awesome score
+          definition: 'MAX({{score}})'
+          tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : countryIsoCode
+           friendlyName : Country ISO Code
+           type : TEXT
+           category : country detail
+           definition : '{{playerCountry.isoCode}}'
+           values : ['US', 'HK']
+           tags: ['PRIVATE']
+           cardinality: Small
+         },
+         {
+           name : teamRegion
+           type : TEXT
+           definition : '{{playerTeam.region}}'
+           tableSource: {
+              table: PlayerStatsChild
+              namespace: PlayerNamespace
+              column: teamRegion
+           }
+         },
+         {
+           name : createdOn
+           friendlyName : Created On
+           type : TIME
+           definition : '{{create_on}}'
+           filterTemplate : 'createdOn=={{createdOn}}'
+           grains:
+            [{
+             type : DaY
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         },
+         {
+           name : updatedOn
+           type : TIme
+           definition : '{{updated_on}}'
+         }
+      ]
+  }]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats_extends.hjson b/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats_extends.hjson
new file mode 100644
index 0000000000..a7cae7e006
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/tables/player_stats_extends.hjson
@@ -0,0 +1,78 @@
+{
+  tables:
+  [
+    {
+      name: PlayerStatsChild
+      namespace: PlayerNamespace
+      extend: PlayerStats
+      description: PlayerStats Child
+      cardinality: large
+      measures : [
+          {
+            name : highScore
+            type : Text
+            description : very awesome score
+            definition: 'MAX({{score}})'
+            tags: ['PUBLIC']
+          },
+          {
+            name : avgScore
+            type : INTEGER
+            description : Avg score
+            definition: 'Avg({{score}})'
+            tags: ['PUBLIC']
+          }
+      ]
+      dimensions : [
+         {
+           name : createdOn
+           type : TIME
+           definition : '{{create_on}}'
+           grains:
+            [{
+             type : MONTH
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM')
+             '''
+            }]
+         },
+         {
+           name : createdYear
+           type : TIME
+           definition : '{{createdYear}}'
+           grains:
+            [{
+             type : Year
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME(createdOn, 'yyyy-MM-dd'), 'yyyy')
+             '''
+            }]
+         },
+         {
+           name : createdWeekDate
+           type : TIME
+           definition : '{{createdOn}}'
+           grains:
+            [{
+             type : isoWEEK
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+             '''
+            }]
+         },
+         {
+           name : updatedMonth
+           type : TIME
+           definition : '{{updated_month}}'
+           grains:
+            [{
+             type : mOnth
+             sql :  '''
+             PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyyMM')
+             '''
+            }]
+         }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/tables/referred_model.hjson b/elide-model-config/src/test/resources/validator/valid/models/tables/referred_model.hjson
new file mode 100644
index 0000000000..3f050a0d8b
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/tables/referred_model.hjson
@@ -0,0 +1,31 @@
+{
+  tables: [
+    {
+      name: Country
+      namespace: default
+      table: country
+      cardinality: small
+      dimensions:
+      [
+        {
+          name: isoCode
+          type: TEXT
+          definition: '{{isoCode}}'
+        }
+      ]
+    }
+    {
+      name: Team
+      table: team
+      cardinality: small
+      dimensions:
+      [
+        {
+          name: region
+          type: TEXT
+          definition: '{{region}}'
+        }
+      ]
+    }
+  ]
+}
diff --git a/elide-model-config/src/test/resources/validator/valid/models/variables.hjson b/elide-model-config/src/test/resources/validator/valid/models/variables.hjson
new file mode 100644
index 0000000000..6d534ed7b7
--- /dev/null
+++ b/elide-model-config/src/test/resources/validator/valid/models/variables.hjson
@@ -0,0 +1,8 @@
+{
+   foo: [1, 2, 3]
+   bar: blah
+   hour: hour_replace
+   measure_type: MAX
+   name: PlayerStats
+   table: player_stats
+}
diff --git a/elide-spring/README.md b/elide-spring/README.md
new file mode 100644
index 0000000000..0a6e6ddf85
--- /dev/null
+++ b/elide-spring/README.md
@@ -0,0 +1,6 @@
+# Elide Spring Artifacts
+
+Elide comes bundled with two Spring artifacts:
+
+1. [elide-spring-boot-autoconfigure](https://github.com/yahoo/elide/blob/master/elide-spring/elide-spring-boot-autoconfigure/README.md) - Provides controllers and configuration for using Elide with Spring Boot.
+2. [elide-spring-boot-starter](https://github.com/yahoo/elide/blob/master/elide-spring/elide-spring-boot-starter/README.md) - Provides a Spring Boot dependency starter for an opinionated setup.
diff --git a/elide-spring/elide-spring-boot-autoconfigure/README.md b/elide-spring/elide-spring-boot-autoconfigure/README.md
new file mode 100644
index 0000000000..c6333a11e9
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/README.md
@@ -0,0 +1,122 @@
+# Elide Spring Autoconfigure
+
+The Elide spring autoconfigure package provides the core code needed to use Elide with Spring Boot 2. It includes:
+1. Rest API controllers for JSON-API, GraphQL, and Swagger documentation.
+2. Configuration properties for common Elide settings.
+3. Bean configurations for complete customization:
+   1. `Elide` - provides complete control to configure Elide.
+   2. `Entity Dictionary` - to register security checks and lifecycle hooks.
+   3. `Data Store` - to override the default data store.
+   4. `Swagger` - to control the Swagger document generation.
+   
+## Configuration Properties   
+
+| *Property*                     | *Required* |  *Default*      | *Description*                                            |
+| ------------------------------ | -----------| --------------- | -------------------------------------------------------- |
+| elide.pageSize                 | No         | 500             | Default pagination page size for collections             |
+| elide.maxPageSize              | No         | 10000           | Max pagination page size a client can request.           |
+| elide.json-api.path            | No         | '/'             | URL path prefix for JSON-API endpoint.                   |
+| elide.json-api.enabled         | No         | false           | Whether or not the JSON-API endpoint is exposed.         |
+| elide.graphql.path             | No         | '/'             | URL path prefix for GraphQL endpoint.                    |
+| elide.graphql.enabled          | No         | false           | Whether or not the GraphQL endpoint is exposed.          |
+| elide.swagger.path             | No         | '/'             | URL path prefix for Swagger document  endpoint.          |
+| elide.swagger.enabled          | No         | false           | Whether or not the Swagger document endpoint is exposed. |
+| elide.swagger.name             | No         | 'Elide Service' | Swagger documentation requires an API name.              |
+| elide.swagger.version          | No         | '1.0'           | Swagger documentation requires an API version.           |
+| elide.queryCacheMaximumEntries | No         | 1024            | Maximum number of entries in query result cache.         |
+
+
+## Entity Dictionary Override
+
+By default, auto configuration creates an `EntityDictionary` with no checks or life cycle hooks registered. It does register spring as the dependency injection framework for Elide model injection.
+
+```java
+    @Bean
+    public EntityDictionary buildDictionary(AutowireCapableBeanFactory beanFactory) {
+        return new EntityDictionary(new HashMap<>(), beanFactory::autowireBean);
+    }
+```
+
+A typical override would add some checks and life cycle hooks.  *This is likely the only override you'll need*:
+
+```java
+    @Bean
+    public EntityDictionary buildDictionary(AutowireCapableBeanFactory beanFactory) {
+        HashMap<String, Class<? extends Check>> checkMappings = new HashMap<>();
+        checkMappings.put("allow all", Role.ALL.class);
+        checkMappings.put("deny all", Role.NONE.class);
+
+        EntityDictionary dictionary = new EntityDictionary(checkMappings, beanFactory::autowireBean);
+        dictionary.bindTrigger(Book.class, OnCreatePostCommit.class, (book, scope, changes) -> { /* DO SOMETHING */ }); 
+        dictionary.bindTrigger(Book.class, OnUpdatePostCommit.class, "title", (book, scope, changes) -> { /* DO SOMETHING */ });
+    }
+```
+
+## Data Store Override
+By default, the auto configuration will wire up a JPA data store:
+
+```java
+    @Bean
+    public DataStore buildDataStore(EntityManagerFactory entityManagerFactory) {
+        return new JpaDataStore(
+                () -> { return entityManagerFactory.createEntityManager(); },
+                (em -> { return new NonJtaTransaction(em); }));
+    }
+```
+
+Override this bean if you want a different store or multiple stores.
+
+## Swagger Override
+
+By default, Elide will generate swagger documentation for every model exposed into a single swagger document:
+
+```java
+    @Bean
+    public Swagger buildSwagger(EntityDictionary dictionary, ElideConfigProperties settings) {
+        Info info = new Info()
+                .title(settings.getSwagger().getName())
+                .version(settings.getSwagger().getVersion());
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+
+        Swagger swagger = builder.build().basePath(settings.getJsonApi().getPath());
+
+        return swagger;
+    }
+```
+
+You'll want to override this if:
+1. You want to configure authentication for your swagger endpoint.
+2. You don't want to expose all your models via swagger.
+3. You want to break up your models into multiple swagger documents.
+
+The Swagger controller will also except a bean that returns: `Map<String, Swagger`. This will break the swagger document into multiple documents.  They key of the map is the URL prefix for each separate document exposed.
+
+## Elide Override
+
+This provides complete control to manipulate the `ElideSettings` object that configures Elide.
+
+Reasons for doing this might include:
+1. Using epoch based dates instead of ISO8601 date strings.
+2. Registering a custom `Serde` for type coercion.
+3. Changing the Elide filter dialect.
+4. Configuring a custom Elide audit logger.
+
+```java
+    @Bean
+    public Elide initializeElide(EntityDictionary dictionary,
+                          DataStore dataStore, ElideConfigProperties settings) {
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withDefaultMaxPageSize(settings.getMaxPageSize())
+                .withDefaultPageSize(settings.getPageSize())
+                .withUseFilterExpressions(true)
+                .withJoinFilterDialect(new RSQLFilterDialect(dictionary))
+                .withSubqueryFilterDialect(new RSQLFilterDialect(dictionary))
+                .withAuditLogger(new Slf4jLogger())
+                .withEncodeErrorResponses(true)
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"));
+
+        return new Elide(builder.build());
+```
diff --git a/elide-spring/elide-spring-boot-autoconfigure/pom.xml b/elide-spring/elide-spring-boot-autoconfigure/pom.xml
new file mode 100644
index 0000000000..a61076c8d2
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/pom.xml
@@ -0,0 +1,272 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-spring-boot-autoconfigure</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Spring Boot Autoconfigure</name>
+    <description>Elide Spring Boot Autoconfigure</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-spring-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Yahoo! Inc.</name>
+        <url>http://www.yahoo.com</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <!-- Compile Dependencies -->
+        <!-- Elide dependencies -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-aggregation</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jpa</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jms</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-swagger</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-async</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-model-config</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.owasp.encoder</groupId>
+            <artifactId>encoder</artifactId>
+            <version>1.2.3</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-websocket</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+            <version>${spring.boot.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>1.8.3</version>
+            <optional>true</optional>
+        </dependency>
+
+
+        <!-- Test Dependencies -->
+
+        <!-- YAML for spring config -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-test-helpers</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-artemis</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jms-server</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Needed because Junit 5.8.x pulls in the wrong version of its own dependency.
+        We should remove this later -->
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>1.8.2</version>
+            <scope>test</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AggregationStoreProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AggregationStoreProperties.java
new file mode 100644
index 0000000000..e80e09fcf7
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AggregationStoreProperties.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import static com.yahoo.elide.datastores.aggregation.cache.CaffeineCache.DEFAULT_MAXIMUM_ENTRIES;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import lombok.Data;
+
+/**
+ * Extra properties for setting up aggregation data store.
+ */
+@Data
+public class AggregationStoreProperties {
+
+    /**
+     * Whether or not aggregation data store is enabled.
+     */
+    private boolean enabled = false;
+
+    /**
+     * Whether or not meta data store is enabled.
+     */
+    private boolean enableMetaDataStore = false;
+
+    /**
+     * {@link SQLDialect} type for default DataSource Object.
+     */
+    private String defaultDialect = "Hive";
+
+    /**
+     * Limit on number of query cache entries. Non-positive values disable the query cache.
+     */
+    private int queryCacheMaximumEntries = DEFAULT_MAXIMUM_ENTRIES;
+
+    /**
+     * Default Cache Expiration.
+     */
+    private long defaultCacheExpirationMinutes = 10;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AsyncProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AsyncProperties.java
new file mode 100644
index 0000000000..e4fdc8c5fd
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/AsyncProperties.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+
+/**
+ * Extra properties for setting up async query support.
+ */
+@Data
+public class AsyncProperties {
+
+    /**
+     * Default thread pool size.
+     */
+    private int threadPoolSize = 5;
+
+    /**
+     * Default max query run time.
+     */
+    private int maxRunTimeSeconds = 3600;
+
+    /**
+     * Default maximum permissible AsyncAfterSeconds value.
+     * The Async requests can be configured to execute synchronously before switching to asynchronous mode.
+     */
+    private int maxAsyncAfterSeconds = 10;
+
+    /**
+     * Whether or not the cleanup is enabled.
+     */
+    private boolean cleanupEnabled = false;
+
+    /**
+     * Default retention of async query and results.
+     */
+    private int queryCleanupDays = 7;
+
+    /**
+     * Polling interval to identify async queries that should be canceled.
+     */
+    private int queryCancellationIntervalSeconds = 300;
+
+    /**
+     * Whether or not to use the default implementation of AsyncAPIDAO.
+     * If false, the user will provide custom implementation of AsyncAPIDAO.
+     */
+    private boolean defaultAsyncAPIDAO = true;
+
+    /**
+     * Whether or not the async feature is enabled.
+     */
+    private boolean enabled = false;
+
+    /**
+     * Settings for the export controller.
+     */
+    private ExportControllerProperties export;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ControllerProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ControllerProperties.java
new file mode 100644
index 0000000000..58047f0a60
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ControllerProperties.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+
+/**
+ * Settings for a Spring REST controller.
+ */
+@Data
+public class ControllerProperties {
+
+    /**
+     * Whether or not the controller is enabled.
+     */
+    private boolean enabled = false;
+
+    /**
+     * The URL path prefix for the controller.
+     */
+    private String path = "/";
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/DynamicConfigProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/DynamicConfigProperties.java
new file mode 100644
index 0000000000..6c569f4096
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/DynamicConfigProperties.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+
+/**
+ * Extra properties for setting up dynamic model config.
+ */
+@Data
+public class DynamicConfigProperties {
+
+    /**
+     * Whether or not dynamic model config is enabled.
+     */
+    private boolean enabled = false;
+
+    /**
+     * The path where the config hjsons are stored.
+     */
+    private String path = "/";
+
+    /**
+     * Enable support for reading and manipulating HJSON configuration through Elide models.
+     */
+    private boolean configApiEnabled = false;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAsyncConfiguration.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAsyncConfiguration.java
new file mode 100644
index 0000000000..3235dad49a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAsyncConfiguration.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.async.export.formatter.CSVExportFormatter;
+import com.yahoo.elide.async.export.formatter.JSONExportFormatter;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.hooks.AsyncQueryHook;
+import com.yahoo.elide.async.hooks.TableExportHook;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.service.AsyncCleanerService;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.RequestScope;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Async Configuration For Elide Services.  Override any of the beans (by defining your own)
+ * and setting flags to disable in properties to change the default behavior.
+ */
+@Configuration
+@EntityScan(basePackageClasses = AsyncQuery.class)
+@EnableConfigurationProperties(ElideConfigProperties.class)
+@ConditionalOnExpression("${elide.async.enabled:false}")
+public class ElideAsyncConfiguration {
+
+    /**
+     * Configure the AsyncExecutorService used for submitting async query requests.
+     * @param elide elideObject.
+     * @param settings Elide settings.
+     * @param asyncQueryDao AsyncDao object.
+     * @return a AsyncExecutorService.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public AsyncExecutorService buildAsyncExecutorService(
+            RefreshableElide elide,
+            ElideConfigProperties settings,
+            AsyncAPIDAO asyncQueryDao,
+            @Autowired(required = false) ResultStorageEngine resultStorageEngine
+    ) {
+        AsyncProperties asyncProperties = settings.getAsync();
+
+        ExecutorService executor = Executors.newFixedThreadPool(asyncProperties.getThreadPoolSize());
+        ExecutorService updater = Executors.newFixedThreadPool(asyncProperties.getThreadPoolSize());
+        AsyncExecutorService asyncExecutorService = new AsyncExecutorService(elide.getElide(), executor,
+                updater, asyncQueryDao);
+
+        // Binding AsyncQuery LifeCycleHook
+        AsyncQueryHook asyncQueryHook = new AsyncQueryHook(asyncExecutorService,
+                asyncProperties.getMaxAsyncAfterSeconds());
+
+        EntityDictionary dictionary = elide.getElide().getElideSettings().getDictionary();
+
+        dictionary.bindTrigger(AsyncQuery.class, CREATE, PREFLUSH, asyncQueryHook, false);
+        dictionary.bindTrigger(AsyncQuery.class, CREATE, POSTCOMMIT, asyncQueryHook, false);
+        dictionary.bindTrigger(AsyncQuery.class, CREATE, PRESECURITY, asyncQueryHook, false);
+
+        boolean exportEnabled = ElideAutoConfiguration.isExportEnabled(asyncProperties);
+
+        if (exportEnabled) {
+            // Initialize the Formatters.
+            boolean skipCSVHeader = asyncProperties.getExport() != null
+                    && asyncProperties.getExport().isSkipCSVHeader();
+            Map<ResultType, TableExportFormatter> supportedFormatters = new HashMap<>();
+            supportedFormatters.put(ResultType.CSV, new CSVExportFormatter(elide.getElide(), skipCSVHeader));
+            supportedFormatters.put(ResultType.JSON, new JSONExportFormatter(elide.getElide()));
+
+            // Binding TableExport LifeCycleHook
+            TableExportHook tableExportHook = getTableExportHook(asyncExecutorService, settings, supportedFormatters,
+                    resultStorageEngine);
+            dictionary.bindTrigger(TableExport.class, CREATE, PREFLUSH, tableExportHook, false);
+            dictionary.bindTrigger(TableExport.class, CREATE, POSTCOMMIT, tableExportHook, false);
+            dictionary.bindTrigger(TableExport.class, CREATE, PRESECURITY, tableExportHook, false);
+        }
+
+        return asyncExecutorService;
+    }
+
+    // TODO Remove this method when ElideSettings has all the settings.
+    // Then the check can be done in TableExportHook.
+    // Trying to avoid adding too many individual properties to ElideSettings for now.
+    // https://github.com/yahoo/elide/issues/1803
+    private TableExportHook getTableExportHook(AsyncExecutorService asyncExecutorService,
+            ElideConfigProperties settings, Map<ResultType, TableExportFormatter> supportedFormatters,
+            ResultStorageEngine resultStorageEngine) {
+        boolean exportEnabled = ElideAutoConfiguration.isExportEnabled(settings.getAsync());
+
+        TableExportHook tableExportHook = null;
+        if (exportEnabled) {
+            tableExportHook = new TableExportHook(asyncExecutorService, settings.getAsync().getMaxAsyncAfterSeconds(),
+                    supportedFormatters, resultStorageEngine);
+        } else {
+            tableExportHook = new TableExportHook(asyncExecutorService, settings.getAsync().getMaxAsyncAfterSeconds(),
+                    supportedFormatters, resultStorageEngine) {
+                @Override
+                public void validateOptions(AsyncAPI export, RequestScope requestScope) {
+                    throw new InvalidOperationException("TableExport is not supported.");
+                }
+            };
+        }
+        return tableExportHook;
+    }
+
+    /**
+     * Configure the AsyncCleanerService used for cleaning up async query requests.
+     * @param elide elideObject.
+     * @param settings Elide settings.
+     * @param asyncQueryDao AsyncDao object.
+     * @return a AsyncCleanerService.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "elide.async", name = "cleanupEnabled", matchIfMissing = false)
+    public AsyncCleanerService buildAsyncCleanerService(RefreshableElide elide,
+                                                        ElideConfigProperties settings,
+                                                        AsyncAPIDAO asyncQueryDao) {
+        AsyncCleanerService.init(elide.getElide(), settings.getAsync().getMaxRunTimeSeconds(),
+                settings.getAsync().getQueryCleanupDays(),
+                settings.getAsync().getQueryCancellationIntervalSeconds(), asyncQueryDao);
+        return AsyncCleanerService.getInstance();
+    }
+
+    /**
+     * Configure the AsyncQueryDAO used by async query requests.
+     * @param elide elideObject.
+     * @return an AsyncQueryDAO object.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "elide.async", name = "defaultAsyncAPIDAO", matchIfMissing = true)
+    public AsyncAPIDAO buildAsyncAPIDAO(RefreshableElide elide) {
+        return new DefaultAsyncAPIDAO(elide.getElide().getElideSettings(), elide.getElide().getDataStore());
+    }
+
+    /**
+     * Configure the ResultStorageEngine used by async query requests.
+     * @param settings Elide settings.
+     * @return an ResultStorageEngine object.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "elide.async.export", name = "enabled", matchIfMissing = false)
+    public ResultStorageEngine buildResultStorageEngine(ElideConfigProperties settings) {
+        FileResultStorageEngine resultStorageEngine = new FileResultStorageEngine(settings.getAsync().getExport()
+                .getStorageDestination(), settings.getAsync().getExport().isExtensionEnabled());
+        return resultStorageEngine;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAutoConfiguration.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAutoConfiguration.java
new file mode 100644
index 0000000000..9c826b439a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideAutoConfiguration.java
@@ -0,0 +1,510 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.cache.Cache;
+import com.yahoo.elide.datastores.aggregation.cache.CaffeineCache;
+import com.yahoo.elide.datastores.aggregation.core.QueryLogger;
+import com.yahoo.elide.datastores.aggregation.core.Slf4jQueryLogger;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.DataSourceConfiguration;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.AggregateBeforeJoinOptimizer;
+import com.yahoo.elide.datastores.aggregation.validator.TemplateConfigValidator;
+import com.yahoo.elide.datastores.jpa.JpaDataStore;
+import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
+import com.yahoo.elide.datastores.multiplex.MultiplexManager;
+import com.yahoo.elide.graphql.QueryRunners;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.links.DefaultJSONApiLinks;
+import com.yahoo.elide.modelconfig.DBPasswordExtractor;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.modelconfig.store.ConfigDataStore;
+import com.yahoo.elide.modelconfig.store.models.ConfigChecks;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import com.yahoo.elide.spring.controllers.SwaggerController;
+import com.yahoo.elide.swagger.SwaggerBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.cache.CaffeineCacheMetrics;
+import io.swagger.models.Info;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+/**
+ * Auto Configuration For Elide Services.  Override any of the beans (by defining your own) to change
+ * the default behavior.
+ */
+@Configuration
+@EnableConfigurationProperties(ElideConfigProperties.class)
+@Slf4j
+public class ElideAutoConfiguration {
+
+    @Autowired(required = false)
+    private MeterRegistry meterRegistry;
+
+    private final Consumer<EntityManager> txCancel = em -> em.unwrap(Session.class).cancelQuery();
+
+    /**
+     * Creates dynamic configuration for models, security roles, and database connections.
+     * @param settings Config Settings.
+     * @throws IOException if there is an error reading the configuration.
+     * @return An instance of DynamicConfiguration.
+     */
+    @Bean
+    @Scope(SCOPE_PROTOTYPE)
+    @ConditionalOnMissingBean
+    @ConditionalOnExpression("${elide.aggregation-store.enabled:false} and ${elide.dynamic-config.enabled:false}")
+    public DynamicConfiguration buildDynamicConfiguration(ClassScanner scanner,
+                                                          ElideConfigProperties settings) throws IOException {
+        DynamicConfigValidator validator = new DynamicConfigValidator(scanner,
+                settings.getDynamicConfig().getPath());
+        validator.readAndValidateConfigs();
+        return validator;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public TransactionRegistry createRegistry() {
+        return new TransactionRegistry();
+    }
+
+    /**
+     * Creates the default Password Extractor Implementation.
+     * @return An instance of DBPasswordExtractor.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.aggregation-store.enabled", havingValue = "true")
+    public DBPasswordExtractor getDBPasswordExtractor() {
+        return config -> StringUtils.EMPTY;
+    }
+
+    /**
+     * Provides the default Hikari DataSource Configuration.
+     * @return An instance of DataSourceConfiguration.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.aggregation-store.enabled", havingValue = "true")
+    public DataSourceConfiguration getDataSourceConfiguration() {
+        return new DataSourceConfiguration() {
+        };
+    }
+
+    /**
+     * Creates the Elide instance with standard settings.
+     * @param dictionary Stores the static metadata about Elide models.
+     * @param dataStore The persistence store.
+     * @param transactionRegistry Global transaction registry.
+     * @param settings Elide settings.
+     * @return A new elide instance.
+     */
+    @Bean
+    @RefreshScope
+    @ConditionalOnMissingBean
+    public RefreshableElide getRefreshableElide(EntityDictionary dictionary,
+                                                DataStore dataStore,
+                                                TransactionRegistry transactionRegistry,
+                                                ElideConfigProperties settings,
+                                                JsonApiMapper mapper,
+                                                ErrorMapper errorMapper) {
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withErrorMapper(errorMapper)
+                .withJsonApiMapper(mapper)
+                .withDefaultMaxPageSize(settings.getMaxPageSize())
+                .withDefaultPageSize(settings.getPageSize())
+                .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withAuditLogger(new Slf4jLogger())
+                .withBaseUrl(settings.getBaseUrl())
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .withJsonApiPath(settings.getJsonApi().getPath())
+                .withGraphQLApiPath(settings.getGraphql().getPath());
+
+        if (settings.isVerboseErrors()) {
+            builder.withVerboseErrors();
+        }
+
+        if (settings.getAsync() != null
+                && settings.getAsync().getExport() != null
+                && settings.getAsync().getExport().isEnabled()) {
+            builder.withExportApiPath(settings.getAsync().getExport().getPath());
+        }
+
+        if (settings.getJsonApi() != null
+                && settings.getJsonApi().isEnabled()
+                && settings.getJsonApi().isEnableLinks()) {
+            String baseUrl = settings.getBaseUrl();
+
+            if (StringUtils.isEmpty(baseUrl)) {
+                builder.withJSONApiLinks(new DefaultJSONApiLinks());
+            } else {
+                String jsonApiBaseUrl = baseUrl + settings.getJsonApi().getPath() + "/";
+                builder.withJSONApiLinks(new DefaultJSONApiLinks(jsonApiBaseUrl));
+            }
+        }
+
+        Elide elide = new Elide(builder.build(), transactionRegistry, dictionary.getScanner(), true);
+
+        return new RefreshableElide(elide);
+    }
+
+    @Bean
+    @RefreshScope
+    @ConditionalOnMissingBean
+    public QueryRunners getQueryRunners(RefreshableElide refreshableElide) {
+        return new QueryRunners(refreshableElide);
+    }
+
+    /**
+     * A Set containing Types to be excluded from EntityDictionary's EntityBinding.
+     * @param settings Elide configuration settings.
+     * @return Set of Types.
+     */
+    @Bean(name = "entitiesToExclude")
+    @ConditionalOnMissingBean
+    public Set<Type<?>> getEntitiesToExclude(ElideConfigProperties settings) {
+        Set<Type<?>> entitiesToExclude = new HashSet<>();
+
+        AsyncProperties asyncProperties = settings.getAsync();
+
+        if (asyncProperties == null || !asyncProperties.isEnabled()) {
+            entitiesToExclude.add(ClassType.of(AsyncQuery.class));
+        }
+
+        boolean exportEnabled = isExportEnabled(asyncProperties);
+
+        if (!exportEnabled) {
+            entitiesToExclude.add(ClassType.of(TableExport.class));
+        }
+
+        return entitiesToExclude;
+    }
+
+    /**
+     * Creates the entity dictionary for Elide which contains static metadata about Elide models.
+     * Override to load check classes or life cycle hooks.
+     * @param beanFactory Injector to inject Elide models.
+     * @param dynamicConfig An instance of DynamicConfiguration.
+     * @param settings Elide configuration settings.
+     * @param entitiesToExclude set of Entities to exclude from binding.
+     * @return a newly configured EntityDictionary.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @Scope(SCOPE_PROTOTYPE)
+    public EntityDictionary buildDictionary(AutowireCapableBeanFactory beanFactory,
+                                            ClassScanner scanner,
+                                            @Autowired(required = false) DynamicConfiguration dynamicConfig,
+                                            ElideConfigProperties settings,
+                                            @Qualifier("entitiesToExclude") Set<Type<?>> entitiesToExclude) {
+
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+
+        if (settings.getDynamicConfig().isConfigApiEnabled()) {
+            checks.put(ConfigChecks.CAN_CREATE_CONFIG, ConfigChecks.CanNotCreate.class);
+            checks.put(ConfigChecks.CAN_READ_CONFIG, ConfigChecks.CanNotRead.class);
+            checks.put(ConfigChecks.CAN_DELETE_CONFIG, ConfigChecks.CanNotDelete.class);
+            checks.put(ConfigChecks.CAN_UPDATE_CONFIG, ConfigChecks.CanNotUpdate.class);
+        }
+
+        EntityDictionary dictionary = new EntityDictionary(
+                checks, //Checks
+                new HashMap<>(), //Role Checks
+                new Injector() {
+                    @Override
+                    public void inject(Object entity) {
+                        beanFactory.autowireBean(entity);
+                    }
+
+                    @Override
+                    public <T> T instantiate(Class<T> cls) {
+                        return beanFactory.createBean(cls);
+                    }
+                },
+                CoerceUtil::lookup, //Serde Lookup
+                entitiesToExclude,
+                scanner);
+
+        if (isAggregationStoreEnabled(settings) && isDynamicConfigEnabled(settings)) {
+            dynamicConfig.getRoles().forEach(role -> {
+                dictionary.addRoleCheck(role, new Role.RoleMemberCheck(role));
+            });
+        }
+
+        return dictionary;
+    }
+
+    /**
+     * Create a QueryEngine instance for aggregation data store to use.
+     * @param defaultDataSource DataSource for JPA.
+     * @param dynamicConfig An instance of DynamicConfiguration.
+     * @param settings Elide configuration settings.
+     * @param dataSourceConfiguration DataSource Configuration
+     * @param dbPasswordExtractor Password Extractor Implementation
+     * @return An instance of a QueryEngine
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.aggregation-store.enabled", havingValue = "true")
+    @Scope(SCOPE_PROTOTYPE)
+    public QueryEngine buildQueryEngine(DataSource defaultDataSource,
+                                        @Autowired(required = false) DynamicConfiguration dynamicConfig,
+                                        ElideConfigProperties settings,
+                                        ClassScanner scanner,
+                                        DataSourceConfiguration dataSourceConfiguration,
+                                        DBPasswordExtractor dbPasswordExtractor) {
+
+        boolean enableMetaDataStore = settings.getAggregationStore().isEnableMetaDataStore();
+        ConnectionDetails defaultConnectionDetails = new ConnectionDetails(defaultDataSource,
+                        SQLDialectFactory.getDialect(settings.getAggregationStore().getDefaultDialect()));
+        if (isDynamicConfigEnabled(settings)) {
+            MetaDataStore metaDataStore = new MetaDataStore(scanner, dynamicConfig.getTables(),
+                    dynamicConfig.getNamespaceConfigurations(), enableMetaDataStore);
+
+            Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+
+            dynamicConfig.getDatabaseConfigurations().forEach(dbConfig -> {
+                connectionDetailsMap.put(dbConfig.getName(),
+                        new ConnectionDetails(
+                                dataSourceConfiguration.getDataSource(dbConfig, dbPasswordExtractor),
+                                SQLDialectFactory.getDialect(dbConfig.getDialect())));
+            });
+
+            Function<String, ConnectionDetails> connectionDetailsLookup = (name) -> {
+                if (StringUtils.isEmpty(name)) {
+                    return defaultConnectionDetails;
+                }
+                return Optional.ofNullable(connectionDetailsMap.get(name))
+                        .orElseThrow(() -> new IllegalStateException("ConnectionDetails undefined for connection: "
+                                + name));
+            };
+
+            return new SQLQueryEngine(metaDataStore, connectionDetailsLookup,
+                    new HashSet<>(Arrays.asList(new AggregateBeforeJoinOptimizer(metaDataStore))),
+                    new DefaultQueryPlanMerger(metaDataStore),
+                    new DefaultQueryValidator(metaDataStore.getMetadataDictionary()));
+        }
+        MetaDataStore metaDataStore = new MetaDataStore(scanner, enableMetaDataStore);
+        return new SQLQueryEngine(metaDataStore, (unused) -> defaultConnectionDetails);
+    }
+
+    /**
+     * Creates the DataStore Elide.  Override to use a different store.
+     * @param entityManagerFactory The JPA factory which creates entity managers.
+     * @param scanner Class Scanner
+     * @param queryEngine QueryEngine instance for aggregation data store.
+     * @param settings Elide configuration settings.
+     * @param cache Analytics query cache
+     * @param querylogger Analytics query logger
+     * @return An instance of a JPA DataStore.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @Scope(SCOPE_PROTOTYPE)
+    public DataStore buildDataStore(EntityManagerFactory entityManagerFactory,
+                                    ClassScanner scanner,
+                                    @Autowired(required = false) QueryEngine queryEngine,
+                                    ElideConfigProperties settings,
+                                    @Autowired(required = false) Cache cache,
+                                    @Autowired(required = false) QueryLogger querylogger) {
+        List<DataStore> stores = new ArrayList<>();
+
+        JpaDataStore jpaDataStore = new JpaDataStore(
+                entityManagerFactory::createEntityManager,
+                em -> new NonJtaTransaction(em, txCancel,
+                        DEFAULT_LOGGER,
+                        settings.getJpaStore().isDelegateToInMemoryStore(), true));
+
+        stores.add(jpaDataStore);
+
+        if (isAggregationStoreEnabled(settings)) {
+            AggregationDataStore.AggregationDataStoreBuilder aggregationDataStoreBuilder =
+                            AggregationDataStore.builder().queryEngine(queryEngine);
+
+            if (isDynamicConfigEnabled(settings)) {
+                aggregationDataStoreBuilder.dynamicCompiledClasses(queryEngine.getMetaDataStore().getDynamicTypes());
+
+                if (settings.getDynamicConfig().isConfigApiEnabled()) {
+                    stores.add(new ConfigDataStore(settings.getDynamicConfig().getPath(),
+                            new TemplateConfigValidator(scanner, settings.getDynamicConfig().getPath())));
+                }
+            }
+            aggregationDataStoreBuilder.cache(cache);
+            aggregationDataStoreBuilder.queryLogger(querylogger);
+            AggregationDataStore aggregationDataStore = aggregationDataStoreBuilder.build();
+
+            stores.add(queryEngine.getMetaDataStore());
+            stores.add(aggregationDataStore);
+
+            // meta data store needs to be put at first to populate meta data models
+            return new MultiplexManager(stores.toArray(new DataStore[0]));
+        }
+
+        return jpaDataStore;
+    }
+
+    /**
+     * Creates a query result cache to be used by {@link #buildDataStore}, or null if cache is to be disabled.
+     * @param settings Elide configuration settings.
+     * @return An instance of a query cache, or null.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.aggregation-store.enabled", havingValue = "true")
+    public Cache buildQueryCache(ElideConfigProperties settings) {
+        CaffeineCache cache = null;
+
+        int maxCacheItems = settings.getAggregationStore().getQueryCacheMaximumEntries();
+        if (maxCacheItems > 0) {
+            cache = new CaffeineCache(maxCacheItems, settings.getAggregationStore().getDefaultCacheExpirationMinutes());
+            if (meterRegistry != null) {
+                CaffeineCacheMetrics.monitor(meterRegistry, cache.getImplementation(), "elideQueryCache");
+            }
+        }
+        return cache;
+    }
+
+    /**
+     * Creates a querylogger to be used by {@link #buildDataStore} for aggregation.
+     * @return The default Noop QueryLogger.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.aggregation-store.enabled", havingValue = "true")
+    public QueryLogger buildQueryLogger() {
+        return new Slf4jQueryLogger();
+    }
+
+    /**
+     * Creates a singular swagger document for JSON-API.
+     * @param elide Singleton elide instance.
+     * @param settings Elide configuration settings.
+     * @return An instance of a JPA DataStore.
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "elide.swagger.enabled", havingValue = "true")
+    @RefreshScope
+    public SwaggerController.SwaggerRegistrations buildSwagger(
+            RefreshableElide elide,
+            ElideConfigProperties settings
+    ) {
+        EntityDictionary dictionary = elide.getElide().getElideSettings().getDictionary();
+        Info info = new Info()
+                .title(settings.getSwagger().getName())
+                .version(settings.getSwagger().getVersion());
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info).withLegacyFilterDialect(false);
+        return new SwaggerController.SwaggerRegistrations(
+                builder.build().basePath(settings.getJsonApi().getPath())
+        );
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ClassScanner getClassScanner() {
+        return new DefaultClassScanner();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ErrorMapper getErrorMapper() {
+        return error -> null;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    @Scope(SCOPE_PROTOTYPE)
+    public JsonApiMapper mapper() {
+        return new JsonApiMapper();
+    }
+
+    private boolean isDynamicConfigEnabled(ElideConfigProperties settings) {
+
+        boolean enabled = false;
+        if (settings.getDynamicConfig() != null) {
+            enabled = settings.getDynamicConfig().isEnabled();
+        }
+
+        return enabled;
+
+    }
+
+    private boolean isAggregationStoreEnabled(ElideConfigProperties settings) {
+
+        boolean enabled = false;
+        if (settings.getAggregationStore() != null) {
+            enabled = settings.getAggregationStore().isEnabled();
+        }
+
+        return enabled;
+
+    }
+
+    public static boolean isExportEnabled(AsyncProperties asyncProperties) {
+
+        return asyncProperties != null && asyncProperties.getExport() != null
+                && asyncProperties.getExport().isEnabled();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideConfigProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideConfigProperties.java
new file mode 100644
index 0000000000..35cd01745b
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideConfigProperties.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import lombok.Data;
+
+/**
+ * Configuration settings for Elide.
+ */
+@Data
+@ConfigurationProperties(prefix = "elide")
+public class ElideConfigProperties {
+
+    /**
+     * Settings for the JSON-API controller.
+     */
+    private JsonApiControllerProperties jsonApi;
+
+    /**
+     * Settings for the GraphQL controller.
+     */
+    private ControllerProperties graphql;
+
+    /**
+     * Settings for the Swagger document controller.
+     */
+    private SwaggerControllerProperties swagger;
+
+    /**
+     * Settings for the Async.
+     */
+    private AsyncProperties async = new AsyncProperties();
+
+    /**
+     * Settings for subscriptions.
+     */
+    private SubscriptionProperties subscription = new SubscriptionProperties();
+
+    /**
+     * Settings for the Dynamic Configuration.
+     */
+    private DynamicConfigProperties dynamicConfig = new DynamicConfigProperties();
+
+    /**
+     * Settings for the Aggregation Store.
+     */
+    private AggregationStoreProperties aggregationStore = new AggregationStoreProperties();
+
+    /**
+     * Settings for the JPA Store.
+     */
+    private JpaStoreProperties jpaStore = new JpaStoreProperties();
+
+    /**
+     * Default pagination size for collections if the client doesn't paginate.
+     */
+    private int pageSize = 500;
+
+    /**
+     * The maximum pagination size a client can request.
+     */
+    private int maxPageSize = 10000;
+
+    /**
+     * The base service URL that clients use in queries.  Elide will reference this name
+     * in any callback URLs returned by the service.  If not set, Elide uses the API request to derive the base URL.
+     */
+    private String baseUrl = "";
+
+    /**
+     * Turns on/off verbose error responses.
+     */
+    private boolean verboseErrors = false;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionConfiguration.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionConfiguration.java
new file mode 100644
index 0000000000..0179db08bf
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionConfiguration.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import static com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket.DEFAULT_USER_FACTORY;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketConfigurator;
+import com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+import javax.jms.ConnectionFactory;
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * Configures GraphQL subscription web sockets for Elide.
+ */
+@Configuration
+@EnableConfigurationProperties(ElideConfigProperties.class)
+public class ElideSubscriptionConfiguration {
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnExpression("${elide.subscription.enabled:false}")
+    ServerEndpointConfig serverEndpointConfig(
+            ElideConfigProperties config,
+            SubscriptionWebSocket.UserFactory userFactory,
+            ConnectionFactory connectionFactory,
+            ErrorMapper errorMapper,
+            JsonApiMapper mapper
+    ) {
+        return ServerEndpointConfig.Builder
+                .create(SubscriptionWebSocket.class, config.getSubscription().getPath())
+                .configurator(SubscriptionWebSocketConfigurator.builder()
+                        .baseUrl(config.getSubscription().getPath())
+                        .sendPingOnSubscribe(config.getSubscription().isSendPingOnSubscribe())
+                        .connectionTimeoutMs(config.getSubscription().getConnectionTimeoutMs())
+                        .maxSubscriptions(config.getSubscription().maxSubscriptions)
+                        .maxMessageSize(config.getSubscription().maxMessageSize)
+                        .maxIdleTimeoutMs(config.getSubscription().idleTimeoutMs)
+                        .connectionFactory(connectionFactory)
+                        .userFactory(userFactory)
+                        .auditLogger(new Slf4jLogger())
+                        .verboseErrors(config.isVerboseErrors())
+                        .errorMapper(errorMapper)
+                        .build())
+                .build();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnExpression("${elide.subscription.enabled:false}")
+    ServerEndpointExporter serverEndpointExporter() {
+        ServerEndpointExporter exporter = new ServerEndpointExporter();
+        return exporter;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnExpression("${elide.subscription.enabled:false}")
+    SubscriptionWebSocket.UserFactory getUserFactory() {
+        return DEFAULT_USER_FACTORY;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionScanningConfiguration.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionScanningConfiguration.java
new file mode 100644
index 0000000000..4e1c88dad2
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideSubscriptionScanningConfiguration.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionScanner;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+
+/**
+ * Scans for GraphQL subscriptions and registers lifecycle hooks.
+ */
+@Configuration
+@ConditionalOnExpression("${elide.subscription.enabled:false}")
+public class ElideSubscriptionScanningConfiguration {
+    private RefreshableElide refreshableElide;
+    private ConnectionFactory connectionFactory;
+
+    @Autowired
+    public ElideSubscriptionScanningConfiguration(
+            RefreshableElide refreshableElide,
+            ConnectionFactory connectionFactory
+    ) {
+        this.refreshableElide = refreshableElide;
+        this.connectionFactory = connectionFactory;
+    }
+
+    @EventListener(value = { ContextRefreshedEvent.class, RefreshScopeRefreshedEvent.class })
+    public void onStartOrRefresh(ApplicationEvent event) {
+
+        Elide elide = refreshableElide.getElide();
+
+        SubscriptionScanner scanner = SubscriptionScanner.builder()
+
+                //Things you may want to override...
+                .deliveryDelay(Message.DEFAULT_DELIVERY_DELAY)
+                .messagePriority(Message.DEFAULT_PRIORITY)
+                .timeToLive(Message.DEFAULT_TIME_TO_LIVE)
+                .deliveryMode(Message.DEFAULT_DELIVERY_MODE)
+
+                //Things you probably don't care about...
+                .scanner(elide.getScanner())
+                .dictionary(elide.getElideSettings().getDictionary())
+                .connectionFactory(connectionFactory)
+                .build();
+
+        scanner.bindLifecycleHooks();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ExportControllerProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ExportControllerProperties.java
new file mode 100644
index 0000000000..96a61db2dd
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ExportControllerProperties.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Extra controller properties for the export endpoint.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExportControllerProperties extends ControllerProperties {
+
+    /**
+     * Skip including Header in CSV formatted export.
+     */
+    private boolean skipCSVHeader = false;
+
+    /**
+     * Enable Adding Extension to table export attachments.
+     */
+    private boolean extensionEnabled = false;
+
+    /**
+     * The URL path prefix for the controller.
+     */
+    private String path = "/export";
+
+    /**
+     * Storage engine destination .
+     */
+    private String storageDestination = "/tmp";
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JpaStoreProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JpaStoreProperties.java
new file mode 100644
index 0000000000..983b9aee9d
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JpaStoreProperties.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+
+/**
+ * Extra properties for setting up aggregation data store.
+ */
+@Data
+public class JpaStoreProperties {
+
+    /**
+     * When fetching a subcollection from another multi-element collection, whether or not to do sorting, filtering
+     * and pagination in memory - or do N+1 queries.
+     */
+    private boolean delegateToInMemoryStore = true;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JsonApiControllerProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JsonApiControllerProperties.java
new file mode 100644
index 0000000000..64369ba0ae
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/JsonApiControllerProperties.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Extra controller properties for the JSON-API endpoint.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JsonApiControllerProperties extends ControllerProperties {
+
+    /**
+     * Turns on/off JSON-API links in the API.
+     */
+    boolean enableLinks = false;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SubscriptionProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SubscriptionProperties.java
new file mode 100644
index 0000000000..3c0d410e30
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SubscriptionProperties.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+
+/**
+ * Extra properties for setting up GraphQL subscription support.
+ */
+@Data
+public class SubscriptionProperties extends ControllerProperties {
+
+    /**
+     * Whether Elide should publish subscription notifications to JMS on lifecycle events.
+     */
+    protected boolean publishingEnabled = isEnabled();
+
+    /**
+     * Websocket sends a PING immediate after receiving a SUBSCRIBE.  Only useful for testing.
+     * @see com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketTestClient
+     */
+    protected boolean sendPingOnSubscribe = false;
+
+    /**
+     * Time allowed in milliseconds from web socket creation to successfully receiving a CONNECTION_INIT message.
+     */
+    protected int connectionTimeoutMs = 5000;
+
+    /**
+     * Maximum number of outstanding GraphQL queries per websocket.
+     */
+    protected int maxSubscriptions = 30;
+
+    /**
+     * Maximum message size that can be sent to the websocket.
+     */
+    protected int maxMessageSize = 10000;
+
+    /**
+     * Maximum idle timeout in milliseconds with no websocket activity.
+     */
+    protected long idleTimeoutMs = 300000;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SwaggerControllerProperties.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SwaggerControllerProperties.java
new file mode 100644
index 0000000000..40c272a922
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/config/SwaggerControllerProperties.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.config;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Extra controller properties for the Swagger document endpoint.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SwaggerControllerProperties extends ControllerProperties {
+
+    /**
+     * Swagger needs a name for the service.
+     */
+    private String name = "Elide Service";
+
+    /**
+     * Swagger needs a version for the service.
+     */
+    private String version = "";
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/ExportController.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/ExportController.java
new file mode 100644
index 0000000000..616266aad3
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/ExportController.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.controllers;
+
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
+import io.reactivex.Observable;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Spring rest controller for Elide Export.
+ * When enabled it is highly recommended to
+ * configure explicitly the TaskExecutor used in Spring MVC for executing
+ * asynchronous requests using StreamingResponseBody. Refer
+ * {@link org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody}.
+ */
+@Slf4j
+@Configuration
+@RestController
+@RequestMapping(value = "${elide.async.export.path:/export}")
+@ConditionalOnExpression("${elide.async.enabled:false} && ${elide.async.export.enabled:false}")
+public class ExportController {
+
+    private ResultStorageEngine resultStorageEngine;
+
+    @Autowired
+    public ExportController(ResultStorageEngine resultStorageEngine) {
+        log.debug("Started ~~");
+        this.resultStorageEngine = resultStorageEngine;
+    }
+
+    /**
+     * Single entry point for export requests.
+     * @param asyncQueryId Id of results to download
+     * @param response HttpServletResponse instance
+     * @return ResponseEntity
+     */
+    @GetMapping(path = "/{asyncQueryId}")
+    public ResponseEntity<StreamingResponseBody> export(@PathVariable String asyncQueryId,
+            HttpServletResponse response) {
+
+        Observable<String> observableResults = resultStorageEngine.getResultsByID(asyncQueryId);
+        StreamingResponseBody streamingOutput = outputStream -> {
+            observableResults
+            .subscribe(
+                    resultString -> {
+                        outputStream.write(resultString.concat(System.lineSeparator()).getBytes());
+                    },
+                    error -> {
+                        String message = error.getMessage();
+                        try {
+                            log.debug(message);
+                            if (message != null && message.equals(ResultStorageEngine.RETRIEVE_ERROR)) {
+                                response.sendError(HttpStatus.SC_NOT_FOUND, asyncQueryId + "not found");
+                            } else {
+                                response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                            }
+                        } catch (IOException | IllegalStateException e) {
+                            // If stream was flushed, Attachment download has already started.
+                            // response.sendError causes java.lang.IllegalStateException:
+                            // Cannot call sendError() after the response has been committed.
+                            // This will return 200 status.
+                            // Add error message in the attachment as a way to signal errors.
+                            outputStream.write(
+                                    "Error Occured...."
+                                    .concat(System.lineSeparator())
+                                    .getBytes()
+                            );
+                            log.debug(e.getMessage());
+                        } finally {
+                            outputStream.flush();
+                            outputStream.close();
+                        }
+                    },
+                    () -> {
+                        outputStream.flush();
+                        outputStream.close();
+                    }
+            );
+        };
+
+        return ResponseEntity
+                .ok()
+                .header("Content-Disposition", "attachment; filename=" + asyncQueryId)
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .body(streamingOutput);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/GraphqlController.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/GraphqlController.java
new file mode 100644
index 0000000000..c2966c922e
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/GraphqlController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.controllers;
+
+import static com.yahoo.elide.graphql.QueryRunner.buildErrorResponse;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.graphql.QueryRunner;
+import com.yahoo.elide.graphql.QueryRunners;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.spring.config.ElideConfigProperties;
+import com.yahoo.elide.spring.security.AuthenticationUser;
+import com.yahoo.elide.utils.HeaderUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+
+/**
+ * Spring rest controller for Elide GraphQL.
+ */
+@Slf4j
+@Configuration
+@RestController
+@RequestMapping(value = "${elide.graphql.path}")
+@EnableConfigurationProperties(ElideConfigProperties.class)
+@ConditionalOnExpression("${elide.graphql.enabled:false}")
+@RefreshScope
+public class GraphqlController {
+
+    private final ElideConfigProperties settings;
+    private final QueryRunners runners;
+    private final ObjectMapper mapper;
+
+    private static final String JSON_CONTENT_TYPE = "application/json";
+
+    @Autowired
+    public GraphqlController(
+            QueryRunners runners,
+            JsonApiMapper jsonApiMapper,
+            ElideConfigProperties settings) {
+        log.debug("Started ~~");
+        this.runners = runners;
+        this.settings = settings;
+        this.mapper = jsonApiMapper.getObjectMapper();
+    }
+
+    /**
+     * Single entry point for GraphQL requests.
+     *
+     * @param requestHeaders request headers
+     * @param graphQLDocument post data as json document
+     * @param principal The user principal
+     * @return response
+     */
+    @PostMapping(value = {"/**", ""}, consumes = JSON_CONTENT_TYPE, produces = JSON_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> post(@RequestHeader HttpHeaders requestHeaders,
+                                                 @RequestBody String graphQLDocument, Authentication principal) {
+        final User user = new AuthenticationUser(principal);
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final QueryRunner runner = runners.getRunner(apiVersion);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response;
+
+                if (runner == null) {
+                    response = buildErrorResponse(mapper, new InvalidOperationException("Invalid API Version"), false);
+                } else {
+                    Elide elide = runner.getElide();
+                    response = runner.run(baseUrl, graphQLDocument, user, UUID.randomUUID(), requestHeadersCleaned);
+                }
+
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    protected String getBaseUrlEndpoint() {
+        String baseUrl = settings.getBaseUrl();
+
+        if (StringUtils.isEmpty(baseUrl)) {
+            baseUrl = ServletUriComponentsBuilder.fromCurrentContextPath().build().toUriString();
+        }
+        return baseUrl;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/JsonApiController.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/JsonApiController.java
new file mode 100644
index 0000000000..e27ad5da1c
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/JsonApiController.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2019, the original author or authors.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.controllers;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideResponse;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.core.security.User;
+import com.yahoo.elide.spring.config.ElideConfigProperties;
+import com.yahoo.elide.spring.security.AuthenticationUser;
+import com.yahoo.elide.utils.HeaderUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+/**
+ * Spring rest controller for Elide JSON-API.
+ * Based on 'https://github.com/illyasviel/elide-spring-boot/'
+ */
+@Slf4j
+@RestController
+@Configuration
+@RequestMapping(value = "${elide.json-api.path}")
+@ConditionalOnExpression("${elide.json-api.enabled:false}")
+@RefreshScope
+public class JsonApiController {
+
+    private final Elide elide;
+    private final ElideConfigProperties settings;
+    public static final String JSON_API_CONTENT_TYPE = JSONAPI_CONTENT_TYPE;
+    public static final String JSON_API_PATCH_CONTENT_TYPE = JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION;
+
+    @Autowired
+    public JsonApiController(RefreshableElide refreshableElide, ElideConfigProperties settings) {
+        log.debug("Started ~~");
+        this.settings = settings;
+        this.elide = refreshableElide.getElide();
+    }
+
+    private <K, V> MultivaluedHashMap<K, V> convert(MultiValueMap<K, V> springMVMap) {
+        MultivaluedHashMap<K, V> convertedMap = new MultivaluedHashMap<>(springMVMap.size());
+        springMVMap.forEach(convertedMap::put);
+        return convertedMap;
+    }
+
+    @GetMapping(value = "/**", produces = JSON_API_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> elideGet(@RequestHeader HttpHeaders requestHeaders,
+                                                     @RequestParam MultiValueMap<String, String> allRequestParams,
+                                                     HttpServletRequest request, Authentication authentication) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final String pathname = getJsonApiPath(request, settings.getJsonApi().getPath());
+        final User user = new AuthenticationUser(authentication);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response = elide.get(baseUrl, pathname,
+                        convert(allRequestParams), requestHeadersCleaned,
+                        user, apiVersion, UUID.randomUUID());
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    @PostMapping(value = "/**", consumes = JSON_API_CONTENT_TYPE, produces = JSON_API_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> elidePost(@RequestHeader HttpHeaders requestHeaders,
+                                                      @RequestParam MultiValueMap<String, String> allRequestParams,
+                                                      @RequestBody String body,
+                                                      HttpServletRequest request, Authentication authentication) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final String pathname = getJsonApiPath(request, settings.getJsonApi().getPath());
+        final User user = new AuthenticationUser(authentication);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response = elide.post(baseUrl, pathname, body, convert(allRequestParams),
+                        requestHeadersCleaned, user, apiVersion, UUID.randomUUID());
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    @PatchMapping(value = "/**", consumes = { JSON_API_CONTENT_TYPE, JSON_API_PATCH_CONTENT_TYPE})
+    public Callable<ResponseEntity<String>> elidePatch(@RequestHeader HttpHeaders requestHeaders,
+                                                       @RequestParam MultiValueMap<String, String> allRequestParams,
+                                                       @RequestBody String body,
+                                                       HttpServletRequest request, Authentication authentication) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final String pathname = getJsonApiPath(request, settings.getJsonApi().getPath());
+        final User user = new AuthenticationUser(authentication);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response = elide
+                        .patch(baseUrl, request.getContentType(), request.getContentType(), pathname, body,
+                               convert(allRequestParams), requestHeadersCleaned, user, apiVersion,
+                               UUID.randomUUID());
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    @DeleteMapping(value = "/**")
+    public Callable<ResponseEntity<String>> elideDelete(@RequestHeader HttpHeaders requestHeaders,
+                                                        @RequestParam MultiValueMap<String, String> allRequestParams,
+                                                        HttpServletRequest request,
+                                                        Authentication authentication) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final String pathname = getJsonApiPath(request, settings.getJsonApi().getPath());
+        final User user = new AuthenticationUser(authentication);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response = elide.delete(baseUrl, pathname, null,
+                        convert(allRequestParams), requestHeadersCleaned,
+                        user, apiVersion, UUID.randomUUID());
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    @DeleteMapping(value = "/**", consumes = JSON_API_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> elideDeleteRelation(
+            @RequestHeader HttpHeaders requestHeaders,
+            @RequestParam MultiValueMap<String, String> allRequestParams,
+            @RequestBody String body,
+            HttpServletRequest request,
+            Authentication authentication) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final Map<String, List<String>> requestHeadersCleaned =
+                HeaderUtils.lowercaseAndRemoveAuthHeaders(requestHeaders);
+        final String pathname = getJsonApiPath(request, settings.getJsonApi().getPath());
+        final User user = new AuthenticationUser(authentication);
+        final String baseUrl = getBaseUrlEndpoint();
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                ElideResponse response = elide
+                        .delete(baseUrl, pathname, body, convert(allRequestParams),
+                                requestHeadersCleaned, user, apiVersion, UUID.randomUUID());
+                return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
+            }
+        };
+    }
+
+    private String getJsonApiPath(HttpServletRequest request, String prefix) {
+        String pathname = (String) request
+                .getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+
+        return pathname.replaceFirst(prefix, "");
+    }
+
+    protected String getBaseUrlEndpoint() {
+        String baseUrl = elide.getElideSettings().getBaseUrl();
+
+        if (StringUtils.isEmpty(baseUrl)) {
+            baseUrl = ServletUriComponentsBuilder.fromCurrentContextPath().build().toUriString();
+        }
+
+        return baseUrl;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/SwaggerController.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/SwaggerController.java
new file mode 100644
index 0000000000..0c4b897e18
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/controllers/SwaggerController.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.spring.controllers;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.swagger.SwaggerBuilder;
+import com.yahoo.elide.utils.HeaderUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.owasp.encoder.Encode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.models.Swagger;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+
+/**
+ * Spring REST controller for exposing Swagger documentation.
+ */
+@Slf4j
+@RefreshScope
+@RestController
+@Configuration
+@RequestMapping(value = "${elide.swagger.path}")
+@ConditionalOnExpression("${elide.swagger.enabled:false}")
+public class SwaggerController {
+
+    //Maps api version & path to swagger document.
+    protected Map<Pair<String, String>, String> documents;
+    private static final String JSON_CONTENT_TYPE = "application/json";
+
+    /**
+     * Wraps a list of swagger registrations so that they can be wrapped with an AOP proxy.
+     */
+    @Data
+    @AllArgsConstructor
+    public static class SwaggerRegistrations {
+
+        public SwaggerRegistrations(Swagger doc) {
+            registrations = List.of(new SwaggerRegistration("", doc));
+        }
+
+        List<SwaggerRegistration> registrations;
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class SwaggerRegistration {
+        private String path;
+        private Swagger document;
+    }
+
+    /**
+     * Constructs the resource.
+     *
+     * @param docs A list of documents to register.
+     */
+    @Autowired
+    public SwaggerController(SwaggerRegistrations docs) {
+        log.debug("Started ~~");
+        documents = new HashMap<>();
+
+        docs.getRegistrations().forEach((doc) -> {
+            String apiVersion = doc.document.getInfo().getVersion();
+            apiVersion = apiVersion == null ? NO_VERSION : apiVersion;
+            String apiPath = doc.path;
+
+            documents.put(Pair.of(apiVersion, apiPath), SwaggerBuilder.getDocument(doc.document));
+        });
+    }
+
+    @GetMapping(value = {"/", ""}, produces = JSON_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> list(@RequestHeader HttpHeaders requestHeaders) {
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+
+        final List<String> documentPaths = documents.keySet().stream()
+                .filter(key -> key.getLeft().equals(apiVersion))
+                .map(Pair::getRight)
+                .collect(Collectors.toList());
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                if (documentPaths.size() == 1) {
+                    return ResponseEntity
+                            .status(HttpStatus.OK)
+                            .body(documents.values().iterator().next());
+                }
+
+                String body = documentPaths.stream()
+                        .map(key -> '"' + key + '"')
+                        .collect(Collectors.joining(",", "[", "]"));
+
+                return ResponseEntity.status(HttpStatus.OK).body(body);
+            }
+        };
+    }
+
+    /**
+     * Read handler.
+     *
+     * @param requestHeaders request headers
+     * @param name document name
+     * @return response The Swagger JSON document
+     */
+    @GetMapping(value = "/{name}", produces = JSON_CONTENT_TYPE)
+    public Callable<ResponseEntity<String>> list(@RequestHeader HttpHeaders requestHeaders,
+                                                 @PathVariable("name") String name) {
+
+        final String apiVersion = HeaderUtils.resolveApiVersion(requestHeaders);
+        final String encodedName = Encode.forHtml(name);
+
+        return new Callable<ResponseEntity<String>>() {
+            @Override
+            public ResponseEntity<String> call() throws Exception {
+                Pair<String, String> lookupKey = Pair.of(apiVersion, encodedName);
+                if (documents.containsKey(lookupKey)) {
+                    return ResponseEntity.status(HttpStatus.OK).body(documents.get(lookupKey));
+                }
+                return ResponseEntity.status(404).body("Unknown document: " + encodedName);
+            }
+        };
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/security/AuthenticationUser.java b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/security/AuthenticationUser.java
new file mode 100644
index 0000000000..1cd71a096e
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/java/com/yahoo/elide/spring/security/AuthenticationUser.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.spring.security;
+
+import com.yahoo.elide.core.security.User;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+
+/**
+ * Elide User object for Spring Boot.
+ */
+public class AuthenticationUser extends User {
+    private Authentication authentication;
+
+    public AuthenticationUser(Authentication authentication) {
+        super(authentication);
+        this.authentication = authentication;
+    }
+
+    @Override
+    public boolean isInRole(String role) {
+        return authentication.getAuthorities().stream()
+                .map(GrantedAuthority::getAuthority)
+                .anyMatch(role::equals);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/elide-spring/elide-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..2070ae5d5a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,9 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.yahoo.elide.spring.config.ElideAutoConfiguration, \
+ com.yahoo.elide.spring.config.ElideAsyncConfiguration, \
+ com.yahoo.elide.spring.config.ElideSubscriptionConfiguration, \
+ com.yahoo.elide.spring.config.ElideSubscriptionScanningConfiguration, \
+ com.yahoo.elide.spring.controllers.JsonApiController, \
+ com.yahoo.elide.spring.controllers.GraphqlController, \
+ com.yahoo.elide.spring.controllers.SwaggerController, \
+ com.yahoo.elide.spring.controllers.ExportController
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/App.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/App.java
new file mode 100644
index 0000000000..2e0114835f
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/App.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.TimeZone;
+import javax.annotation.PostConstruct;
+
+/**
+ * Example app using elide-spring.
+ */
+@Slf4j
+@SpringBootApplication
+@EntityScan
+public class App {
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(App.class, args);
+    }
+
+    @PostConstruct
+    public void init() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/SecurityConfiguration.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/SecurityConfiguration.java
new file mode 100644
index 0000000000..929febefdc
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/SecurityConfiguration.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+/**
+ * Disables security for testing.
+ */
+@Configuration
+@EnableWebSecurity
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity.authorizeRequests().antMatchers("/**").permitAll().and().csrf().disable();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/checks/AdminCheck.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/checks/AdminCheck.java
new file mode 100644
index 0000000000..ccb769a44d
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/checks/AdminCheck.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.checks;
+
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.util.Optional;
+
+@SecurityCheck(AdminCheck.USER_IS_ADMIN)
+public class AdminCheck extends OperationCheck {
+
+    public static final String USER_IS_ADMIN = "User is Admin";
+
+    @Override
+    public boolean ok(Object object, RequestScope requestScope, Optional optional) {
+
+        //There are no admins...
+        return false;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/aggregation/Stats.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/aggregation/Stats.java
new file mode 100644
index 0000000000..13f7abc49a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/aggregation/Stats.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models.aggregation;
+
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.annotation.MetricFormula;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.FromTable;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.annotation.VersionQuery;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.persistence.Id;
+
+@Include
+@EqualsAndHashCode
+@ToString
+@FromTable(name = "stats")
+@VersionQuery(sql = "SELECT COUNT(*) FROM stats")
+@Data
+public class Stats {
+
+    /**
+     * PK.
+     */
+    @Id
+    private String id;
+
+    /**
+     * A metric.
+     */
+    @MetricFormula("SUM({{$measure}})")
+    private long measure;
+
+    /**
+     * A degenerate dimension.
+     */
+    private String dimension;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactGroup.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactGroup.java
new file mode 100644
index 0000000000..69ed5b6cf3
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactGroup.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models.jpa;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import example.checks.AdminCheck;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Include(name = "group")
+@Entity
+@Data
+@Subscription
+public class ArtifactGroup {
+    @Id
+    private String name = "";
+
+    @SubscriptionField
+    private String commonName = "";
+
+    private String description = "";
+
+    @CreatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    @UpdatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    @SubscriptionField
+    private boolean deprecated = false;
+
+    @SubscriptionField
+    @OneToMany(mappedBy = "group")
+    private List<ArtifactProduct> products = new ArrayList<>();
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactProduct.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactProduct.java
new file mode 100644
index 0000000000..b0c393f53f
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactProduct.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models.jpa;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+@Include(name = "product", rootLevel = false)
+@Entity
+public class ArtifactProduct {
+    @Id
+    private String name = "";
+
+    private String commonName = "";
+
+    private String description = "";
+
+    @ManyToOne
+    private ArtifactGroup group = null;
+
+    @OneToMany(mappedBy = "artifact")
+    private List<ArtifactVersion> versions = new ArrayList<>();
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactVersion.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactVersion.java
new file mode 100644
index 0000000000..d046fa9553
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/ArtifactVersion.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models.jpa;
+
+import com.yahoo.elide.annotation.Include;
+
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Include(name = "version", rootLevel = false)
+@Entity
+public class ArtifactVersion {
+    @Id
+    private String name = "";
+
+    private Date createdAt = new Date();
+
+    @ManyToOne
+    private ArtifactProduct artifact;
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/ArtifactGroupV2.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/ArtifactGroupV2.java
new file mode 100644
index 0000000000..d924ce5ec8
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/ArtifactGroupV2.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.jpa.v2;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Include(name = "group")
+@Entity
+@Data
+@Table(name = "ArtifactGroup")
+public class ArtifactGroupV2 {
+    @Id
+    private String name = "";
+
+    @Column(name = "commonName")
+    private String title = "";
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/package-info.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/package-info.java
new file mode 100644
index 0000000000..bb06bbfd19
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/models/jpa/v2/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+/**
+ * Models Package V2.
+ */
+@ApiVersion(version = "1.0")
+package example.models.jpa.v2;
+
+import com.yahoo.elide.annotation.ApiVersion;
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AggregationStoreTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AggregationStoreTest.java
new file mode 100644
index 0000000000..ddabf7bb4a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AggregationStoreTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.context.jdbc.Sql;
+import io.micrometer.core.instrument.MeterRegistry;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Example functional tests for Aggregation Store.
+ */
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = {
+                "INSERT INTO Stats (id, measure, dimension) VALUES\n"
+                    + "\t\t(1,100,'Foo'),"
+                    + "\t\t(2,150,'Bar');"
+})
+public class AggregationStoreTest extends IntegrationTest {
+
+    /**
+     * This test demonstrates an example test using the aggregation store.
+     */
+    @Test
+    public void jsonApiGetTestNoHeader(@Autowired MeterRegistry metrics) {
+        when()
+                .get("/json/stats?fields[stats]=measure")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("stats"),
+                                        id("0"),
+                                        attributes(
+                                                attr("measure", 250)
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK);
+        when()
+        .get("/json/stats?fields[stats]=measure")
+        .then()
+        .body(equalTo(
+                data(
+                        resource(
+                                type("stats"),
+                                id("0"),
+                                attributes(
+                                        attr("measure", 250)
+                                )
+                        )
+                ).toJSON())
+        )
+        .statusCode(HttpStatus.SC_OK);
+        assertTrue(metrics
+                .get("cache.gets")
+                .tags("cache", "elideQueryCache", "result", "hit")
+                .functionCounter().count() > 0);
+    }
+
+    /**
+     * This test demonstrates an example test using the aggregation store.
+     */
+    @Test
+    public void jsonApiGetTest(@Autowired MeterRegistry metrics) {
+        Map<String, String> requestHeaders = new HashMap<>();
+         requestHeaders.put("bypassCache", "true");
+         HttpHeaders headers = new HttpHeaders();
+         headers.set("bypassCache", "true");
+         given().headers(headers)
+                .get("/json/stats?fields[stats]=measure")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("stats"),
+                                        id("0"),
+                                        attributes(
+                                                attr("measure", 250)
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK);
+
+         given().headers(requestHeaders)
+         .get("/json/stats?fields[stats]=measure")
+         .then()
+         .body(equalTo(
+                 data(
+                         resource(
+                                 type("stats"),
+                                 id("0"),
+                                 attributes(
+                                         attr("measure", 250)
+                                 )
+                         )
+                 ).toJSON())
+         )
+         .statusCode(HttpStatus.SC_OK);
+        assertFalse(metrics
+                .get("cache.gets")
+                .tags("cache", "elideQueryCache", "result", "hit")
+                .functionCounter().count() > 0);
+    }
+
+    @Test
+    public void metaDataTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/json/namespace/default") //"default" namespace added by Agg Store
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("default"))
+                .body("data.attributes.friendlyName", equalTo("default"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncDisableExportControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncDisableExportControllerTest.java
new file mode 100644
index 0000000000..08f27a7d33
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncDisableExportControllerTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static io.restassured.RestAssured.when;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Executes Export Controller tests with Async Disabled.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.async.enabled=false"
+        }
+)
+public class AsyncDisableExportControllerTest extends IntegrationTest {
+
+    @Test
+    public void exportControllerTest() {
+        // A post to export will result in not found, if controller was disabled.
+        // If controller is enabled, it returns Method Not Allowed.
+        when()
+                .post("/export/1")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncTest.java
new file mode 100644
index 0000000000..d95841566c
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/AsyncTest.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+import io.restassured.response.Response;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Basic functional tests to test Async service setup, JSONAPI and GRAPHQL endpoints.
+ */
+@SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = {
+                "INSERT INTO ArtifactGroup (name, commonName, description, deprecated) VALUES\n"
+                    + "\t\t('com.example.repository','Example Repository','The code for this project', false);",
+                "INSERT INTO Stats (id, measure, dimension) VALUES\n"
+                    + "\t\t(1,100,'Foo'),"
+                    + "\t\t(2,150,'Bar');",
+                "INSERT INTO PlayerStats (name, highScore, countryId, createdOn, updatedOn) VALUES\n"
+                    + "\t\t('Sachin',100, 1, '2020-01-01', now());",
+                "INSERT INTO PlayerCountry (id, isoCode) VALUES\n"
+                    + "\t\t(1, 'IND');"
+})
+public class AsyncTest extends IntegrationTest {
+
+    @Test
+    public void testAsyncApiEndpoint() throws InterruptedException {
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"),
+                                        attributes(
+                                                attr("query", "/group"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/json/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/json/asyncQuery/ba31ca4e-ed8f-4be0-a0f3-12088fa9263d");
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+             //If Async Query is created and completed then validate results
+            if (outputResponse.equals("COMPLETE")) {
+
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"))
+                        .body("data.type", equalTo("asyncQuery"))
+                        .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.contentLength", notNullValue())
+                        .body("data.attributes.result.responseBody", equalTo("{\"data\":"
+                                + "[{\"type\":\"group\",\"id\":\"com.example.repository\",\"attributes\":"
+                                + "{\"commonName\":\"Example Repository\",\"deprecated\":false,\"description\":\"The code for this project\"},"
+                                + "\"relationships\":{\"products\":{\"data\":[]}}}]}"));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ asyncQuery(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\\\"]) "
+                                + "{ edges { node { id queryType status result "
+                                + "{ responseBody httpStatus contentLength } } } } }\","
+                                + "\"variables\":null }")
+                        .post("/graphql")
+                        .asString();
+
+                String expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\",\"queryType\":\"JSONAPI_V1_0\",\"status\":\"COMPLETE\",\"result\":{\"responseBody\":\"{\\\"data\\\":[{\\\"type\\\":\\\"group\\\",\\\"id\\\":\\\"com.example.repository\\\",\\\"attributes\\\":{\\\"commonName\\\":\\\"Example Repository\\\",\\\"deprecated\\\":false,\\\"description\\\":\\\"The code for this project\\\"},\\\"relationships\\\":{\\\"products\\\":{\\\"data\\\":[]}}}]}\",\"httpStatus\":200,\"contentLength\":208}}}]}}}";
+
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+        }
+    }
+
+    @Test
+    public void testExportDynamicModel() throws InterruptedException {
+        //Create Table Export
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9265d"),
+                                        attributes(
+                                                attr("query", "{\"query\":\"{playerStats(filter:\\\"createdOn>=2020-01-01;createdOn<2020-01-02\\\"){ edges{node{countryCode highScore}}}}\",\"variables\":null}"),
+                                                attr("queryType", "GRAPHQL_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/json/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/json/tableExport/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d");
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+             //If Async Query is created and completed then validate results
+            if (outputResponse.equals("COMPLETE")) {
+
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9265d"))
+                        .body("data.type", equalTo("tableExport"))
+                        .body("data.attributes.queryType", equalTo("GRAPHQL_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.message", equalTo(null))
+                        .body("data.attributes.result.url",
+                                equalTo("https://elide.io" + "/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d.csv"));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ tableExport(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9265d\\\"]) "
+                                + "{ edges { node { id queryType status resultType result "
+                                + "{ url httpStatus recordCount } } } } }\","
+                                + "\"variables\":null }")
+                        .post("/graphql")
+                        .asString();
+
+                String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9265d\","
+                        + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"CSV\","
+                        + "\"result\":{\"url\":\"https://elide.io/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d.csv\",\"httpStatus\":200,\"recordCount\":1}}}]}}}";
+
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+        }
+        when()
+                .get("/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d.csv")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testExportStaticModel() throws InterruptedException {
+        //Create Table Export
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9264d"),
+                                        attributes(
+                                                attr("query", "{\"query\":\"{ stats { edges { node { dimension measure } } } }\",\"variables\":null}"),
+                                                attr("queryType", "GRAPHQL_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/json/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/json/tableExport/ba31ca4e-ed8f-4be0-a0f3-12088fa9264d");
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+             //If Async Query is created and completed then validate results
+            if (outputResponse.equals("COMPLETE")) {
+
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9264d"))
+                        .body("data.type", equalTo("tableExport"))
+                        .body("data.attributes.queryType", equalTo("GRAPHQL_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.message", equalTo(null))
+                        .body("data.attributes.result.url",
+                                equalTo("https://elide.io" + "/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9264d.csv"));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ tableExport(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9264d\\\"]) "
+                                + "{ edges { node { id queryType status resultType result "
+                                + "{ url httpStatus recordCount } } } } }\","
+                                + "\"variables\":null }")
+                        .post("/graphql")
+                        .asString();
+
+                String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9264d\","
+                        + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"CSV\","
+                        + "\"result\":{\"url\":\"https://elide.io/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9264d.csv\",\"httpStatus\":200,\"recordCount\":2}}}]}}}";
+
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+        }
+        when()
+                .get("/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9264d.csv")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void exportControllerTest() {
+        when()
+                .get("/export/asyncQueryId")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void postExportControllerTest() {
+        when()
+                .post("/export/asyncQueryId")
+                .then()
+                .statusCode(HttpStatus.SC_METHOD_NOT_ALLOWED);
+    }
+
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/doc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("tags.name", containsInAnyOrder("group", "argument", "metric",
+                        "dimension", "column", "table", "asyncQuery",
+                        "timeDimensionGrain", "timeDimension", "product", "playerCountry", "version", "playerStats",
+                        "stats", "tableExport", "namespace", "tableSource"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreIntegrationTestSetup.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreIntegrationTestSetup.java
new file mode 100644
index 0000000000..fcfbb13696
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreIntegrationTestSetup.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.modelconfig.store.models.ConfigChecks;
+import com.yahoo.elide.spring.config.ElideConfigProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+@TestConfiguration
+public class ConfigStoreIntegrationTestSetup {
+
+    @Bean
+    public EntityDictionary buildDictionary(AutowireCapableBeanFactory beanFactory,
+                                            ClassScanner scanner,
+                                            @Autowired(required = false) DynamicConfiguration dynamicConfig,
+                                            ElideConfigProperties settings,
+                                            @Qualifier("entitiesToExclude") Set<Type<?>> entitiesToExclude) {
+
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+
+        if (settings.getDynamicConfig().isConfigApiEnabled()) {
+            checks.put(ConfigChecks.CAN_CREATE_CONFIG, ConfigChecks.CanCreate.class);
+            checks.put(ConfigChecks.CAN_READ_CONFIG, ConfigChecks.CanRead.class);
+            checks.put(ConfigChecks.CAN_DELETE_CONFIG, ConfigChecks.CanDelete.class);
+            checks.put(ConfigChecks.CAN_UPDATE_CONFIG, ConfigChecks.CanNotUpdate.class);
+        }
+
+        EntityDictionary dictionary = new EntityDictionary(
+                checks, //Checks
+                new HashMap<>(), //Role Checks
+                new Injector() {
+                    @Override
+                    public void inject(Object entity) {
+                        beanFactory.autowireBean(entity);
+                    }
+
+                    @Override
+                    public <T> T instantiate(Class<T> cls) {
+                        return beanFactory.createBean(cls);
+                    }
+                },
+                CoerceUtil::lookup, //Serde Lookup
+                entitiesToExclude,
+                scanner);
+
+        return dictionary;
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreTest.java
new file mode 100644
index 0000000000..d0c77e4519
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ConfigStoreTest.java
@@ -0,0 +1,719 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.modelconfig.store.models.ConfigFile.ConfigFileType;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import com.yahoo.elide.test.graphql.GraphQLDSL;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.io.TempDir;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+
+import io.restassured.RestAssured;
+import lombok.Builder;
+import lombok.Data;
+
+import java.nio.file.Path;
+import java.util.TimeZone;
+import javax.ws.rs.core.MediaType;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(ConfigStoreIntegrationTestSetup.class)
+@TestPropertySource(
+        properties = {
+                "elide.dynamic-config.configApiEnabled=true"
+        }
+)
+public class ConfigStoreTest {
+
+    @Data
+    @Builder
+    public static class ConfigFile {
+        ConfigFileType type;
+
+        String path;
+
+        String content;
+    }
+
+    @LocalServerPort
+    protected int port;
+
+    @BeforeAll
+    public static void initialize(@TempDir Path testDirectory) {
+        System.setProperty("elide.dynamic-config.path", testDirectory.toFile().getAbsolutePath());
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        System.clearProperty("elide.dynamic-config.path");
+    }
+
+    /**
+     * Empty configuration load test.
+     */
+    @Test
+    public void testEmptyConfiguration() {
+        when()
+                .get("http://localhost:" + port + "/json/config?fields[config]=path,type")
+                .then()
+                .body(equalTo("{\"data\":[]}"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testGraphQLNullContent() {
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", "{ type: TABLE, path: \\\"models/tables/table1.hjson\\\" }")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo("{\"errors\":[{\"message\":\"Null or empty file content for models/tables/table1.hjson\"}]}"))
+                .statusCode(200);
+    }
+
+    @Test
+    public void testGraphQLCreateFetchAndDelete() {
+        String hjson = "\\\"{\\\\n"
+                + "  tables: [{\\\\n"
+                + "      name: Test\\\\n"
+                + "      table: test\\\\n"
+                + "      schema: test\\\\n"
+                + "      measures : [\\\\n"
+                + "         {\\\\n"
+                + "          name : measure\\\\n"
+                + "          type : INTEGER\\\\n"
+                + "          definition: 'MAX({{$measure}})'\\\\n"
+                + "         }\\\\n"
+                + "      ]\\\\n"
+                + "      dimensions : [\\\\n"
+                + "         {\\\\n"
+                + "           name : dimension\\\\n"
+                + "           type : TEXT\\\\n"
+                + "           definition : '{{$dimension}}'\\\\n"
+                + "         }\\\\n"
+                + "      ]\\\\n"
+                + "  }]\\\\n"
+                + "}\\\"";
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", String.format("{ type: TABLE, path: \\\"models/tables/table1.hjson\\\", content: %s }", hjson))
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                                        field("path", "models/tables/table1.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+               ))
+               .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        selection(
+                                field("config",
+                                        argument(
+                                                argument("ids", "[\\\"bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=\\\"]")
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("path")
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                                        field("path", "models/tables/table1.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                            selection(
+                                    field("config",
+                                            arguments(
+                                                    argument("op", "DELETE"),
+                                                    argument("ids", "[\\\"bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=\\\"]")
+                                            ),
+                                            selections(
+                                                    field("id"),
+                                                    field("path")
+                                            )
+                                    )
+                            )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        selection(
+                                field("config",
+                                        selections(
+                                                field("id"),
+                                                field("path")
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+    }
+
+    @Test
+    public void testTwoNamespaceCreateAndDelete() {
+        String hjson1 = "\\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace2\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"";
+
+        String hjson2 = "\\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace3\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"";
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", String.format("["
+                                                                        + "{ type: NAMESPACE, path: \\\"models/namespaces/namespace2.hjson\\\", content: %s },"
+                                                                        + "{ type: NAMESPACE, path: \\\"models/namespaces/namespace3.hjson\\\", content: %s }"
+                                                                        + "]" , hjson1, hjson2))
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMi5oanNvbg=="),
+                                                        field("path", "models/namespaces/namespace2.hjson")
+                                                ),
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMy5oanNvbg=="),
+                                                        field("path", "models/namespaces/namespace3.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "DELETE"),
+                                                        argument("ids", "[\\\"bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMi5oanNvbg==\\\", \\\"bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMy5oanNvbg==\\\"]")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+    }
+
+    @Test
+    public void testTwoNamespaceCreationStatements() {
+        String query = "{ \"query\": \" mutation saveChanges {\\n  one: config(op: UPSERT, data: {id:\\\"one\\\", path: \\\"models/namespaces/oneDemoNamespaces.hjson\\\", type: NAMESPACE, content: \\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace2\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"}) {\\n    edges {\\n      node {\\n        id\\n      }\\n    }\\n  }\\n  two: config(op: UPSERT, data: {id: \\\"two\\\", path: \\\"models/namespaces/twoDemoNamespaces.hjson\\\", type: NAMESPACE, content: \\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace3\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"}) {\\n    edges {\\n      node {\\n        id\\n      }\\n    }\\n  }\\n} \" }";
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(query)
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selections(
+                                        field(
+                                                "one",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvb25lRGVtb05hbWVzcGFjZXMuaGpzb24=")
+                                                )
+                                        ),
+                                        field(
+                                                "two",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvdHdvRGVtb05hbWVzcGFjZXMuaGpzb24=")
+                                                )
+                                        )
+                                )
+                        ).toResponse().replace(" ", "")
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "DELETE"),
+                                                        argument("ids", "[\\\"bW9kZWxzL25hbWVzcGFjZXMvb25lRGVtb05hbWVzcGFjZXMuaGpzb24=\\\", \\\"bW9kZWxzL25hbWVzcGFjZXMvdHdvRGVtb05hbWVzcGFjZXMuaGpzb24=\\\"]")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("http://localhost:" + port + "/graphql")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+    }
+
+    @Test
+    public void testJsonApiCreateFetchAndDelete() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        when()
+                .get("http://localhost:" + port + "/json/config?fields[config]=content")
+                .then()
+                .body(equalTo(data(
+                        resource(
+                                type("config"),
+                                id("bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                attributes(
+                                        attr("content", hjson)
+                                )
+                        )
+                ).toJSON()))
+                .statusCode(HttpStatus.SC_OK);
+
+        when()
+                .delete("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        when()
+                .get("http://localhost:" + port + "/json/config?fields[config]=path,type")
+                .then()
+                .body(equalTo("{\"data\":[]}"))
+                .statusCode(HttpStatus.SC_OK);
+
+        when()
+                .get("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void testUpdatePermissionError() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        id("bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        when()
+                .delete("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+    @Test
+    public void testTemplateError() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}}) + {{$$column.args.missing}}'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Failed to verify column arguments for column: measure in table: Test. Argument &#39;missing&#39; is not defined but found &#39;{{$$column.args.missing}}&#39;.\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testPathUpdatePermissionError() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        id("bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                        attributes(
+                                                attr("path", "models/tables/newName.hjson")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        when()
+                .delete("http://localhost:" + port + "/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+    @Test
+    public void testHackAttempt() {
+        String hjson = "#!/bin/sh ...";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "foo"),
+                                                attr("type", "UNKNOWN"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Unrecognized File: foo\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testPathTraversalAttempt() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "../../../../../tmp/models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("http://localhost:" + port + "/json/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Parent directory traversal not allowed: ../../../../../tmp/models/tables/table1.hjson\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ControllerTest.java
new file mode 100644
index 0000000000..d854bb7423
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/ControllerTest.java
@@ -0,0 +1,480 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.query;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.links;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.patchOperation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.patchSet;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relationships;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static com.yahoo.elide.test.jsonapi.elements.PatchOperationType.add;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import com.yahoo.elide.test.graphql.GraphQLDSL;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Example functional test.
+ */
+@SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = "INSERT INTO ArtifactGroup (name, commonName, description, deprecated) VALUES\n"
+                + "\t\t('com.example.repository','Example Repository','The code for this project', false);"
+)
+@TestPropertySource(
+        properties = {
+                "elide.json-api.enableLinks=true",
+                "elide.async.export.enabled=false",
+        }
+)
+@ActiveProfiles("default")
+public class ControllerTest extends IntegrationTest {
+    private String baseUrl;
+
+    @BeforeAll
+    @Override
+    public void setUp() {
+        super.setUp();
+        baseUrl = "https://elide.io/json/";
+    }
+
+    /**
+     * This test demonstrates an example test using the JSON-API DSL.
+     */
+    @Test
+    public void jsonApiGetTest() {
+        when()
+                .get("/json/group")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("commonName", "Example Repository"),
+                                                attr("deprecated", false),
+                                                attr("description", "The code for this project")
+                                        ),
+                                        links(
+                                                attr("self", baseUrl + "group/com.example.repository")
+                                        ),
+                                        relationships(
+                                                relation(
+                                                        "products",
+                                                        links(
+                                                                attr("self", baseUrl + "group/com.example.repository/relationships/products"),
+                                                                attr("related", baseUrl + "group/com.example.repository/products")
+                                                        )
+                                                )
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void versionedJsonApiGetTest() {
+        given()
+                .header("ApiVersion", "1.0")
+                .when()
+                .get("/json/group")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("title", "Example Repository")
+                                        ),
+                                        links(
+                                                attr("self", baseUrl + "group/com.example.repository")
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void jsonApiPatchTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("commonName", "Changed It.")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+
+        when()
+                .get("/json/group")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("commonName", "Changed It."),
+                                                attr("deprecated", false),
+                                                attr("description", "The code for this project")
+                                        ),
+                                        links(
+                                                attr("self", baseUrl + "group/com.example.repository")
+                                        ),
+                                        relationships(
+                                                relation(
+                                                        "products",
+                                                        links(
+                                                                attr("self", baseUrl + "group/com.example.repository/relationships/products"),
+                                                                attr("related", baseUrl + "group/com.example.repository/products")
+                                                        )
+
+                                                )
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void jsonForbiddenApiPatchTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("commonName", "Changed It."),
+                                                attr("deprecated", true)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+    }
+
+    @Test
+    public void jsonApiPatchExtensionTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_PATCH_CONTENT_TYPE)
+                .accept(JsonApiController.JSON_API_PATCH_CONTENT_TYPE)
+                .body(
+                        patchSet(
+                                patchOperation(add, "/group",
+                                        resource(
+                                                type("group"),
+                                                id("com.example.repository.foo"),
+                                                attributes(
+                                                        attr("commonName", "Foo")
+                                                )
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/json")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void jsonApiPostTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository2"),
+                                        attributes(
+                                                attr("commonName", "New group.")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/json/group")
+                .then()
+                .body(equalTo(datum(
+                        resource(
+                                type("group"),
+                                id("com.example.repository2"),
+                                attributes(
+                                        attr("commonName", "New group."),
+                                        attr("deprecated", false),
+                                        attr("description", "")
+                                ),
+                                links(
+                                        attr("self", baseUrl + "group/com.example.repository2")
+                                ),
+                                relationships(
+                                        relation(
+                                                "products",
+                                                links(
+                                                        attr("self", baseUrl + "group/com.example.repository2/relationships/products"),
+                                                        attr("related", baseUrl + "group/com.example.repository2/products")
+                                                )
+                                        )
+                                )
+                        )
+                ).toJSON()))
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+
+    @Test
+    public void jsonApiDeleteTest() {
+        when()
+                .delete("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+    @Test
+    @Sql(statements = {
+            "INSERT INTO ArtifactProduct (name, commonName, description, group_name) VALUES\n"
+                    + "\t\t('foo','foo Core','The guts of foo','com.example.repository');"
+    })
+    public void jsonApiDeleteRelationshipTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(datum(
+                        linkage(type("product"), id("foo"))
+                ))
+                .when()
+                .delete("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+
+    /**
+     * This test demonstrates an example test using the GraphQL DSL.
+     */
+    @Test
+    public void graphqlTest() {
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        query(
+                                selection(
+                                        field("group",
+                                                selections(
+                                                        field("name"),
+                                                        field("commonName"),
+                                                        field("description")
+                                                )
+                                        )
+                                )
+                        )
+                        ).toQuery() + "\" }"
+                )
+                .when()
+                .post("/graphql")
+                .then()
+                .body(equalTo(GraphQLDSL.document(
+                        selection(
+                                field(
+                                        "group",
+                                        selections(
+                                                field("name", "com.example.repository"),
+                                                field("commonName", "Example Repository"),
+                                                field("description", "The code for this project")
+                                        )
+                                )
+                        )
+                ).toResponse()))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testInvalidApiVersion() {
+
+        String graphQLRequest = GraphQLDSL.document(
+                selection(
+                        field(
+                                "group",
+                                selections(
+                                        field("name")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        String expected = "{\"errors\":[{\"message\":\"Invalid operation: Invalid API Version\"}]}";
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .header("ApiVersion", "2.0")
+                .body("{ \"query\" : \"" + graphQLRequest + "\" }")
+                .post("/graphql")
+                .then()
+                .body(equalTo(expected))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    /**
+     * This test demonstrates an example test using the GraphQL DSL.
+     */
+    @Test
+    public void versionedGraphqlTest() {
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .header("ApiVersion", "1.0")
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        query(
+                                selection(
+                                        field("group",
+                                                selections(
+                                                        field("name"),
+                                                        field("title")
+                                                )
+                                        )
+                                )
+                        )
+                        ).toQuery() + "\" }"
+                )
+                .when()
+                .post("/graphql")
+                .then()
+                .body(equalTo(GraphQLDSL.document(
+                        selection(
+                                field(
+                                        "group",
+                                        selections(
+                                                field("name", "com.example.repository"),
+                                                field("title", "Example Repository")
+                                        )
+                                )
+                        )
+                ).toResponse()))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/doc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("tags.name", containsInAnyOrder("group", "argument", "metric",
+                        "dimension", "column", "table", "asyncQuery",
+                        "timeDimensionGrain", "timeDimension", "product", "playerCountry", "version", "playerStats",
+                        "stats", "namespace", "tableSource"));
+    }
+
+    @Test
+    public void versionedSwaggerDocumentTest() {
+        given()
+                .header("ApiVersion", "1.0")
+                .when()
+                .get("/doc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo("[]"));
+    }
+
+    @Test
+    public void swaggerXSSDocumentTest() {
+        when()
+                .get("/doc/<script>")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body(equalTo("Unknown document: &lt;script&gt;"));
+    }
+
+    @Test
+    public void graphqlTestForbiddenCreate() {
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("group",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", "{name:\\\"Foo\\\", deprecated:true}")
+                                                ),
+                                                selections(
+                                                        field("name"),
+                                                        field("commonName"),
+                                                        field("description")
+                                                )
+                                        )
+                                )
+                        )
+                        ).toQuery() + "\" }"
+                )
+                .when()
+                .post("/graphql")
+                .then()
+                .body("errors.message", contains("CreatePermission Denied"))
+                .statusCode(200);
+    }
+
+    // Controller disabled by default.
+    @Test
+    public void exportControllerDisabledTest() {
+        // Though post is not supported for export we can use it to test if controller is disabled.
+        // post returns with 404 if controller is disabled and 405 when enabled.
+        when()
+                .post("/export/asyncQueryId")
+                .then()
+                .body("error", equalTo("Not Found"))
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreAsyncTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreAsyncTest.java
new file mode 100644
index 0000000000..84ffe70f94
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreAsyncTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+import io.restassured.response.Response;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Executes Async tests with Aggregation Store disabled.
+ */
+@SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = "INSERT INTO ArtifactGroup (name, commonName, description, deprecated) VALUES\n"
+            + "\t\t('com.example.repository','Example Repository','The code for this project', false);"
+)
+@TestPropertySource(
+        properties = {
+                "elide.aggregation-store.enabled=false"
+        }
+)
+public class DisableAggStoreAsyncTest extends IntegrationTest {
+
+    // Test if AsyncQuery is functional with AggregationStore disabled.
+    @Test
+    public void testAsyncApiFunctionDisabledAggStore() throws InterruptedException {
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"),
+                                        attributes(
+                                                attr("query", "/group"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/json/asyncQuery")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/json/asyncQuery/ba31ca4e-ed8f-4be0-a0f3-12088fa9263d");
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+             //If Async Query is created and completed then validate results
+            if (outputResponse.equals("COMPLETE")) {
+
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"))
+                        .body("data.type", equalTo("asyncQuery"))
+                        .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.contentLength", notNullValue())
+                        .body("data.attributes.result.responseBody", equalTo("{\"data\":"
+                                + "[{\"type\":\"group\",\"id\":\"com.example.repository\",\"attributes\":"
+                                + "{\"commonName\":\"Example Repository\",\"deprecated\":false,\"description\":\"The code for this project\"},"
+                                + "\"relationships\":{\"products\":{\"data\":[]}}}]}"));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ asyncQuery(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\\\"]) "
+                                + "{ edges { node { id queryType status result "
+                                + "{ responseBody httpStatus contentLength } } } } }\","
+                                + "\"variables\":null }")
+                        .post("/graphql")
+                        .asString();
+
+                String expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\",\"queryType\":\"JSONAPI_V1_0\",\"status\":\"COMPLETE\",\"result\":{\"responseBody\":\"{\\\"data\\\":[{\\\"type\\\":\\\"group\\\",\\\"id\\\":\\\"com.example.repository\\\",\\\"attributes\\\":{\\\"commonName\\\":\\\"Example Repository\\\",\\\"deprecated\\\":false,\\\"description\\\":\\\"The code for this project\\\"},\\\"relationships\\\":{\\\"products\\\":{\\\"data\\\":[]}}}]}\",\"httpStatus\":200,\"contentLength\":208}}}]}}}";
+
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+        }
+    }
+
+    @Test
+    public void metaDataTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/json/namespace/default") //"default" namespace added by Agg Store.
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND); // Metadatastore is disabled, so not found.
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreControllerTest.java
new file mode 100644
index 0000000000..e38037e1fe
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableAggStoreControllerTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Executes Controller tests with Aggregation Store disabled.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.aggregation-store.enabled=false"
+        }
+)
+public class DisableAggStoreControllerTest extends ControllerTest {
+
+    @Override
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/doc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("tags.name", containsInAnyOrder("group", "asyncQuery", "product", "version"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableExportControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableExportControllerTest.java
new file mode 100644
index 0000000000..36895bf249
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableExportControllerTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static io.restassured.RestAssured.when;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Executes Export Controller tests with Async Enabled but Export Controller Disabled.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.async.enabled=true",
+                "elide.async.export.enabled=false"
+        }
+)
+public class DisableExportControllerTest extends IntegrationTest {
+
+    @Test
+    public void exportControllerTest() {
+        // A post to export will result in not found, if controller was disabled.
+        // If controller is enabled, it returns Method Not Allowed.
+        when()
+                .post("/export/1")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableMetaDataStoreControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableMetaDataStoreControllerTest.java
new file mode 100644
index 0000000000..e16f98fd63
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableMetaDataStoreControllerTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Executes Controller tests with Aggregation Store disabled.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.aggregation-store.enabled=true",
+                "elide.aggregation-store.enableMetaDataStore=false"
+        }
+)
+public class DisableMetaDataStoreControllerTest extends ControllerTest {
+
+    @Override
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/doc")
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("tags.name", containsInAnyOrder("playerCountry", "version",
+                        "asyncQuery", "playerStats", "stats", "product", "group"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableVerboseErrorsTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableVerboseErrorsTest.java
new file mode 100644
index 0000000000..65103cc6d3
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DisableVerboseErrorsTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.IsEqual.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Tests turning off verbose errors.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.verboseErrors=false",
+        }
+)
+public class DisableVerboseErrorsTest extends IntegrationTest {
+
+    @Test
+    public void verboseErrorsEnabledTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("foo"),
+                                        attributes(
+                                                attr("deprecated", "Invalid!")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/json/group")
+                .then()
+                .body("errors.detail[0]", equalTo("Invalid value: Invalid!"))
+                .log().all()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DynamicConfigTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DynamicConfigTest.java
new file mode 100644
index 0000000000..84fba9fe78
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/DynamicConfigTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.Matchers.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+
+/**
+ * Dynamic Configuration functional test.
+ */
+@SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = "INSERT INTO PlayerStats (name,countryId,createdOn,updatedOn) VALUES\n"
+            + "\t\t('SerenaWilliams','1','2000-10-10','2001-10-10');"
+            + "INSERT INTO PlayerCountry (id,isoCode) VALUES\n"
+            + "\t\t('2','IND');"
+            + "INSERT INTO PlayerCountry (id,isoCode) VALUES\n"
+            + "\t\t('1','USA');")
+public class DynamicConfigTest extends IntegrationTest {
+    /**
+     * This test demonstrates an example test using the JSON-API DSL.
+     * @throws InterruptedException
+     */
+
+    @Test
+    public void jsonApiGetTest() {
+        String apiGetViewExpected = "{\"data\":[{\"type\":\"playerStats\",\"id\":\"0\",\"attributes\":{\"countryCode\":\"USA\",\"createdOn\":\"2000-10-10\",\"highScore\":null,\"name\":\"SerenaWilliams\",\"updatedOn\":\"2001-10\"}}]}";
+        when()
+                .get("/json/playerStats?filter=createdOn>=1999-01-01;createdOn<2001-01-01")
+                .then()
+                .body(equalTo(
+                        data(
+                                resource(
+                                        type("playerStats"),
+                                        id("0"),
+                                        attributes(
+                                                attr("countryCode", "USA"),
+                                                attr("createdOn", "2000-10-10"),
+                                                attr("highScore", null),
+                                                attr("name", "SerenaWilliams"),
+                                                attr("updatedOn", "2001-10")
+                                        )
+                                )
+                        ).toJSON())
+                )
+                .statusCode(HttpStatus.SC_OK)
+                .body(equalTo(apiGetViewExpected));
+    }
+
+    @SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+    @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+            statements = "INSERT INTO PlayerStats (name,countryId,createdOn,updatedOn) VALUES\n"
+                    + "\t\t('SaniaMirza','2','2000-10-10','2001-10-10');")
+    @Test
+    public void jsonApiGetMultiTest() {
+        when()
+                .get("/json/playerStats?filter=createdOn>=1999-01-01;createdOn<2002-01-01")
+                .then()
+                .body("data.id", hasItems("1"))
+                .body("data.attributes.name", hasItems("SaniaMirza", "SerenaWilliams"))
+                .body("data.attributes.countryCode", hasItems("USA", "IND"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/EnableVerboseErrorsTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/EnableVerboseErrorsTest.java
new file mode 100644
index 0000000000..bb06d33e78
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/EnableVerboseErrorsTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.IsEqual.equalTo;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * Tests turning on verbose errors.
+ */
+@TestPropertySource(
+        properties = {
+                "elide.verboseErrors=true",
+        }
+)
+public class EnableVerboseErrorsTest extends IntegrationTest {
+
+    @Test
+    public void verboseErrorsEnabledTest() {
+        given()
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("foo"),
+                                        attributes(
+                                                attr("deprecated", "Invalid!")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/json/group")
+                .then()
+                .body("errors.detail[0]", equalTo("Invalid value: Invalid!\nCan&#39;t convert value &#39;Invalid!&#39; to type class java.lang.Boolean"))
+                .log().all()
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/HeaderCleansingTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/HeaderCleansingTest.java
new file mode 100644
index 0000000000..169d4c9308
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/HeaderCleansingTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.linkage;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Example functional test.
+ */
+@SqlMergeMode(SqlMergeMode.MergeMode.MERGE)
+@Sql(
+        executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
+        scripts = "classpath:db/test_init.sql",
+        statements = "INSERT INTO ArtifactGroup (name, commonName, description, deprecated) VALUES\n"
+                + "\t\t('com.example.repository','Example Repository','The code for this project', false);"
+)
+@Import(IntegrationTestSetup.class)
+@TestPropertySource(
+        properties = {
+                "elide.json-api.enableLinks=true",
+                "elide.async.export.enabled=false",
+        }
+)
+@ActiveProfiles("default")
+public class HeaderCleansingTest extends IntegrationTest {
+    public static final String SORT_PARAM = "sort";
+    private String baseUrl;
+
+    @SpyBean
+    private RefreshableElide elide;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @BeforeAll
+    @Override
+    public void setUp() {
+        super.setUp();
+        baseUrl = "https://elide.io/json/";
+    }
+
+    @BeforeEach
+    public void resetMocks() {
+        reset(elide.getElide());
+    }
+
+    @Test
+    public void jsonVerifyParamsAndHeadersGetTest() {
+        given()
+                .header(HttpHeaders.AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.PROXY_AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.ACCEPT_LANGUAGE, "en-US")
+                .queryParam(SORT_PARAM, "name", "description")
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository2"),
+                                        attributes(
+                                                attr("commonName", "New group.")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/json/group")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        ArgumentCaptor<MultivaluedMap<String, String>> requestParamsCaptor = ArgumentCaptor.forClass(MultivaluedMap.class);
+        ArgumentCaptor<Map<String, List<String>>> requestHeadersCleanedCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(elide.getElide()).post(any(), any(), any(), requestParamsCaptor.capture(), requestHeadersCleanedCaptor.capture(), any(), any(), any());
+
+        MultivaluedHashMap<String, String> expectedRequestParams = new MultivaluedHashMap<>();
+        expectedRequestParams.put(SORT_PARAM, ImmutableList.of("name", "description"));
+        assertEquals(expectedRequestParams, requestParamsCaptor.getValue());
+
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("authorization"));
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("proxy-authorization"));
+    }
+
+    @Test
+    public void jsonVerifyParamsAndHeadersPostTest() {
+        given()
+                .header(HttpHeaders.AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.PROXY_AUTHORIZATION, "willBeRemoved")
+                .queryParam(SORT_PARAM, "name", "description")
+                .when()
+                .get("/json/group")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+
+        ArgumentCaptor<MultivaluedMap<String, String>> requestParamsCaptor = ArgumentCaptor.forClass(MultivaluedMap.class);
+        ArgumentCaptor<Map<String, List<String>>> requestHeadersCleanedCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(elide.getElide()).get(any(), any(), requestParamsCaptor.capture(), requestHeadersCleanedCaptor.capture(), any(), any(), any());
+
+        MultivaluedHashMap<String, String> expectedRequestParams = new MultivaluedHashMap<>();
+        expectedRequestParams.put(SORT_PARAM, ImmutableList.of("name", "description"));
+        assertEquals(expectedRequestParams, requestParamsCaptor.getValue());
+
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("authorization"));
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("proxy-authorization"));
+    }
+
+    @Test
+    public void jsonVerifyParamsAndHeadersPatchTest() {
+        given()
+                .header(HttpHeaders.AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.PROXY_AUTHORIZATION, "willBeRemoved")
+                .queryParam(SORT_PARAM, "name", "description")
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("group"),
+                                        id("com.example.repository"),
+                                        attributes(
+                                                attr("commonName", "Changed It.")
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        ArgumentCaptor<MultivaluedMap<String, String>> requestParamsCaptor = ArgumentCaptor.forClass(MultivaluedMap.class);
+        ArgumentCaptor<Map<String, List<String>>> requestHeadersCleanedCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(elide.getElide()).patch(any(), any(), any(), any(), any(), requestParamsCaptor.capture(), requestHeadersCleanedCaptor.capture(), any(), any(), any());
+
+        MultivaluedHashMap<String, String> expectedRequestParams = new MultivaluedHashMap<>();
+        expectedRequestParams.put(SORT_PARAM, ImmutableList.of("name", "description"));
+        assertEquals(expectedRequestParams, requestParamsCaptor.getValue());
+
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("authorization"));
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("proxy-authorization"));
+    }
+
+    @Test
+    public void jsonVerifyParamsAndHeadersDeleteTest() {
+        given()
+                .header(HttpHeaders.AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.PROXY_AUTHORIZATION, "willBeRemoved")
+                .queryParam(SORT_PARAM, "name", "description")
+                .when()
+                .delete("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        ArgumentCaptor<MultivaluedMap<String, String>> requestParamsCaptor = ArgumentCaptor.forClass(MultivaluedMap.class);
+        ArgumentCaptor<Map<String, List<String>>> requestHeadersCleanedCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(elide.getElide()).delete(
+                any(),
+                any(),
+                any(),
+                requestParamsCaptor.capture(),
+                requestHeadersCleanedCaptor.capture(),
+                any(),
+                any(),
+                any()
+        );
+
+        MultivaluedHashMap<String, String> expectedRequestParams = new MultivaluedHashMap<>();
+        expectedRequestParams.put(SORT_PARAM, ImmutableList.of("name", "description"));
+        assertEquals(expectedRequestParams, requestParamsCaptor.getValue());
+
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("authorization"));
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("proxy-authorization"));
+    }
+
+    @Test
+    public void jsonVerifyParamsAndHeadersDeleteRelationshipTest() {
+        given()
+                .header(HttpHeaders.AUTHORIZATION, "willBeRemoved")
+                .header(HttpHeaders.PROXY_AUTHORIZATION, "willBeRemoved")
+                .queryParam(SORT_PARAM, "name", "description")
+                .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                .body(datum(
+                        linkage(type("product"), id("foo"))
+                ))
+                .when()
+                .delete("/json/group/com.example.repository")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        ArgumentCaptor<MultivaluedMap<String, String>> requestParamsCaptor = ArgumentCaptor.forClass(MultivaluedMap.class);
+        ArgumentCaptor<Map<String, List<String>>> requestHeadersCleanedCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(elide.getElide()).delete(
+                any(),
+                any(),
+                any(),
+                requestParamsCaptor.capture(),
+                requestHeadersCleanedCaptor.capture(),
+                any(),
+                any(),
+                any()
+        );
+
+        MultivaluedHashMap<String, String> expectedRequestParams = new MultivaluedHashMap<>();
+        expectedRequestParams.put(SORT_PARAM, ImmutableList.of("name", "description"));
+        assertEquals(expectedRequestParams, requestParamsCaptor.getValue());
+
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("authorization"));
+        assertFalse(requestHeadersCleanedCaptor.getValue().containsKey("proxy-authorization"));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTest.java
new file mode 100644
index 0000000000..3fc54fbf50
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static io.restassured.RestAssured.given;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import io.restassured.RestAssured;
+
+import java.util.TimeZone;
+
+/**
+ * Base class for running a set of functional Elide tests.  This class
+ * sets up an Elide instance with an in-memory H2 database.
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class IntegrationTest {
+
+    @LocalServerPort
+    protected int port;
+
+    @BeforeAll
+    public void setUp() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        RestAssured.port = port;
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
+    }
+
+    public void refreshServer() {
+        given()
+                .contentType("application/json")
+                .when()
+                .post("/actuator/refresh")
+                .then()
+                .log().all()
+                .statusCode(HttpStatus.SC_OK);
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTestSetup.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTestSetup.java
new file mode 100644
index 0000000000..105d9141c3
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/IntegrationTestSetup.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.tests;
+
+import static org.mockito.Mockito.spy;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.RefreshableElide;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.links.DefaultJSONApiLinks;
+import com.yahoo.elide.spring.config.ElideConfigProperties;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+import java.util.TimeZone;
+
+@TestConfiguration
+public class IntegrationTestSetup {
+    //Initialize beans here if needed.
+
+    //We recreate the Elide bean here without @RefreshScope so that it can be used With @SpyBean.
+    @Bean
+    public RefreshableElide initializeElide(EntityDictionary dictionary,
+                                            DataStore dataStore,
+                                            ElideConfigProperties settings,
+                                            JsonApiMapper mapper,
+                                            ErrorMapper errorMapper) {
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withErrorMapper(errorMapper)
+                .withJsonApiMapper(mapper)
+                .withDefaultMaxPageSize(settings.getMaxPageSize())
+                .withDefaultPageSize(settings.getPageSize())
+                .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withAuditLogger(new Slf4jLogger())
+                .withBaseUrl(settings.getBaseUrl())
+                .withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"))
+                .withJsonApiPath(settings.getJsonApi().getPath())
+                .withGraphQLApiPath(settings.getGraphql().getPath());
+
+        if (settings.isVerboseErrors()) {
+            builder.withVerboseErrors();
+        }
+
+        if (settings.getAsync() != null
+                && settings.getAsync().getExport() != null
+                && settings.getAsync().getExport().isEnabled()) {
+            builder.withExportApiPath(settings.getAsync().getExport().getPath());
+        }
+
+        if (settings.getJsonApi() != null
+                && settings.getJsonApi().isEnabled()
+                && settings.getJsonApi().isEnableLinks()) {
+            String baseUrl = settings.getBaseUrl();
+
+            if (StringUtils.isEmpty(baseUrl)) {
+                builder.withJSONApiLinks(new DefaultJSONApiLinks());
+            } else {
+                String jsonApiBaseUrl = baseUrl + settings.getJsonApi().getPath() + "/";
+                builder.withJSONApiLinks(new DefaultJSONApiLinks(jsonApiBaseUrl));
+            }
+        }
+
+        Elide elide = new Elide(builder.build(), new TransactionRegistry(), dictionary.getScanner(), true);
+
+        return new RefreshableElide(spy(elide));
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/SubscriptionTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/SubscriptionTest.java
new file mode 100644
index 0000000000..e470bd06d7
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/SubscriptionTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.tests;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketTestClient;
+import com.yahoo.elide.spring.controllers.JsonApiController;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+import graphql.ExecutionResult;
+
+import java.net.URI;
+import java.util.List;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+public class SubscriptionTest extends IntegrationTest {
+
+    @Test
+    public void testSubscription() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {group(topic: ADDED) {name commonName}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:" + port + "/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JsonApiController.JSON_API_CONTENT_TYPE)
+                    .body(
+                            datum(
+                                    resource(
+                                            type("group"),
+                                            id("com.example.repository2"),
+                                            attributes(
+                                                    attr("commonName", "New group.")
+                                            )
+                                    )
+                            )
+                    )
+                    .when()
+                    .post("/json/group")
+                    .then()
+                    .statusCode(HttpStatus.SC_CREATED);
+
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+
+            assertEquals(1, results.size());
+            assertEquals(0, results.get(0).getErrors().size());
+        }
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadAggregationStoreTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadAggregationStoreTest.java
new file mode 100644
index 0000000000..bc00e6afdf
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadAggregationStoreTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.tests.hotreload;
+
+import example.tests.AggregationStoreTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(
+        properties = {
+                "management.endpoints.web.exposure.include: *"
+        }
+)
+public class HotReloadAggregationStoreTest extends AggregationStoreTest {
+
+    @Override
+    @BeforeAll
+    public void setUp() {
+        super.setUp();
+        refreshServer();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadControllerTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadControllerTest.java
new file mode 100644
index 0000000000..f8296763e5
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadControllerTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.tests.hotreload;
+
+import example.tests.ControllerTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(
+        properties = {
+                "management.endpoints.web.exposure.include: *"
+        }
+)
+public class HotReloadControllerTest extends ControllerTest {
+
+    @Override
+    @BeforeAll
+    public void setUp() {
+        super.setUp();
+        refreshServer();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadSubscriptionTest.java b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadSubscriptionTest.java
new file mode 100644
index 0000000000..a853be5026
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/java/example/tests/hotreload/HotReloadSubscriptionTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.tests.hotreload;
+
+import example.tests.SubscriptionTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(
+        properties = {
+                "management.endpoints.web.exposure.include: *"
+        }
+)
+public class HotReloadSubscriptionTest extends SubscriptionTest {
+
+    @Override
+    @BeforeAll
+    public void setUp() {
+        super.setUp();
+        refreshServer();
+    }
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/application.yaml b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/application.yaml
new file mode 100644
index 0000000000..3df45b0160
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/application.yaml
@@ -0,0 +1,57 @@
+server:
+  port: 4001
+
+elide:
+  baseUrl: 'https://elide.io'
+  json-api:
+    path: /json
+    enabled: true
+  graphql:
+    path: /graphql
+    enabled: true
+  swagger:
+    path: /doc
+    enabled: true
+  subscription:
+    enabled: true
+    sendPingOnSubscribe: true
+    path: /subscription
+  async:
+    enabled: true
+    threadPoolSize: 7
+    maxRunTimeMinutes: 65
+    cleanupEnabled: true
+    queryCleanupDays: 7
+    defaultAsyncAPIDAO: true
+    export:
+      enabled: true
+      path: /export
+      extensionEnabled: true
+  dynamic-config:
+    path: src/test/resources/configs
+    enabled: true
+    configApiEnabled: false
+  aggregation-store:
+    enabled: true
+    default-dialect: h2
+    enableMetaDataStore: true
+spring:
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        dialect: 'org.hibernate.dialect.H2Dialect'
+        jdbc:
+          use_scrollable_resultset: true
+    hibernate:
+      naming:
+        physical-strategy: 'org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl'
+      ddl-auto: 'create'
+  datasource:
+    url: 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1'
+    username: 'sa'
+    password: ''
+    driver-class-name: 'org.h2.Driver'
+  activemq:
+    broker-url: 'vm://embedded?broker.persistent=false,useShutdownHook=false'
+    in-memory: true
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerCountry.hjson b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerCountry.hjson
new file mode 100644
index 0000000000..58271dcc99
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerCountry.hjson
@@ -0,0 +1,19 @@
+{
+    tables: [{
+        name: playerCountry
+        table: PlayerCountry
+        description:
+        '''
+        A long description
+        '''
+        cardinality : small
+        readAccess : Prefab.Role.All
+        dimensions : [
+            {
+                name : isoCode
+                type : TEXT
+                definition : '{{$isoCode}}'
+            }
+        ]
+    }]
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerStats.hjson b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerStats.hjson
new file mode 100644
index 0000000000..b83f807f90
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/configs/models/tables/playerStats.hjson
@@ -0,0 +1,64 @@
+{
+    tables: [{
+        name: playerStats
+        table: PlayerStats
+        description:
+        '''
+        A long description
+        '''
+        cardinality : large
+        readAccess : Prefab.Role.All
+        filterTemplate : createdOn>={{start}};createdOn<{{end}}
+        joins: [
+            {
+                name: playerCountry
+                to: playerCountry
+                kind: toOne
+                definition: '{{playerCountry.$id}} = {{$countryId}}'
+            }
+        ]
+        measures : [
+            {
+            name : highScore
+            type : INTEGER
+            definition: 'MAX({{$highScore}})'
+            }
+        ]
+        dimensions : [
+            {
+                name : name
+                type : TEXT
+                definition : '{{$name}}'
+            },
+            {
+                name : countryCode
+                type : TEXT
+                definition : '{{playerCountry.isoCode}}'
+            },
+            {
+                name : createdOn
+                type : TIME
+                definition : '{{$createdOn}}'
+                grains:
+                [{
+                    type : DAY
+                    sql : '''
+                    PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-dd'), 'yyyy-MM-dd')
+                    '''
+                }]
+            },
+            {
+                name : updatedOn
+                type : TIME
+                definition : '{{$updatedOn}}'
+                grains:
+                [{
+                    type : MONTH
+                    sql : '''
+                    PARSEDATETIME(FORMATDATETIME({{$$column.expr}}, 'yyyy-MM-01'), 'yyyy-MM-dd')
+                    '''
+                }]
+            }
+        ]
+    }]
+}
diff --git a/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/db/test_init.sql b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/db/test_init.sql
new file mode 100644
index 0000000000..5985374a30
--- /dev/null
+++ b/elide-spring/elide-spring-boot-autoconfigure/src/test/resources/db/test_init.sql
@@ -0,0 +1,31 @@
+-- Initialization SQL for the Tests.
+-- They are designed to be executed before each test.
+
+-- Create Tables if not present.
+CREATE TABLE IF NOT EXISTS Stats (
+  id int,
+  measure int,
+  dimension VARCHAR(255)
+);
+
+CREATE TABLE IF NOT EXISTS PlayerStats (
+ name varchar(255) not null,
+ countryId varchar(255),
+ createdOn timestamp,
+ updatedOn timestamp,
+ highScore bigint,
+ primary key (name)
+);
+CREATE TABLE IF NOT EXISTS PlayerCountry (
+  id varchar(255) not null,
+  isoCode varchar(255),
+  primary key (id)
+);
+
+-- Cleanup tables.
+DELETE FROM ArtifactVersion;
+DELETE FROM ArtifactProduct;
+DELETE FROM ArtifactGroup;
+DELETE FROM Stats;
+DELETE FROM PlayerStats;
+DELETE FROM PlayerCountry;
diff --git a/elide-spring/elide-spring-boot-starter/README.md b/elide-spring/elide-spring-boot-starter/README.md
new file mode 100644
index 0000000000..775cff2a2a
--- /dev/null
+++ b/elide-spring/elide-spring-boot-starter/README.md
@@ -0,0 +1,49 @@
+# Elide Spring Boot Starter
+
+For more information on Elide, visit [elide.io](https://elide.io).
+
+Opinionated jar which packages dependencies to get started with Elide and Spring Boot.  The starter includes:
+1. Spring Boot Web
+2. Spring Boot JPA
+3. YAML Configuration
+4. All of the Elide dependencies
+
+## Maven Dependency
+
+```xml
+   <dependency>
+       <groupId>com.yahoo.elide</groupId>
+       <artifactId>elide-spring-boot-starter</artifactId>
+       <version>${elide.version}</version>
+   </dependency>
+```
+
+## Example Usage.
+
+An example project can be viewed [here](https://github.com/aklish/elide-spring).
+
+## Configuration
+
+Elide can be configured in `application.yaml` with settings like this:
+
+```yaml
+elide:
+  pageSize: 1000
+  maxPageSize: 10000
+  json-api:
+    path: /json
+    enabled: true
+  graphql:
+    path: /graphql
+    enabled: true
+  swagger:
+    path: /doc
+    enabled: true
+    name: 'My Awesome Service'
+    version: "1.0"
+```
+
+For more information on custom configuration, see the [elide-spring-boot-autoconfigure documentation](https://github.com/yahoo/elide/blob/master/elide-spring/elide-spring-boot-autoconfigure/README.md).
+
+## License
+This project is licensed under the terms of the [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) open source license.
diff --git a/elide-spring/elide-spring-boot-starter/pom.xml b/elide-spring/elide-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000..a07aedcde3
--- /dev/null
+++ b/elide-spring/elide-spring-boot-starter/pom.xml
@@ -0,0 +1,130 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-spring-boot-starter</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Spring Boot Starter</name>
+    <description>Elide Spring Boot Starter</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-spring-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Yahoo! Inc.</name>
+        <url>http://www.yahoo.com</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+
+        <!-- Compile Dependencies -->
+        <!-- Elide dependencies -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jpa</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-aggregation</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jms</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-swagger</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-async</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-spring-boot-autoconfigure</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>1.8.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+        </dependency>
+
+        <!-- YAML for spring config -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/elide-spring/pom.xml b/elide-spring/pom.xml
new file mode 100644
index 0000000000..1ae8eabbad
--- /dev/null
+++ b/elide-spring/pom.xml
@@ -0,0 +1,134 @@
+<!--
+  ~ Copyright 2020, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-spring-parent-pom</artifactId>
+    <packaging>pom</packaging>
+    <name>Elide Spring: Parent Pom</name>
+    <description>Parent pom for spring packages</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <artifactId>elide-parent-pom</artifactId>
+        <groupId>com.yahoo.elide</groupId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
+        <spring.boot.version>2.6.5</spring.boot.version>
+        <groovy.version>3.0.10</groovy.version>
+        <tomcat.version>9.0.58</tomcat.version>
+    </properties>
+
+    <modules>
+        <module>elide-spring-boot-autoconfigure</module>
+        <module>elide-spring-boot-starter</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <!-- Version added for CVE-2022-23181 -->
+                <version>${tomcat.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <!-- Version added for CVE-2022-23181 -->
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-websocket</artifactId>
+                <version>5.3.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-context</artifactId>
+                <version>3.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-actuator</artifactId>
+                <version>${spring.boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>rest-assured</artifactId>
+                <version>${version.restassured}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>json-path</artifactId>
+                <version>${version.restassured}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>xml-path</artifactId>
+                <version>${version.restassured}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-xml</artifactId>
+                <version>${groovy.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-to-slf4j</artifactId>
+                <version>2.17.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>2.17.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/elide-standalone/README.md b/elide-standalone/README.md
new file mode 100644
index 0000000000..4561dc5876
--- /dev/null
+++ b/elide-standalone/README.md
@@ -0,0 +1,559 @@
+Table of Contents
+=================
+
+  * [Overview](#overview)
+  * [Who is this for?](#whofor)
+  * [Getting Started](#gettingstarted)
+  * [More Detailed Examples](#moredetail)
+
+## <a name="overview"></a>Overview
+
+The Elide standalone application is a configurable web server using Elide. While Elide is typically a pluggable **middleware** framework, we have constructed a flexible and complete service to allow you to get started quickly.
+
+The Elide standalone application takes an opinionated stance on its technology stack (i.e. jersey/jetty), but provides many opportunities for users to configure the behavior of their application. To use the Elide standalone application, there are only a few steps:
+  1. Configure ElideStandalone by implementing the ElideStandaloneSettings interface.
+  1. Build an uber jar containing `elide-standalone`, your models, security checks, and additional application configuration.
+  1. Start your web service:
+     * `$ java -jar YOUR_APP.jar`
+
+## <a name="whofor"></a>Who is this for?
+
+The Elide standalone application is an alternative to Spring Boot for getting started quickly with Elide.  However, if you need more flexibility in your application than what is provided, then you should consider using the Elide __middleware__ directly.
+
+## <a name="gettingstarted"></a>Getting Started
+
+This tutorial will use elide-standalone, and all of the code is [available here](https://github.com/yahoo/elide-standalone-example).  You can deploy and play with this example on Heroku or locally.  The landing page will let you toggle between the [swagger UI](https://swagger.io/tools/swagger-ui) and [Graphiql](https://github.com/graphql/graphiql) for the example service.
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/yahoo/elide-standalone-example)
+
+### Add Elide as a Dependency
+
+To include `elide-standalone` into your project, add the single dependency:
+```xml
+<dependency>
+  <groupId>com.yahoo.elide</groupId>
+  <artifactId>elide-standalone</artifactId>
+  <version>LATEST</version>
+</dependency>
+```
+
+### Create Models
+
+Elide models are some of the most important code in any Elide project. Your models are the view of your data that you wish to expose. In this example we will be modeling a software artifact repository since most developers have a high-level familiarity with artifact repositories such as Maven, Artifactory, npm, and the like.
+
+There will two kinds of models:
+ - Models that we intend to both read & write.  These models are created by definining Java classes.  For this example, that includes `ArtifactGroup`, `ArtifactProduct`, and `ArtifactVersion`.  For brevity we will omit package names and import statements.
+ - Read-only models that we intend to run analytic queries against.  These models can be created with Java classes or with a HJSON configuration language.  For this example, we will use the latter to create a `Downloads` model.
+
+#### ArtifactGroup.java
+
+  ```java
+  @Include(rootLevel = true, type = "group")
+  @Table(name="ArtifactGroup")
+  @Entity
+  public class ArtifactGroup {
+      @Id
+      public String name = "";
+
+      public String commonName = "";
+
+      public String description = "";
+
+      @OneToMany(mappedBy = "group")
+      public List<ArtifactProduct> products = new ArrayList<>();
+  }
+  ```
+
+#### ArtifactProduct.java
+
+  ```java
+  @Include(type = "product")
+  @Table(name="ArtifactProduct")
+  @Entity
+  public class ArtifactProduct {
+      @Id
+      public String name = "";
+
+      public String commonName = "";
+
+      public String description = "";
+
+      @ManyToOne
+      public ArtifactGroup group = null;
+
+      @OneToMany(mappedBy = "artifact")
+      public List<ArtifactVersion> versions = new ArrayList<>();
+  }
+  ```
+
+#### ArtifactVersion.java
+
+  ```java
+  @Include(type = "version")
+  @Table(name="ArtifactVersion")
+  @Entity
+  public class ArtifactVersion {
+      @Id
+      public String name = "";
+
+      public Date createdAt = new Date();
+
+      @ManyToOne
+      public ArtifactProduct artifact;
+  }
+  ```
+
+#### artifactDownloads.hjson
+
+  ```hjson
+  {
+    tables: [
+      {
+        name: Downloads
+        table: downloads
+        description:
+        '''
+        Analytics for artifact downloads.
+        '''
+        joins: [
+          {
+            name: artifactGroup
+            to: group
+            type: toOne
+            definition: '{{group_id}} = {{artifactGroup.name}}'
+          },
+          {
+            name: artifactProduct
+            to: product
+            type: toOne
+            definition: '{{product_id}} = {{artifactProduct.name}}'
+          }
+        ]
+        dimensions: [
+          {
+            name: group
+            type: TEXT
+            definition: '{{artifactGroup.name}}'
+          }
+          {
+            name: product
+            type: TEXT
+            definition: '{{artifactProduct.name}}'
+          }
+          {
+            name: date
+            type: TIME
+            definition: '{{date}}'
+            grain: {
+              type: DAY
+            }
+          }
+        ]
+        measures: [
+          {
+            name: downloads
+            type: INTEGER
+            definition: 'SUM({{downloads}})'
+          }
+        ]
+      }
+    ]
+  }
+  ```
+
+### Spin up the API
+
+So now we have some models, but without an API it is not very useful. Before we add the API component, we need to create the schema in the database that our models will use.   Our example uses liquibase to manage the schema.  When Heroku releases the application, our example will execute the [database migrations](https://github.com/yahoo/elide-standalone-example/blob/master/src/main/resources/db/changelog/changelog.xml) to configure the database with some test data automatically.  This demo uses Postgres.  Feel free to modify the migration script if you are using a different database provider.
+
+You may notice the example liquibase migration script adds an extra table, `AsyncQuery`.  This is only required if leveraging Elide's [asynchronous API](https://elide.io/pages/guide/v5/11.5-asyncapi.html) to manage long running analytic queries.
+
+There may be more tables in your database than models in your project or vice versa.  Similarly, there may be more columns in a table than in a particular model or vice versa.  Not only will our models work just fine, but we expect that models will normally expose only a subset of the fields present in the database. Elide is an ideal tool for building micro-services - each service in your system can expose only the slice of the database that it requires.
+
+### App & Settings
+
+Bringing life to our API is trivially easy. We need two new classes: Main and Settings.
+
+#### Main.java
+
+  ```java
+  public class Main {
+      public static void main(String[] args) throws Exception {
+          ElideStandalone app = new ElideStandalone(new Settings());
+          app.start();
+      }
+  }
+  ```
+
+#### Settings.java
+
+  ```java
+  public class Settings implements ElideStandaloneSettings {
+      /**
+       * Tells elide where our models live.
+       */
+      @Override
+      public String getModelPackageName() {
+          return ArtifactGroup.class.getPackage().getName();
+      }
+
+      /**
+       * Configuration properties for how to talk to the database.
+       */
+      @Override
+      public Properties getDatabaseProperties() {
+          Properties options = new Properties();
+
+          //Here we use H2 in memory instead of Postgres
+          options.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+          options.put("javax.persistence.jdbc.driver", "org.h2.Driver");
+          options.put("javax.persistence.jdbc.url", "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1");
+          options.put("javax.persistence.jdbc.user", "sa");
+          options.put("javax.persistence.jdbc.password", "");
+
+          return options;
+      }
+
+      /**
+       * Enables elide's asynchronous API for analytic queries.
+       */
+      @Override
+      public ElideStandaloneAsyncSettings getAsyncProperties() {
+          return new ElideStandaloneAsyncSettings() {
+
+              @Override
+              public boolean enabled() {
+                  return true;
+              }
+
+              @Override
+              public boolean enableCleanup() {
+                  return true;
+              }
+          };
+      }
+
+      /**
+       * Configure analytic settings.
+       */
+      @Override
+      public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+          return new ElideStandaloneAnalyticSettings() {
+
+              /**
+               * Enable HJSON configuration files for analytic models.
+               */
+              @Override
+              public boolean enableDynamicModelConfig() {
+                  return true;
+              }
+
+              /**
+               * Enable analytic queries.
+               */
+              @Override
+              public boolean enableAggregationDataStore() {
+                  return true;
+              }
+
+              /**
+               * Configure the SQL dialect for analytic queries.
+               */
+              @Override
+              public String getDefaultDialect() {
+                  return "h2";
+              }
+
+              /**
+               * Configure the location of HJSON models.
+               */
+              @Override
+              public String getDynamicConfigPath() {
+                  return "src/main/resources/analytics";
+              }
+          };
+      }
+  }
+  ```
+
+### Supporting Files
+
+Elide standalone uses a JPA data store (the thing that talks to the database) that is [configured programmatically](https://github.com/yahoo/elide-standalone-example/blob/master/src/main/java/example/Settings.java#L95-L111) (no persistence.xml required).
+
+If you want to see the logs from your shiny new API, you will also want a [log4j config](https://github.com/yahoo/elide-standalone-example/blob/master/src/main/resources/log4j2.xml).
+Your log4j config should go in `src/main/resources` so log4j can find it.
+
+### Running
+
+With these new classes, you have two options for running your project.  You can either run the `Main` class using your
+favorite IDE, or you can run the service from the command line:
+
+```java -jar target/elide-heroku-example.jar```
+
+Our example requires the following environment variables to be set to work correctly with Heroku and Postgres.
+
+1. JDBC_DATABASE_URL
+2. JDBC_DATABASE_USERNAME
+3. JDBC_DATABASE_PASSWORD
+
+If running inside a Heroku dyno, Heroku sets these variables for us.  If you don't set them, the example will use the H2 in memory database.
+
+With the `Main` and `Settings` classes we can now run our API.
+
+You can now run the following curl commands to see some of the sample data that the liquibase migrations added for us:
+Don't forget to replace localhost:8080 with your Heroku URL if running from Heroku!
+
+#### JSON-API
+
+  ```curl
+  curl http://localhost:8080/api/v1/group
+  ```
+
+#### GraphQL
+  ```curl
+  curl -g -X POST -H"Content-Type: application/json" -H"Accept: application/json" \
+      "http://localhost:8080/graphql/api/v1" \
+      -d'{
+             "query" : "{ group { edges { node { name commonName description } } } }"
+         }'
+  ```
+
+Here are the respective responses:
+
+#### JSON-API
+  ```json
+    {
+        "data": [
+        {
+            "attributes": {
+            "commonName": "Example Repository",
+            "description": "The code for this project"
+            },
+            "id": "com.example.repository",
+            "relationships": {
+            "products": {
+                "data": [
+                {
+                    "id": "elide-demo",
+                    "type": "product"
+                }
+                ]
+            }
+            },
+            "type": "group"
+        },
+        {
+            "attributes": {
+            "commonName": "Elide",
+            "description": "The magical library powering this project"
+            },
+            "id": "com.yahoo.elide",
+            "relationships": {
+            "products": {
+                "data": [
+                {
+                    "id": "elide-core",
+                    "type": "product"
+                },
+                {
+                    "id": "elide-standalone",
+                    "type": "product"
+                },
+                {
+                    "id": "elide-datastore-hibernate5",
+                    "type": "product"
+                }
+                ]
+            }
+            },
+            "type": "group"
+        }
+        ]
+    }
+  ```
+
+
+#### GraphQL
+  ```json
+    {
+        "data": {
+            "group": {
+                "edges": [
+                {
+                    "node": {
+                    "commonName": "Example Repository",
+                    "description": "The code for this project",
+                    "name": "com.example.repository"
+                    }
+                },
+                {
+                    "node": {
+                    "commonName": "Elide",
+                    "description": "The magical library powering this project",
+                    "name": "com.yahoo.elide"
+                    }
+                }
+                ]
+            }
+        }
+    }
+  ```
+### Looking at more data
+
+You can navigate through the entity relationship graph defined in the models and explore relationships:
+
+```
+List groups:                 group/
+Show a group:                group/<group id>
+List a group's products:     group/<group id>/products/
+Show a product:              group/<group id>/products/<product id>
+List a product's versions:   group/<group id>/products/<product id>/versions/
+Show a version:              group/<group id>/products/<product id>/versions/<version id>
+```
+
+### Writing Data
+
+So far we have defined our views on the database and exposed those views over HTTP. This is great progress, but so far
+we have only read data from the database.
+
+#### Inserting Data
+
+Fortunately for us adding data is just as easy as reading data. For now let’s use cURL to put data in the database.
+
+#### JSON-API
+  ```
+  curl -X POST http://localhost:8080/api/v1/group/com.example.repository/products -H"Content-Type: application/vnd.api+json" -H"Accept: application/vnd.api+json" -d '{"data": {"type": "product", "id": "elide-demo"}}'
+  ```
+
+#### GraphQL
+  ```
+  curl -g -X POST -H"Content-Type: application/json" -H"Accept: application/json" "http://localhost:8080/graphql/api/v1" -d'{ "query" : "mutation { group(ids: [\"com.example.repository\"]) { edges { node { products(op: UPSERT, data: {name: \"elide-demo\"}) { edges { node { name } } } } } } }" }'
+  ```
+
+### Modifying Data
+
+Notice that, when we created it, we did not set any of the attributes of our new product record.  Updating our
+data to help our users is just as easy as it is to add new data. Let’s update our model with the following cURL call.
+
+#### JSON-API
+  ```curl
+    curl -X PATCH http://localhost:8080/api/v1/group/com.example.repository/products/elide-demo \
+      -H"Content-Type: application/vnd.api+json" -H"Accept: application/vnd.api+json" \
+      -d '{
+        "data": {
+          "type": "product",
+          "id": "elide-demo",
+          "attributes": {
+            "commonName": "demo application",
+            "description": "An example implementation of an Elide web service that showcases many Elide features"
+          }
+        }
+      }'
+  ```
+
+#### GraphQL
+  ```curl
+   curl -g -X POST -H"Content-Type: application/json" -H"Accept: application/json" \
+      "http://localhost:8080/graphql/api/v1" \
+      -d'{
+             "query" : "mutation { group(ids: [\"com.example.repository\"]) { edges { node { products(op: UPDATE, data: { name: \"elide-demo\", commonName: \"demo application\", description: \"An example implementation of an Elide web service that showcases many Elide features\" }) { edges { node { name } } } } } } }"
+         }'
+  ```
+
+### Running Analytic Queries
+
+Analytic queries leverage the same API as reading any other Elide model.  Note that Elide will aggregate the measures selected by the dimensions requested.  Learn more about analytic queries [here](https://elide.io/pages/guide/v5/04-analytics.html).
+
+#### JSON-API
+
+  ```curl
+  curl http://localhost:8080/api/v1/Downloads?fields[Downloads]=downloads,group,product
+  ```
+
+#### GraphQL
+
+  ```curl
+  curl -g -X POST -H"Content-Type: application/json" -H"Accept: application/json" \
+      "http://localhost:8080/graphql/api/v1" \
+      -d'{
+             "query" : "{ Downloads { edges { node { downloads group product } } } }"
+         }'
+  ```
+
+Here are the respective responses:
+
+#### JSON-API
+
+  ```json
+  {
+    "data": [
+      {
+        "attributes": {
+          "downloads": 35,
+          "group": "com.example.repository",
+          "product": "elide-core"
+        },
+        "id": "0",
+        "type": "Downloads"
+      }
+    ]
+  }
+  ```
+
+#### GraphQL
+
+  ```json
+  {
+    "data": {
+      "Downloads": {
+        "edges": [
+          {
+            "node": {
+              "downloads": 35,
+              "group": "com.example.repository",
+              "product": "elide-core"
+            }
+          }
+        ]
+      }
+    }
+  }
+  ```
+
+### <a name="filters"></a>Filters
+
+Filters are JAX-RS or Jersey filter classes. These classes can be used for authentication, logging, or any other type of request filtering you may be required to perform.
+
+Some commonly used servlets & filters are packaged as individual settings.
+
+#### Codahale / Dropwizard InstrumentedFilter Servlet
+
+Codahale/dropwizard has a servlet and a small set of [administrative filters](https://metrics.dropwizard.io/3.1.0/manual/servlet/) for
+exposing Codahale metrics, thread dumps, and system health checks.
+
+These are enabled by default but can be explicitly disabled by overriding `ElideStandaloneSettings`:
+
+```
+    /**
+     * Whether or not Codahale metrics, healthchecks, thread, ping, and admin servlet
+     * should be enabled.
+     * @return
+     */
+    @Override
+    boolean enableServiceMonitoring() {
+        return false;
+    }
+```
+
+The admin endpoint is exposed at `/stats`.
+
+New metrics can be exposed through the servlet path `/stats/metrics` by adding them to the static registry found here:
+```ElideResourceConfig.getMetricRegistry()```
+
+New health checks can be exposed through the servlet path `/stats/healthcheck` by adding them to the static registry found here:
+```ElideResourceConfig.getHealthCheckRegistry()```
+
+### <a name="additional-config"></a>Additional Configuration
+
+You can add additional configuration by specifying the `applicationConfigurator` method. The class (i.e. the `Consumer`) is fully injectable and will take in the root Jersey `ResourceConfig` for your application.
+
+This method accepts a `ResourceConfig` object so you can continue to modify it as necessary.
diff --git a/elide-standalone/pom.xml b/elide-standalone/pom.xml
new file mode 100644
index 0000000000..9d32a339f1
--- /dev/null
+++ b/elide-standalone/pom.xml
@@ -0,0 +1,282 @@
+<!--
+  ~ Copyright 2017, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-standalone</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Standalone</name>
+    <description>Elide Standalone Application</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <groupId>com.yahoo.elide</groupId>
+        <artifactId>elide-parent-pom</artifactId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Yahoo! Inc.</name>
+        <url>http://www.yahoo.com</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <!-- Versions -->
+        <metrics.version>4.2.8</metrics.version>
+
+        <!-- Settings -->
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- Elide dependency -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-aggregation</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jpa</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-datastore-jms</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-graphql</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-swagger</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-async</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-model-config</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate5.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-hikaricp</artifactId>
+            <version>${hibernate5.version}</version>
+        </dependency>
+
+        <!-- Jetty for embedded web server -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Jersey for servlet & injection technology -->
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+            <version>${metrics.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-servlets</artifactId>
+            <version>${metrics.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-servlet</artifactId>
+            <version>${metrics.version}</version>
+        </dependency>
+
+        <!-- Various Utility Libraries -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- dependencies for native jetty websocket -->
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${version.jetty}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-servlet</artifactId>
+            <version>${version.jetty}</version>
+        </dependency>
+        <!-- dependencies for javax.websocket (JSR-356) websocket -->
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>javax-websocket-server-impl</artifactId>
+            <version>${version.jetty}</version>
+        </dependency>
+
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Elide Test Helpers -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+            <artifactId>elide-test-helpers</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- H2 -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-server</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jms-client-all</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-client</artifactId>
+            <version>${version.jetty}</version>
+            <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-standalone/settings/elide-settings.properties b/elide-standalone/settings/elide-settings.properties
new file mode 100644
index 0000000000..bdbdcc5361
--- /dev/null
+++ b/elide-standalone/settings/elide-settings.properties
@@ -0,0 +1,7 @@
+port=8080
+modelPackage=com.yourcompany.elide.models
+settingsClass=com.yourcompany.elide.security.Settings
+hibernate5Config=./settings/hibernate.cfg.xml
+jsonApiPathSpec=/api/v1/*
+filters=
+additionalApplicationConfiguration=
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java
new file mode 100644
index 0000000000..3c22e7cea6
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone;
+
+import static com.yahoo.elide.standalone.config.ElideResourceConfig.ASYNC_EXECUTOR_ATTR;
+import static com.yahoo.elide.standalone.config.ElideResourceConfig.ASYNC_UPDATER_ATTR;
+import static com.yahoo.elide.standalone.config.ElideResourceConfig.ELIDE_STANDALONE_SETTINGS_ATTR;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.standalone.config.ElideResourceConfig;
+import com.yahoo.elide.standalone.config.ElideStandaloneSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneSubscriptionSettings;
+import com.codahale.metrics.servlet.InstrumentedFilter;
+import com.codahale.metrics.servlets.AdminServlet;
+import com.codahale.metrics.servlets.HealthCheckServlet;
+import com.codahale.metrics.servlets.MetricsServlet;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
+import org.glassfish.jersey.servlet.ServletContainer;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import javax.servlet.DispatcherType;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * Elide Standalone.
+ */
+@Slf4j
+public class ElideStandalone {
+    private final ElideStandaloneSettings elideStandaloneSettings;
+    private Server jettyServer;
+
+    /**
+     * Constructor.
+     *
+     * @param elideStandaloneSettings Elide standalone configuration settings.
+     */
+    public ElideStandalone(ElideStandaloneSettings elideStandaloneSettings) {
+        this.elideStandaloneSettings = elideStandaloneSettings;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param checkMappings Check mappings to use for service.
+     */
+    public ElideStandalone(Map<String, Class<? extends Check>> checkMappings) {
+        this(new ElideStandaloneSettings() {
+            @Override
+            public Map<String, Class<? extends Check>> getCheckMappings() {
+                return checkMappings;
+            }
+        });
+    }
+    /**
+     * Start the Elide service.
+     * This method blocks until the server exits.
+     *
+     * @throws Exception Exception thrown
+     */
+    public void start() throws Exception {
+        start(true);
+
+    }
+    /**
+     * Start the Elide service.
+     *
+     * @param block - Whether or not to wait for the server to shutdown.
+     * @throws Exception Exception thrown
+     */
+    public void start(boolean block) throws Exception {
+        ServletContextHandler context = new ServletContextHandler();
+        context.setContextPath("/");
+
+        log.info("Starting jetty server on port: {}", elideStandaloneSettings.getPort());
+        jettyServer = new Server(elideStandaloneSettings.getPort());
+        jettyServer.setHandler(context);
+
+        context.setAttribute(ELIDE_STANDALONE_SETTINGS_ATTR, elideStandaloneSettings);
+
+        if (elideStandaloneSettings.getAsyncProperties().enabled()) {
+            Integer threadPoolSize = elideStandaloneSettings.getAsyncProperties().getThreadSize() == null
+                            ? AsyncExecutorService.DEFAULT_THREAD_POOL_SIZE
+                            : elideStandaloneSettings.getAsyncProperties().getThreadSize();
+            context.setAttribute(ASYNC_EXECUTOR_ATTR, Executors.newFixedThreadPool(threadPoolSize));
+            context.setAttribute(ASYNC_UPDATER_ATTR, Executors.newFixedThreadPool(threadPoolSize));
+        }
+
+        if (elideStandaloneSettings.enableJSONAPI()) {
+            ServletHolder jerseyServlet = context.addServlet(ServletContainer.class,
+                    elideStandaloneSettings.getJsonApiPathSpec());
+            jerseyServlet.setInitOrder(0);
+            jerseyServlet.setInitParameter("jersey.config.server.provider.packages",
+                    "com.yahoo.elide.jsonapi.resources");
+            jerseyServlet.setInitParameter("javax.ws.rs.Application", ElideResourceConfig.class.getCanonicalName());
+        }
+
+        if (elideStandaloneSettings.enableGraphQL()) {
+            ServletHolder jerseyServlet = context.addServlet(ServletContainer.class,
+                    elideStandaloneSettings.getGraphQLApiPathSpec());
+            jerseyServlet.setInitOrder(0);
+            jerseyServlet.setInitParameter("jersey.config.server.provider.packages", "com.yahoo.elide.graphql");
+            jerseyServlet.setInitParameter("javax.ws.rs.Application", ElideResourceConfig.class.getCanonicalName());
+        }
+        ElideStandaloneSubscriptionSettings subscriptionSettings = elideStandaloneSettings.getSubscriptionProperties();
+        if (elideStandaloneSettings.enableGraphQL() && subscriptionSettings.enabled()) {
+            // GraphQL subscription endpoint
+            ServerContainer container  = WebSocketServerContainerInitializer.configureContext(context);
+
+            ServerEndpointConfig subscriptionEndpoint =
+                    subscriptionSettings.serverEndpointConfig(elideStandaloneSettings);
+
+            container.addEndpoint(subscriptionEndpoint);
+        }
+
+        if (elideStandaloneSettings.getAsyncProperties().enableExport()) {
+            ServletHolder jerseyServlet = context.addServlet(ServletContainer.class,
+                    elideStandaloneSettings.getAsyncProperties().getExportApiPathSpec());
+            jerseyServlet.setInitOrder(0);
+            jerseyServlet.setInitParameter("jersey.config.server.provider.packages",
+                    "com.yahoo.elide.async.resources");
+            jerseyServlet.setInitParameter("javax.ws.rs.Application", ElideResourceConfig.class.getCanonicalName());
+        }
+
+        if (elideStandaloneSettings.enableServiceMonitoring()) {
+            FilterHolder instrumentedFilterHolder = new FilterHolder(InstrumentedFilter.class);
+            instrumentedFilterHolder.setName("instrumentedFilter");
+            instrumentedFilterHolder.setAsyncSupported(true);
+            context.addFilter(instrumentedFilterHolder,
+                    "/*",
+                    EnumSet.of(DispatcherType.REQUEST));
+
+            context.setAttribute(HealthCheckServlet.HEALTH_CHECK_REGISTRY,
+                    ElideResourceConfig.getHealthCheckRegistry());
+            context.setAttribute(InstrumentedFilter.REGISTRY_ATTRIBUTE, ElideResourceConfig.getMetricRegistry());
+
+            context.setAttribute(MetricsServlet.METRICS_REGISTRY, ElideResourceConfig.getMetricRegistry());
+            context.addServlet(AdminServlet.class, "/stats/*");
+        }
+
+        if (elideStandaloneSettings.enableSwagger()) {
+            ServletHolder jerseyServlet = context.addServlet(ServletContainer.class,
+                    elideStandaloneSettings.getSwaggerPathSpec());
+            jerseyServlet.setInitOrder(0);
+            jerseyServlet.setInitParameter("jersey.config.server.provider.packages",
+                    "com.yahoo.elide.swagger.resources");
+            jerseyServlet.setInitParameter("javax.ws.rs.Application", ElideResourceConfig.class.getCanonicalName());
+        }
+
+        elideStandaloneSettings.updateServletContextHandler(context);
+
+        try {
+            jettyServer.start();
+            log.info("Jetty started!");
+            if (block) {
+                jettyServer.join();
+            }
+        } catch (Exception e) {
+            log.error("Unexpected exception caught: {}", e.getMessage(), e);
+            throw e;
+        } finally {
+            if (block) {
+                jettyServer.destroy();
+            }
+        }
+    }
+
+    /**
+     * Stop the Elide service.
+     *
+     * @throws Exception Exception thrown
+     */
+    public void stop() throws Exception {
+        jettyServer.stop();
+        jettyServer.destroy();
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/Util.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/Util.java
new file mode 100644
index 0000000000..5bce3beb56
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/Util.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone;
+
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.datastores.jpa.PersistenceUnitInfoImpl;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
+import org.hibernate.jpa.boot.internal.PersistenceUnitInfoDescriptor;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.stream.Collectors;
+import javax.persistence.Entity;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceUnitInfo;
+import javax.sql.DataSource;
+
+/**
+ * Util.
+ */
+public class Util {
+
+    public static EntityManagerFactory getEntityManagerFactory(
+            ClassScanner scanner,
+            String modelPackageName,
+            boolean includeAsyncModel,
+            Properties options
+    ) {
+
+        // Configure default options for example service
+        populateDefaultOptions(options);
+
+        ClassLoader classLoader = null;
+
+        PersistenceUnitInfo persistenceUnitInfo = new PersistenceUnitInfoImpl("elide-stand-alone",
+                combineModelEntities(scanner, modelPackageName, includeAsyncModel),
+                options, classLoader);
+
+        return new EntityManagerFactoryBuilderImpl(
+                new PersistenceUnitInfoDescriptor(persistenceUnitInfo), new HashMap<>(), classLoader)
+                .build();
+    }
+
+    /**
+     * Creates {@link DataSource} object from Database Connection Properties.
+     * @param options Database Connection Properties.
+     * @return DataSource Object.
+     */
+    public static DataSource getDataSource(Properties options) {
+
+        // Configure default options for example service
+        populateDefaultOptions(options);
+
+        HikariConfig config = new HikariConfig();
+        config.setJdbcUrl(options.getProperty("javax.persistence.jdbc.url"));
+        config.setUsername(options.getProperty("javax.persistence.jdbc.user"));
+        config.setPassword(options.getProperty("javax.persistence.jdbc.password"));
+        config.setDriverClassName(options.getProperty("javax.persistence.jdbc.driver"));
+        if (options.getProperty("hibernate.hikari.connectionTimeout") != null) {
+            config.setConnectionTimeout(new Long(options.getProperty("hibernate.hikari.connectionTimeout")));
+        }
+        if (options.getProperty("hibernate.hikari.idleTimeout") != null) {
+            config.setIdleTimeout(new Long(options.getProperty("hibernate.hikari.idleTimeout")));
+        }
+        if (options.getProperty("hibernate.hikari.maximumPoolSize") != null) {
+            config.setMaximumPoolSize(new Integer(options.getProperty("hibernate.hikari.maximumPoolSize")));
+        }
+
+        return new HikariDataSource(config);
+    }
+
+    private static void populateDefaultOptions(Properties options) {
+        if (options.isEmpty()) {
+            options.put("hibernate.show_sql", "true");
+            options.put("hibernate.hbm2ddl.auto", "create");
+            options.put("hibernate.dialect", "org.hibernate.dialect.MySQL5Dialect");
+            options.put("hibernate.current_session_context_class", "thread");
+            options.put("hibernate.jdbc.use_scrollable_resultset", "true");
+
+            // Collection Proxy & JDBC Batching
+            options.put("hibernate.jdbc.batch_size", "50");
+            options.put("hibernate.jdbc.fetch_size", "50");
+            options.put("hibernate.default_batch_fetch_size", "100");
+
+            // Hikari Connection Pool Settings
+            options.putIfAbsent("hibernate.connection.provider_class",
+                    "com.zaxxer.hikari.hibernate.HikariConnectionProvider");
+            options.putIfAbsent("hibernate.hikari.connectionTimeout", "20000");
+            options.putIfAbsent("hibernate.hikari.maximumPoolSize", "30");
+            options.putIfAbsent("hibernate.hikari.idleTimeout", "30000");
+
+            options.put("javax.persistence.jdbc.driver", "com.mysql.jdbc.Driver");
+            options.put("javax.persistence.jdbc.url", "jdbc:mysql://localhost/elide?serverTimezone=UTC");
+            options.put("javax.persistence.jdbc.user", "elide");
+            options.put("javax.persistence.jdbc.password", "elide123");
+        }
+    }
+
+    /**
+     * Combine the model entities with Async and Dynamic models.
+     *
+     * @param scanner Class scanner
+     * @param modelPackageName Package name
+     * @param includeAsyncModel Include Async model package Name
+     * @return All entities combined from both package.
+     */
+    public static List<String> combineModelEntities(ClassScanner scanner,
+                                                    String modelPackageName, boolean includeAsyncModel) {
+
+        List<String> modelEntities = getAllEntities(scanner, modelPackageName);
+
+        if (includeAsyncModel) {
+            modelEntities.addAll(getAllEntities(scanner, AsyncQuery.class.getPackage().getName()));
+        }
+        return modelEntities;
+    }
+
+    /**
+     * Get all the entities in a package.
+     *
+     * @param packageName Package name
+     * @return All entities found in package.
+     */
+    public static List<String> getAllEntities(ClassScanner scanner, String packageName) {
+        return scanner.getAnnotatedClasses(packageName, Entity.class).stream()
+                .map(Class::getName)
+                .collect(Collectors.toList());
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideResourceConfig.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideResourceConfig.java
new file mode 100644
index 0000000000..8cca8d92e7
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideResourceConfig.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.config;
+
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.async.export.formatter.CSVExportFormatter;
+import com.yahoo.elide.async.export.formatter.JSONExportFormatter;
+import com.yahoo.elide.async.export.formatter.TableExportFormatter;
+import com.yahoo.elide.async.hooks.AsyncQueryHook;
+import com.yahoo.elide.async.hooks.TableExportHook;
+import com.yahoo.elide.async.models.AsyncAPI;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.ResultType;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.async.resources.ExportApiEndpoint.ExportApiProperties;
+import com.yahoo.elide.async.service.AsyncCleanerService;
+import com.yahoo.elide.async.service.AsyncExecutorService;
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.dao.DefaultAsyncAPIDAO;
+import com.yahoo.elide.async.service.storageengine.FileResultStorageEngine;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+import com.yahoo.elide.core.TransactionRegistry;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.exceptions.InvalidOperationException;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.standalone.Util;
+import com.yahoo.elide.swagger.resources.DocEndpoint;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.health.HealthCheckRegistry;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.api.TypeLiteral;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import javax.inject.Inject;
+import javax.persistence.EntityManagerFactory;
+import javax.servlet.ServletContext;
+import javax.sql.DataSource;
+import javax.ws.rs.core.Context;
+
+/**
+ * Elide application resource configuration file.
+ */
+@Slf4j
+public class ElideResourceConfig extends ResourceConfig {
+    private final ElideStandaloneSettings settings;
+    private final ServiceLocator injector;
+
+    public static final String ELIDE_STANDALONE_SETTINGS_ATTR = "elideStandaloneSettings";
+    public static final String ASYNC_EXECUTOR_ATTR = "asyncExecutor";
+    public static final String ASYNC_UPDATER_ATTR = "asyncUpdater";
+
+    private static MetricRegistry metricRegistry = null;
+    private static HealthCheckRegistry healthCheckRegistry = null;
+
+    @AllArgsConstructor
+    public class ElideBinder extends AbstractBinder {
+
+        private ClassScanner classScanner;
+        private Optional<DynamicConfiguration> dynamicConfiguration;
+        private ServletContext servletContext;
+
+        @Override
+        protected void configure() {
+            ElideStandaloneAsyncSettings asyncProperties = settings.getAsyncProperties() == null
+                    ? new ElideStandaloneAsyncSettings() { } : settings.getAsyncProperties();
+            EntityManagerFactory entityManagerFactory = Util.getEntityManagerFactory(classScanner,
+                    settings.getModelPackageName(), asyncProperties.enabled(), settings.getDatabaseProperties());
+
+
+            EntityDictionary dictionary = settings.getEntityDictionary(injector, classScanner, dynamicConfiguration,
+                    settings.getEntitiesToExclude());
+
+            DataStore dataStore;
+
+            if (settings.getAnalyticProperties().enableAggregationDataStore()) {
+                MetaDataStore metaDataStore = settings.getMetaDataStore(classScanner, dynamicConfiguration);
+                if (metaDataStore == null) {
+                    throw new IllegalStateException("Aggregation Datastore is enabled but metaDataStore is null");
+                }
+
+                DataSource defaultDataSource = Util.getDataSource(settings.getDatabaseProperties());
+                ConnectionDetails defaultConnectionDetails = new ConnectionDetails(defaultDataSource,
+                        SQLDialectFactory.getDialect(settings.getAnalyticProperties().getDefaultDialect()));
+
+                QueryEngine queryEngine = settings.getQueryEngine(metaDataStore, defaultConnectionDetails,
+                        dynamicConfiguration, settings.getDataSourceConfiguration(),
+                        settings.getAnalyticProperties().getDBPasswordExtractor());
+                AggregationDataStore aggregationDataStore = settings.getAggregationDataStore(queryEngine);
+                if (aggregationDataStore == null) {
+                    throw new IllegalStateException(
+                            "Aggregation Datastore is enabled but aggregationDataStore is null");
+                }
+                dataStore = settings.getDataStore(metaDataStore, aggregationDataStore, entityManagerFactory);
+
+            } else {
+                dataStore = settings.getDataStore(entityManagerFactory);
+            }
+
+            ElideSettings elideSettings = settings.getElideSettings(dictionary, dataStore,
+                    settings.getObjectMapper());
+            Elide elide = new Elide(elideSettings, new TransactionRegistry(),
+                    elideSettings.getDictionary().getScanner(), false);
+
+            // Bind elide instance for injection into endpoint
+            bind(elide).to(Elide.class).named("elide");
+
+            // Bind additional elements
+            bind(elideSettings).to(ElideSettings.class);
+            bind(elideSettings.getDictionary()).to(EntityDictionary.class);
+            bind(elideSettings.getDataStore()).to(DataStore.class).named("elideDataStore");
+
+            // Binding async service
+            if (asyncProperties.enabled()) {
+                bindAsync(asyncProperties, elide, dictionary);
+            }
+        }
+
+        protected void bindAsync(
+                ElideStandaloneAsyncSettings asyncProperties,
+                Elide elide,
+                EntityDictionary dictionary
+        ) {
+            AsyncAPIDAO asyncAPIDao = asyncProperties.getAPIDAO();
+            if (asyncAPIDao == null) {
+                asyncAPIDao = new DefaultAsyncAPIDAO(elide.getElideSettings(), elide.getDataStore());
+            }
+            bind(asyncAPIDao).to(AsyncAPIDAO.class);
+
+            ExecutorService executor = (ExecutorService) servletContext.getAttribute(ASYNC_EXECUTOR_ATTR);
+            ExecutorService updater = (ExecutorService) servletContext.getAttribute(ASYNC_UPDATER_ATTR);
+            AsyncExecutorService asyncExecutorService =
+                    new AsyncExecutorService(elide, executor, updater, asyncAPIDao);
+            bind(asyncExecutorService).to(AsyncExecutorService.class);
+
+            if (asyncProperties.enableExport()) {
+                ExportApiProperties exportApiProperties = new ExportApiProperties(
+                        asyncProperties.getExportAsyncResponseExecutor(),
+                        asyncProperties.getExportAsyncResponseTimeoutSeconds());
+                bind(exportApiProperties).to(ExportApiProperties.class).named("exportApiProperties");
+
+                ResultStorageEngine resultStorageEngine = asyncProperties.getResultStorageEngine();
+                if (resultStorageEngine == null) {
+                    resultStorageEngine = new FileResultStorageEngine(asyncProperties.getStorageDestination(),
+                            asyncProperties.enableExtension());
+                }
+                bind(resultStorageEngine).to(ResultStorageEngine.class).named("resultStorageEngine");
+
+                // Initialize the Formatters.
+                Map<ResultType, TableExportFormatter> supportedFormatters = new HashMap<>();
+                supportedFormatters.put(ResultType.CSV, new CSVExportFormatter(elide,
+                        asyncProperties.skipCSVHeader()));
+                supportedFormatters.put(ResultType.JSON, new JSONExportFormatter(elide));
+
+                // Binding TableExport LifeCycleHook
+                TableExportHook tableExportHook = getTableExportHook(asyncExecutorService,
+                        asyncProperties, supportedFormatters, resultStorageEngine);
+                dictionary.bindTrigger(TableExport.class, CREATE, PREFLUSH, tableExportHook, false);
+                dictionary.bindTrigger(TableExport.class, CREATE, POSTCOMMIT, tableExportHook, false);
+                dictionary.bindTrigger(TableExport.class, CREATE, PRESECURITY, tableExportHook, false);
+            }
+
+            // Binding AsyncQuery LifeCycleHook
+            AsyncQueryHook asyncQueryHook = new AsyncQueryHook(asyncExecutorService,
+                    asyncProperties.getMaxAsyncAfterSeconds());
+
+            dictionary.bindTrigger(AsyncQuery.class, CREATE, PREFLUSH, asyncQueryHook, false);
+            dictionary.bindTrigger(AsyncQuery.class, CREATE, POSTCOMMIT, asyncQueryHook, false);
+            dictionary.bindTrigger(AsyncQuery.class, CREATE, PRESECURITY, asyncQueryHook, false);
+
+            // Binding async cleanup service
+            if (asyncProperties.enableCleanup()) {
+                AsyncCleanerService.init(elide, asyncProperties.getMaxRunTimeSeconds(),
+                        asyncProperties.getQueryCleanupDays(),
+                        asyncProperties.getQueryCancelCheckIntervalSeconds(), asyncAPIDao);
+                bind(AsyncCleanerService.getInstance()).to(AsyncCleanerService.class);
+            }
+        }
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param injector Injection instance for application.
+     * @param servletContext servlet context instance.
+     */
+    @Inject
+    public ElideResourceConfig(ServiceLocator injector, @Context ServletContext servletContext) {
+        this.injector = injector;
+        settings = (ElideStandaloneSettings) servletContext.getAttribute(ELIDE_STANDALONE_SETTINGS_ATTR);
+
+        ClassScanner classScanner = settings.getClassScanner();
+
+        // Bind things that should be injectable to the Settings class
+        register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                ElideStandaloneAsyncSettings asyncProperties = settings.getAsyncProperties();
+                bind(Util.combineModelEntities(
+                        classScanner,
+                        settings.getModelPackageName(),
+                        asyncProperties.enabled())).to(Set.class).named("elideAllModels");
+            }
+        });
+
+        Optional<DynamicConfiguration> dynamicConfiguration;
+        try {
+            dynamicConfiguration = settings.getDynamicConfiguration(classScanner);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+
+
+        // Bind to injector
+        register(new ElideBinder(classScanner, dynamicConfiguration, servletContext));
+
+        // Bind swaggers to given endpoint
+        //This looks strange, but Jersey binds its Abstract binders first, and then later it binds 'external'
+        //binders (like this HK2 version).  This allows breaking dependency injection into two phases.
+        //Everything bound in the first phase can be accessed in the second phase.
+        register(new org.glassfish.hk2.utilities.binding.AbstractBinder() {
+            @Override
+            protected void configure() {
+                Elide elide = injector.getService(Elide.class, "elide");
+
+                elide.doScans();
+
+                //Bind subscription hooks.
+                if (settings.getSubscriptionProperties().publishingEnabled()) {
+                    settings.getSubscriptionProperties().subscriptionScanner(elide,
+                            settings.getSubscriptionProperties().getConnectionFactory());
+                }
+
+                EntityDictionary dictionary = elide.getElideSettings().getDictionary();
+
+                if (settings.enableSwagger()) {
+                    List<DocEndpoint.SwaggerRegistration> swaggerDocs = settings.buildSwagger(dictionary);
+                    bind(swaggerDocs).named("swagger").to(new TypeLiteral<List<DocEndpoint.SwaggerRegistration>>() { });
+                }
+            }
+        });
+
+        registerFilters(settings.getFilters());
+
+        additionalConfiguration(settings.getApplicationConfigurator());
+    }
+
+    /**
+     * Init the supplemental resource config.
+     */
+    private void additionalConfiguration(Consumer<ResourceConfig> configurator) {
+        // Inject into consumer if class is provided
+        injector.inject(configurator);
+        configurator.accept(this);
+    }
+
+    /**
+     * Register provided JAX-RS filters.
+     */
+    private void registerFilters(List<Class<?>> filters) {
+        filters.forEach(this::register);
+    }
+
+    public static MetricRegistry getMetricRegistry() {
+        if (metricRegistry == null) {
+            metricRegistry = new MetricRegistry();
+        }
+
+        return metricRegistry;
+    }
+
+    public static HealthCheckRegistry getHealthCheckRegistry() {
+        if (healthCheckRegistry == null) {
+            healthCheckRegistry = new HealthCheckRegistry();
+        }
+
+        return healthCheckRegistry;
+    }
+
+    // TODO Remove this method when ElideSettings has all the settings.
+    // Then the check can be done in TableExportHook.
+    // Trying to avoid adding too many individual properties to ElideSettings for now.
+    // https://github.com/yahoo/elide/issues/1803
+    private TableExportHook getTableExportHook(AsyncExecutorService asyncExecutorService,
+            ElideStandaloneAsyncSettings asyncProperties, Map<ResultType, TableExportFormatter> supportedFormatters,
+            ResultStorageEngine engine) {
+        TableExportHook tableExportHook = null;
+        if (asyncProperties.enableExport()) {
+            tableExportHook = new TableExportHook(asyncExecutorService, asyncProperties.getMaxAsyncAfterSeconds(),
+                    supportedFormatters, engine);
+        } else {
+            tableExportHook = new TableExportHook(asyncExecutorService, asyncProperties.getMaxAsyncAfterSeconds(),
+                    supportedFormatters, engine) {
+                @Override
+                public void validateOptions(AsyncAPI export, RequestScope requestScope) {
+                    throw new InvalidOperationException("TableExport is not supported.");
+                }
+            };
+        }
+        return tableExportHook;
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAnalyticSettings.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAnalyticSettings.java
new file mode 100644
index 0000000000..499cf12601
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAnalyticSettings.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.config;
+
+import com.yahoo.elide.datastores.aggregation.cache.CaffeineCache;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialect;
+import com.yahoo.elide.modelconfig.DBPasswordExtractor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+/**
+ * Interface for configuring the Analytic configuration of Standalone Application.
+ */
+public interface ElideStandaloneAnalyticSettings {
+
+    /**
+     * Enable the support for Dynamic Model Configuration. If false, the feature will be disabled. If enabled, ensure
+     * that Aggregation Data Store is also enabled
+     *
+     * @return Default: False
+     */
+    default boolean enableDynamicModelConfig() {
+        return false;
+    }
+
+    /**
+     * Enable support for reading and manipulating HJSON configuration through Elide models.
+     *
+     * @return Default: False
+     */
+    default boolean enableDynamicModelConfigAPI() {
+        return false;
+    }
+
+    /**
+     * Base path to Hjson dynamic model configurations.
+     *
+     * @return Default: /configs/
+     */
+    default String getDynamicConfigPath() {
+        return File.separator + "configs" + File.separator;
+    }
+
+    /**
+     * Enable the support for Aggregation Data Store. If false, the feature will be disabled.
+     *
+     * @return Default: False
+     */
+    default boolean enableAggregationDataStore() {
+        return false;
+    }
+
+    /**
+     * Enable the support for MetaData Store. If false, the feature will be disabled.
+     *
+     * @return Default: False
+     */
+    default boolean enableMetaDataStore() {
+        return false;
+    }
+
+    /**
+     * Provides the default SQLDialect type.
+     *
+     * @return {@link SQLDialect} type for default DataSource Object.
+     */
+    default String getDefaultDialect() {
+        return "Hive";
+    }
+
+    /**
+     * Creates the default Password Extractor Implementation.
+     *
+     * @return An instance of DBPasswordExtractor.
+     */
+    default DBPasswordExtractor getDBPasswordExtractor() {
+        return config -> StringUtils.EMPTY;
+    }
+
+    /**
+     * Limit on number of query cache entries. Non-positive values disable the query cache.
+     *
+     * @return Default: 1024
+     */
+    default Integer getQueryCacheMaximumEntries() {
+        return CaffeineCache.DEFAULT_MAXIMUM_ENTRIES;
+    }
+
+    /**
+     * Returns the default expiration in minutes of items in the AggregationDataStore query cache.
+     *
+     * @return Default: 10
+     */
+    default Long getDefaultCacheExpirationMinutes() {
+        return 10L;
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAsyncSettings.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAsyncSettings.java
new file mode 100644
index 0000000000..3cfd683430
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneAsyncSettings.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.config;
+
+import com.yahoo.elide.async.service.dao.AsyncAPIDAO;
+import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * interface for configuring the Async configuration of standalone application.
+ */
+public interface ElideStandaloneAsyncSettings {
+    /* Elide Async settings */
+
+    /**
+     * Enable the support for Async querying feature. If false, the async feature will be disabled.
+     *
+     * @return Default: False
+     */
+    default boolean enabled() {
+        return false;
+    }
+
+    /**
+     * Enable the support for cleaning up Async query history. If false, the async cleanup feature will be disabled.
+     *
+     * @return Default: False
+     */
+    default boolean enableCleanup() {
+        return false;
+    }
+
+    /**
+     * Thread Size for Async queries to run in parallel.
+     *
+     * @return Default: 5
+     */
+    default Integer getThreadSize() {
+        return 5;
+    }
+
+    /**
+     * Maximum Query Run time for Async Queries to mark as TIMEDOUT.
+     *
+     * @return Default: 3600
+     */
+    default Integer getMaxRunTimeSeconds() {
+        return 3600;
+    }
+
+    /**
+     * Maximum permissible AsyncAfterSeconds value.
+     * The Async requests can be configured to execute synchronously before switching to asynchronous mode.
+     *
+     * @return Default: 10
+     */
+    default Integer getMaxAsyncAfterSeconds() {
+        return 10;
+    }
+
+    /**
+     * Number of days history to retain for async query executions and results.
+     *
+     * @return Default: 7
+     */
+    default Integer getQueryCleanupDays() {
+        return 7;
+    }
+
+    /**
+     * Polling interval to identify async queries that should be canceled.
+     *
+     * @return Default: 300
+     */
+    default Integer getQueryCancelCheckIntervalSeconds() {
+        return 300;
+    }
+
+    /**
+     * Implementation of AsyncAPIDAO to use.
+     *
+     * @return AsyncAPIDAO type object.
+     */
+    default AsyncAPIDAO getAPIDAO() {
+        return null;
+    }
+
+    /**
+     * Implementation of ResultStorageEngine to use.
+     *
+     * @return ResultStorageEngine type object.
+     */
+    default ResultStorageEngine getResultStorageEngine() {
+        return null;
+    }
+
+    /**
+     * API root path specification for the export endpoint.
+     *
+     * @return Default: /export
+     */
+    default String getExportApiPathSpec() {
+        return "/export/*";
+    }
+
+    /**
+     * Enable the Export endpoint. If false, the endpoint and export support will be disabled.
+     *
+     * @return Default: False
+     */
+    default boolean enableExport() {
+        return false;
+    }
+
+    /**
+     * Enable the addition of extensions to Export attachments.
+     * If false, the attachments will be downloaded without extensions.
+     *
+     * @return Default: False
+     */
+    default boolean enableExtension() {
+        return false;
+    }
+
+    /**
+     * Skip generating Header when exporting in CSV format.
+     *
+     * @return Default: False
+     */
+    default boolean skipCSVHeader() {
+        return false;
+    }
+
+    /**
+     * Storage engine destination.
+     *
+     * @return Default: /tmp
+     */
+    default String getStorageDestination() {
+        return "/tmp";
+    }
+
+    /**
+     * Storage engine destination.
+     *
+     * @return Default: 30
+     */
+    default Integer getExportAsyncResponseTimeoutSeconds() {
+        return 30;
+    }
+
+    /**
+     * Executor for running export resource asynchronously.
+     *
+     * @return Default: null
+     */
+    default ExecutorService getExportAsyncResponseExecutor() {
+        return enableExport() ? Executors.newFixedThreadPool(getThreadSize() == null ? 6 : getThreadSize()) : null;
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSettings.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSettings.java
new file mode 100644
index 0000000000..46d5857995
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSettings.java
@@ -0,0 +1,608 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.config;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static com.yahoo.elide.datastores.jpa.JpaDataStore.DEFAULT_LOGGER;
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.async.models.AsyncQuery;
+import com.yahoo.elide.async.models.TableExport;
+import com.yahoo.elide.core.audit.AuditLogger;
+import com.yahoo.elide.core.audit.Slf4jLogger;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.exceptions.ErrorMapper;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.datastores.aggregation.AggregationDataStore;
+import com.yahoo.elide.datastores.aggregation.DefaultQueryValidator;
+import com.yahoo.elide.datastores.aggregation.QueryEngine;
+import com.yahoo.elide.datastores.aggregation.cache.Cache;
+import com.yahoo.elide.datastores.aggregation.cache.CaffeineCache;
+import com.yahoo.elide.datastores.aggregation.core.Slf4jQueryLogger;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.query.DefaultQueryPlanMerger;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.ConnectionDetails;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.DataSourceConfiguration;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.SQLQueryEngine;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.query.AggregateBeforeJoinOptimizer;
+import com.yahoo.elide.datastores.aggregation.validator.TemplateConfigValidator;
+import com.yahoo.elide.datastores.jpa.JpaDataStore;
+import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
+import com.yahoo.elide.datastores.multiplex.MultiplexManager;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.modelconfig.DBPasswordExtractor;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.modelconfig.store.ConfigDataStore;
+import com.yahoo.elide.modelconfig.store.models.ConfigChecks;
+import com.yahoo.elide.modelconfig.validator.DynamicConfigValidator;
+import com.yahoo.elide.swagger.SwaggerBuilder;
+import com.yahoo.elide.swagger.resources.DocEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.hibernate.Session;
+import io.swagger.models.Info;
+import io.swagger.models.Swagger;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+/**
+ * Interface for configuring an ElideStandalone application.
+ */
+public interface ElideStandaloneSettings {
+    /* Elide settings */
+
+     public final Consumer<EntityManager> TXCANCEL = em -> em.unwrap(Session.class).cancelQuery();
+
+    /**
+     * A map containing check mappings for security across Elide. If not provided, then an empty map is used.
+     * In case of an empty map, checks can be referenced by their fully qualified class names.
+     *
+     * @return Check mappings.
+     */
+    default Map<String, Class<? extends Check>> getCheckMappings() {
+        return Collections.emptyMap();
+    }
+
+    /**
+     * A Set containing Types to be excluded from EntityDictionary's EntityBinding.
+     * @return Set of Types.
+     */
+    default Set<Type<?>> getEntitiesToExclude() {
+        Set<Type<?>> entitiesToExclude = new HashSet<>();
+        ElideStandaloneAsyncSettings asyncProperties = getAsyncProperties();
+
+        if (asyncProperties == null || !asyncProperties.enabled()) {
+            entitiesToExclude.add(ClassType.of(AsyncQuery.class));
+        }
+
+        if (asyncProperties == null || !asyncProperties.enableExport()) {
+            entitiesToExclude.add(ClassType.of(TableExport.class));
+        }
+
+        return entitiesToExclude;
+    }
+
+    /**
+     * Elide settings to be used for bootstrapping the Elide service. By default, this method constructs an
+     * ElideSettings object using the application overrides provided in this class. If this method is overridden,
+     * the returned settings object is used over any additional Elide setting overrides.
+     *
+     * That is to say, if you intend to override this method, expect to fully configure the ElideSettings object to
+     * your needs.
+     *
+     * @param dictionary EntityDictionary object.
+     * @param dataStore Dastore object
+     * @param mapper Object mapper
+     * @return Configured ElideSettings object.
+     */
+    default ElideSettings getElideSettings(EntityDictionary dictionary, DataStore dataStore, JsonApiMapper mapper) {
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withErrorMapper(getErrorMapper())
+                .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withBaseUrl(getBaseUrl())
+                .withJsonApiPath(getJsonApiPathSpec().replaceAll("/\\*", ""))
+                .withGraphQLApiPath(getGraphQLApiPathSpec().replaceAll("/\\*", ""))
+                .withJsonApiMapper(mapper)
+                .withAuditLogger(getAuditLogger());
+
+        if (verboseErrors()) {
+            builder.withVerboseErrors();
+        }
+
+        if (getAsyncProperties().enableExport()) {
+            builder.withExportApiPath(getAsyncProperties().getExportApiPathSpec().replaceAll("/\\*", ""));
+        }
+
+        if (enableISO8601Dates()) {
+            builder.withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"));
+        }
+
+        return builder.build();
+    }
+
+    /* Non-required application/server settings */
+    /**
+     * Port for HTTP server to listen on.
+     *
+     * @return Default: 8080
+     */
+    default int getPort() {
+        return 8080;
+    }
+
+    /**
+     * Package name containing your models. This package will be recursively scanned for @Entity's and
+     * registered with Elide.
+     *
+     * NOTE: This will scan for all entities in that package and bind this data to a set named "elideAllModels".
+     *       If providing a custom ElideSettings object, you can inject this data into your class by using:
+     *
+     *       <strong>@Inject @Named("elideAllModels") Set&lt;Class&gt; entities;</strong>
+     *
+     * @return Default: com.yourcompany.elide.models
+     */
+    default String getModelPackageName() {
+        return "com.yourcompany.elide.models";
+    }
+
+    /**
+     * API root path specification for JSON-API. Namely, this is the mount point of your API.
+     * By default it will look something like:
+     *   <strong>yourcompany.com/api/v1/YOUR_ENTITY</strong>
+     *
+     * @return Default: /api/v1/*
+     */
+    default String getJsonApiPathSpec() {
+        return "/api/v1/*";
+    }
+
+    /**
+     * API root path specification for the GraphQL endpoint. Namely, this is the root uri for GraphQL.
+     *
+     * @return Default: /graphql/api/v1
+     */
+    default String getGraphQLApiPathSpec() {
+        return "/graphql/api/v1/*";
+    }
+
+    /**
+     * API root path specification for the Swagger endpoint. Namely, this is the root uri for Swagger docs.
+     *
+     * @return Default: /swagger/*
+     */
+    default String getSwaggerPathSpec() {
+        return "/swagger/*";
+    }
+
+    /**
+     * Enable the JSONAPI endpoint. If false, the endpoint will be disabled.
+     *
+     * @return Default: True
+     */
+    default boolean enableJSONAPI() {
+        return true;
+    }
+
+    /**
+     * Enable the GraphQL endpoint. If false, the endpoint will be disabled.
+     *
+     * @return Default: True
+     */
+    default boolean enableGraphQL() {
+        return true;
+    }
+
+    /**
+     * Enable/disable verbose error responses.
+     * @return Default: False
+     */
+    default boolean verboseErrors() {
+        return false;
+    }
+
+    /**
+     * Async Properties.
+     *
+     * @return AsyncProperties type object.
+     */
+    default ElideStandaloneAsyncSettings getAsyncProperties() {
+        //Default Properties
+        return new ElideStandaloneAsyncSettings() { };
+    }
+
+    /**
+     * Analytic Properties.
+     *
+     * @return AnalyticProperties type object.
+     */
+    default ElideStandaloneAnalyticSettings getAnalyticProperties() {
+        //Default Properties
+        return new ElideStandaloneAnalyticSettings() { };
+    }
+
+    /**
+     * Subscription Properties.
+     *
+     * @return SubscriptionProperties type object.
+     */
+    default ElideStandaloneSubscriptionSettings getSubscriptionProperties() {
+        //Default Properties
+        return new ElideStandaloneSubscriptionSettings() { };
+    }
+
+    /**
+     * Whether Dates should be ISO8601 strings (true) or epochs (false).
+     * @return whether ISO8601Dates are enabled.
+     */
+    default boolean enableISO8601Dates() {
+        return true;
+    }
+
+    /**
+     * Whether or not Codahale metrics, healthchecks, thread, ping, and admin servlet
+     * should be enabled.
+     * @return  whether ServiceMonitoring is enabled.
+     */
+    default boolean enableServiceMonitoring() {
+        return true;
+    }
+
+    /**
+     * Enable swagger documentation.
+     * @return whether Swagger is enabled;
+     */
+    default boolean enableSwagger() {
+        return false;
+    }
+
+    /**
+     * Swagger documentation requires an API version.
+     * The models with the same version are included.
+     * @return swagger version;
+     */
+    default String getSwaggerVersion() {
+        return NO_VERSION;
+    }
+
+    /**
+     * The service base URL that clients use in queries.  Elide will reference this name
+     * in any callback URLs returned by the service.  If not set, Elide uses the API request to generate the base URL.
+     * @return The base URL of the service.
+     */
+    default String getBaseUrl() {
+        return "";
+    }
+
+    /**
+     * Swagger documentation requires an API name.
+     * @return swagger service name;
+     */
+    default String getSwaggerName() {
+        return "Elide Service";
+    }
+
+    /**
+     * Creates a singular swagger document for JSON-API.
+     * @param dictionary Contains the static metadata about Elide models. .
+     * @return list of swagger registration objects.
+     */
+    default List<DocEndpoint.SwaggerRegistration> buildSwagger(EntityDictionary dictionary) {
+        Info info = new Info()
+                .title(getSwaggerName())
+                .version(getSwaggerVersion());
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+
+        String moduleBasePath = getJsonApiPathSpec().replaceAll("/\\*", "");
+
+        Swagger swagger = builder.build().basePath(moduleBasePath);
+
+        List<DocEndpoint.SwaggerRegistration> docs = new ArrayList<>();
+        docs.add(new DocEndpoint.SwaggerRegistration("test", swagger));
+
+        return docs;
+    }
+
+    /**
+     * JAX-RS filters to register with the web service.
+     *
+     * @return Default: Empty
+     */
+    default List<Class<?>> getFilters() {
+        return Collections.emptyList();
+    }
+
+    /**
+     * Supplemental resource configuration for Elide application. This should be a fully qualified class name.
+     *
+     * Before calling the consumer, the class will be injected by the ServiceLocator.
+     *
+     * @return Default: null
+     */
+    default Consumer<ResourceConfig> getApplicationConfigurator() {
+        // Do nothing by default
+        return (x) -> { };
+    }
+
+    /**
+     * Gets properties to configure the database.
+     *
+     * @return Default: ./settings/hibernate.cfg.xml
+     */
+    default Properties getDatabaseProperties() {
+        return new Properties();
+    }
+
+    /**
+     * A hook to directly modify the jetty servlet context handler as necessary.
+     *
+     * @param servletContextHandler ServletContextHandler in use by Elide standalone.
+     */
+    default void updateServletContextHandler(ServletContextHandler servletContextHandler) {
+        // Do nothing
+    }
+
+    /**
+     * Gets the audit logger for elide.
+     *
+     * @return Default: Slf4jLogger
+     */
+    default AuditLogger getAuditLogger() {
+        return new Slf4jLogger();
+    }
+
+    /**
+     * Get the query cache implementation. If null, query cache is disabled.
+     *
+     * @return Default: {@code new CaffeineCache(getQueryCacheSize())}
+     */
+    default Cache getQueryCache() {
+        return getAnalyticProperties().getQueryCacheMaximumEntries() > 0
+                ? new CaffeineCache(getAnalyticProperties().getQueryCacheMaximumEntries(),
+                                    getAnalyticProperties().getDefaultCacheExpirationMinutes())
+                : null;
+    }
+
+    /**
+     * Gets the dynamic configuration for models, security roles, and database connection.
+     * @param scanner Class scanner
+     * @return Optional DynamicConfiguration
+     * @throws IOException thrown when validator fails to read configuration.
+     */
+    default Optional<DynamicConfiguration> getDynamicConfiguration(ClassScanner scanner) throws IOException {
+        DynamicConfigValidator validator = null;
+
+        if (getAnalyticProperties().enableAggregationDataStore()
+                        && getAnalyticProperties().enableDynamicModelConfig()) {
+            validator = new DynamicConfigValidator(scanner, getAnalyticProperties().getDynamicConfigPath());
+            validator.readAndValidateConfigs();
+        }
+
+        return Optional.ofNullable(validator);
+    }
+
+    /**
+     * Provides the default Hikari DataSource Configuration.
+     * @return An instance of DataSourceConfiguration.
+     */
+    default DataSourceConfiguration getDataSourceConfiguration() {
+        return new DataSourceConfiguration() {
+        };
+    }
+
+    /**
+     * Gets the DataStore for elide.
+     * @param metaDataStore MetaDataStore object.
+     * @param aggregationDataStore AggregationDataStore object.
+     * @param entityManagerFactory EntityManagerFactory object.
+     * @return DataStore object initialized.
+     */
+    default DataStore getDataStore(MetaDataStore metaDataStore, AggregationDataStore aggregationDataStore,
+            EntityManagerFactory entityManagerFactory) {
+
+        List<DataStore> stores = new ArrayList<>();
+
+        DataStore jpaDataStore = new JpaDataStore(
+                () -> entityManagerFactory.createEntityManager(),
+                em -> new NonJtaTransaction(em, TXCANCEL, DEFAULT_LOGGER, true, true));
+
+        stores.add(jpaDataStore);
+
+        if (getAnalyticProperties().enableDynamicModelConfigAPI()) {
+            stores.add(new ConfigDataStore(getAnalyticProperties().getDynamicConfigPath(),
+                    new TemplateConfigValidator(getClassScanner(), getAnalyticProperties().getDynamicConfigPath())));
+        }
+
+        stores.add(metaDataStore);
+        stores.add(aggregationDataStore);
+
+        return new MultiplexManager(stores.toArray(new DataStore[0]));
+    }
+
+    /**
+     * Gets the DataStore for elide when aggregation store is disabled.
+     * @param entityManagerFactory EntityManagerFactory object.
+     * @return DataStore object initialized.
+     */
+    default DataStore getDataStore(EntityManagerFactory entityManagerFactory) {
+        DataStore jpaDataStore = new JpaDataStore(
+                () -> entityManagerFactory.createEntityManager(),
+                em -> new NonJtaTransaction(em, TXCANCEL, DEFAULT_LOGGER, true, true));
+
+        return jpaDataStore;
+    }
+
+    /**
+     * Gets the AggregationDataStore for elide.
+     * @param queryEngine query engine object.
+     * @return AggregationDataStore object initialized.
+     */
+    default AggregationDataStore getAggregationDataStore(QueryEngine queryEngine) {
+        AggregationDataStore.AggregationDataStoreBuilder aggregationDataStoreBuilder = AggregationDataStore.builder()
+                .queryEngine(queryEngine).queryLogger(new Slf4jQueryLogger());
+
+        if (getAnalyticProperties().enableDynamicModelConfig()) {
+            aggregationDataStoreBuilder.dynamicCompiledClasses(queryEngine.getMetaDataStore().getDynamicTypes());
+        }
+        aggregationDataStoreBuilder.cache(getQueryCache());
+        return aggregationDataStoreBuilder.build();
+    }
+
+    /**
+     * Gets the EntityDictionary for elide.
+     * @param injector Service locator for web service for dependency injection.
+     * @param dynamicConfiguration optional dynamic config object.
+     * @param entitiesToExclude set of Entities to exclude from binding.
+     * @return EntityDictionary object initialized.
+     */
+    default EntityDictionary getEntityDictionary(ServiceLocator injector, ClassScanner scanner,
+            Optional<DynamicConfiguration> dynamicConfiguration, Set<Type<?>> entitiesToExclude) {
+
+        Map<String, Class<? extends Check>> checks = new HashMap<>();
+
+        if (getAnalyticProperties().enableDynamicModelConfigAPI()) {
+            checks.put(ConfigChecks.CAN_CREATE_CONFIG, ConfigChecks.CanNotCreate.class);
+            checks.put(ConfigChecks.CAN_READ_CONFIG, ConfigChecks.CanNotRead.class);
+            checks.put(ConfigChecks.CAN_DELETE_CONFIG, ConfigChecks.CanNotDelete.class);
+            checks.put(ConfigChecks.CAN_UPDATE_CONFIG, ConfigChecks.CanNotUpdate.class);
+        }
+
+        EntityDictionary dictionary = new EntityDictionary(
+                new HashMap<>(), //Checks
+                new HashMap<>(), //Role Checks
+                new Injector() {
+                    @Override
+                    public void inject(Object entity) {
+                        injector.inject(entity);
+                    }
+
+                    @Override
+                    public <T> T instantiate(Class<T> cls) {
+                        return injector.create(cls);
+                    }
+                },
+                CoerceUtil::lookup, //Serde Lookup
+                entitiesToExclude,
+                scanner);
+
+        dynamicConfiguration.map(DynamicConfiguration::getRoles).orElseGet(Collections::emptySet).forEach(role ->
+            dictionary.addRoleCheck(role, new Role.RoleMemberCheck(role))
+        );
+
+        return dictionary;
+    }
+
+    /**
+     * Gets the metadatastore for elide.
+     * @param scanner Class scanner.
+     * @param dynamicConfiguration optional dynamic config object.
+     * @return MetaDataStore object initialized.
+     */
+    default MetaDataStore getMetaDataStore(ClassScanner scanner,
+            Optional<DynamicConfiguration> dynamicConfiguration) {
+        boolean enableMetaDataStore = getAnalyticProperties().enableMetaDataStore();
+
+        return dynamicConfiguration
+                .map(dc -> new MetaDataStore(scanner, dc.getTables(),
+                        dc.getNamespaceConfigurations(), enableMetaDataStore))
+                .orElseGet(() -> new MetaDataStore(scanner, enableMetaDataStore));
+    }
+
+    /**
+     * Gets the QueryEngine for elide.
+     * @param metaDataStore MetaDataStore object.
+     * @param defaultConnectionDetails default DataSource Object and SQLDialect Object.
+     * @param dynamicConfiguration Optional dynamic config.
+     * @param dataSourceConfiguration DataSource Configuration.
+     * @param dbPasswordExtractor Password Extractor Implementation.
+     * @return QueryEngine object initialized.
+     */
+    default QueryEngine getQueryEngine(MetaDataStore metaDataStore, ConnectionDetails defaultConnectionDetails,
+                    Optional<DynamicConfiguration> dynamicConfiguration,
+                    DataSourceConfiguration dataSourceConfiguration, DBPasswordExtractor dbPasswordExtractor) {
+        if (dynamicConfiguration.isPresent()) {
+            Map<String, ConnectionDetails> connectionDetailsMap = new HashMap<>();
+
+            dynamicConfiguration.get().getDatabaseConfigurations().forEach(dbConfig ->
+                connectionDetailsMap.put(dbConfig.getName(),
+                                new ConnectionDetails(
+                                                dataSourceConfiguration.getDataSource(dbConfig, dbPasswordExtractor),
+                                                SQLDialectFactory.getDialect(dbConfig.getDialect())))
+            );
+
+            Function<String, ConnectionDetails> connectionDetailsLookup = (name) -> {
+                if (StringUtils.isEmpty(name)) {
+                    return defaultConnectionDetails;
+                }
+                return Optional.ofNullable(connectionDetailsMap.get(name))
+                        .orElseThrow(() -> new IllegalStateException("ConnectionDetails undefined for connection: "
+                                + name));
+            };
+
+            return new SQLQueryEngine(metaDataStore, connectionDetailsLookup,
+                    new HashSet<>(Arrays.asList(new AggregateBeforeJoinOptimizer(metaDataStore))),
+                    new DefaultQueryPlanMerger(metaDataStore),
+                    new DefaultQueryValidator(metaDataStore.getMetadataDictionary()));
+        }
+        return new SQLQueryEngine(metaDataStore, (unused) -> defaultConnectionDetails);
+    }
+
+    /**
+     * Get the class scanner for this Elide instance.
+     * @return class scanner implementation.
+     */
+    default ClassScanner getClassScanner() {
+        return new DefaultClassScanner();
+    }
+
+    /**
+     * Get the error mapper for this Elide instance. By default no errors will be mapped.
+     *
+     * @return error mapper implementation
+     */
+    default ErrorMapper getErrorMapper() {
+        return error -> null;
+    }
+
+    /**
+     * Get the Jackson object mapper for Elide.
+     *
+     * @return object mapper.
+     */
+    default JsonApiMapper getObjectMapper() {
+        return new JsonApiMapper();
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSubscriptionSettings.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSubscriptionSettings.java
new file mode 100644
index 0000000000..61bbeee002
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/config/ElideStandaloneSubscriptionSettings.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.config;
+
+import static com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket.DEFAULT_USER_FACTORY;
+import com.yahoo.elide.Elide;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketConfigurator;
+import com.yahoo.elide.graphql.subscriptions.hooks.SubscriptionScanner;
+import com.yahoo.elide.graphql.subscriptions.websocket.SubscriptionWebSocket;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * interface for configuring the GraphQL Subscriptions in the standalone application.
+ */
+public interface ElideStandaloneSubscriptionSettings {
+
+    /**
+     * Enable support for subscriptions.
+     *
+     * @return Default: False
+     */
+    default boolean enabled() {
+        return false;
+    }
+
+    /**
+     * Enable support for subscriptions.
+     *
+     * @return Default: False
+     */
+    default boolean publishingEnabled() {
+        return enabled();
+    }
+
+    /**
+     * Websocket root path for the subscription endpoint.
+     *
+     * @return Default: /subscription
+     */
+    default String getPath() {
+        return "/subscription";
+    }
+
+    /**
+     * Websocket sends a PING immediate after receiving a SUBSCRIBE.  Only useful for testing.
+     *
+     * @return Default false.
+     * @see com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketTestClient
+     */
+    default boolean shouldSendPingOnSubscribe() {
+        return false;
+    }
+
+    /**
+     * Time allowed in milliseconds from web socket creation to successfully receiving a CONNECTION_INIT message.
+     *
+     * @return Default 5000.
+     */
+    default Integer getConnectionTimeoutMs() {
+        return 5000;
+    }
+
+    /**
+     * Maximum number of outstanding GraphQL queries per websocket.
+     *
+     * @return Default 30
+     */
+    default Integer getMaxSubscriptions() {
+        return 30;
+    }
+
+    /**
+     * Maximum message size that can be sent to the websocket.
+     *
+     * @return Default 10000
+     */
+    default Integer getMaxMessageSize() {
+        return 10000;
+    }
+
+    /**
+     * Maximum idle timeout in milliseconds with no websocket activity.
+     *
+     * @return default 300000
+     */
+    default Long getIdleTimeoutMs() {
+        return 300000L;
+    }
+
+    /**
+     * Return JMS connection factory.
+     *
+     * @return Default null.  This must be implemented if leveraging GraphQL subscriptions.
+     */
+    default ConnectionFactory getConnectionFactory() {
+        return null;
+    }
+
+    /**
+     * Return the function which converts a web socket Session into an Elide user.
+     *
+     * @return default user factory.
+     */
+    default SubscriptionWebSocket.UserFactory getUserFactory() {
+        return DEFAULT_USER_FACTORY;
+    }
+
+    /**
+     * Returns the scanner that searches for subscription annotations and binds life cycle hooks for them.
+     * @param elide The elide instance.
+     * @param connectionFactory The JMS connection factory where subscription messages should be sent.
+     * @return The scanner.
+     */
+    default SubscriptionScanner subscriptionScanner(Elide elide, ConnectionFactory connectionFactory) {
+        SubscriptionScanner scanner = SubscriptionScanner.builder()
+
+                //Things you may want to override...
+                .deliveryDelay(Message.DEFAULT_DELIVERY_DELAY)
+                .messagePriority(Message.DEFAULT_PRIORITY)
+                .timeToLive(Message.DEFAULT_TIME_TO_LIVE)
+                .deliveryMode(Message.DEFAULT_DELIVERY_MODE)
+
+                //Things you probably don't care about...
+                .scanner(elide.getScanner())
+                .dictionary(elide.getElideSettings().getDictionary())
+                .connectionFactory(connectionFactory)
+                .build();
+
+        scanner.bindLifecycleHooks();
+
+        return scanner;
+    }
+
+    /**
+     * Returns the web socket configuration for GraphQL subscriptions.
+     * @param settings Elide settings.
+     * @return Web socket configuration.
+     */
+    default ServerEndpointConfig serverEndpointConfig(
+            ElideStandaloneSettings settings
+    ) {
+        return ServerEndpointConfig.Builder
+                .create(SubscriptionWebSocket.class, getPath())
+                .configurator(SubscriptionWebSocketConfigurator.builder()
+                        .baseUrl(getPath())
+                        .sendPingOnSubscribe(shouldSendPingOnSubscribe())
+                        .connectionTimeoutMs(getConnectionTimeoutMs())
+                        .maxSubscriptions(getMaxSubscriptions())
+                        .maxMessageSize(getMaxMessageSize())
+                        .maxIdleTimeoutMs(getIdleTimeoutMs())
+                        .connectionFactory(getConnectionFactory())
+                        .userFactory(getUserFactory())
+                        .auditLogger(settings.getAuditLogger())
+                        .verboseErrors(settings.verboseErrors())
+                        .errorMapper(settings.getErrorMapper())
+                        .build())
+                .build();
+
+    }
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/CheckMappingsProvider.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/CheckMappingsProvider.java
new file mode 100644
index 0000000000..bb49a75739
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/CheckMappingsProvider.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.interfaces;
+
+import com.yahoo.elide.core.security.checks.Check;
+
+import java.util.Map;
+
+/**
+ * Provider for check mappings.
+ */
+public interface CheckMappingsProvider {
+
+    /**
+     * Get check mappings.
+     *
+     * @return Check mappings.
+     */
+    Map<String, Class<? extends Check>> getCheckMappings();
+}
diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/ElideSettingsProvider.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/ElideSettingsProvider.java
new file mode 100644
index 0000000000..f22a9e9f82
--- /dev/null
+++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/interfaces/ElideSettingsProvider.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.standalone.interfaces;
+
+import com.yahoo.elide.ElideSettings;
+
+/**
+ * Standalone ElideSettingsProvider.
+ */
+public interface ElideSettingsProvider {
+
+    /**
+     * Provider for Elide settings.
+     *
+     * @return Elide settings object.
+     */
+    ElideSettings getElideSettings();
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneConfigStoreTest.java b/elide-standalone/src/test/java/example/ElideStandaloneConfigStoreTest.java
new file mode 100644
index 0000000000..0aa6574183
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneConfigStoreTest.java
@@ -0,0 +1,721 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
+import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.links;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.equalTo;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.Injector;
+import com.yahoo.elide.core.exceptions.HttpStatus;
+import com.yahoo.elide.core.security.checks.Check;
+import com.yahoo.elide.core.security.checks.prefab.Role;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.core.utils.coerce.CoerceUtil;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.modelconfig.store.models.ConfigChecks;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneSettings;
+import com.yahoo.elide.test.graphql.GraphQLDSL;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import javax.ws.rs.core.MediaType;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneConfigStoreTest {
+    protected ElideStandalone elide;
+    protected ElideStandaloneSettings settings;
+    protected Path configRoot;
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        configRoot.toFile().delete();
+        elide.stop();
+    }
+
+    @BeforeAll
+    public void init() throws Exception {
+        configRoot = Files.createTempDirectory("test");
+        settings = new ElideStandaloneTestSettings() {
+
+            @Override
+            public EntityDictionary getEntityDictionary(ServiceLocator injector, ClassScanner scanner,
+                                                        Optional<DynamicConfiguration> dynamicConfiguration, Set<Type<?>> entitiesToExclude) {
+
+                Map<String, Class<? extends Check>> checks = new HashMap<>();
+
+                if (getAnalyticProperties().enableDynamicModelConfigAPI()) {
+                    checks.put(ConfigChecks.CAN_CREATE_CONFIG, ConfigChecks.CanCreate.class);
+                    checks.put(ConfigChecks.CAN_READ_CONFIG, ConfigChecks.CanRead.class);
+                    checks.put(ConfigChecks.CAN_DELETE_CONFIG, ConfigChecks.CanDelete.class);
+                    checks.put(ConfigChecks.CAN_UPDATE_CONFIG, ConfigChecks.CanNotUpdate.class);
+                }
+
+                EntityDictionary dictionary = new EntityDictionary(
+                        checks, //Checks
+                        new HashMap<>(), //Role Checks
+                        new Injector() {
+                            @Override
+                            public void inject(Object entity) {
+                                injector.inject(entity);
+                            }
+
+                            @Override
+                            public <T> T instantiate(Class<T> cls) {
+                                return injector.create(cls);
+                            }
+                        },
+                        CoerceUtil::lookup, //Serde Lookup
+                        entitiesToExclude,
+                        scanner);
+
+                dynamicConfiguration.map(DynamicConfiguration::getRoles).orElseGet(Collections::emptySet).forEach(role ->
+                        dictionary.addRoleCheck(role, new Role.RoleMemberCheck(role))
+                );
+
+                return dictionary;
+            }
+
+            @Override
+            public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+                return new ElideStandaloneAnalyticSettings() {
+                    @Override
+                    public boolean enableDynamicModelConfig() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableDynamicModelConfigAPI() {
+                        return true;
+                    }
+
+                    @Override
+                    public String getDynamicConfigPath() {
+                        return configRoot.toFile().getAbsolutePath();
+                    }
+
+                    @Override
+                    public boolean enableAggregationDataStore() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableMetaDataStore() {
+                        return true;
+                    }
+                };
+            }
+        };
+
+        elide = new ElideStandalone(settings);
+        elide.start(false);
+    }
+
+    /**
+     * Empty configuration load test.
+     */
+    @Test
+    public void testEmptyConfiguration() {
+        when()
+                .get("/api/v1/config?fields[config]=path,type")
+                .then()
+                .body(equalTo("{\"data\":[]}"))
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void testGraphQLNullContent() {
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", "{ type: TABLE, path: \\\"models/tables/table1.hjson\\\" }")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo("{\"errors\":[{\"message\":\"Null or empty file content for models/tables/table1.hjson\"}]}"))
+                .log().all()
+                .statusCode(200);
+    }
+
+    @Test
+    public void testTwoNamespaceCreationStatements() {
+        String query = "{ \"query\": \" mutation saveChanges {\\n  one: config(op: UPSERT, data: {id:\\\"one\\\", path: \\\"models/namespaces/oneDemoNamespaces.hjson\\\", type: NAMESPACE, content: \\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace2\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"}) {\\n    edges {\\n      node {\\n        id\\n      }\\n    }\\n  }\\n  two: config(op: UPSERT, data: {id: \\\"two\\\", path: \\\"models/namespaces/twoDemoNamespaces.hjson\\\", type: NAMESPACE, content: \\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace3\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"}) {\\n    edges {\\n      node {\\n        id\\n      }\\n    }\\n  }\\n} \" }";
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body(query)
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selections(
+                                        field(
+                                                "one",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvb25lRGVtb05hbWVzcGFjZXMuaGpzb24=")
+                                                )
+                                        ),
+                                        field(
+                                                "two",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvdHdvRGVtb05hbWVzcGFjZXMuaGpzb24=")
+                                                )
+                                        )
+                                )
+                        ).toResponse().replace(" ", "")
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "DELETE"),
+                                                        argument("ids", "[\\\"bW9kZWxzL25hbWVzcGFjZXMvb25lRGVtb05hbWVzcGFjZXMuaGpzb24=\\\", \\\"bW9kZWxzL25hbWVzcGFjZXMvdHdvRGVtb05hbWVzcGFjZXMuaGpzb24=\\\"]")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+    }
+
+    @Test
+    public void testTwoNamespaceCreateAndDelete() {
+        String hjson1 = "\\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace2\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"";
+
+        String hjson2 = "\\\"{\\\\n  namespaces:\\\\n  [\\\\n    {\\\\n      name: DemoNamespace3\\\\n      description: Namespace for Demo Purposes\\\\n      friendlyName: Demo Namespace\\\\n    }\\\\n  ]\\\\n}\\\"";
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", String.format("["
+                                                                        + "{ type: NAMESPACE, path: \\\"models/namespaces/namespace2.hjson\\\", content: %s },"
+                                                                        + "{ type: NAMESPACE, path: \\\"models/namespaces/namespace3.hjson\\\", content: %s }"
+                                                                + "]", hjson1, hjson2))
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMi5oanNvbg=="),
+                                                        field("path", "models/namespaces/namespace2.hjson")
+                                                ),
+                                                selections(
+                                                        field("id", "bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMy5oanNvbg=="),
+                                                        field("path", "models/namespaces/namespace3.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "DELETE"),
+                                                        argument("ids", "[\\\"bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMi5oanNvbg==\\\", \\\"bW9kZWxzL25hbWVzcGFjZXMvbmFtZXNwYWNlMy5oanNvbg==\\\"]")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+    }
+
+    @Test
+    public void testGraphQLCreateFetchAndDelete() {
+        String hjson = "\\\"{\\\\n"
+                + "  tables: [{\\\\n"
+                + "      name: Test\\\\n"
+                + "      table: test\\\\n"
+                + "      schema: test\\\\n"
+                + "      measures : [\\\\n"
+                + "         {\\\\n"
+                + "          name : measure\\\\n"
+                + "          type : INTEGER\\\\n"
+                + "          definition: 'MAX({{$measure}})'\\\\n"
+                + "         }\\\\n"
+                + "      ]\\\\n"
+                + "      dimensions : [\\\\n"
+                + "         {\\\\n"
+                + "           name : dimension\\\\n"
+                + "           type : TEXT\\\\n"
+                + "           definition : '{{$dimension}}'\\\\n"
+                + "         }\\\\n"
+                + "      ]\\\\n"
+                + "  }]\\\\n"
+                + "}\\\"";
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "UPSERT"),
+                                                        argument("data", String.format("{ type: TABLE, path: \\\"models/tables/table1.hjson\\\", content: %s }", hjson))
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                                        field("path", "models/tables/table1.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        selection(
+                                field("config",
+                                        argument(
+                                                argument("ids", "[\\\"bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=\\\"]")
+                                        ),
+                                        selections(
+                                                field("id"),
+                                                field("path")
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo(
+                        GraphQLDSL.document(
+                                selection(
+                                        field(
+                                                "config",
+                                                selections(
+                                                        field("id", "bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                                        field("path", "models/tables/table1.hjson")
+                                                )
+                                        )
+                                )
+                        ).toResponse()
+                ))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        mutation(
+                                selection(
+                                        field("config",
+                                                arguments(
+                                                        argument("op", "DELETE"),
+                                                        argument("ids", "[\\\"bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=\\\"]")
+                                                ),
+                                                selections(
+                                                        field("id"),
+                                                        field("path")
+                                                )
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+
+        given()
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
+                .body("{ \"query\" : \"" + GraphQLDSL.document(
+                        selection(
+                                field("config",
+                                        selections(
+                                                field("id"),
+                                                field("path")
+                                        )
+                                )
+                        )
+                ).toQuery() + "\" }")
+                .when()
+                .post("/graphql/api/v1")
+                .then()
+                .body(equalTo("{\"data\":{\"config\":{\"edges\":[]}}}"))
+                .statusCode(200);
+    }
+
+    @Test
+    public void testJsonApiCreateFetchAndDelete() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/api/v1/config")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        when()
+                .get("/api/v1/config?fields[config]=content")
+                .then()
+                .body(equalTo(data(
+                        resource(
+                                type("config"),
+                                id("bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                attributes(
+                                        attr("content", hjson)
+                                ),
+                                links(
+                                        attr("self", "https://elide.io/api/v1/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                                )
+                        )
+                ).toJSON()))
+                .statusCode(HttpStatus.SC_OK);
+
+        when()
+                .delete("/api/v1/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+
+        when()
+                .get("/api/v1/config?fields[config]=path,type")
+                .then()
+                .body(equalTo("{\"data\":[]}"))
+                .statusCode(HttpStatus.SC_OK);
+
+        when()
+                .get("/api/v1/json/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void testTemplateError() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}}) + {{$$column.args.missing}}'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/api/v1/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Failed to verify column arguments for column: measure in table: Test. Argument &#39;missing&#39; is not defined but found &#39;{{$$column.args.missing}}&#39;.\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testHackAttempt() {
+        String hjson = "#!/bin/sh ...";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "foo"),
+                                                attr("type", "UNKNOWN"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/api/v1/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Unrecognized File: foo\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testPathTraversalAttempt() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "../../../../../tmp/models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/api/v1/config")
+                .then()
+                .body(equalTo("{\"errors\":[{\"detail\":\"Parent directory traversal not allowed: ../../../../../tmp/models/tables/table1.hjson\"}]}"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testUpdatePermissionError() {
+        String hjson = "{            \n"
+                + "  tables: [{     \n"
+                + "      name: Test\n"
+                + "      table: test\n"
+                + "      schema: test\n"
+                + "      measures : [\n"
+                + "         {\n"
+                + "          name : measure\n"
+                + "          type : INTEGER\n"
+                + "          definition: 'MAX({{$measure}})'\n"
+                + "         }\n"
+                + "      ]      \n"
+                + "      dimensions : [\n"
+                + "         {\n"
+                + "           name : dimension\n"
+                + "           type : TEXT\n"
+                + "           definition : '{{$dimension}}'\n"
+                + "         }\n"
+                + "      ]\n"
+                + "  }]\n"
+                + "}";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .post("/api/v1/config")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("config"),
+                                        id("bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24="),
+                                        attributes(
+                                                attr("path", "models/tables/table1.hjson"),
+                                                attr("type", "TABLE"),
+                                                attr("content", hjson)
+                                        )
+                                )
+                        )
+                )
+                .when()
+                .patch("/api/v1/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);
+
+        when()
+                .delete("/api/v1/config/bW9kZWxzL3RhYmxlcy90YWJsZTEuaGpzb24=")
+                .then()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneDisableAggStoreTest.java b/elide-standalone/src/test/java/example/ElideStandaloneDisableAggStoreTest.java
new file mode 100644
index 0000000000..267654edd3
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneDisableAggStoreTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+/**
+ * Tests ElideStandalone starts and works.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneDisableAggStoreTest extends ElideStandaloneTest {
+
+    @Override
+    @BeforeAll
+    public void init() throws Exception {
+        elide = new ElideStandalone(new ElideStandaloneTestSettings() {
+
+            @Override
+            public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+                ElideStandaloneAnalyticSettings analyticProperties = new ElideStandaloneAnalyticSettings() {
+                    @Override
+                    public boolean enableDynamicModelConfig() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableAggregationDataStore() {
+                        return false;
+                    }
+
+                    @Override
+                    public String getDynamicConfigPath() {
+                        return "src/test/resources/configs/";
+                    }
+                };
+                return analyticProperties;
+            }
+        });
+        elide.start(false);
+    }
+
+    @Override
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/swagger/doc/test")
+                .then()
+                .statusCode(200)
+                .body("tags.name", containsInAnyOrder("post", "asyncQuery"));
+    }
+
+    @Override
+    @Test
+    public void testJsonAPIPost() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                    datum(
+                        resource(
+                            type("post"),
+                            id("1"),
+                            attributes(
+                                attr("content", "This is my first post. woot."),
+                                attr("date", "2019-01-01T00:00Z")
+                            )
+                        )
+                    )
+                )
+                .post("/api/v1/post")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+
+    @Override
+    @Test
+    public void metaDataTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/api/v1/namespace/default") //"default" namespace added by Agg Store.
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND); // Metadatastore is disabled, so not found.
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneDisableMetaDataStoreTest.java b/elide-standalone/src/test/java/example/ElideStandaloneDisableMetaDataStoreTest.java
new file mode 100644
index 0000000000..3ac65dffcc
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneDisableMetaDataStoreTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+/**
+ * Tests ElideStandalone starts and works.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneDisableMetaDataStoreTest extends ElideStandaloneTest {
+
+    @BeforeAll
+    public void init() throws Exception {
+        elide = new ElideStandalone(new ElideStandaloneTestSettings() {
+
+            @Override
+            public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+                ElideStandaloneAnalyticSettings analyticProperties = new ElideStandaloneAnalyticSettings() {
+                    @Override
+                    public boolean enableDynamicModelConfig() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableAggregationDataStore() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableMetaDataStore() {
+                        return false;
+                    }
+
+                    @Override
+                    public String getDynamicConfigPath() {
+                        return "src/test/resources/configs/";
+                    }
+                };
+                return analyticProperties;
+            }
+        });
+        elide.start(false);
+    }
+
+    @Override
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+                .get("/swagger/doc/test")
+                .then()
+                .statusCode(200)
+                .body("tags.name", containsInAnyOrder("post", "asyncQuery", "postView"));
+    }
+
+    @Override
+    @Test
+    public void metaDataTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/api/v1/namespace/default") //"default" namespace added by Agg Store.
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND); // Metadatastore is disabled, so not found.
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneExportTest.java b/elide-standalone/src/test/java/example/ElideStandaloneExportTest.java
new file mode 100644
index 0000000000..8a3f874d6f
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneExportTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneAsyncSettings;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.restassured.response.Response;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Tests ElideStandalone starts and works.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneExportTest {
+    protected ElideStandalone elide;
+
+    @BeforeAll
+    public void init() throws Exception {
+        elide = new ElideStandalone(new ElideStandaloneTestSettings() {
+
+            @Override
+            public ElideStandaloneAsyncSettings getAsyncProperties() {
+                ElideStandaloneAsyncSettings asyncProperties = new ElideStandaloneAsyncSettings() {
+                    @Override
+                    public boolean enabled() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableCleanup() {
+                        return true;
+                    }
+
+                    @Override
+                    public Integer getThreadSize() {
+                        return 5;
+                    }
+
+                    @Override
+                    public Integer getMaxRunTimeSeconds() {
+                        return 1800;
+                    }
+
+                    @Override
+                    public Integer getQueryCleanupDays() {
+                        return 3;
+                    }
+
+                    @Override
+                    public boolean enableExport() {
+                        return true;
+                    }
+                };
+                return asyncProperties;
+            }
+
+            @Override
+            public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+                ElideStandaloneAnalyticSettings analyticProperties = new ElideStandaloneAnalyticSettings() {
+                    @Override
+                    public boolean enableDynamicModelConfig() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableAggregationDataStore() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableMetaDataStore() {
+                        return true;
+                    }
+
+                    @Override
+                    public String getDefaultDialect() {
+                        return SQLDialectFactory.getDefaultDialect().getDialectType();
+                    }
+
+                    @Override
+                    public String getDynamicConfigPath() {
+                        return "src/test/resources/configs/";
+                    }
+                };
+                return analyticProperties;
+            }
+        });
+        elide.start(false);
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        elide.stop();
+    }
+
+    @Test
+    public void exportNotFound() {
+        int queryId = 1;
+        when()
+                .get("/export/" + queryId)
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                // Special Message generated by Export API
+                .body(containsString(queryId + " Not Found"));
+    }
+
+    @Test
+    public void testExportDynamicModel() throws InterruptedException {
+        // Load Test data in Post Table
+        given()
+        .contentType(JSONAPI_CONTENT_TYPE)
+        .accept(JSONAPI_CONTENT_TYPE)
+        .body(
+            datum(
+                resource(
+                    type("post"),
+                    id("1"),
+                    attributes(
+                        attr("content", "This is my first post. woot."),
+                        attr("date", "2019-01-01T00:00Z")
+                    )
+                )
+            )
+        )
+        .post("/api/v1/post")
+        .then()
+
+        .statusCode(HttpStatus.SC_CREATED);
+
+        //Create Table Export
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("tableExport"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9265d"),
+                                        attributes(
+                                                attr("query", "{\"query\":\"{postView{ edges{node{content}}}}\",\"variables\":null}"),
+                                                attr("queryType", "GRAPHQL_V1_0"),
+                                                attr("status", "QUEUED"),
+                                                attr("asyncAfterSeconds", "10"),
+                                                attr("resultType", "CSV")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/api/v1/tableExport")
+                .then()
+                .statusCode(org.apache.http.HttpStatus.SC_CREATED);
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/api/v1/tableExport/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d");
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+             //If Async Query is created and completed then validate results
+            if (outputResponse.equals("COMPLETE")) {
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9265d"))
+                        .body("data.type", equalTo("tableExport"))
+                        .body("data.attributes.queryType", equalTo("GRAPHQL_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.message", equalTo(null))
+                        .body("data.attributes.result.url",
+                                equalTo("https://elide.io" + "/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d"));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ tableExport(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9265d\\\"]) "
+                                + "{ edges { node { id queryType status resultType result "
+                                + "{ url httpStatus recordCount } } } } }\","
+                                + "\"variables\":null }")
+                        .post("/graphql/api/v1")
+                        .asString();
+                String expectedResponse = "{\"data\":{\"tableExport\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9265d\","
+                        + "\"queryType\":\"GRAPHQL_V1_0\",\"status\":\"COMPLETE\",\"resultType\":\"CSV\","
+                        + "\"result\":{\"url\":\"https://elide.io/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d\",\"httpStatus\":200,\"recordCount\":1}}}]}}}";
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+        }
+        when()
+                .get("/export/ba31ca4e-ed8f-4be0-a0f3-12088fa9265d")
+                .then()
+                .statusCode(HttpStatus.SC_OK);
+    }
+
+    // TableExport should be available in Swagger Doc
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+               .get("/swagger/doc/test")
+                .then()
+                .statusCode(200)
+                .body("tags.name", containsInAnyOrder("post", "argument", "metric",
+                        "dimension", "column", "table", "asyncQuery",
+                        "timeDimensionGrain", "timeDimension", "postView", "tableExport", "namespace", "tableSource"));
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneMetadataStoreMissingTest.java b/elide-standalone/src/test/java/example/ElideStandaloneMetadataStoreMissingTest.java
new file mode 100644
index 0000000000..677a019b9b
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneMetadataStoreMissingTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import com.yahoo.elide.core.utils.ClassScanner;
+import com.yahoo.elide.datastores.aggregation.metadata.MetaDataStore;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.modelconfig.DynamicConfiguration;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import org.eclipse.jetty.util.MultiException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Optional;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneMetadataStoreMissingTest {
+
+    private ElideStandalone elide;
+
+    @BeforeAll
+    public void init() throws Exception {
+        elide = new ElideStandalone(new ElideStandaloneTestSettings() {
+
+            @Override
+            public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+                ElideStandaloneAnalyticSettings analyticProperties = new ElideStandaloneAnalyticSettings() {
+                    @Override
+                    public boolean enableDynamicModelConfig() {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean enableAggregationDataStore() {
+                        return true;
+                    }
+
+                    @Override
+                    public String getDefaultDialect() {
+                        return SQLDialectFactory.getDefaultDialect().getDialectType();
+                    }
+
+                    @Override
+                    public String getDynamicConfigPath() {
+                        return "src/test/resources/configs/";
+                    }
+                };
+                return analyticProperties;
+            }
+
+            @Override
+            public MetaDataStore getMetaDataStore(ClassScanner scanner, Optional<DynamicConfiguration> validator) {
+                return null;
+            }
+        });
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        elide.stop();
+    }
+
+    @Test
+    public void testMetadataStoreMissing() {
+       assertThrows(MultiException.class, () -> elide.start(false));
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneSubscriptionTest.java b/elide-standalone/src/test/java/example/ElideStandaloneSubscriptionTest.java
new file mode 100644
index 0000000000..26c5843882
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneSubscriptionTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.yahoo.elide.datastores.jms.websocket.SubscriptionWebSocketTestClient;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneSubscriptionSettings;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import graphql.ExecutionResult;
+
+import java.net.URI;
+import java.util.List;
+import javax.jms.ConnectionFactory;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+/**
+ * Tests ElideStandalone starts and works.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneSubscriptionTest extends ElideStandaloneTest {
+    protected EmbeddedActiveMQ embedded;
+
+    @BeforeAll
+    public void init() throws Exception {
+        settings = new ElideStandaloneTestSettings() {
+
+            @Override
+            public ElideStandaloneSubscriptionSettings getSubscriptionProperties() {
+                return new ElideStandaloneSubscriptionSettings() {
+                    @Override
+                    public boolean enabled() {
+                        return true;
+                    }
+
+                    @Override
+                    public ConnectionFactory getConnectionFactory() {
+                        return new ActiveMQConnectionFactory("vm://0");
+                    }
+                };
+            }
+        };
+
+        elide = new ElideStandalone(settings);
+        elide.start(false);
+    }
+
+    @BeforeAll
+    public void initArtemis() throws Exception {
+        //Startup up an embedded active MQ.
+        embedded = new EmbeddedActiveMQ();
+        Configuration configuration = new ConfigurationImpl();
+        configuration.addAcceptorConfiguration("default", "vm://0");
+        configuration.setPersistenceEnabled(false);
+        configuration.setSecurityEnabled(false);
+        configuration.setJournalType(JournalType.NIO);
+
+        embedded.setConfiguration(configuration);
+        embedded.start();
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        embedded.stop();
+        elide.stop();
+    }
+
+    @Test
+    public void testSubscription() throws Exception {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+
+        SubscriptionWebSocketTestClient client = new SubscriptionWebSocketTestClient(1,
+                List.of("subscription {post(topic: ADDED) {id content}}"));
+
+        try (Session session = container.connectToServer(client, new URI("ws://localhost:" + settings.getPort() + "/subscription"))) {
+
+            //Wait for the socket to be full established.
+            client.waitOnSubscribe(10);
+
+            given()
+                    .contentType(JSONAPI_CONTENT_TYPE)
+                    .accept(JSONAPI_CONTENT_TYPE)
+                    .body(
+                            datum(
+                                    resource(
+                                            type("post"),
+                                            id("3"),
+                                            attributes(
+                                                    attr("content", "This is my first post. woot."),
+                                                    attr("date", "2019-01-01T00:00Z")
+                                            )
+                                    )
+                            )
+                    )
+                    .post("/api/v1/post")
+                    .then()
+                    .statusCode(HttpStatus.SC_CREATED);
+
+            List<ExecutionResult> results = client.waitOnClose(10);
+
+            client.sendClose();
+
+            assertEquals(1, results.size());
+            assertEquals(0, results.get(0).getErrors().size());
+        }
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneTest.java b/elide-standalone/src/test/java/example/ElideStandaloneTest.java
new file mode 100644
index 0000000000..df85b516d8
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneTest.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.links;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasKey;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import com.yahoo.elide.standalone.ElideStandalone;
+import com.yahoo.elide.standalone.config.ElideStandaloneSettings;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.restassured.response.Response;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Tests ElideStandalone starts and works.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ElideStandaloneTest {
+    protected ElideStandalone elide;
+    protected ElideStandaloneSettings settings;
+
+    @BeforeAll
+    public void init() throws Exception {
+        settings = new ElideStandaloneTestSettings();
+
+        elide = new ElideStandalone(settings);
+        elide.start(false);
+    }
+
+    @AfterAll
+    public void shutdown() throws Exception {
+        elide.stop();
+    }
+
+    @Test
+    public void testJsonAPIPost() {
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(
+                datum(
+                    resource(
+                        type("post"),
+                        id("1"),
+                        attributes(
+                            attr("content", "This is my first post. woot."),
+                            attr("date", "2019-01-01T00:00Z")
+                        )
+                    )
+                )
+            )
+            .post("/api/v1/post")
+            .then()
+            .statusCode(HttpStatus.SC_CREATED);
+
+        // Test the Dynamic Generated Analytical Model is accessible
+        given()
+            .when()
+            .get("/api/v1/postView")
+            .then()
+            .statusCode(200)
+            .body(equalTo(
+                    data(
+                            resource(
+                                    type("postView"),
+                                    id("0"),
+                                    attributes(
+                                            attr("content", "This is my first post. woot.")
+                                    ),
+                                    links(
+                                            attr("self", "https://elide.io/api/v1/postView/0")
+                                    )
+                            )
+                    ).toJSON()
+                )
+            );
+    }
+
+    @Test
+    public void testVersionedJsonAPIPost() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .header("ApiVersion", "1.0")
+                .body(
+                        datum(
+                                resource(
+                                        type("post"),
+                                        id("2"),
+                                        attributes(
+                                                attr("text", "This is my first post. woot."),
+                                                attr("date", "2019-01-01T00:00Z")
+                                        )
+                                )
+                        )
+                )
+                .post("/api/v1/post")
+                .then()
+                .statusCode(HttpStatus.SC_CREATED);
+    }
+
+    @Test
+    public void testForbiddenJsonAPIPost() {
+        given()
+            .contentType(JSONAPI_CONTENT_TYPE)
+            .accept(JSONAPI_CONTENT_TYPE)
+            .body(
+                datum(
+                    resource(
+                        type("post"),
+                        id("2"),
+                        attributes(
+                            attr("content", "This is my first post. woot."),
+                            attr("date", "2019-01-01T00:00Z"),
+                            attr("abusiveContent", true)
+                        )
+                    )
+                )
+            )
+            .post("/api/v1/post")
+            .then()
+            .statusCode(HttpStatus.SC_FORBIDDEN);
+    }
+
+    @Test
+    public void testMetricsServlet() throws Exception {
+        given()
+                .when()
+                .get("/stats/metrics")
+                .then()
+                .statusCode(200)
+                .body("meters", hasKey("com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok"));
+    }
+
+    @Test
+    public void testHealthCheckServlet() throws Exception {
+            given()
+                .when()
+                .get("/stats/healthcheck")
+                .then()
+                .statusCode(501); //Returns 'Not Implemented' if there are no Health Checks Registered
+    }
+
+    @Test
+    public void testSwaggerEndpoint() throws Exception {
+        given()
+                .when()
+                .get("/swagger/doc/test")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    public void swaggerDocumentTest() {
+        when()
+               .get("/swagger/doc/test")
+                .then()
+                .statusCode(200)
+                .body("tags.name", containsInAnyOrder("post", "argument", "metric",
+                        "dimension", "column", "table", "asyncQuery",
+                        "timeDimensionGrain", "timeDimension", "postView", "namespace", "tableSource"));
+    }
+
+    @Test
+    public void testAsyncApiEndpoint() throws InterruptedException {
+        //Create Async Request
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .body(
+                        data(
+                                resource(
+                                        type("asyncQuery"),
+                                        id("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"),
+                                        attributes(
+                                                attr("query", "/post"),
+                                                attr("queryType", "JSONAPI_V1_0"),
+                                                attr("status", "QUEUED")
+                                        )
+                                )
+                        ).toJSON())
+                .when()
+                .post("/api/v1/asyncQuery").asString();
+
+        int i = 0;
+        while (i < 1000) {
+            Thread.sleep(10);
+            Response response = given()
+                    .accept("application/vnd.api+json")
+                    .get("/api/v1/asyncQuery/ba31ca4e-ed8f-4be0-a0f3-12088fa9263d");
+
+            String outputResponse = response.jsonPath().getString("data.attributes.status");
+
+            // If Async Query is created and completed
+            if (outputResponse.equals("COMPLETE")) {
+
+                // Validate AsyncQuery Response
+                response
+                        .then()
+                        .statusCode(com.yahoo.elide.core.exceptions.HttpStatus.SC_OK)
+                        .body("data.id", equalTo("ba31ca4e-ed8f-4be0-a0f3-12088fa9263d"))
+                        .body("data.type", equalTo("asyncQuery"))
+                        .body("data.attributes.queryType", equalTo("JSONAPI_V1_0"))
+                        .body("data.attributes.status", equalTo("COMPLETE"))
+                        .body("data.attributes.result.contentLength", notNullValue())
+                        .body("data.attributes.result.responseBody", equalTo(
+                            data(
+                                resource(
+                                    type("post"),
+                                    id("2"),
+                                    attributes(
+                                        attr("abusiveContent", false),
+                                        attr("content", "This is my first post. woot."),
+                                        attr("date", "2019-01-01T00:00Z")
+                                    ),
+                                    links(
+                                        attr("self", "https://elide.io/api/v1/post/2")
+                                    )
+                                )
+                            ).toJSON()
+                        ));
+
+                // Validate GraphQL Response
+                String responseGraphQL = given()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .body("{\"query\":\"{ asyncQuery(ids: [\\\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\\\"]) "
+                                + "{ edges { node { id queryType status result "
+                                + "{ responseBody httpStatus  contentLength } } } } }\","
+                                + "\"variables\":null}")
+                        .post("/graphql/api/v1/")
+                        .asString();
+
+                String expectedResponse = "{\"data\":{\"asyncQuery\":{\"edges\":[{\"node\":{\"id\":\"ba31ca4e-ed8f-4be0-a0f3-12088fa9263d\",\"queryType\":\"JSONAPI_V1_0\",\"status\":\"COMPLETE\",\"result\":{\"responseBody\":\"{\\\"data\\\":[{\\\"type\\\":\\\"post\\\",\\\"id\\\":\\\"2\\\",\\\"attributes\\\":{\\\"abusiveContent\\\":false,\\\"content\\\":\\\"This is my first post. woot.\\\",\\\"date\\\":\\\"2019-01-01T00:00Z\\\"},\\\"links\\\":{\\\"self\\\":\\\"https://elide.io/api/v1/post/2\\\"}}]}\",\"httpStatus\":200,\"contentLength\":191}}}]}}}";
+                assertEquals(expectedResponse, responseGraphQL);
+                break;
+            }
+            assertEquals("PROCESSING", outputResponse, "Async Query has failed.");
+            i++;
+            assertNotEquals(1000, i, "Async Query not completed.");
+        }
+    }
+
+    // Resource disabled by default.
+    @Test
+    public void exportResourceDisabledTest() {
+        // elide-standalone returns different error message when export resource is not initialized
+        // vs when it could not find a matching id to export.
+        // Jetty seems to have a different behavior than spring-framework for non-existent resources.
+        // Post call to a non-existent resource returns 405 in jetty, spring-framework returns 404.
+        // Spring-framework behaved similar to Jetty,
+        // but was changed with https://github.com/spring-projects/spring-boot/issues/4876.
+        int queryId = 1;
+        when()
+                .get("/export/" + queryId)
+                .then()
+                .statusCode(HttpStatus.SC_NOT_FOUND)
+                .body(containsString(" Not Found"))
+                .body(not(containsString(queryId + " Not Found")));
+    }
+
+    @Test
+    public void metaDataTest() {
+        given()
+                .accept("application/vnd.api+json")
+                .get("/api/v1/namespace/default") //"default" namespace added by Agg Store
+                .then()
+                .statusCode(HttpStatus.SC_OK)
+                .body("data.attributes.name", equalTo("default"))
+                .body("data.attributes.friendlyName", equalTo("default"));
+    }
+
+    @Test
+    public void testVerboseErrors() {
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE)
+                .accept(JSONAPI_CONTENT_TYPE)
+                .body(
+                        datum(
+                                resource(
+                                        type("post"),
+                                        id("1"),
+                                        attributes(
+                                                attr("content", "This is my first post. woot."),
+                                                attr("date", "Invalid")
+                                        )
+                                )
+                        )
+                )
+                .post("/api/v1/post")
+                .then()
+                .body("errors.detail[0]", equalTo("Invalid value: Invalid\nDate strings must be formatted as yyyy-MM-dd&#39;T&#39;HH:mm&#39;Z&#39;"))
+                .statusCode(HttpStatus.SC_BAD_REQUEST);
+    }
+}
diff --git a/elide-standalone/src/test/java/example/ElideStandaloneTestSettings.java b/elide-standalone/src/test/java/example/ElideStandaloneTestSettings.java
new file mode 100644
index 0000000000..d23ab6c2b2
--- /dev/null
+++ b/elide-standalone/src/test/java/example/ElideStandaloneTestSettings.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example;
+
+import com.yahoo.elide.ElideSettings;
+import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.datastore.DataStore;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.datastores.aggregation.queryengines.sql.dialects.SQLDialectFactory;
+import com.yahoo.elide.jsonapi.JsonApiMapper;
+import com.yahoo.elide.jsonapi.links.DefaultJSONApiLinks;
+import com.yahoo.elide.standalone.config.ElideStandaloneAnalyticSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneAsyncSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneSettings;
+import com.yahoo.elide.standalone.config.ElideStandaloneSubscriptionSettings;
+import example.models.Post;
+
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+
+import java.util.Properties;
+import java.util.TimeZone;
+import javax.jms.ConnectionFactory;
+
+/**
+ * Settings class extending ElideStandaloneSettings for tests.
+ */
+public class ElideStandaloneTestSettings implements ElideStandaloneSettings {
+
+    @Override
+    public ElideSettings getElideSettings(EntityDictionary dictionary, DataStore dataStore, JsonApiMapper mapper) {
+        String jsonApiBaseUrl = getBaseUrl()
+                + getJsonApiPathSpec().replaceAll("/\\*", "")
+                + "/";
+
+        ElideSettingsBuilder builder = new ElideSettingsBuilder(dataStore)
+                .withEntityDictionary(dictionary)
+                .withErrorMapper(getErrorMapper())
+                .withJoinFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withSubqueryFilterDialect(RSQLFilterDialect.builder().dictionary(dictionary).build())
+                .withJSONApiLinks(new DefaultJSONApiLinks(jsonApiBaseUrl))
+                .withBaseUrl("https://elide.io")
+                .withAuditLogger(getAuditLogger())
+                .withVerboseErrors()
+                .withJsonApiMapper(mapper)
+                .withJsonApiPath(getJsonApiPathSpec().replaceAll("/\\*", ""))
+                .withGraphQLApiPath(getGraphQLApiPathSpec().replaceAll("/\\*", ""))
+                .withExportApiPath(getAsyncProperties().getExportApiPathSpec().replaceAll("/\\*", ""));
+
+        if (enableISO8601Dates()) {
+            builder = builder.withISO8601Dates("yyyy-MM-dd'T'HH:mm'Z'", TimeZone.getTimeZone("UTC"));
+        }
+
+        return builder.build();
+    }
+
+    @Override
+    public String getBaseUrl() {
+        return "https://elide.io";
+    }
+
+    @Override
+    public Properties getDatabaseProperties() {
+        Properties options = new Properties();
+
+        options.put("hibernate.show_sql", "true");
+        options.put("hibernate.hbm2ddl.auto", "create");
+        options.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+        options.put("hibernate.current_session_context_class", "thread");
+        options.put("hibernate.jdbc.use_scrollable_resultset", "true");
+
+        options.put("javax.persistence.jdbc.driver", "org.h2.Driver");
+        options.put("javax.persistence.jdbc.url", "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;");
+        options.put("javax.persistence.jdbc.user", "sa");
+        options.put("javax.persistence.jdbc.password", "");
+        return options;
+    }
+
+    @Override
+    public String getModelPackageName() {
+        return Post.class.getPackage().getName();
+    }
+
+    @Override
+    public boolean enableSwagger() {
+        return true;
+    }
+
+    @Override
+    public boolean enableGraphQL() {
+        return true;
+    }
+
+    @Override
+    public boolean enableJSONAPI() {
+        return true;
+    }
+
+    @Override
+    public ElideStandaloneAsyncSettings getAsyncProperties() {
+        ElideStandaloneAsyncSettings asyncProperties = new ElideStandaloneAsyncSettings() {
+            @Override
+            public boolean enabled() {
+                return true;
+            }
+
+            @Override
+            public boolean enableCleanup() {
+                return true;
+            }
+
+            @Override
+            public Integer getThreadSize() {
+                return 5;
+            }
+
+            @Override
+            public Integer getMaxRunTimeSeconds() {
+                return 1800;
+            }
+
+            @Override
+            public Integer getQueryCleanupDays() {
+                return 3;
+            }
+
+            @Override
+            public boolean enableExport() {
+                return false;
+            }
+        };
+        return asyncProperties;
+    }
+
+    @Override
+    public ElideStandaloneAnalyticSettings getAnalyticProperties() {
+        ElideStandaloneAnalyticSettings analyticProperties = new ElideStandaloneAnalyticSettings() {
+            @Override
+            public boolean enableDynamicModelConfig() {
+                return true;
+            }
+
+            @Override
+            public boolean enableAggregationDataStore() {
+                return true;
+            }
+
+            @Override
+            public boolean enableMetaDataStore() {
+                return true;
+            }
+
+            @Override
+            public String getDefaultDialect() {
+                return SQLDialectFactory.getDefaultDialect().getDialectType();
+            }
+
+            @Override
+            public String getDynamicConfigPath() {
+                return "src/test/resources/configs/";
+            }
+        };
+        return analyticProperties;
+    }
+
+    @Override
+    public ElideStandaloneSubscriptionSettings getSubscriptionProperties() {
+        return new ElideStandaloneSubscriptionSettings() {
+            @Override
+            public boolean enabled() {
+                return false;
+            }
+
+            @Override
+            public boolean shouldSendPingOnSubscribe() {
+                return true;
+            }
+
+            @Override
+            public ConnectionFactory getConnectionFactory() {
+                return new ActiveMQConnectionFactory("vm://0");
+            }
+        };
+    }
+}
diff --git a/elide-standalone/src/test/java/example/checks/AdminCheck.java b/elide-standalone/src/test/java/example/checks/AdminCheck.java
new file mode 100644
index 0000000000..ccb769a44d
--- /dev/null
+++ b/elide-standalone/src/test/java/example/checks/AdminCheck.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.checks;
+
+import com.yahoo.elide.annotation.SecurityCheck;
+import com.yahoo.elide.core.security.RequestScope;
+import com.yahoo.elide.core.security.checks.OperationCheck;
+
+import java.util.Optional;
+
+@SecurityCheck(AdminCheck.USER_IS_ADMIN)
+public class AdminCheck extends OperationCheck {
+
+    public static final String USER_IS_ADMIN = "User is Admin";
+
+    @Override
+    public boolean ok(Object object, RequestScope requestScope, Optional optional) {
+
+        //There are no admins...
+        return false;
+    }
+}
diff --git a/elide-standalone/src/test/java/example/models/Post.java b/elide-standalone/src/test/java/example/models/Post.java
new file mode 100644
index 0000000000..fa3252f414
--- /dev/null
+++ b/elide-standalone/src/test/java/example/models/Post.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.graphql.subscriptions.annotations.Subscription;
+import com.yahoo.elide.graphql.subscriptions.annotations.SubscriptionField;
+import example.checks.AdminCheck;
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Include
+@Data
+@Subscription
+public class Post {
+    @Id
+    private long id;
+
+    @Column(nullable = false)
+    @SubscriptionField
+    private String content;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @SubscriptionField
+    private Date date;
+
+    @CreatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    @UpdatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    private boolean abusiveContent;
+}
diff --git a/elide-standalone/src/test/java/example/models/v2/PostV2.java b/elide-standalone/src/test/java/example/models/v2/PostV2.java
new file mode 100644
index 0000000000..a93a62f3a8
--- /dev/null
+++ b/elide-standalone/src/test/java/example/models/v2/PostV2.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package example.models.v2;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.UpdatePermission;
+import example.checks.AdminCheck;
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Include(name = "post")
+@Data
+@Table(name = "Post")
+public class PostV2 {
+    @Id
+    private long id;
+
+    @Column(nullable = false, name = "content")
+    private String text;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date date;
+
+    @CreatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    @UpdatePermission(expression = AdminCheck.USER_IS_ADMIN)
+    private boolean abusiveContent;
+}
diff --git a/elide-standalone/src/test/java/example/models/v2/package-info.java b/elide-standalone/src/test/java/example/models/v2/package-info.java
new file mode 100644
index 0000000000..bed0597366
--- /dev/null
+++ b/elide-standalone/src/test/java/example/models/v2/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+@ApiVersion(version = "1.0")
+package example.models.v2;
+
+import com.yahoo.elide.annotation.ApiVersion;
diff --git a/elide-standalone/src/test/resources/configs/models/tables/PostView.hjson b/elide-standalone/src/test/resources/configs/models/tables/PostView.hjson
new file mode 100644
index 0000000000..b4d204945a
--- /dev/null
+++ b/elide-standalone/src/test/resources/configs/models/tables/PostView.hjson
@@ -0,0 +1,19 @@
+{
+    tables: [{
+        name: postView
+        table: Post
+        description:
+        '''
+        A long description
+        '''
+        cardinality : large
+        readAccess : Prefab.Role.All
+        dimensions : [
+            {
+                name : content
+                type : TEXT
+                definition : '{{$content}}'
+            }
+        ]
+    }]
+}
diff --git a/elide-standalone/src/test/resources/logback.xml b/elide-standalone/src/test/resources/logback.xml
new file mode 100644
index 0000000000..38c1b57bd6
--- /dev/null
+++ b/elide-standalone/src/test/resources/logback.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2020, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter
+      class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>%msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/elide-swagger/pom.xml b/elide-swagger/pom.xml
new file mode 100644
index 0000000000..2da8f95de6
--- /dev/null
+++ b/elide-swagger/pom.xml
@@ -0,0 +1,131 @@
+<!--
+  ~ Copyright 2016, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-swagger</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Swagger</name>
+    <description>Swagger Support for Elide</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <artifactId>elide-parent-pom</artifactId>
+        <groupId>com.yahoo.elide</groupId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+    	    <artifactId>elide-core</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>com.yahoo.elide</groupId>
+    	    <artifactId>elide-integration-tests</artifactId>
+            <version>6.1.4-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+       </dependency>
+       <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>1.6.5</version>
+       </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+	    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+   	    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+	    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiModelResolver.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiModelResolver.java
new file mode 100644
index 0000000000..5f1c6a2d7b
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiModelResolver.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright 2021, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.swagger.model.Resource;
+import com.yahoo.elide.swagger.property.Relationship;
+import com.fasterxml.jackson.databind.type.SimpleType;
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.converter.ModelConverter;
+import io.swagger.converter.ModelConverterContext;
+import io.swagger.jackson.ModelResolver;
+import io.swagger.models.Model;
+import io.swagger.models.properties.Property;
+import io.swagger.util.Json;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Swagger ModelResolvers map POJO classes to Swagger example.models.
+ * This resolver maps the POJO to a JSON-API Resource.
+ */
+public class JsonApiModelResolver extends ModelResolver {
+    private final EntityDictionary dictionary;
+
+    public JsonApiModelResolver(EntityDictionary dictionary) {
+        super(Json.mapper());
+        this.dictionary = dictionary;
+    }
+
+    @Override
+    public Model resolve(java.lang.reflect.Type type, ModelConverterContext context, Iterator<ModelConverter> next) {
+
+        if (!(type instanceof Class || type instanceof SimpleType || type instanceof Type)) {
+            return super.resolve(type, context, next);
+        }
+
+        Type<?> clazzType = null;
+
+        /*
+         * If an Elide entity is an attribute somewhere in a model, the ModelResolver will
+         * end up wrapping this as a SimpleType (rather than trying to resolve the entity class directly).
+         */
+        if (type instanceof SimpleType) {
+            type = ((SimpleType) type).getRawClass();
+            clazzType = ClassType.of((Class<?>) type);
+        } else if (type instanceof Type) {
+            clazzType = (Type<?>) type;
+        } else if (type instanceof Class) {
+            clazzType = ClassType.of((Class<?>) type);
+        }
+
+        /* Not an entity managed by Elide, let Swagger convert it */
+        String typeAlias;
+        try {
+            typeAlias = dictionary.getJsonAliasFor(clazzType);
+        } catch (IllegalArgumentException e) {
+            return super.resolve(type, context, next);
+        }
+
+        Resource entitySchema = new Resource();
+        entitySchema.description(getModelDescription(clazzType));
+        entitySchema.setSecurityDescription(getClassPermissions(clazzType));
+
+        /* Populate the attributes */
+        List<String> attributeNames = dictionary.getAttributes(clazzType);
+        for (String attributeName : attributeNames) {
+            Type<?> attributeType = dictionary.getType(clazzType, attributeName);
+
+            Property attribute = processAttribute(clazzType, attributeName, attributeType,
+                            context, next);
+            entitySchema.addAttribute(attributeName, attribute);
+        }
+
+        /* Populate the relationships */
+        List<String> relationshipNames = dictionary.getRelationships(clazzType);
+        for (String relationshipName : relationshipNames) {
+
+            Type<?> relationshipType = dictionary.getParameterizedType(clazzType, relationshipName);
+
+            Relationship relationship = processRelationship(clazzType, relationshipName, relationshipType);
+
+            if (relationship != null) {
+                entitySchema.addRelationship(relationshipName, relationship);
+            }
+
+        }
+
+        entitySchema.name(typeAlias);
+        return entitySchema;
+    }
+
+    private Property processAttribute(Type<?> clazzType, String attributeName, Type<?> attributeType,
+        ModelConverterContext context, Iterator<ModelConverter> next) {
+
+        Preconditions.checkState(attributeType instanceof ClassType);
+        Property attribute = super.resolveProperty(((ClassType) attributeType).getCls(), context, null, next);
+
+        String permissions = getFieldPermissions(clazzType, attributeName);
+        String description = getFieldDescription(clazzType, attributeName);
+
+        attribute.setDescription(StringUtils.defaultIfEmpty(joinNonEmpty("\n", description, permissions), null));
+        attribute.setExample((Object) StringUtils.defaultIfEmpty(getFieldExample(clazzType, attributeName), null));
+        attribute.setReadOnly(getFieldReadOnly(clazzType, attributeName));
+        attribute.setRequired(getFieldRequired(clazzType, attributeName));
+
+        return attribute;
+    }
+
+    private Relationship processRelationship(Type<?> clazz, String relationshipName, Type<?> relationshipClazz) {
+        Relationship relationship = null;
+        try {
+            relationship = new Relationship(dictionary.getJsonAliasFor(relationshipClazz));
+
+        /* Skip the relationship if it is not bound in the dictionary */
+        } catch (IllegalArgumentException e) {
+            return relationship;
+        }
+
+        String description = getFieldDescription(clazz, relationshipName);
+        String permissions = getFieldPermissions(clazz, relationshipName);
+
+        relationship.setDescription(StringUtils.defaultIfEmpty(joinNonEmpty("\n", description, permissions), null));
+        relationship.setExample((Object) StringUtils.defaultIfEmpty(getFieldExample(clazz, relationshipName), null));
+        relationship.setReadOnly(getFieldReadOnly(clazz, relationshipName));
+        relationship.setRequired(getFieldRequired(clazz, relationshipName));
+
+        return relationship;
+    }
+
+    private ApiModel getApiModel(Type<?> clazz) {
+        return dictionary.getAnnotation(clazz, ApiModel.class);
+    }
+
+    private String getModelDescription(Type<?> clazz) {
+        ApiModel model = getApiModel(clazz);
+        if (model == null) {
+
+            String description = EntityDictionary.getEntityDescription(clazz);
+
+            if (StringUtils.isEmpty(description)) {
+                return null;
+            }
+
+            return description;
+        }
+        return model.description();
+    }
+
+    private ApiModelProperty getApiModelProperty(Type<?> clazz, String fieldName) {
+        return dictionary.getAttributeOrRelationAnnotation(clazz, ApiModelProperty.class, fieldName);
+    }
+
+    private boolean getFieldRequired(Type<?> clazz, String fieldName) {
+        ApiModelProperty property = getApiModelProperty(clazz, fieldName);
+        return property != null && property.required();
+    }
+
+    private boolean getFieldReadOnly(Type<?> clazz, String fieldName) {
+        ApiModelProperty property = getApiModelProperty(clazz, fieldName);
+        return property != null && property.readOnly();
+    }
+
+    private String getFieldExample(Type<?> clazz, String fieldName) {
+        ApiModelProperty property = getApiModelProperty(clazz, fieldName);
+        return property == null ? "" : property.example();
+    }
+
+    private String getFieldDescription(Type<?> clazz, String fieldName) {
+        ApiModelProperty property = getApiModelProperty(clazz, fieldName);
+        return property == null ? "" : property.value();
+    }
+
+    /**
+     * Get the class-level permission annotation value.
+     *
+     * @param clazz the entity class
+     * @return the create and delete permissions for the entity class.
+     */
+    protected String getClassPermissions(Type<?> clazz) {
+        String createPermissions = getCreatePermission(clazz);
+        String deletePermissions = getDeletePermission(clazz);
+
+        createPermissions = (createPermissions == null) ? "" : "Create Permissions : (" + createPermissions + ")";
+        deletePermissions = (deletePermissions == null) ? "" : "Delete Permissions : (" + deletePermissions + ")";
+        return joinNonEmpty("\n", createPermissions, deletePermissions);
+    }
+
+    private String joinNonEmpty(String delimiter, String... elements) {
+        return Arrays.stream(elements).filter(StringUtils::isNotBlank)
+            .collect(Collectors.joining(delimiter));
+    }
+
+    /**
+     * Get the field level permission annotation value.
+     *
+     * @param clazz the entity class
+     * @param fieldName the field
+     * @return read and update permissions for a field.
+     */
+    protected String getFieldPermissions(Type<?> clazz, String fieldName) {
+        String readPermissions = getReadPermission(clazz, fieldName);
+        String updatePermissions = getUpdatePermission(clazz, fieldName);
+
+        readPermissions = (readPermissions == null) ? "" : "Read Permissions : (" + readPermissions + ")";
+        updatePermissions = (updatePermissions == null) ? "" : "Update Permissions : (" + updatePermissions + ")";
+        return joinNonEmpty("\n", readPermissions, updatePermissions);
+    }
+
+    /**
+     * Get the calculated {@link ReadPermission} value for the field.
+     *
+     * @param clazz the entity class
+     * @param fieldName the field
+     * @return the read permissions for a field
+     */
+    protected String getReadPermission(Type<?> clazz, String fieldName) {
+        ReadPermission classPermission = dictionary.getAnnotation(clazz, ReadPermission.class);
+        ReadPermission fieldPermission = dictionary.getAttributeOrRelationAnnotation(clazz, ReadPermission.class,
+                fieldName);
+
+        if (fieldPermission != null) {
+            return fieldPermission.expression();
+        }
+        if (classPermission != null) {
+            return classPermission.expression();
+        }
+        return null;
+    }
+
+    /**
+     * Get the calculated {@link UpdatePermission} value for the field.
+     *
+     * @param clazz the entity class
+     * @param fieldName the field
+     * @return the update permissions for a field
+     */
+    protected String getUpdatePermission(Type<?> clazz, String fieldName) {
+        UpdatePermission classPermission = dictionary.getAnnotation(clazz, UpdatePermission.class);
+        UpdatePermission fieldPermission = dictionary.getAttributeOrRelationAnnotation(clazz, UpdatePermission.class,
+                fieldName);
+
+        if (fieldPermission != null) {
+            return fieldPermission.expression();
+        }
+        if (classPermission != null) {
+            return classPermission.expression();
+        }
+        return null;
+    }
+
+    /**
+     * Get the calculated {@link CreatePermission} value for the field.
+     *
+     * @param clazz the entity class
+     * @return the create permissions for an entity
+     */
+    protected String getCreatePermission(Type<?> clazz) {
+        CreatePermission classPermission = dictionary.getAnnotation(clazz, CreatePermission.class);
+
+        if (classPermission != null) {
+            return classPermission.expression();
+        }
+        return null;
+    }
+
+    /**
+     * Get the calculated {@link DeletePermission} value for the field.
+     *
+     * @param clazz the entity class
+     * @return the delete permissions for an entity
+     */
+    protected String getDeletePermission(Type<?> clazz) {
+        DeletePermission classPermission = dictionary.getAnnotation(clazz, DeletePermission.class);
+
+        if (classPermission != null) {
+            return classPermission.expression();
+        }
+        return null;
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiOperation.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiOperation.java
new file mode 100644
index 0000000000..7030976f02
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/JsonApiOperation.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import static com.yahoo.elide.Elide.JSONAPI_CONTENT_TYPE;
+import io.swagger.models.Operation;
+
+/**
+ * Operation that consumes and produces JSON API mime type.
+ */
+public class JsonApiOperation extends Operation {
+    public static final String JSON_API_MIME = JSONAPI_CONTENT_TYPE;
+
+    public JsonApiOperation() {
+        super();
+        consumes(JSON_API_MIME);
+        produces(JSON_API_MIME);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/SwaggerBuilder.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/SwaggerBuilder.java
new file mode 100644
index 0000000000..5c611c286f
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/SwaggerBuilder.java
@@ -0,0 +1,886 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.core.dictionary.RelationshipType;
+import com.yahoo.elide.core.filter.Operator;
+import com.yahoo.elide.core.type.ClassType;
+import com.yahoo.elide.core.type.Type;
+import com.yahoo.elide.swagger.model.Data;
+import com.yahoo.elide.swagger.model.Datum;
+import com.yahoo.elide.swagger.property.Relationship;
+import com.google.common.collect.Sets;
+import io.swagger.converter.ModelConverter;
+import io.swagger.converter.ModelConverterContextImpl;
+import io.swagger.converter.ModelConverters;
+import io.swagger.models.Info;
+import io.swagger.models.Model;
+import io.swagger.models.Path;
+import io.swagger.models.Response;
+import io.swagger.models.Swagger;
+import io.swagger.models.Tag;
+import io.swagger.models.parameters.BodyParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.parameters.PathParameter;
+import io.swagger.models.parameters.QueryParameter;
+import io.swagger.models.properties.StringProperty;
+import io.swagger.util.Json;
+import lombok.Getter;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
+import java.util.Stack;
+import java.util.stream.Collectors;
+
+/**
+ * Builds a 'Swagger' object from Swagger-Core by walking the static Elide entity metadata contained in the
+ * 'EntityDictionary'.  The 'Swagger' object can be used to generate a Swagger document.
+ */
+public class SwaggerBuilder {
+    protected EntityDictionary dictionary;
+    protected Set<Type<?>> rootClasses;
+    protected Set<Type<?>> allClasses;
+    protected Swagger swagger;
+    protected Map<Integer, Response> globalResponses;
+    protected Set<Parameter> globalParams;
+    protected Set<Operator> filterOperators;
+    protected boolean supportLegacyDialect;
+    protected boolean supportRSQLDialect;
+
+    public static final Response UNAUTHORIZED_RESPONSE = new Response().description("Unauthorized");
+    public static final Response FORBIDDEN_RESPONSE = new Response().description("Forbidden");
+    public static final Response NOT_FOUND_RESPONSE = new Response().description("Not Found");
+    public static final Response REQUEST_TIMEOUT_RESPONSE = new Response().description("Request Timeout");
+    public static final Response TOO_MANY_REQUESTS_RESPONSE = new Response().description("Too Many Requests");
+
+    /**
+     * Metadata for constructing URLs and Swagger 'Path' objects.
+     */
+    public class PathMetaData {
+
+        /**
+         * All prior nodes in the path to the root entity.
+         */
+        private Stack<PathMetaData> lineage;
+
+        /**
+         * Either the name of the root collection or the relationship.
+         */
+        @Getter
+        private String name;
+
+        /**
+         * Either the type of the root collection of the relationship.
+         */
+        @Getter
+        private Type<?> type;
+
+        /**
+         * The unique identifying instance URL for the path.
+         */
+        @Getter
+        private String url;
+
+        /**
+         * Constructs a PathMetaData for a 'root' entity.
+         * @param type the 'root' entity type of the first segment of the URL.
+         */
+        public PathMetaData(Type<?> type) {
+            this(new Stack<>(), dictionary.getJsonAliasFor(type), type);
+        }
+
+
+        /**
+         * Required argument constructor.
+         * @param lineage The lineage of prior path elements.
+         * @param name The relationship of the path element.
+         * @param type The type associated with the relationship.
+         */
+        public PathMetaData(Stack<PathMetaData> lineage, String name, Type<?> type) {
+            this.lineage = lineage;
+            this.type = type;
+            this.name = name;
+            this.url = constructInstanceUrl();
+        }
+
+        /**
+         * Returns the root type (first collection) of this path.
+         * @return The class that represents the root collection of the path.
+         */
+        public Type<?> getRootType() {
+            if (lineage.isEmpty()) {
+                return type;
+            }
+
+            return lineage.elementAt(0).type;
+        }
+
+        /**
+         * Returns a URL that represents the collection.
+         * @return Something like '/book/{bookId}/authors' or '/publisher'
+         */
+        public String getCollectionUrl() {
+            if (lineage.isEmpty()) {
+                return "/" + name;
+            }
+            return lineage.peek().getUrl() + "/" + name;
+        }
+
+        /**
+         * Constructs a URL that returns an instance of the entity.
+         * @return Something like '/book/{bookId}'
+         */
+        private String constructInstanceUrl() {
+            String typeName = dictionary.getJsonAliasFor(type);
+            return getCollectionUrl() + "/{" + typeName + "Id}";
+        }
+
+        /**
+         * Constructs a URL that returns a relationship collection.
+         * @return Something like '/book/{bookId}/relationships/authors'
+         * @throws IllegalStateException for errors.
+         */
+        public String getRelationshipUrl() {
+            if (lineage.isEmpty()) {
+                throw new IllegalStateException("Root collections don't have relationships");
+            }
+
+            PathMetaData prior = lineage.peek();
+            String baseUrl = prior.getUrl();
+
+            return baseUrl + "/relationships/" + name;
+        }
+
+        @Override
+        public String toString() {
+            return getUrl();
+        }
+
+        /**
+         * All Paths are 'tagged' in swagger with the final entity type name in the path.
+         * This allows swaggerUI to group the paths by entities.
+         * @return the entity type name
+         */
+        private String getTag() {
+            return dictionary.getJsonAliasFor(type);
+        }
+
+        /**
+         * Returns the path parameter for the instance URL.
+         * @return the swagger PathParameter for this particular path segment.
+         */
+        private Parameter getPathParameter() {
+            String typeName = dictionary.getJsonAliasFor(type);
+
+            Parameter param = new PathParameter()
+                    .name(typeName + "Id")
+                    .description(typeName + " Identifier")
+                    .property(new StringProperty());
+
+            return param;
+        }
+
+        /**
+         * Returns the swagger path for a relationship URL.
+         * @return the Swagger 'Path' for a relationship URL (/books/{bookId}/relationships/author).
+         * @throws IllegalStateException for errors.
+         */
+        public Path getRelationshipPath() {
+            if (lineage.isEmpty()) {
+                throw new IllegalStateException("Root collections don't have relationships");
+            }
+
+            Path path = new Path();
+
+            /* The path parameter apply for all operations */
+            lineage.stream().forEach(item ->
+                    path.addParameter(item.getPathParameter()));
+
+            String typeName = dictionary.getJsonAliasFor(type);
+
+            Response okSingularResponse = new Response()
+                    .description("Successful response")
+                    .schema(new com.yahoo.elide.swagger.property.Datum(
+                            new Relationship(typeName)));
+
+            Response okPluralResponse = new Response()
+                    .description("Successful response")
+                    .schema(new com.yahoo.elide.swagger.property.Data(
+                            new Relationship(typeName)));
+
+            Response okEmptyResponse = new Response()
+                    .description("Successful response");
+
+            Type<?> parentClass = lineage.peek().getType();
+            RelationshipType relationshipType = dictionary.getRelationshipType(parentClass, name);
+
+            if (relationshipType.isToMany()) {
+                path.get(new JsonApiOperation()
+                        .description("Returns the relationship identifiers for " + name)
+                        .tag(getTag())
+                        .response(200, okPluralResponse));
+
+                path.patch(new JsonApiOperation()
+                        .description("Replaces the relationship " + name)
+                        .tag(getTag())
+                        .response(204, okEmptyResponse)
+                        .parameter(new BodyParameter()
+                                .schema(new Data(new Relationship(typeName)))
+                                .name("relationship"))
+                );
+                path.delete(new JsonApiOperation()
+                                .description("Deletes items from the relationship " + name)
+                                .tag(getTag())
+                                .response(204, okEmptyResponse)
+                                .parameter(new BodyParameter()
+                                        .schema(new Data(new Relationship(typeName)))
+                                        .name("relationship"))
+                );
+                path.post(new JsonApiOperation()
+                                .description("Adds items to the relationship " + name)
+                                .tag(getTag())
+                                .response(201, okPluralResponse)
+                                .parameter(new BodyParameter()
+                                        .schema(new Data(new Relationship(typeName)))
+                                        .name("relationship"))
+                );
+            } else {
+                path.get(new JsonApiOperation()
+                        .description("Returns the relationship identifiers for " + name)
+                        .tag(getTag())
+                        .response(200, okSingularResponse));
+                path.patch(new JsonApiOperation()
+                        .description("Replaces the relationship " + name)
+                        .tag(getTag())
+                        .response(204, okEmptyResponse)
+                        .parameter(new BodyParameter()
+                                .schema(new Datum(new Relationship(typeName)))
+                                .name("relationship"))
+                );
+            }
+
+            for (Parameter param : getFilterParameters()) {
+                path.getGet().addParameter(param);
+            }
+
+            for (Parameter param : getPageParameters()) {
+                path.getGet().addParameter(param);
+            }
+
+            decorateGlobalResponses(path);
+            decorateGlobalParameters(path);
+            return path;
+        }
+
+        /**
+         * Returns the Swagger Path for a collection URL.
+         * @return the Swagger 'Path' for a collection URL (/books).
+         */
+        public Path getCollectionPath() {
+            String typeName = dictionary.getJsonAliasFor(type);
+            Path path = new Path();
+
+            /* The path parameter apply for all operations */
+            lineage.stream().forEach(item ->
+                path.addParameter(item.getPathParameter()));
+
+            Response okSingularResponse = new Response()
+                    .description("Successful response")
+                    .schema(new com.yahoo.elide.swagger.property.Datum(typeName, false));
+
+            Response okPluralResponse = new Response()
+                    .description("Successful response")
+                    .schema(new com.yahoo.elide.swagger.property.Data(typeName));
+
+            String getDescription;
+            String postDescription;
+            if (lineage.isEmpty()) {
+                getDescription = "Returns the collection of type " + typeName;
+                postDescription = "Creates an item of type " + typeName;
+            } else {
+                getDescription = "Returns the relationship " + name;
+                postDescription = "Creates an item of type " + typeName + " and adds it to " + name;
+            }
+
+            path.get(new JsonApiOperation()
+                    .description(getDescription)
+                    .parameter(getSortParameter())
+                    .parameter(getSparseFieldsParameter())
+                    .parameter(getIncludeParameter())
+                    .tag(getTag())
+                    .response(200, okPluralResponse));
+
+            for (Parameter param : getFilterParameters()) {
+                path.getGet().addParameter(param);
+            }
+
+            for (Parameter param : getPageParameters()) {
+                path.getGet().addParameter(param);
+            }
+
+            path.post(new JsonApiOperation()
+                    .description(postDescription)
+                    .tag(getTag())
+                    .response(201, okSingularResponse)
+                    .parameter(new BodyParameter()
+                            .schema(new Datum(typeName))
+                            .name(typeName))
+            );
+
+            decorateGlobalResponses(path);
+            decorateGlobalParameters(path);
+            return path;
+        }
+
+        /**
+         * Returns the Swagger Path for an instance URL.
+         * @return the Swagger 'Path' for a instance URL (/books/{bookID}).
+         */
+        public Path getInstancePath() {
+            String typeName = dictionary.getJsonAliasFor(type);
+            Path path = new Path();
+
+            /* The path parameter apply for all operations */
+            getFullLineage().stream().forEach(item ->
+                path.addParameter(item.getPathParameter()));
+
+            Response okSingularResponse = new Response()
+                .description("Successful response")
+                .schema(new com.yahoo.elide.swagger.property.Datum(typeName));
+
+            Response okEmptyResponse = new Response()
+                .description("Successful response");
+
+            path.get(new JsonApiOperation()
+                    .description("Returns an instance of type " + typeName)
+                    .tag(getTag())
+                    .parameter(getSparseFieldsParameter())
+                    .parameter(getIncludeParameter())
+                    .response(200, okSingularResponse));
+
+            path.patch(new JsonApiOperation()
+                    .description("Modifies an instance of type " + typeName)
+                    .tag(getTag())
+                    .response(204, okEmptyResponse)
+                    .parameter(new BodyParameter()
+                            .schema(new Datum(typeName))
+                            .name(typeName))
+            );
+
+            path.delete(new JsonApiOperation()
+                     .description("Deletes an instance of type " + typeName)
+                     .tag(getTag())
+                     .response(204, okEmptyResponse));
+
+            decorateGlobalResponses(path);
+            decorateGlobalParameters(path);
+            return path;
+        }
+
+        /**
+         * Decorates with path parameters that apply to all paths.
+         * @param path the path to decorate
+         * @return the decorated path
+         */
+        private Path decorateGlobalParameters(Path path) {
+            globalParams.forEach(param ->
+                path.addParameter(param));
+            return path;
+        }
+
+        /**
+         * Decorates with responses that apply to all operations for all paths.
+         * @param path the path to decorate.
+         * @return the decorated path.
+         */
+        private Path decorateGlobalResponses(Path path) {
+            globalResponses.forEach(
+                (code, response) -> {
+                        if (path.getGet() != null) {
+                            path.getGet().response(code, response);
+                        }
+                        if (path.getDelete() != null) {
+                            path.getDelete().response(code, response);
+                        }
+                        if (path.getPost() != null) {
+                            path.getPost().response(code, response);
+                        }
+                        if (path.getPatch() != null) {
+                            path.getPatch().response(code, response);
+                        }
+                }
+            );
+            return path;
+        }
+
+        /**
+         * Returns the sparse fields query parameter.
+         * @return the JSON-API 'field' query parameter for some GET operations.
+         */
+        private Parameter getSparseFieldsParameter() {
+            String typeName = dictionary.getJsonAliasFor(type);
+            List<String> fieldNames = dictionary.getAllExposedFields(type);
+
+            return new QueryParameter()
+                    .type("array")
+                    .name("fields[" + typeName + "]")
+                    .description("Selects the set of " + typeName + " fields that should be returned in the result.")
+                    .items(new StringProperty()._enum(fieldNames))
+                    .collectionFormat("csv");
+        }
+
+        /**
+         * Returns the include parameter.
+         * @return the JSON-API 'include' query parameter for some GET operations.
+         */
+        private Parameter getIncludeParameter() {
+            List<String> relationshipNames = dictionary.getRelationships(type);
+
+            return new QueryParameter()
+                    .type("array")
+                    .name("include")
+                    .description("Selects the set of relationships that should be expanded as a compound document in "
+                            + "the result.")
+                    .items(new StringProperty()._enum(relationshipNames))
+                    .collectionFormat("csv");
+        }
+
+        /**
+         * Returns the pagination parameter.
+         * @return the Elide 'page' query parameter for some GET operations.
+         */
+        private List<Parameter> getPageParameters() {
+            List<Parameter> params = new ArrayList<>();
+
+            params.add(new QueryParameter()
+                    .name("page[number]")
+                    .description("Number of pages to return.  Can be used with page[size]")
+                    .type("integer")
+            );
+
+            params.add(new QueryParameter()
+                            .name("page[size]")
+                            .description("Number of elements per page.  Can be used with page[number]")
+                            .type("integer")
+            );
+
+            params.add(new QueryParameter()
+                    .name("page[offset]")
+                    .description("Offset from 0 to start paginating.  Can be used with page[limit]")
+                    .type("integer")
+            );
+
+            params.add(new QueryParameter()
+                    .name("page[limit]")
+                    .description("Maximum number of items to return.  Can be used with page[offset]")
+                    .type("integer")
+            );
+
+            params.add(new QueryParameter()
+                    .name("page[totals]")
+                    .description("For requesting total pages/records be included in the response page meta data")
+                    /* Swagger UI doesn't support parameters that don't take args today.  We'll just make
+                     * this a string for now */
+                    .type("string")
+            );
+
+            return params;
+        }
+
+        /**
+         * Returns the sort parameter.
+         * @return the JSON-API 'sort' query parameter for some GET operations.
+         */
+        private Parameter getSortParameter() {
+            List<String> filterAttributes = dictionary.getAttributes(type).stream()
+                    .filter((name) -> {
+                        Type<?> attributeClass = dictionary.getType(type, name);
+                        return (attributeClass.isPrimitive() || ClassType.STRING_TYPE.isAssignableFrom(attributeClass));
+                    })
+                    .map((name) -> Arrays.asList(name, "-" + name))
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList());
+
+            filterAttributes.add("id");
+            filterAttributes.add("-id");
+
+            return new QueryParameter()
+                    .name("sort")
+                    .type("array")
+                    .description("Sorts the collection on the selected attributes.  A prefix of '-' sorts descending")
+                    .items(new StringProperty()._enum(filterAttributes))
+                    .collectionFormat("csv");
+        }
+
+        /**
+         * Returns the filter parameter.
+         * @return the Elide 'filter' query parameter for some GET operations.
+         */
+        private List<Parameter> getFilterParameters() {
+            String typeName = dictionary.getJsonAliasFor(type);
+            List<String> attributeNames = dictionary.getAttributes(type);
+
+            List<Parameter> params = new ArrayList<>();
+
+            if (supportRSQLDialect) {
+                /* Add RSQL Disjoint Filter Query Param */
+                params.add(new QueryParameter()
+                        .type("string")
+                        .name("filter[" + typeName + "]")
+                        .description("Filters the collection of " + typeName
+                                + " using a 'disjoint' RSQL expression"));
+
+                if (lineage.isEmpty()) {
+                    /* Add RSQL Joined Filter Query Param */
+                    params.add(new QueryParameter()
+                            .type("string")
+                            .name("filter")
+                            .description("Filters the collection of " + typeName
+                                    + " using a 'joined' RSQL expression"));
+                }
+            }
+
+            if (supportLegacyDialect) {
+                for (Operator op : filterOperators) {
+                    attributeNames.forEach((name) -> {
+                        Type<?> attributeClass = dictionary.getType(type, name);
+
+                        /* Only filter attributes that can be assigned to strings or primitives */
+                        if (attributeClass.isPrimitive() || ClassType.STRING_TYPE.isAssignableFrom(attributeClass)) {
+                            params.add(new QueryParameter()
+                                    .type("string")
+                                    .name("filter[" + typeName + "." + name + "][" + op.getNotation() + "]")
+                                    .description("Filters the collection of " + typeName + " by the attribute "
+                                            + name + " " + "using the operator " + op.getNotation()));
+                        }
+                    });
+                }
+            }
+
+            return params;
+        }
+
+        /**
+         * Constructs a new lineage including the current path element.
+         * @return ALL of the path segments in the URL including this segment.
+         */
+        public Stack<PathMetaData> getFullLineage() {
+            Stack<PathMetaData> fullLineage = new Stack<>();
+
+            fullLineage.addAll(lineage);
+            fullLineage.add(this);
+            return fullLineage;
+        }
+
+        /**
+         * Returns true if this path is a shorter path to the same entity than the given path.
+         * @param compare The path to compare against.
+         * @return is shorter or same
+         */
+        public boolean shorterThan(PathMetaData compare) {
+            return (compare.getUrl().startsWith(url));
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof PathMetaData)) {
+                return false;
+            }
+
+            PathMetaData that = (PathMetaData) o;
+
+            return url.equals(that.getUrl());
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(lineage, name, type);
+        }
+
+        /**
+         * Checks if a given path segment is already within the URL/lineage (forming a cycle).
+         * @param other the segment to search for.
+         * @return true if the lineage contains the given segment.  False otherwise.
+         */
+        private boolean lineageContainsType(PathMetaData other) {
+            if (this.type.equals(other.type)) {
+                return true;
+            }
+
+            if (lineage.isEmpty()) {
+                return false;
+            }
+
+            for (PathMetaData compare : lineage) {
+                if (compare.type.equals(other.type)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Constructor.
+     * @param dictionary The entity dictionary.
+     * @param info Basic service information that cannot be generated.
+     */
+    public SwaggerBuilder(EntityDictionary dictionary, Info info) {
+        this.dictionary = dictionary;
+        this.supportLegacyDialect = true;
+        this.supportRSQLDialect = true;
+        globalResponses = new HashMap<>();
+        globalParams = new HashSet<>();
+        allClasses = new HashSet<>();
+        filterOperators = Sets.newHashSet(
+                Operator.IN,
+                Operator.NOT,
+                Operator.INFIX,
+                Operator.PREFIX,
+                Operator.POSTFIX,
+                Operator.GE,
+                Operator.GT,
+                Operator.LE,
+                Operator.LT,
+                Operator.ISNULL,
+                Operator.NOTNULL
+        );
+        swagger = new Swagger();
+        swagger.info(info);
+    }
+
+    /**
+     * Decorates every operation on every path with the given response.
+     * @param code The HTTP status code to associate with the response
+     * @param response The global response to add to every operation
+     * @return the builder
+     */
+    public SwaggerBuilder withGlobalResponse(int code, Response response) {
+        globalResponses.put(code, response);
+        return this;
+    }
+
+    /**
+     * Turns on or off the legacy filter dialect.
+     * @param enableLegacyDialect Whether or not to enable the legacy filter dialect.
+     * @return the builder
+     */
+    public SwaggerBuilder withLegacyFilterDialect(boolean enableLegacyDialect) {
+        supportLegacyDialect = enableLegacyDialect;
+        return this;
+    }
+
+    /**
+     * Turns on or off the RSQL filter dialect.
+     * @param enableRSQLDialect Whether or not to enable the RSQL filter dialect.
+     * @return the builder
+     */
+    public SwaggerBuilder withRSQLFilterDialect(boolean enableRSQLDialect) {
+        supportRSQLDialect = enableRSQLDialect;
+        return this;
+    }
+
+    /**
+     * Decorates every path with the given parameter.
+     * @param param the parameter to decorate
+     * @return the builder
+     */
+    public SwaggerBuilder withGlobalParameter(Parameter param) {
+        globalParams.add(param);
+        return this;
+    }
+
+    /**
+     * The classes for which API paths will be generated.  All paths that include other entities
+     * are dropped.
+     * @param classes A subset of the entities in the entity dictionary.
+     * @return the builder
+     */
+    public SwaggerBuilder withExplicitClassList(Set<Type<?>> classes) {
+        allClasses = new HashSet<>(classes);
+        return this;
+    }
+
+    /**
+     * Assigns a subset of the complete set of filter operations to support for each GET operation.
+     * @param ops The subset of filter operations to support.
+     * @return the builder
+     */
+    public SwaggerBuilder withFilterOps(Set<Operator> ops) {
+        filterOperators = new HashSet<>(ops);
+        return this;
+    }
+
+    /**
+     * Builds a swagger object.
+     * @return the constructed 'Swagger' object
+     */
+    public Swagger build() {
+
+        /* Used to convert Elide POJOs into Swagger Model objects */
+        ModelConverters converters = ModelConverters.getInstance();
+        ModelConverter converter = new JsonApiModelResolver(dictionary);
+        converters.addConverter(converter);
+
+        String apiVersion = swagger.getInfo().getVersion();
+        if (apiVersion == null) {
+            apiVersion = NO_VERSION;
+        }
+
+        if (allClasses.isEmpty()) {
+            allClasses = dictionary.getBoundClassesByVersion(apiVersion);
+        } else {
+            allClasses = Sets.intersection(dictionary.getBoundClassesByVersion(apiVersion), allClasses);
+            if (allClasses.isEmpty()) {
+                throw new IllegalArgumentException("None of the provided classes are exported by Elide");
+            }
+        }
+
+        /*
+         * Create a Model for each Elide entity.
+         * Elide entity could be of ClassType or DynamicType.
+         * For ClassType, extract the class and pass it to ModelConverters#readAll method.
+         * ModelConverters#readAll doesn't support Elide Dynamic Type, so calling the
+         * JsonApiModelResolver#resolve method directly when its not a ClassType.
+         */
+        Map<String, Model> models = new HashMap<>();
+        for (Type<?> clazz : allClasses) {
+            if (clazz instanceof ClassType) {
+                models.putAll(converters.readAll(((ClassType) clazz).getCls()));
+            } else {
+                ModelConverterContextImpl context = new ModelConverterContextImpl(Arrays.asList(converter));
+                context.resolve(clazz);
+                models.putAll(context.getDefinedModels());
+            }
+        }
+        swagger.setDefinitions(models);
+
+        rootClasses =  allClasses.stream()
+                .filter(dictionary::isRoot)
+                .collect(Collectors.toSet());
+
+        /* Find all the paths starting from the root entities. */
+        Set<PathMetaData> pathData =  rootClasses.stream()
+                .map(this::find)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+
+        /* Prune the discovered paths to remove redundant elements */
+        Set<PathMetaData> toRemove = new HashSet<>();
+
+        pathData.stream()
+                .collect(Collectors.groupingBy(PathMetaData::getRootType))
+                .values()
+                .forEach(pathSet -> {
+                    for (PathMetaData path : pathSet) {
+                        for (PathMetaData compare : pathSet) {
+
+                            /*
+                             * We don't prune paths that are redundant with root collections to allow both BOTH
+                             * root collection urls as well as relationship urls.
+                             */
+                            if (compare.lineage.isEmpty() || path == compare) {
+                                continue;
+                            }
+                            if (compare.shorterThan(path)) {
+                                toRemove.add(path);
+                                break;
+                            }
+                        }
+                    }
+                }
+        );
+
+        pathData = Sets.difference(pathData, toRemove);
+
+        /* Each path constructs 3 URLs (collection, instance, and relationship) */
+        for (PathMetaData pathDatum : pathData) {
+            swagger.path(pathDatum.getCollectionUrl(), pathDatum.getCollectionPath());
+
+            swagger.path(pathDatum.getUrl(), pathDatum.getInstancePath());
+
+            /* We only construct relationship URLs if the entity is not a root collection */
+            if (! pathDatum.lineage.isEmpty()) {
+                swagger.path(pathDatum.getRelationshipUrl(), pathDatum.getRelationshipPath());
+            }
+        }
+
+        /* We create Swagger 'tags' for each entity so Swagger UI organizes the paths by entities */
+        List<Tag> tags = allClasses.stream()
+                .map((clazz) -> dictionary.getJsonAliasFor(clazz))
+                .map((alias) -> new Tag().name(alias))
+                .collect(Collectors.toList());
+
+        swagger.tags(tags);
+
+        return swagger;
+    }
+
+    /**
+     * Finds all the paths by navigating the entity relationship graph - starting at the given root entity.
+     * Cycles are avoided.
+     * @param rootClass the starting node of the graph
+     * @return set of discovered paths.
+     */
+    protected Set<PathMetaData> find(Type<?> rootClass) {
+        Queue<PathMetaData> toVisit = new ArrayDeque<>();
+        Set<PathMetaData> paths = new HashSet<>();
+
+        toVisit.add(new PathMetaData(rootClass));
+
+        while (! toVisit.isEmpty()) {
+            PathMetaData current = toVisit.remove();
+
+            List<String> relationshipNames;
+            try {
+                relationshipNames = dictionary.getRelationships(current.getType());
+
+            /* If the entity is not bound in the dictionary, skip it */
+            } catch (IllegalArgumentException e) {
+                continue;
+            }
+
+            for (String relationshipName : relationshipNames) {
+                Type<?> relationshipClass = dictionary.getParameterizedType(current.getType(), relationshipName);
+
+                PathMetaData next = new PathMetaData(current.getFullLineage(), relationshipName, relationshipClass);
+
+                /* We don't allow cycles AND we only record paths that traverse through the provided subgraph */
+                if (current.lineageContainsType(next) || !allClasses.contains(relationshipClass)) {
+                    continue;
+                }
+
+                toVisit.add(next);
+            }
+            paths.add(current);
+        }
+        return paths;
+    }
+
+    /**
+     * Converts a swagger document to human-formatted JSON.
+     * @param swagger Swagger-Core swagger POJO
+     * @return Pretty printed 'Swagger' document in JSON.
+     */
+    public static String getDocument(Swagger swagger) {
+        return Json.pretty(swagger);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Data.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Data.java
new file mode 100644
index 0000000000..fb0d706dbe
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Data.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.model;
+
+import com.yahoo.elide.swagger.property.Relationship;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.RefProperty;
+
+/**
+ * Represents a JSON-API collection of resources or resource identifiers.
+ * It is used when a schema is required for swagger.
+ */
+public class Data extends ModelImpl {
+    public Data(String definitionName) {
+        super();
+        property("data", new ArrayProperty().items(new RefProperty(definitionName)));
+    }
+
+    /**
+     * Used to construct a collection of resource identifiers.
+     * @param relationship is added as a property of 'data'.
+     */
+    public Data(Relationship relationship) {
+        super();
+        property("data", new ArrayProperty().items(relationship));
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Datum.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Datum.java
new file mode 100644
index 0000000000..30c22e10cd
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Datum.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.model;
+
+import com.yahoo.elide.swagger.property.Relationship;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.RefProperty;
+
+/**
+ * Represents a JSON-API singular resource or resource identifier.
+ * It is used when a schema is required for swagger.
+ */
+public class Datum extends ModelImpl {
+
+    public Datum(String definitionName) {
+        super();
+        property("data", new RefProperty(definitionName));
+    }
+
+    /**
+     * Constructs a singular resource identifier.
+     *
+     * @param relationship added as a property of 'data'.
+     */
+    public Datum(Relationship relationship) {
+        super();
+        property("data", relationship);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Resource.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Resource.java
new file mode 100644
index 0000000000..bd64125b3f
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/model/Resource.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.model;
+
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+
+/**
+ * Represents a Swagger Model that was mapped from a POJO.  Each instance will
+ * be bound to a specific POJO class.
+ */
+public class Resource extends ModelImpl {
+
+    ObjectProperty attributes;
+    ObjectProperty relationships;
+    StringProperty idProperty;
+    StringProperty typeProperty;
+
+    public Resource() {
+        super();
+
+        attributes = new ObjectProperty();
+        relationships = new ObjectProperty();
+        idProperty = new StringProperty();
+        typeProperty = new StringProperty();
+
+        property("type", typeProperty);
+        property("id", idProperty);
+        property("attributes", attributes);
+        property("relationships", relationships);
+    }
+
+    public Resource setSecurityDescription(String description) {
+        typeProperty.setDescription(description);
+        return this;
+    }
+
+    public void addAttribute(String attributeName, Property attribute) {
+        attributes.property(attributeName, attribute);
+    }
+
+    public void addRelationship(String relationshipName, Property relationship) {
+        relationships.property(relationshipName, relationship);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Data.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Data.java
new file mode 100644
index 0000000000..e68f24c3f6
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Data.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.property;
+
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.RefProperty;
+
+/**
+ * Represents a JSON-API collection of resources or resource identifiers.
+ * It is used when a property is required for swagger.
+ */
+public class Data extends ObjectProperty {
+
+    /**
+     * Used to construct a collection of resources (referenced by the resource type).
+     * @param definitionName The swagger model to reference in 'data'
+     */
+    public Data(String definitionName) {
+        this(definitionName, true);
+    }
+
+    /**
+     * Used to construct a collection of resources (referenced by the resource type).
+     * @param definitionName The swagger model to reference in 'data'
+     * @param included Whether or not to add the 'included' property to the schema.
+     */
+    public Data(String definitionName, boolean included) {
+        super();
+        property("data", new ArrayProperty().items(new RefProperty(definitionName)));
+
+        if (included) {
+            property("included", new ArrayProperty()
+                            .description("Included resources")
+                            .uniqueItems()
+                            .items(new IncludedResource())
+            );
+        }
+    }
+
+    /**
+     * Used to construct a collection of resource identifiers.
+     * @param relationship Added to the property 'data'
+     */
+    public Data(Relationship relationship) {
+        super();
+        property("data", new ArrayProperty().items(relationship));
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Datum.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Datum.java
new file mode 100644
index 0000000000..cd1f53934f
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Datum.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.property;
+
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.RefProperty;
+
+/**
+ * Represents a JSON-API single resource or resource identifier.
+ * It is used when a schema is required for swagger.
+ */
+public class Datum extends ObjectProperty {
+
+    /**
+     * Constructs a singular resource (referenced by type).
+     *
+     * @param definitionName The swagger model to reference in 'data'.
+     */
+    public Datum(String definitionName) {
+        this(definitionName, true);
+    }
+
+    /**
+     * Constructs a singular resource (referenced by type).
+     * @param definitionName The swagger model to reference in 'data'.
+     * @param included Whether or not to add the 'included' property to the schema.
+     */
+    public Datum(String definitionName, boolean included) {
+        super();
+        property("data", new RefProperty(definitionName));
+
+        if (included) {
+            property("included", new ArrayProperty()
+                            .description("Included resources")
+                            .uniqueItems()
+                            .items(new IncludedResource())
+            );
+        }
+    }
+
+    /**
+     * Constructs a singular resource identifier.
+     *
+     * @param relationship Added to the property 'data'.
+     */
+    public Datum(Relationship relationship) {
+        super();
+        property("data", relationship);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/IncludedResource.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/IncludedResource.java
new file mode 100644
index 0000000000..35b08f64ee
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/IncludedResource.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.property;
+
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.StringProperty;
+
+/**
+ * Represents the schema for the 'included' section of a JSON-API compound document.
+ * The 'included' section can contain many different types.  As such, this class is not POJO/type
+ * specific and just has the skeleton structure of a resource.
+ */
+public class IncludedResource extends ObjectProperty {
+    public IncludedResource() {
+        super();
+
+        /* These will always be empty. */
+        ObjectProperty attributes = new ObjectProperty();
+        ObjectProperty relationships = new ObjectProperty();
+
+        property("type", new StringProperty());
+        property("id", new StringProperty());
+        property("attributes", attributes);
+        property("relationships", relationships);
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Relationship.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Relationship.java
new file mode 100644
index 0000000000..3c79574c45
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/property/Relationship.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.property;
+
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.StringProperty;
+
+/**
+ * Represents a JSON-API resource identifier.
+ */
+public class Relationship extends ObjectProperty {
+
+    /**
+     * Constructs a singular resource identifier.
+     * @param relationshipType the type of resource.
+     */
+    public Relationship(String relationshipType) {
+        super();
+        property("type", new StringProperty()._enum(relationshipType));
+        property("id", new StringProperty());
+    }
+}
diff --git a/elide-swagger/src/main/java/com/yahoo/elide/swagger/resources/DocEndpoint.java b/elide-swagger/src/main/java/com/yahoo/elide/swagger/resources/DocEndpoint.java
new file mode 100644
index 0000000000..82ba3a2e5c
--- /dev/null
+++ b/elide-swagger/src/main/java/com/yahoo/elide/swagger/resources/DocEndpoint.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger.resources;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import com.yahoo.elide.swagger.SwaggerBuilder;
+import org.apache.commons.lang3.tuple.Pair;
+import io.swagger.models.Swagger;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+/**
+ * A convenience endpoint to expose a swagger document.
+ */
+
+@Path("/doc")
+@Produces("application/json")
+public class DocEndpoint {
+    //Maps api version & path to a swagger document.
+    protected Map<Pair<String, String>, String> documents;
+
+    @Data
+    @AllArgsConstructor
+    public static class SwaggerRegistration {
+        private String path;
+        private Swagger document;
+    }
+
+    /**
+     * Constructs the resource.
+     *
+     * @param docs Map of path parameter name to swagger document.
+     */
+    @Inject
+    public DocEndpoint(@Named("swagger") List<SwaggerRegistration> docs) {
+        documents = new HashMap<>();
+
+        docs.forEach((doc) -> {
+            String apiVersion = doc.document.getInfo().getVersion();
+            apiVersion = apiVersion == null ? NO_VERSION : apiVersion;
+            String apiPath = doc.path;
+
+            documents.put(Pair.of(apiVersion, apiPath), SwaggerBuilder.getDocument(doc.document));
+        });
+    }
+
+    @GET
+    @Path("/")
+    public Response list(@HeaderParam("ApiVersion") String apiVersion) {
+        String safeApiVersion = apiVersion == null ? NO_VERSION : apiVersion;
+
+        String body = documents.keySet().stream()
+                .filter(key -> key.getLeft().equals(safeApiVersion))
+                .map(Pair::getRight)
+                .map(key -> '"' + key + '"')
+                .collect(Collectors.joining(",", "[", "]"));
+
+        return Response.ok(body).build();
+    }
+
+    /**
+     * Read handler.
+     *
+     * @param name document name
+     * @return response The Swagger JSON document
+     */
+    @GET
+    @Path("/{name}")
+    public Response get(@HeaderParam("ApiVersion") String apiVersion, @PathParam("name") String name) {
+        String safeApiVersion = apiVersion == null ? NO_VERSION : apiVersion;
+        Pair<String, String> lookupKey = Pair.of(safeApiVersion, name);
+        if (documents.containsKey(lookupKey)) {
+            return Response.ok(documents.get(lookupKey)).build();
+        }
+        return Response.status(404).entity("Unknown document: " + name).build();
+    }
+}
diff --git a/elide-swagger/src/test/java/com/yahoo/elide/swagger/JsonApiModelResolverTest.java b/elide-swagger/src/test/java/com/yahoo/elide/swagger/JsonApiModelResolverTest.java
new file mode 100644
index 0000000000..61896088d0
--- /dev/null
+++ b/elide-swagger/src/test/java/com/yahoo/elide/swagger/JsonApiModelResolverTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.swagger.model.Resource;
+import com.google.common.collect.ImmutableMap;
+import example.models.Author;
+import example.models.Book;
+import example.models.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.swagger.converter.ModelConverters;
+import io.swagger.models.Model;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.StringProperty;
+
+import java.util.Map;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class JsonApiModelResolverTest {
+
+    private static final String KEY_BOOK = "book";
+    private static final String KEY_PUBLISHER = "publisher";
+    private static final String KEY_AUTHOR = "author";
+
+    private static final Map<String, Class> ENTITIES =
+        ImmutableMap.of(KEY_BOOK, Book.class,
+                        KEY_PUBLISHER, Publisher.class,
+                        KEY_AUTHOR, Author.class);
+
+    private ModelConverters converters;
+
+    @BeforeAll
+    public void setup() {
+        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(ENTITIES.get(KEY_BOOK));
+        dictionary.bindEntity(ENTITIES.get(KEY_PUBLISHER));
+        dictionary.bindEntity(ENTITIES.get(KEY_AUTHOR));
+
+        converters = ModelConverters.getInstance();
+        converters.addConverter(new JsonApiModelResolver(dictionary));
+    }
+
+    @Test
+    public void testBookPermissions() {
+        StringProperty entity = getStringProperty(KEY_BOOK, "type");
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "attributes");
+        ObjectProperty relationships = getObjectProperty(KEY_BOOK, "relationships");
+
+        String entityPermissions = entity.getDescription();
+        assertEquals("Create Permissions : (Principal is author)\nDelete Permissions : (Prefab.Role.None)",
+                entityPermissions);
+
+        String titlePermissions = attributes.getProperties().get("title").getDescription();
+        assertEquals("Read Permissions : (Principal is author OR Principal is publisher)", titlePermissions);
+
+        String publisherPermissions = relationships.getProperties().get("publisher").getDescription();
+        assertEquals("Read Permissions : (Principal is author OR Principal is publisher)\n"
+                + "Update Permissions : (Principal is publisher)",
+                publisherPermissions);
+    }
+
+    @Test
+    public void testModelDescriptions() {
+        Resource model = getModel(KEY_BOOK);
+        assertEquals("A book", model.getDescription());
+
+        model = getModel(KEY_AUTHOR);
+        assertEquals("The Author", model.getDescription());
+
+        model = getModel(KEY_PUBLISHER);
+        assertNull(model.getDescription());
+    }
+
+    @Test
+    public void testModelResolution() {
+        ObjectProperty attributes = getObjectProperty(KEY_PUBLISHER, "attributes");
+        ObjectProperty relationships = getObjectProperty(KEY_PUBLISHER, "relationships");
+
+        assertEquals(3, attributes.getProperties().size());
+        assertEquals(2, relationships.getProperties().size());
+        assertTrue(attributes.getProperties().containsKey("billingAddress"));
+        assertTrue(attributes.getProperties().containsKey("billingCodes"));
+        assertTrue(relationships.getProperties().containsKey("books"));
+        assertTrue(relationships.getProperties().containsKey("exclusiveAuthors"));
+    }
+
+    @Test
+    public void testDescription() {
+        ObjectProperty attributes = getObjectProperty(KEY_PUBLISHER, "attributes");
+
+        String phoneDescription = attributes.getProperties().get("phone").getDescription();
+        assertEquals("Phone number", phoneDescription);
+    }
+
+    @Test
+    public void testNoDescriptionWithoutAnnotation() {
+        ObjectProperty attributes = getObjectProperty(KEY_AUTHOR, "attributes");
+
+        Object nameDescription = attributes.getProperties().get("name").getDescription();
+        assertNull(nameDescription);
+    }
+
+    @Test
+    public void testNoDescriptionWhenNotProvided() {
+        ObjectProperty attributes = getObjectProperty(KEY_AUTHOR, "attributes");
+
+        Object phoneDescription = attributes.getProperties().get("phone").getDescription();
+        assertNull(phoneDescription);
+    }
+
+    @Test
+    public void testExample() {
+        ObjectProperty attributes = getObjectProperty(KEY_PUBLISHER, "attributes");
+
+        Object phoneExample = attributes.getProperties().get("phone").getExample();
+        assertEquals("555-000-1111", phoneExample);
+    }
+
+    @Test
+    public void testExampleRelationship() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "relationships");
+
+        Object authorsExample = attributes.getProperties().get("authors").getExample();
+        assertEquals("[\"author1\", \"author2\", \"author3\"]", authorsExample);
+    }
+
+    @Test
+    public void testNoExampleWithoutAnnotation() {
+        ObjectProperty attributes = getObjectProperty(KEY_AUTHOR, "attributes");
+
+        Object nameExample = attributes.getProperties().get("name").getExample();
+        assertNull(nameExample);
+    }
+
+    @Test
+    public void testNoExampleWhenNotProvided() {
+        ObjectProperty attributes = getObjectProperty(KEY_AUTHOR, "attributes");
+
+        Object phoneExample = attributes.getProperties().get("phone").getExample();
+        assertNull(phoneExample);
+    }
+
+    @Test
+    public void testConcatenatedDescriptionAndPermissions() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "attributes");
+
+        String yearDescription = attributes.getProperties().get("year").getDescription();
+        assertEquals("Year published\nRead Permissions : (Principal is author OR Principal is publisher)",
+                yearDescription);
+    }
+
+    @Test
+    public void testConcatenatedDescriptionAndPermissionsRelationship() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "relationships");
+
+        String authorsDescription = attributes.getProperties().get("authors").getDescription();
+        assertEquals("Writers\nRead Permissions : (Principal is author OR Principal is publisher)"
+                + "\nUpdate Permissions : (Principal is author)", authorsDescription);
+    }
+
+    @Test
+    public void testRequired() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "attributes");
+
+        boolean titleRequired = attributes.getProperties().get("title").getRequired();
+        assertTrue(titleRequired);
+    }
+
+    @Test
+    public void testReadOnly() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "attributes");
+
+        Boolean titleReadOnly = attributes.getProperties().get("year").getReadOnly();
+        assertTrue(titleReadOnly);
+    }
+
+    @Test
+    public void testRequiredRelationship() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "relationships");
+
+        Boolean authorsRequired = attributes.getProperties().get("authors").getRequired();
+        assertFalse(authorsRequired);
+    }
+
+    @Test
+    public void testReadOnlyRelationship() {
+        ObjectProperty attributes = getObjectProperty(KEY_BOOK, "relationships");
+
+        Boolean authorsReadOnly = attributes.getProperties().get("authors").getReadOnly();
+        assertTrue(authorsReadOnly);
+    }
+
+    private Resource getModel(String entityKey) {
+        Map<String, Model> models = converters.readAll(ENTITIES.get(entityKey));
+        return (Resource) models.get(entityKey);
+    }
+
+    private ObjectProperty getObjectProperty(String entityKey, String propertyKey) {
+        return (ObjectProperty) getModel(entityKey).getProperties().get(propertyKey);
+    }
+
+    private StringProperty getStringProperty(String entityKey, String propertyKey) {
+        return (StringProperty) getModel(entityKey).getProperties().get(propertyKey);
+    }
+}
diff --git a/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerBuilderTest.java b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerBuilderTest.java
new file mode 100644
index 0000000000..86c3265a5b
--- /dev/null
+++ b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerBuilderTest.java
@@ -0,0 +1,762 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import static com.yahoo.elide.core.dictionary.EntityDictionary.NO_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.swagger.model.Resource;
+import com.yahoo.elide.swagger.property.Data;
+import com.yahoo.elide.swagger.property.Datum;
+import com.yahoo.elide.swagger.property.Relationship;
+import example.models.Author;
+import example.models.Book;
+import example.models.Publisher;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import io.swagger.models.Info;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Response;
+import io.swagger.models.Swagger;
+import io.swagger.models.Tag;
+import io.swagger.models.parameters.BodyParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.parameters.QueryParameter;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SwaggerBuilderTest {
+    EntityDictionary dictionary;
+    Swagger swagger;
+
+    @BeforeAll
+    public void setup() {
+        dictionary = EntityDictionary.builder().build();
+
+        dictionary.bindEntity(Book.class);
+        dictionary.bindEntity(Author.class);
+        dictionary.bindEntity(Publisher.class);
+        Info info = new Info().title("Test Service").version(NO_VERSION);
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+        swagger = builder.build();
+    }
+
+    @Test
+    public void testPathGeneration() throws Exception {
+        assertTrue(swagger.getPaths().containsKey("/publisher"));
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}"));
+
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/books"));
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/books/{bookId}"));
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/relationships/books"));
+
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/exclusiveAuthors"));
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/exclusiveAuthors/{authorId}"));
+        assertTrue(swagger.getPaths().containsKey("/publisher/{publisherId}/relationships/exclusiveAuthors"));
+
+        assertTrue(swagger.getPaths().containsKey("/book"));
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}"));
+
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/authors"));
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/authors/{authorId}"));
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/relationships/authors"));
+
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/publisher"));
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/publisher/{publisherId}"));
+        assertTrue(swagger.getPaths().containsKey("/book/{bookId}/relationships/publisher"));
+
+        assertEquals(16, swagger.getPaths().size());
+    }
+
+    @Test
+    public void testOperationGeneration() throws Exception {
+        /* For each path, ensure the correct operations exist */
+        swagger.getPaths().forEach((url, path) -> {
+
+            /* All paths should have a GET */
+            assertNotNull(path.getGet());
+
+            if (url.contains("relationship")) { //Relationship URL
+
+                /* The relationship is a one to one (so there is no DELETE op */
+                if ("/book/{bookId}/relationships/publisher".equals(url)) {
+                    assertNull(path.getDelete());
+                    assertNull(path.getPost());
+                } else {
+                    assertNotNull(path.getDelete());
+                    assertNotNull(path.getPost());
+                }
+                assertNotNull(path.getPatch());
+            } else if (url.endsWith("Id}")) { //Instance URL
+                assertNotNull(path.getDelete());
+                assertNotNull(path.getPatch());
+                assertNull(path.getPost());
+            } else { //Collection URL
+                assertNull(path.getDelete());
+                assertNull(path.getPatch());
+                assertNotNull(path.getPost());
+            }
+        });
+    }
+
+    @Test
+    public void testPathParams() throws Exception {
+        Path path = swagger.getPaths().get("/book/{bookId}/authors/{authorId}");
+        assertEquals(2,
+                path.getParameters().stream()
+                .filter((param) -> param.getIn().equals("path"))
+                .count());
+
+        Parameter bookId = path.getParameters().stream()
+                .filter((param) -> param.getName().equals("bookId"))
+                .findFirst()
+                .get();
+
+        assertEquals("path", bookId.getIn());
+        assertTrue(bookId.getRequired());
+
+        Parameter authorId = path.getParameters().stream()
+                .filter((param) -> param.getName().equals("authorId"))
+                .findFirst()
+                .get();
+
+        assertEquals("path", authorId.getIn());
+        assertTrue(authorId.getRequired());
+
+        path = swagger.getPaths().get("/book/{bookId}/authors");
+        assertEquals(1,
+                path.getParameters().stream()
+                .filter((param) -> param.getIn().equals("path"))
+                .count());
+
+        bookId = path.getParameters().stream()
+                .filter((param) -> param.getName().equals("bookId"))
+                .findFirst()
+                .get();
+
+        assertEquals("path", bookId.getIn());
+        assertTrue(bookId.getRequired());
+
+        path = swagger.getPaths().get("/book/{bookId}/relationships/authors");
+        assertEquals(1,
+                path.getParameters().stream()
+                .filter((param) -> param.getIn().equals("path"))
+                .count());
+
+        bookId = path.getParameters().stream()
+                .filter((param) -> param.getName().equals("bookId"))
+                .findFirst()
+                .get();
+
+        assertEquals("path", bookId.getIn());
+        assertTrue(bookId.getRequired());
+    }
+
+    @Test
+    public void testOperationRequestBodies() throws Exception {
+        /* These take a datum pointing to a resource */
+        Operation[] resourceOps = {
+                swagger.getPaths().get("/book").getPost(),
+                swagger.getPaths().get("/book/{bookId}").getPatch(),
+        };
+
+        for (Operation op : resourceOps) {
+            BodyParameter bodyParam = (BodyParameter) op.getParameters().stream()
+                    .filter((param) -> param.getIn().equals("body"))
+                    .findFirst()
+                    .get();
+
+            assertNotNull(bodyParam);
+            verifyDatum(bodyParam.getSchema(), "book");
+        }
+
+        /* These don't take any params */
+        Operation[] noParamOps = {
+                swagger.getPaths().get("/book").getGet(),
+                swagger.getPaths().get("/book/{bookId}").getDelete(),
+                swagger.getPaths().get("/book/{bookId}").getGet(),
+        };
+
+        for (Operation op : noParamOps) {
+             Optional<Parameter> bodyParam = op.getParameters().stream()
+                    .filter((param) -> param.getIn().equals("body"))
+                    .findFirst();
+
+            assertFalse(bodyParam.isPresent());
+        }
+
+        /* These take a 'data' of relationships */
+        Operation[] relationshipOps = {
+                swagger.getPaths().get("/book/{bookId}/relationships/authors").getPatch(),
+                swagger.getPaths().get("/book/{bookId}/relationships/authors").getDelete(),
+                swagger.getPaths().get("/book/{bookId}/relationships/authors").getPost(),
+        };
+
+        for (Operation op : relationshipOps) {
+            BodyParameter bodyParam = (BodyParameter) op.getParameters().stream()
+                    .filter((param) -> param.getIn().equals("body"))
+                    .findFirst()
+                    .get();
+            assertNotNull(bodyParam);
+            verifyDataRelationship(bodyParam.getSchema(), "author");
+        }
+    }
+
+    @Test
+    public void testOperationSuccessResponseBodies() throws Exception {
+        Response response = swagger.getPaths().get("/book").getGet().getResponses().get("200");
+        verifyData(response.getSchema(), "book");
+
+        response = swagger.getPaths().get("/book").getPost().getResponses().get("201");
+        verifyDatum(response.getSchema(), "book", false);
+
+        response = swagger.getPaths().get("/book/{bookId}").getGet().getResponses().get("200");
+        verifyDatum(response.getSchema(), "book", true);
+
+        response = swagger.getPaths().get("/book/{bookId}").getPatch().getResponses().get("204");
+        assertNull(response.getSchema());
+
+        response = swagger.getPaths().get("/book/{bookId}").getDelete().getResponses().get("204");
+        assertNull(response.getSchema());
+
+        response = swagger.getPaths().get("/book/{bookId}/relationships/authors").getGet().getResponses().get("200");
+        verifyDataRelationship(response.getSchema(), "author");
+
+        response = swagger.getPaths().get("/book/{bookId}/relationships/authors").getPost().getResponses().get("201");
+        verifyDataRelationship(response.getSchema(), "author");
+
+        response = swagger.getPaths().get("/book/{bookId}/relationships/authors").getPatch().getResponses().get("204");
+        assertNull(response.getSchema());
+
+        response = swagger.getPaths().get("/book/{bookId}/relationships/authors").getDelete().getResponses().get("204");
+        assertNull(response.getSchema());
+    }
+
+    @Test
+    public void testOperationSuccessResponseCodes() throws Exception {
+        /* For each path, ensure the correct operations exist */
+        swagger.getPaths().forEach((url, path) -> {
+
+            Operation getOperation = path.getGet();
+            assertTrue(getOperation.getResponses().containsKey("200"));
+
+            if (url.contains("relationship")) { //Relationship URL
+
+                if (path.getDelete() != null) {
+                    Operation deleteOperation = path.getDelete();
+                    assertTrue(deleteOperation.getResponses().containsKey("204"));
+                }
+
+                if (path.getPost() != null) {
+                    Operation postOperation = path.getPost();
+                    assertTrue(postOperation.getResponses().containsKey("201"));
+                }
+
+                Operation patchOperation = path.getPatch();
+                assertTrue(patchOperation.getResponses().containsKey("204"));
+            } else if (url.endsWith("Id}")) { //Instance URL
+                Operation deleteOperation = path.getDelete();
+                assertTrue(deleteOperation.getResponses().containsKey("204"));
+
+                Operation patchOperation = path.getPatch();
+                assertTrue(patchOperation.getResponses().containsKey("204"));
+            } else { //Collection URL
+                Operation postOperation = path.getPost();
+                assertTrue(postOperation.getResponses().containsKey("201"));
+            }
+        });
+    }
+
+    @Test
+    public void testFilterParam() throws Exception {
+
+        /* Test root filters */
+        List<Parameter> params = swagger.getPaths().get("/book").getGet().getParameters();
+
+        Set<String> paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        long filterParams = paramNames.stream().filter((name) -> name.startsWith("filter")).count();
+        assertEquals(24, filterParams);
+
+        assertTrue(paramNames.contains("filter"));
+        assertTrue(paramNames.contains("filter[book]"));
+        assertTrue(paramNames.contains("filter[book.title][in]"));
+        assertTrue(paramNames.contains("filter[book.title][not]"));
+        assertTrue(paramNames.contains("filter[book.title][prefix]"));
+        assertTrue(paramNames.contains("filter[book.title][infix]"));
+        assertTrue(paramNames.contains("filter[book.title][postfix]"));
+        assertTrue(paramNames.contains("filter[book.title][isnull]"));
+        assertTrue(paramNames.contains("filter[book.title][notnull]"));
+        assertTrue(paramNames.contains("filter[book.title][lt]"));
+        assertTrue(paramNames.contains("filter[book.title][gt]"));
+        assertTrue(paramNames.contains("filter[book.title][le]"));
+        assertTrue(paramNames.contains("filter[book.title][ge]"));
+
+
+        /* Test relationships filters */
+        params = swagger.getPaths().get("/book/{bookId}/relationships/authors").getGet().getParameters();
+        paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        filterParams = paramNames.stream().filter((name) -> name.startsWith("filter")).count();
+        assertEquals(23, filterParams);
+
+        assertTrue(paramNames.contains("filter[author]"));
+        assertTrue(paramNames.contains("filter[author.name][in]"));
+        assertTrue(paramNames.contains("filter[author.name][not]"));
+        assertTrue(paramNames.contains("filter[author.name][prefix]"));
+        assertTrue(paramNames.contains("filter[author.name][infix]"));
+        assertTrue(paramNames.contains("filter[author.name][postfix]"));
+        assertTrue(paramNames.contains("filter[author.name][isnull]"));
+        assertTrue(paramNames.contains("filter[author.name][notnull]"));
+        assertTrue(paramNames.contains("filter[author.name][lt]"));
+        assertTrue(paramNames.contains("filter[author.name][gt]"));
+        assertTrue(paramNames.contains("filter[author.name][le]"));
+        assertTrue(paramNames.contains("filter[author.name][ge]"));
+    }
+
+    @Test
+    public void testPageParam() throws Exception {
+        /* Tests root collection */
+        List<Parameter> params = swagger.getPaths().get("/book").getGet().getParameters();
+
+        Set<String> paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        long pageParams = paramNames.stream().filter((name) -> name.startsWith("page")).count();
+        assertEquals(5, pageParams);
+
+        assertTrue(paramNames.contains("page[number]"));
+        assertTrue(paramNames.contains("page[size]"));
+        assertTrue(paramNames.contains("page[offset]"));
+        assertTrue(paramNames.contains("page[limit]"));
+        assertTrue(paramNames.contains("page[totals]"));
+
+        /* Tests relationship collection */
+        params = swagger.getPaths().get("/book/{bookId}/relationships/authors").getGet().getParameters();
+
+        paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        pageParams = paramNames.stream().filter((name) -> name.startsWith("page")).count();
+        assertEquals(5, pageParams);
+
+        assertTrue(paramNames.contains("page[number]"));
+        assertTrue(paramNames.contains("page[size]"));
+        assertTrue(paramNames.contains("page[offset]"));
+        assertTrue(paramNames.contains("page[limit]"));
+        assertTrue(paramNames.contains("page[totals]"));
+    }
+
+    @Test
+    public void testSortParam() throws Exception {
+        List<Parameter> params = swagger.getPaths().get("/book").getGet().getParameters();
+
+        Set<String> paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        long sortParams = paramNames.stream().filter((name) -> name.startsWith("sort")).count();
+        assertEquals(1, sortParams);
+        assertTrue(paramNames.contains("sort"));
+
+        QueryParameter sortParam = (QueryParameter) params.stream()
+                .filter((param) -> param.getName().equals("sort"))
+                .findFirst()
+                .get();
+
+        assertEquals("query", sortParam.getIn());
+
+        List<String> sortValues = Arrays.asList("id", "-id", "title", "-title");
+        assertTrue(((StringProperty) sortParam.getItems()).getEnum().containsAll(sortValues));
+        assertEquals("csv", sortParam.getCollectionFormat());
+    }
+
+    @Test
+    public void testIncludeParam() throws Exception {
+        List<Parameter> params = swagger.getPaths().get("/book").getGet().getParameters();
+
+        Set<String> paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        long includeParams = paramNames.stream().filter((name) -> name.startsWith("include")).count();
+        assertEquals(1, includeParams);
+        assertTrue(paramNames.contains("include"));
+
+        QueryParameter includeParam = (QueryParameter) params.stream()
+                .filter((param) -> param.getName().equals("include"))
+                .findFirst()
+                .get();
+
+        assertEquals("query", includeParam.getIn());
+
+        List<String> includeValues = Arrays.asList("authors", "publisher");
+        assertTrue(((StringProperty) includeParam.getItems()).getEnum().containsAll(includeValues));
+        assertEquals("csv", includeParam.getCollectionFormat());
+    }
+
+    @Test
+    public void testSparseFieldsParam() throws Exception {
+        List<Parameter> params = swagger.getPaths().get("/book").getGet().getParameters();
+
+        Set<String> paramNames = params.stream()
+                .map((param) -> param.getName())
+                .collect(Collectors.toSet());
+
+        long fieldParams = paramNames.stream().filter((name) -> name.startsWith("fields")).count();
+        assertEquals(1, fieldParams);
+        assertTrue(paramNames.contains("fields[book]"));
+
+        QueryParameter fieldParam = (QueryParameter) params.stream()
+                .filter((param) -> param.getName().equals("fields[book]"))
+                .findFirst()
+                .get();
+
+        assertEquals("query", fieldParam.getIn());
+
+        List<String> filterValues = Arrays.asList("title", "authors", "publisher");
+        assertTrue(((StringProperty) fieldParam.getItems()).getEnum().containsAll(filterValues));
+        assertEquals("csv", fieldParam.getCollectionFormat());
+    }
+
+    @Test
+    public void testDefinitionGeneration() throws Exception {
+        Map<String, Model> definitions = swagger.getDefinitions();
+
+        assertEquals(4, definitions.size());
+        assertTrue(definitions.containsKey("book"));
+        assertTrue(definitions.containsKey("author"));
+        assertTrue(definitions.containsKey("publisher"));
+        assertTrue(definitions.containsKey("Address"));
+
+        Model bookModel = definitions.get("book");
+        assertTrue(bookModel instanceof Resource);
+
+        assertEquals("A book", bookModel.getDescription());
+
+        ObjectProperty attributeProps = (ObjectProperty) bookModel.getProperties().get("attributes");
+        assertTrue(attributeProps.getProperties().containsKey("title"));
+
+        ObjectProperty relationProps = (ObjectProperty) bookModel.getProperties().get("relationships");
+        assertTrue(relationProps.getProperties().containsKey("publisher"));
+        assertTrue(relationProps.getProperties().containsKey("authors"));
+    }
+
+    @Test
+    public void testTagGeneration() throws Exception {
+
+        /* Check for the global tag definitions */
+        assertEquals(3, swagger.getTags().size());
+
+        Tag bookTag = swagger.getTags().stream()
+                .filter((tag) -> tag.getName().equals("book"))
+                .findFirst().get();
+
+        assertNotNull(bookTag);
+
+        Tag publisherTag = swagger.getTags().stream()
+                .filter((tag) -> tag.getName().equals("publisher"))
+                .findFirst().get();
+
+        assertNotNull(publisherTag);
+
+        /* For each operation, ensure its tagged with the root collection name */
+        swagger.getPaths().forEach((url, path) -> {
+            if (url.endsWith("relationships/books")) {
+                path.getGet().getTags().contains(bookTag);
+                path.getPost().getTags().contains(bookTag);
+                path.getDelete().getTags().contains(bookTag);
+                path.getPatch().getTags().contains(bookTag);
+            } else if (url.endsWith("/books")) {
+                path.getGet().getTags().contains(bookTag);
+                path.getPost().getTags().contains(bookTag);
+            } else if (url.endsWith("{bookId}")) {
+                path.getGet().getTags().contains(bookTag);
+                path.getPatch().getTags().contains(bookTag);
+                path.getDelete().getTags().contains(bookTag);
+            } else if (url.endsWith("relationships/publisher")) {
+                path.getGet().getTags().contains(publisherTag);
+                path.getPatch().getTags().contains(publisherTag);
+            } else if (url.endsWith("/publisher")) {
+                path.getGet().getTags().contains(publisherTag);
+                path.getPost().getTags().contains(publisherTag);
+            } else if (url.endsWith("{publisherId}")) {
+                path.getGet().getTags().contains(publisherTag);
+                path.getPatch().getTags().contains(publisherTag);
+                path.getDelete().getTags().contains(publisherTag);
+            }
+        });
+    }
+
+    @Test
+    public void testGlobalErrorResponses() throws Exception {
+        Info info = new Info()
+                .title("Test Service")
+                .version(NO_VERSION);
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+
+        Map<Integer, Response> responses = new HashMap<>();
+
+        responses.put(401, SwaggerBuilder.UNAUTHORIZED_RESPONSE);
+        responses.put(403, SwaggerBuilder.FORBIDDEN_RESPONSE);
+        responses.put(404, SwaggerBuilder.NOT_FOUND_RESPONSE);
+        responses.put(408, SwaggerBuilder.REQUEST_TIMEOUT_RESPONSE);
+        responses.put(429, SwaggerBuilder.REQUEST_TIMEOUT_RESPONSE);
+
+        responses.forEach(
+                (code, response) -> {
+                    builder.withGlobalResponse(code, response);
+
+                }
+        );
+
+        Swagger swagger = builder.build();
+
+        Operation [] ops = {
+                swagger.getPaths().get("/book/{bookId}").getGet(),
+                swagger.getPaths().get("/book/{bookId}").getDelete(),
+                swagger.getPaths().get("/publisher/{publisherId}/relationships/exclusiveAuthors").getPatch(),
+                swagger.getPaths().get("/publisher").getPost(),
+        };
+
+        for (Operation op : ops) {
+            responses.forEach(
+                    (code, response) -> {
+                        String key = String.valueOf(code);
+                        assertEquals(response, op.getResponses().get(key));
+                    }
+            );
+        }
+    }
+
+    @Test
+    public void testSortParameter() {
+        @Entity
+        @Include
+        class NothingToSort {
+            @Id
+            long name;
+        }
+        EntityDictionary entityDictionary = EntityDictionary.builder().build();
+
+        entityDictionary.bindEntity(NothingToSort.class);
+        Info info = new Info().title("Test Service").version(NO_VERSION);
+
+        SwaggerBuilder builder = new SwaggerBuilder(entityDictionary, info);
+        Swagger testSwagger = builder.build();
+
+        List<Parameter> params = testSwagger.getPaths().get("/nothingToSort").getGet().getParameters();
+
+        QueryParameter sortParam = (QueryParameter) params.stream()
+                .filter((param) -> param.getName().equals("sort"))
+                .findFirst()
+                .get();
+
+        assertEquals("query", sortParam.getIn());
+
+        List<String> sortValues = Arrays.asList("id", "-id");
+        assertEquals(sortValues, ((StringProperty) sortParam.getItems()).getEnum());
+    }
+
+    @Test
+    public void testAllFilterParameters() throws Exception {
+        Info info = new Info()
+                .title("Test Service");
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+        Swagger swagger = builder.build();
+
+        Operation op = swagger.getPaths().get("/book").getGet();
+
+        List<String> paramNames = op.getParameters().stream()
+                .filter(param -> param.getName().startsWith("filter"))
+                .map(Parameter::getName)
+                .sorted()
+                .collect(Collectors.toList());
+
+        List<String> expectedNames = Arrays.asList("filter", "filter[book.title][ge]", "filter[book.title][gt]",
+                "filter[book.title][in]", "filter[book.title][infix]", "filter[book.title][isnull]",
+                "filter[book.title][le]", "filter[book.title][lt]", "filter[book.title][not]",
+                "filter[book.title][notnull]", "filter[book.title][postfix]", "filter[book.title][prefix]",
+                "filter[book.year][ge]", "filter[book.year][gt]", "filter[book.year][in]", "filter[book.year][infix]",
+                "filter[book.year][isnull]", "filter[book.year][le]", "filter[book.year][lt]", "filter[book.year][not]",
+                "filter[book.year][notnull]", "filter[book.year][postfix]", "filter[book.year][prefix]",
+                "filter[book]");
+
+        assertEquals(expectedNames, paramNames);
+    }
+
+    @Test
+    public void testRsqlOnlyFilterParameters() throws Exception {
+        Info info = new Info()
+                .title("Test Service");
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+        builder = builder.withLegacyFilterDialect(false);
+        Swagger swagger = builder.build();
+
+        Operation op = swagger.getPaths().get("/book").getGet();
+
+        List<String> paramNames = op.getParameters().stream()
+                .filter(param -> param.getName().startsWith("filter"))
+                .map(Parameter::getName)
+                .sorted()
+                .collect(Collectors.toList());
+
+        List<String> expectedNames = Arrays.asList("filter", "filter[book]");
+
+        assertEquals(expectedNames, paramNames);
+    }
+
+    @Test
+    public void testLegacyOnlyFilterParameters() throws Exception {
+        Info info = new Info()
+                .title("Test Service");
+
+        SwaggerBuilder builder = new SwaggerBuilder(dictionary, info);
+        builder = builder.withRSQLFilterDialect(false);
+        Swagger swagger = builder.build();
+
+        Operation op = swagger.getPaths().get("/book").getGet();
+
+        List<String> paramNames = op.getParameters().stream()
+                .filter(param -> param.getName().startsWith("filter"))
+                .map(Parameter::getName)
+                .sorted()
+                .collect(Collectors.toList());
+
+        List<String> expectedNames = Arrays.asList("filter[book.title][ge]", "filter[book.title][gt]",
+                "filter[book.title][in]", "filter[book.title][infix]", "filter[book.title][isnull]",
+                "filter[book.title][le]", "filter[book.title][lt]", "filter[book.title][not]",
+                "filter[book.title][notnull]", "filter[book.title][postfix]", "filter[book.title][prefix]",
+                "filter[book.year][ge]", "filter[book.year][gt]", "filter[book.year][in]", "filter[book.year][infix]",
+                "filter[book.year][isnull]", "filter[book.year][le]", "filter[book.year][lt]", "filter[book.year][not]",
+                "filter[book.year][notnull]", "filter[book.year][postfix]", "filter[book.year][prefix]");
+
+        assertEquals(expectedNames, paramNames);
+    }
+
+    /**
+     * Verifies that the given property is of type 'Data' containing a reference to the given model.
+     * @param property The property to check
+     * @param refTypeName The model name
+     */
+    private void verifyData(Property property, String refTypeName) {
+        assertTrue((property instanceof Data));
+
+        ArrayProperty data = (ArrayProperty) ((Data) property).getProperties().get("data");
+
+        RefProperty ref = (RefProperty) data.getItems();
+        assertEquals("#/definitions/" + refTypeName, ref.get$ref());
+    }
+
+    /**
+     * Verifies that the given model is of type 'Data' containing a reference to the given model name.
+     * @param model The model to check
+     * @param refTypeName The model name to check
+     */
+    private void verifyData(Model model, String refTypeName) {
+        assertTrue((model instanceof com.yahoo.elide.swagger.model.Data));
+
+        ArrayProperty data = (ArrayProperty) model.getProperties().get("model");
+
+        RefProperty ref = (RefProperty) data.getItems();
+        assertEquals("#/definitions/" + refTypeName, ref.get$ref());
+    }
+
+    /**
+     * Verifies that the given property is of type 'Datum' containing a reference to the given model.
+     * @param property The property to check
+     * @param refTypeName The model name
+     * @param included Whether or not the datum should have an 'included' section.
+     */
+    private void verifyDatum(Property property, String refTypeName, boolean included) {
+        assertTrue((property instanceof Datum));
+
+        RefProperty ref = (RefProperty) ((Datum) property).getProperties().get("data");
+
+        assertEquals("#/definitions/" + refTypeName, ref.get$ref());
+
+        if (included) {
+            assertNotNull(((Datum) property).getProperties().get("included"));
+        }
+    }
+
+    /**
+     * Verifies that the given model is of type 'Datum' containing a reference to the given model name.
+     * @param model The model to check
+     * @param refTypeName The model name to check
+     */
+    private void verifyDatum(Model model, String refTypeName) {
+        assertTrue((model instanceof com.yahoo.elide.swagger.model.Datum));
+
+        RefProperty ref = (RefProperty) model.getProperties().get("data");
+
+        assertEquals("#/definitions/" + refTypeName, ref.get$ref());
+    }
+
+    /**
+     * Verifies that the given property is of type 'Data' containing a 'Relationship' with the
+     * correct type field.
+     * @param property The property to check
+     * @param refTypeName The type field to match against
+     */
+    private void verifyDataRelationship(Property property, String refTypeName) {
+        assertTrue((property instanceof Data));
+
+        ArrayProperty data = (ArrayProperty) ((Data) property).getProperties().get("data");
+
+        Relationship relation = (Relationship) data.getItems();
+        StringProperty type = (StringProperty) relation.getProperties().get("type");
+        assertTrue(type.getEnum().contains(refTypeName));
+    }
+
+     /**
+     * Verifies that the given model is of type 'Data' containing a 'Relationship' with the
+     * correct type field.
+     * @param model The model to check
+     * @param refTypeName The type field to match against
+     */
+    private void verifyDataRelationship(Model model, String refTypeName) {
+        assertTrue((model instanceof com.yahoo.elide.swagger.model.Data));
+
+        ArrayProperty data = (ArrayProperty) model.getProperties().get("data");
+
+        Relationship relation = (Relationship) data.getItems();
+        StringProperty type = (StringProperty) relation.getProperties().get("type");
+        assertTrue(type.getEnum().contains(refTypeName));
+    }
+}
diff --git a/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerIT.java b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerIT.java
new file mode 100644
index 0000000000..f7ca831f72
--- /dev/null
+++ b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerIT.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import static io.restassured.RestAssured.get;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.yahoo.elide.initialization.AbstractApiResourceInitializer;
+import com.yahoo.elide.swagger.resources.DocEndpoint;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+public class SwaggerIT extends AbstractApiResourceInitializer {
+    public SwaggerIT() {
+        super(SwaggerResourceConfig.class, DocEndpoint.class.getPackage().getName());
+    }
+
+    @Test
+    void testDocumentFetch() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(get("/doc/test").asString());
+        assertTrue(node.get("paths").size() > 1);
+        assertNotNull(node.get("paths").get("/book"));
+        assertNotNull(node.get("paths").get("/publisher"));
+    }
+
+    @Test
+    void testVersion2DocumentFetch() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(given().header("ApiVersion", "1.0").get("/doc/test").asString());
+        assertEquals(2, node.get("paths").size());
+        assertNotNull(node.get("paths").get("/book"));
+        assertNotNull(node.get("paths").get("/book/{bookId}"));
+    }
+}
diff --git a/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerResourceConfig.java b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerResourceConfig.java
new file mode 100644
index 0000000000..6a820c3646
--- /dev/null
+++ b/elide-swagger/src/test/java/com/yahoo/elide/swagger/SwaggerResourceConfig.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.swagger;
+
+import com.yahoo.elide.core.dictionary.EntityDictionary;
+import com.yahoo.elide.swagger.resources.DocEndpoint;
+import example.models.Author;
+import example.models.Book;
+import example.models.Publisher;
+import example.models.versioned.BookV2;
+import org.glassfish.hk2.api.Factory;
+import org.glassfish.hk2.api.TypeLiteral;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import io.swagger.models.Info;
+import io.swagger.models.Swagger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SwaggerResourceConfig extends ResourceConfig {
+
+    public SwaggerResourceConfig() {
+        register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                bindFactory(new Factory<List<DocEndpoint.SwaggerRegistration>>() {
+
+                    @Override
+                    public List<DocEndpoint.SwaggerRegistration> provide() {
+                        EntityDictionary dictionary = EntityDictionary.builder().build();
+
+                        dictionary.bindEntity(Book.class);
+                        dictionary.bindEntity(BookV2.class);
+                        dictionary.bindEntity(Author.class);
+                        dictionary.bindEntity(Publisher.class);
+                        Info info1 = new Info().title("Test Service");
+
+                        SwaggerBuilder builder1 = new SwaggerBuilder(dictionary, info1).withLegacyFilterDialect(false);
+                        Swagger swagger1 = builder1.build();
+
+                        Info info2 = new Info().title("Test Service").version("1.0");
+                        SwaggerBuilder builder2 = new SwaggerBuilder(dictionary, info2);
+                        Swagger swagger2 = builder2.build();
+
+                        List<DocEndpoint.SwaggerRegistration> docs = new ArrayList<>();
+                        docs.add(new DocEndpoint.SwaggerRegistration("test", swagger1));
+                        docs.add(new DocEndpoint.SwaggerRegistration("test", swagger2));
+                        return docs;
+                    }
+
+                    @Override
+                    public void dispose(List<DocEndpoint.SwaggerRegistration> instance) {
+                        //NOP
+                    }
+                }).to(new TypeLiteral<List<DocEndpoint.SwaggerRegistration>>() {
+                }).named("swagger");
+            }
+        });
+    }
+}
diff --git a/elide-swagger/src/test/java/example/models/Author.java b/elide-swagger/src/test/java/example/models/Author.java
new file mode 100644
index 0000000000..7f3731efad
--- /dev/null
+++ b/elide-swagger/src/test/java/example/models/Author.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+import com.yahoo.elide.annotation.Include;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+
+@Entity
+@Include(rootLevel = false, description = "The Author")
+public class Author {
+
+    public AuthorType membershipType;
+
+    public String name;
+
+    @ApiModelProperty(required = true)
+    public String phone;
+
+    @OneToMany
+    public Set<Book> getBooks() {
+        return null;
+    }
+
+    @OneToMany
+    public Set<Publisher> getPublisher() {
+        return null;
+    }
+}
diff --git a/elide-swagger/src/test/java/example/models/AuthorType.java b/elide-swagger/src/test/java/example/models/AuthorType.java
new file mode 100644
index 0000000000..0d33c043ef
--- /dev/null
+++ b/elide-swagger/src/test/java/example/models/AuthorType.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+public enum AuthorType {
+    SIGNED,
+    UNSIGNED,
+    PUBLISHED
+}
diff --git a/elide-swagger/src/test/java/example/models/Book.java b/elide-swagger/src/test/java/example/models/Book.java
new file mode 100644
index 0000000000..13bf68d5bd
--- /dev/null
+++ b/elide-swagger/src/test/java/example/models/Book.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+import com.yahoo.elide.annotation.CreatePermission;
+import com.yahoo.elide.annotation.DeletePermission;
+import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.annotation.ReadPermission;
+import com.yahoo.elide.annotation.UpdatePermission;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+@Entity
+@Include
+@ReadPermission(expression = "Principal is author OR Principal is publisher")
+@CreatePermission(expression = "Principal is author")
+@DeletePermission(expression = "Prefab.Role.None")
+@ApiModel(description = "A book")
+public class Book {
+    @OneToMany
+    @Size(max = 10)
+    @UpdatePermission(expression = "Principal is author")
+    @ApiModelProperty(value = "Writers", required = false, readOnly = true,
+        example = "[\"author1\", \"author2\", \"author3\"]")
+    public Set<Author> getAuthors() {
+        return null;
+    }
+
+    @OneToOne
+    @UpdatePermission(expression = "Principal is publisher")
+    public Publisher getPublisher() {
+        return null;
+    }
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    public String title;
+
+    @ApiModelProperty(value = "Year published", example = "1999", readOnly = true)
+    public String year;
+}
diff --git a/elide-swagger/src/test/java/example/models/Publisher.java b/elide-swagger/src/test/java/example/models/Publisher.java
new file mode 100644
index 0000000000..e3f30a16f4
--- /dev/null
+++ b/elide-swagger/src/test/java/example/models/Publisher.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package example.models;
+
+import com.yahoo.elide.annotation.Include;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+
+@Entity
+@Include
+public class Publisher {
+
+    /* Tests an inner class */
+    public class Address {
+        public String street;
+        public String city;
+        public String state;
+        public String zip;
+
+        /*
+         * Adding an Elide entity as an attribute is a test case for making sure the Swagger ModelResolver creates
+         * a ref back to our existing model for Book (rather than create a new model).
+         */
+        public Book hmmm;
+    }
+
+    @OneToMany
+    public Set<Book> getBooks() {
+        return null;
+    }
+
+    @OneToMany
+    public Set<Author> getExclusiveAuthors() {
+        return null;
+    }
+
+    public Address billingAddress;
+
+    public Map<String, Integer> billingCodes;
+
+    @ApiModelProperty(value = "Phone number", example = "555-000-1111")
+    public String phone;
+}
diff --git a/elide-test/README.md b/elide-test/README.md
new file mode 100644
index 0000000000..a93c1ab837
--- /dev/null
+++ b/elide-test/README.md
@@ -0,0 +1,60 @@
+# Elide Test Helpers
+
+A set of helpers for testing Elide web services
+
+## Installation
+```xml
+<dependency>
+  <groupId>com.yahoo.elide</groupId>
+  <artifactId>elide-test-helpers</artifactId>
+  <version>${elide.verison}</version>
+  <scope>test</scope>
+</dependency>
+```
+
+## Usage
+
+The `JsonApiDSL` can be used to build JSON:API documents in a typesafe way.
+
+```java
+package com.yahoo.elideinstnace.integration
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.*;
+
+public class ReviewTest {
+  @Test
+  public void createReview() {
+
+    given().
+    contentType("application/vnd.api+json").
+    body(
+      data(
+        resource(
+          type("review"),
+          attributes(
+            attr("title", "My Awesome Review")
+          ),
+          relationships(
+          	relation("author",
+              linkage(
+                type("author"), 
+                id("1")
+              )
+            )
+          )
+        )
+      ).toJSON()
+    ).
+    when().
+      post("/reviews/").
+    then().
+      statusCode(HttpStatus.SC_CREATED).
+      body(
+        "data.id", equalTo("22"),
+      );
+  }
+}
diff --git a/elide-test/pom.xml b/elide-test/pom.xml
new file mode 100644
index 0000000000..51b04321b8
--- /dev/null
+++ b/elide-test/pom.xml
@@ -0,0 +1,101 @@
+<!--
+  ~ Copyright 2019, Yahoo Inc.
+  ~ Licensed under the Apache License, Version 2.0
+  ~ See LICENSE file in project root for terms.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>elide-test-helpers</artifactId>
+    <packaging>jar</packaging>
+    <name>Elide Test Helpers</name>
+    <description>Test Helpers for Elide</description>
+    <url>https://github.com/yahoo/elide</url>
+    <parent>
+        <artifactId>elide-parent-pom</artifactId>
+        <groupId>com.yahoo.elide</groupId>
+        <version>6.1.4-SNAPSHOT</version>
+    </parent>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Yahoo Inc.</name>
+            <url>https://github.com/yahoo</url>
+        </developer>
+    </developers>
+
+    <scm>
+        <developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
+        <url>https://github.com/yahoo/elide.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java</artifactId>
+            <version>17.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/EnumFieldSerializer.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/EnumFieldSerializer.java
new file mode 100644
index 0000000000..555a5f4386
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/EnumFieldSerializer.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * A Jackson serializer for String entity field.
+ */
+public class EnumFieldSerializer extends JsonSerializer<String> {
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeRawValue(value);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/GraphQLDSL.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/GraphQLDSL.java
new file mode 100644
index 0000000000..3b3b5646ea
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/GraphQLDSL.java
@@ -0,0 +1,582 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql;
+
+import com.yahoo.elide.test.graphql.elements.Argument;
+import com.yahoo.elide.test.graphql.elements.Arguments;
+import com.yahoo.elide.test.graphql.elements.Definition;
+import com.yahoo.elide.test.graphql.elements.Document;
+import com.yahoo.elide.test.graphql.elements.Edges;
+import com.yahoo.elide.test.graphql.elements.Field;
+import com.yahoo.elide.test.graphql.elements.Mutation;
+import com.yahoo.elide.test.graphql.elements.Node;
+import com.yahoo.elide.test.graphql.elements.Query;
+import com.yahoo.elide.test.graphql.elements.Selection;
+import com.yahoo.elide.test.graphql.elements.SelectionSet;
+import com.yahoo.elide.test.graphql.elements.VariableDefinition;
+import com.yahoo.elide.test.graphql.elements.VariableDefinitions;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link GraphQLDSL} programmatically construct GraphQL query(excluding query variables)
+ * and serializes it to a GraphQL query string.
+ * <p>
+ * For example,
+ * <pre>
+ * {@code
+ * String graphQLQuery = document(
+ *         query(
+ *                 "myQuery",
+ *                 variableDefinitions(
+ *                         variableDefinition("bookId", "[String]")
+ *                 ),
+ *                 selections(
+ *                         field(
+ *                                 "book",
+ *                                 arguments(
+ *                                         argument("ids", "$bookId")
+ *                                 ),
+ *                                 selections(
+ *                                         field("id"),
+ *                                         field("title"),
+ *                                         field(
+ *                                                 "authors",
+ *                                                 selection(
+ *                                                         field("name")
+ *                                                 )
+ *                                         )
+ *                                 )
+ *                         )
+ *                 )
+ *                 )
+ *         ).toQuery();
+ * }
+ * </pre>
+ * will produces the following query
+ * <pre>
+ * {@code
+ * query myQuery($bookId: [String]) {
+ *     book(ids: $bookId) {
+ *         edges {
+ *             node {
+ *                 id
+ *                 title
+ *                 authors {
+ *                     edges {
+ *                         node {
+ *                             name
+ *                         }
+ *                     }
+ *                 }
+ *             }
+ *         }
+ *     }
+ * }
+ * }
+ * </pre>
+ * In addition, {@link GraphQLDSL} also allows programmatically constructing GraphQL response data. For example,
+ * <pre>
+ * {@code
+ * document(
+ *         selection(
+ *                 field(
+ *                         "book",
+ *                         selections(
+ *                                 field("id", "3"),
+ *                                 field("title", "Doctor Zhivago"),
+ *                                 field(
+ *                                         "publisher",
+ *                                         selection(
+ *                                                 field("id", "2")
+ *                                         )
+ *                                 )
+ *                         ),
+ *                         selections(
+ *                                 field("id", "1"),
+ *                                 field("title", "Libro Uno"),
+ *                                 field(
+ *                                         "publisher",
+ *                                         selection(
+ *                                                 field("id", "1")
+ *                                         )
+ *                                 )
+ *                         ),
+ *                         selections(
+ *                                 field("id", "2"),
+ *                                 field("title", "Libro Dos"),
+ *                                 field(
+ *                                         "publisher",
+ *                                         selection(
+ *                                                 field("id", "1")
+ *                                         )
+ *                                 )
+ *                         )
+ *                 )
+ *         )
+ * ).toResponse();
+ * }
+ * </pre>
+ * produces the following response:
+ * <pre>
+ * {@code
+ * {
+ *     "data":{
+ *         "book":{
+ *             "edges":[
+ *                 {
+ *                     "node":{
+ *                         "id":"3",
+ *                         "title":"Doctor Zhivago",
+ *                         "publisher":{
+ *                             "edges":[
+ *                                 {
+ *                                     "node":{
+ *                                         "id":"2"
+ *                                     }
+ *                                 }
+ *                             ]
+ *                         }
+ *                     }
+ *                 },
+ *                 {
+ *                     "node":{
+ *                         "id":"1",
+ *                         "title":"Libro Uno",
+ *                         "publisher":{
+ *                             "edges":[
+ *                                 {
+ *                                     "node":{
+ *                                         "id":"1"
+ *                                     }
+ *                                 }
+ *                             ]
+ *                         }
+ *                     }
+ *                 },
+ *                 {
+ *                     "node":{
+ *                         "id":"2",
+ *                         "title":"Libro Dos",
+ *                         "publisher":{
+ *                             "edges":[
+ *                                 {
+ *                                     "node":{
+ *                                         "id":"1"
+ *                                     }
+ *                                 }
+ *                             ]
+ *                         }
+ *                     }
+ *                 }
+ *             ]
+ *         }
+ *     }
+ * }
+ * }
+ * </pre>
+ * Note that {@link GraphQLDSL} follows Relay's connection pattern(https://graphql.org/learn/pagination/).
+ */
+public final class GraphQLDSL {
+
+    public static final boolean QUOTE_VALUE = true;
+    public static final boolean UNQUOTED_VALUE = false;
+
+    /**
+     * Jackson-serializes objects.
+     */
+    private static final ObjectMapper BASE_MAPPER = new ObjectMapper()
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
+            .setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+
+    /**
+     * Returns the JSON representation of an object.
+     *
+     * @param object  Object to be serialized
+     *
+     * @return a string
+     *
+     * @throws IllegalStateException
+     */
+    public static String toJson(Object object) {
+        try {
+            return BASE_MAPPER.writer().writeValueAsString(object);
+        } catch (JsonProcessingException exception) {
+            throw new IllegalArgumentException(exception);
+        }
+    }
+
+    /**
+     * Creates a GraphQL query.
+     *
+     * @param definitions  An variable-lengthed array of {@link Definition}s that composes a complete GraphQL query.
+     *
+     * @return a serializable GraphQL query object
+     */
+    public static Document document(Definition... definitions) {
+        return new Document(Arrays.asList(definitions));
+    }
+
+    /**
+     * Creates a single root-entity selection spec.
+     *
+     * @param selection  The single selection spec object
+     *
+     * @return a definition of a multi-definitions GraphQL query
+     *
+     * @see <a href="https://graphql.org/learn/queries/#fields">Field Selection</a>
+     */
+    public static SelectionSet selection(Selection selection) {
+        return new SelectionSet(new LinkedHashSet<>(Collections.singleton(selection)));
+    }
+
+    /**
+     * Creates a multi-root-entities selections spec.
+     *
+     * @param selections  An variable-sized array of selection spec objects
+     *
+     * @return a definition of a multi-definitions GraphQL query
+     *
+     * @see <a href="https://graphql.org/learn/queries/#fields">Field Selection</a>
+     */
+    public static SelectionSet selections(Selection... selections) {
+        return new SelectionSet(Arrays.stream(selections).collect(Collectors.toCollection(LinkedHashSet::new)));
+    }
+
+    /**
+     * Constructs a mutation.
+     *
+     * @param name  Mutation name
+     * @param variableDefinitions  Optional variables
+     * @param selectionSet  Selected fields
+     *
+     * @return a mutation
+     */
+    public static Mutation mutation(String name, VariableDefinitions variableDefinitions, SelectionSet selectionSet) {
+        return new Mutation(name, variableDefinitions, selectionSet);
+    }
+
+    /**
+     * Constructs a mutation.
+     *
+     * @param selectionSet  Selected fields
+     *
+     * @return a mutation
+     */
+    public static Mutation mutation(SelectionSet selectionSet) {
+        return new Mutation(null, null, selectionSet);
+    }
+
+    /**
+     * Constructs a named query.
+     *
+     * @param name  Query name
+     * @param variableDefinitions  Optional variables
+     * @param selectionSet  Selected fields
+     *
+     * @return a named query
+     */
+    public static Query query(String name, VariableDefinitions variableDefinitions, SelectionSet selectionSet) {
+        return new Query(name, variableDefinitions, selectionSet);
+    }
+
+    /**
+     * Constructs a named query.
+     *
+     * @param selectionSet  Selected fields
+     *
+     * @return a named query
+     */
+    public static Query query(SelectionSet selectionSet) {
+        return new Query(null, null, selectionSet);
+    }
+
+    /**
+     * Creates a collection of GraphQL variable definitions.
+     *
+     * @param variableDefinitions  A variable-sized array of {@link VariableDefinition}s
+     *
+     * @return A collection of GraphQL variable definitions
+     *
+     * @see <a href="https://graphql.org/learn/queries/#variables">Variables</a>
+     */
+    public static VariableDefinitions variableDefinitions(VariableDefinition... variableDefinitions) {
+        return new VariableDefinitions(Arrays.asList(variableDefinitions));
+    }
+
+    /**
+     * Creates a single GraphQL variable definition without default value.
+     *
+     * @param variable  A string (without "$" sign) representing the name of the variable
+     * @param type  A simplified String representation of the aforementioned type literal.
+     *
+     * @return A single GraphQL variable definition
+     *
+     * @see <a href="https://graphql.org/learn/queries/#variables">Variables</a>
+     */
+    public static VariableDefinition variableDefinition(String variable, String type) {
+        return new VariableDefinition(variable, type, null);
+    }
+
+    /**
+     * Constructs a response field with string value.
+     *
+     * @param name  Field name
+     * @param value  Field value
+     *
+     * @return a field
+     */
+    public static Selection field(String name, String value) {
+        return new Field(null, name, Arguments.emptyArgument(), Field.quoteValue(value));
+    }
+
+    /**
+     * Constructs a response field with numeric value.
+     *
+     * @param name  Field name
+     * @param value  Field value
+     *
+     * @return a field
+     */
+    public static Selection field(String name, Number value) {
+        return new Field(null, name, Arguments.emptyArgument(), value);
+    }
+
+    /**
+     * Constructs a response field with boolean value.
+     *
+     * @param name  Field name
+     * @param value  Field value
+     *
+     * @return a field
+     */
+    public static Selection field(String name, Boolean value) {
+        return new Field(null, name, Arguments.emptyArgument(), value);
+    }
+
+    /**
+     * Constructs a scalar response field.
+     *
+     * @param name  Field name
+     * @param value  Field value
+     * @param quoted  Weather value is quoted
+     *
+     * @return a field
+     */
+    public static Selection field(String name, String value, boolean quoted) {
+        return new Field(null, name, Arguments.emptyArgument(), quoted ? Field.quoteValue(value) : value);
+    }
+
+    /**
+     * Creates a request selection without {@link Argument}s.
+     *
+     * @param name  The name of the selected entity/field that would appear in a GraphQL query
+     * @param selectionSet  The fields of the entity that are selected
+     *
+     * @return a top-level selection
+     *
+     * @see <a href="https://graphql.org/learn/queries/#fields">Fields</a>
+     * @see <a href="https://graphql.org/learn/schema/#object-types-and-fields">Object Types and Fields</a>
+     */
+    public static Selection field(String name, SelectionSet... selectionSet) {
+        return field(null, name, selectionSet);
+    }
+
+    public static Selection field(String alias, String name, SelectionSet... selectionSet) {
+        List<SelectionSet> ss = ImmutableList.copyOf(selectionSet);
+        return new Field(alias, name, Arguments.emptyArgument(), relayWrap(ss));
+    }
+
+    /**
+     * Creates a single entity(object field) selection.
+     *
+     * @param name  The name of the selected entity/field that would appear in a GraphQL query
+     * @param arguments  The {@link Argument}s that would be applied to the selected entity
+     * @param selectionSet  The fields of the entity that are selected
+     *
+     * @return a top-level selection
+     *
+     * @see <a href="https://graphql.org/learn/queries/#fields">Fields</a>
+     * @see <a href="https://graphql.org/learn/queries/#arguments">Arguments</a>
+     * @see <a href="https://graphql.org/learn/schema/#object-types-and-fields">Object Types and Fields</a>
+     */
+    public static Selection field(String name, Arguments arguments, SelectionSet... selectionSet) {
+        return new Field(null, name, arguments, relayWrap(Arrays.asList(selectionSet)));
+    }
+
+    public static Selection field(String alias, String name, Arguments arguments, SelectionSet... selectionSet) {
+        return new Field(alias, name, arguments, relayWrap(Arrays.asList(selectionSet)));
+    }
+
+    /**
+     * Creates an attribute(scalar field) selection.
+     *
+     * @param name  The name of the selected attribute that would appear in a GraphQL query.
+     *
+     * @return a field that represents an non-reltionship entity attribute
+     *
+     * @see <a href="https://graphql.org/learn/schema/#scalar-types">Scalar Field</a>
+     */
+    public static Selection field(String name) {
+        return Field.scalarField(name);
+    }
+
+    /**
+     * Creates an attribute field selection with arguments.
+     * @param name The name of the field.
+     * @param arguments The arguments.
+     * @return a field that represents an non-reltionship entity attribute
+     */
+    public static Selection field(String name, Arguments arguments) {
+        return new Field(null, name, arguments, null);
+    }
+
+    /**
+     * Creates an attribute field selection with arguments and an alias.
+     * @param name The name of the field.
+     * @param alias The alias name of the field.
+     * @param arguments The arguments.
+     * @return a field that represents an non-reltionship entity attribute
+     */
+    public static Selection field(String name, String alias, Arguments arguments) {
+        return new Field(alias, name, arguments, null);
+    }
+
+    /**
+     * Creates a complete set of {@link Argument}s that is passed to a object field selection.
+     *
+     * @param arguments  A variable-sized group of {@link Argument}s passed to the object field selection
+     *
+     * @return a complete specification of selection arguments
+     *
+     * @see <a href="https://graphql.org/learn/queries/#arguments">Arguments</a>
+     */
+    public static Arguments arguments(Argument... arguments) {
+        return new Arguments(Arrays.asList(arguments));
+    }
+
+    /**
+     * Creates a {@link Argument single argument} that is passed to a object field selection.
+     *
+     * @param argument  The single {@link Argument} passed to the object field selection
+     *
+     * @return a complete specification of selection argument
+     *
+     * @see <a href="https://graphql.org/learn/queries/#arguments">Arguments</a>
+     */
+    public static Arguments argument(Argument argument) {
+        return new Arguments(Collections.singletonList(argument));
+    }
+
+    /**
+     * Creates a spec object of an GraphQL {@link Argument argument} whose value is not quoted.
+     *
+     * @param name  The name of the argument
+     * @param value  An object that models argument value.
+     *
+     * @return a complete specification of selection arguments
+     *
+     * @see <a href="https://graphql.org/learn/queries/#arguments">Arguments</a>
+     */
+    public static Argument argument(String name, Object value) {
+        return argument(name, value, false);
+    }
+
+    /**
+     * Creates a spec object of an GraphQL {@link Argument argument}.
+     *
+     * @param name  The name of the argument
+     * @param value  An object that models argument value.
+     * @param quoted  Whether or not the serialized {@code value} should be double-quote
+     *
+     * @return a complete specification of selection arguments
+     *
+     * @see <a href="https://graphql.org/learn/queries/#arguments">Arguments</a>
+     */
+    public static Argument argument(String name, Object value, boolean quoted) {
+        if (value instanceof String) {
+            value = quoted ? Field.quoteValue(value.toString()) : value;
+            return new Argument(name, value);
+        }
+        // this is an object which needs to be Jackson-serialized
+        try {
+            return new Argument(
+                    name,
+                    BASE_MAPPER
+                            .configure(
+                                    // GraphQL argument name is unquoted; hence quoted field is disabled.
+                                    JsonGenerator.Feature.QUOTE_FIELD_NAMES,
+                                    false
+                            )
+                            .writeValueAsString(value)
+            );
+        } catch (JsonProcessingException exception) {
+            throw new IllegalStateException(String.format("Cannot serialize %s", value), exception);
+        }
+    }
+
+    /**
+     * Wraps a set of field selections inside a Relay connection pattern spec.
+     * <p>
+     * For example,
+     * <pre>
+     * {@code
+     * book(ids: $bookId) {
+     *     id
+     *     title
+     *     authors {
+     *         name
+     *     }
+     * }
+     * }
+     * </pre>
+     * becomes
+     * <pre>
+     * {@code
+     * book(ids: $bookId) {
+     *     edges {
+     *         node {
+     *             id
+     *             title
+     *             authors {
+     *                 edges {
+     *                     node {
+     *                         name
+     *                     }
+     *                 }
+     *             }
+     *         }
+     *     }
+     * }
+     * }
+     * </pre>
+     *
+     * @param selectionSet  The field selections to be wrapped
+     *
+     * @return the same GraphQL spec in Relay's annotation
+     *
+     * @see <a href="https://graphql.org/learn/pagination/">Relay's connection pattern</a>
+     */
+    private static SelectionSet relayWrap(List<SelectionSet> selectionSet) {
+        Edges edges = new Edges(
+                selectionSet.stream()
+                        .map(Node::new)
+                        .collect(Collectors.toList())
+        );
+
+        return new SelectionSet(new LinkedHashSet<>(Collections.singleton(edges)));
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/VariableFieldSerializer.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/VariableFieldSerializer.java
new file mode 100644
index 0000000000..4700c6dc81
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/VariableFieldSerializer.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * A Jackson serializer for String entity field.
+ * <p>
+ * {@link VariableFieldSerializer} serializes a String field differently when value can both represents a concrete value
+ * or a GraphQL variable. On concrete value, it outputs the original value unmodified and quoted; on variable value, it
+ * does not quote the original value.
+ * <p>
+ * For example, given the following entity:
+ * <pre>
+ * {@code
+ * public class Book {
+ *
+ *     {@literal @}JsonSerialize(using = VariableFieldSerializer.class, as = String.class)
+ *     private String title;
+ * }
+ * }
+ * </pre>
+ * A {@code Book(title="Java Concurrency in Practice")} serializes to
+ * <pre>
+ * {"title": "Java Concurrency in Practice"}
+ * </pre>
+ * However a {@code Book(title="$titlePassedByClient")} serializes to
+ * <pre>
+ * {"title": $titlePassedByClient}
+ * </pre>
+ * Note in the 1st serialization {@code title} value is quoted while the 2nd serialization it is not.
+ * <p>
+ * To serialize a String entity field in such a way, add the following annotation to the field, as shown above:
+ * <pre>
+ * {@code
+ * {@literal @}JsonSerialize(using = VariableFieldSerializer.class, as = String.class)
+ * }
+ * </pre>
+ *
+ * @see <a href="https://graphql.org/learn/queries/#variables">Variables</a>
+ */
+public class VariableFieldSerializer extends JsonSerializer<String> {
+
+    private static final String VARIABLE_SIGN = "$";
+    private static final String ENUM_SIGN = "#";
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+
+        if (value.startsWith(VARIABLE_SIGN)) {
+            // this is a variable
+            gen.writeRawValue(value);
+        } else if (value.startsWith(ENUM_SIGN)) {
+            // this is an enum
+            gen.writeRawValue(value.substring(1));
+        } else {
+            gen.writeString(value);
+        }
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Argument.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Argument.java
new file mode 100644
index 0000000000..73c7a2a454
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Argument.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * {@link Argument} represents the same concept as {@link graphql.language.Argument GraphQL Argument} but specializes
+ * in serialization, in contrast to {@link graphql.language.Argument GraphQL Argument}, which is designed for
+ * deserialization.
+ *
+ * @see <a href="https://graphql.org/learn/queries/#arguments">GraphQL Arguments</a>
+ */
+@RequiredArgsConstructor
+public class Argument implements Serializable {
+
+    private static final long serialVersionUID = 2346978495975190484L;
+
+    /**
+     * The "name" TOKEN defined in GraphQL grammar.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final String name;
+
+    /**
+     * A GraphQL concept that defines argument value.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final Object value;
+
+    /**
+     * Returns a GraphQL query string that representing an argument.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    public String toGraphQLSpec() {
+        return String.format("%s: %s", getName(), getValue());
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Arguments.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Arguments.java
new file mode 100644
index 0000000000..6c818ac1c8
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Arguments.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link Arguments} is a serializable object that models the concept of GraphQL arguments.
+ * <p>
+ * According to GraphQL grammar (6.0)
+ * <pre>
+ * {@code
+ * arguments : '(' argument+ ')';
+ * }
+ * </pre>
+ * Arguments is a space-separated list of {@link Argument}s surrounded by a pair of parenthesis.
+ *
+ * @see Argument
+ */
+@RequiredArgsConstructor
+public class Arguments implements Serializable {
+
+    /**
+     * Creates an empty list of {@link Arguments arguments}.
+     *
+     * @return no argument
+     */
+    public static Arguments emptyArgument() {
+        return new Arguments(Collections.emptyList());
+    }
+
+    private static final long serialVersionUID = 1312779653134889019L;
+
+    /**
+     * Models {@code argument+}.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    List<Argument> arguments;
+
+    /**
+     * Returns a GraphQL query string that representing an set of arguments.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    public String toGraphQLSpec() {
+        return getArguments().stream()
+                .map(Argument::toGraphQLSpec)
+                .collect(Collectors.joining(" ", "(", ")"));
+    }
+
+    /**
+     * Returns whether or not this {@link Arguments} is empty, i.e. no argument is to be serialized.
+     *
+     * @return {@code true} if serializing this {@link Arguments} is skipped
+     */
+    public boolean noArgument() {
+        return getArguments().isEmpty();
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Definition.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Definition.java
new file mode 100644
index 0000000000..75187ad9e6
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Definition.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import java.io.Serializable;
+
+/**
+ * {@link Definition} represents the same concept as {@link graphql.language.Definition GraphQL Definition} but
+ * specializes in serialization, in contrast to {@link graphql.language.Definition GraphQL Definition}, which is
+ * designed for deserialization.
+ */
+public abstract class Definition implements Serializable {
+
+    private static final long serialVersionUID = 9111832639983951228L;
+
+    /**
+     * Returns the query string that corresponds to the a {@link graphql.language.Definition} part
+     * of a GraphQL query.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    abstract String toGraphQLSpec();
+
+    /**
+     * Returns the response string that corresponds to the a {@link graphql.language.Definition} part
+     * of a GraphQL query.
+     *
+     * @return a sub-string of a GraphQL response
+     */
+    String toResponse() {
+        throw new UnsupportedOperationException("Typed operation cannot be in response");
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Document.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Document.java
new file mode 100644
index 0000000000..002b2389d0
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Document.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link Document} represents the same concept as {@link graphql.language.Document GraphQL Document} but
+ * specializes in serialization, in contrast to {@link graphql.language.Document GraphQL Document}, which is
+ * designed for deserialization.
+ * <p>
+ * According to GraphQL grammar (6.0)
+ * <pre>
+ * {@code
+ * document : definition+;
+ * }
+ * </pre>
+ * A {@link Document} is a list of one or more {@link Definition}s.
+ */
+@RequiredArgsConstructor
+public class Document implements Serializable {
+
+    private static final long serialVersionUID = -1388610970958604545L;
+
+    /**
+     * Models the list of one or more {@link Definition}s.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final List<Definition> definitions;
+
+    /**
+     * Returns the complete GraphQL query that this {@link Document} represents.
+     *
+     * @return a string representation of a GraphQL query
+     */
+    public String toQuery() {
+        return getDefinitions().stream()
+                .map(Definition::toGraphQLSpec)
+                .collect(Collectors.joining(" "));
+    }
+
+    /**
+     * Returns the complete GraphQL response that this {@link Document} represents.
+     *
+     * @return a string representation of a GraphQL response
+     */
+    public String toResponse() {
+        String response = getDefinitions().stream()
+                .map(definition -> String.format("{\"data\":%s}", definition.toResponse()))
+                .collect(Collectors.joining(", "));
+
+        if (getDefinitions().size() != 1) {
+            return String.format("[%s]", response);
+        }
+
+        return response;
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Edges.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Edges.java
new file mode 100644
index 0000000000..457edda766
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Edges.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link Edges} represents the same concepts as the edges in Relay's connection pattern
+ * (https://graphql.org/learn/pagination/#pagination-and-edges).
+ * <p>
+ * {@link Edges} is a list of {@link Node}s.
+ *
+ * @see Node
+ */
+@RequiredArgsConstructor
+public class Edges extends Selection {
+
+    private static final long serialVersionUID = 1860183539630769326L;
+
+    /**
+     * Models the list of {@link Node}s.
+     */
+    @Getter
+    @NonNull
+    private final List<Node> nodes;
+
+    /**
+     * Returns the query string that corresponds to the edges that connects sub-graphs in a GraphQL query.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    @Override
+    public String toGraphQLSpec() {
+        return String.format("edges {%s}", getNodes().get(0).toGraphQLSpec());
+    }
+
+    @Override
+    public String toResponse() {
+        return String.format("\"edges\":[%s]", attachNodes(getNodes()));
+    }
+
+    /**
+     * Serializes a list of nodes represented by a list of {@link SelectionSet} into GraphQL response data format.
+     * <p>
+     * For example,
+     * <pre>
+     * {@code
+     * {
+     *     "node" {
+     *         "id": "1",
+     *         "title": "Effective Java",
+     *         "authors": ...
+     *     }
+     * },
+     * {
+     *     "node" {
+     *         "id": "2",
+     *         "title": "JVM Specification",
+     *         "authors": ...
+     *     }
+     * }
+     * }
+     * </pre>
+     * <p>
+     * If the list is empty, this method returns empty string.
+     *
+     * @param nodes  Objects each containing all fields of an instantiated entity
+     *
+     * @return a sub-string of response data
+     */
+    private static String attachNodes(List<Node> nodes) {
+        if (nodes.isEmpty()) {
+            /* we want response to be something like
+             *
+             * "book": {
+             *   "edges": []
+             * }
+             */
+            return "";
+        }
+
+        return nodes.stream()
+                .map(Node::toResponse)
+                .collect(Collectors.joining(","));
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Field.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Field.java
new file mode 100644
index 0000000000..903677ce62
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Field.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * {@link Field} represents the same concept as {@link graphql.language.Field GraphQL Field} but specializes in
+ * serialization, in contrast to {@link graphql.language.Field GraphQL Field}, which is designed for deserialization.
+ * <p>
+ * According to GraphQL grammar (6.0):
+ * <pre>
+ * {@code
+ *     selection :
+ *         field |
+ *         fragmentSpread |
+ *         inlineFragment;
+ *
+ *     field : alias? name arguments? directives? selectionSet?;
+ * }
+ * </pre>
+ * A {@link Field} is a sub-type of {@link Selection}. The simplest {@link Field} is a scalar field; otherwise it would
+ * be an object field
+ *
+ * @see Selection
+ * @see <a href="https://graphql.org/learn/schema/#scalar-types">Scalar types</a>
+ * @see <a href="https://graphql.org/learn/schema/#object-types-and-fields">Object types and fields</a>
+ */
+@RequiredArgsConstructor
+public class Field extends Selection {
+
+    private static final long serialVersionUID = -5906705888838083150L;
+
+    public static Field scalarField(String name) {
+        return new Field(null, name, Arguments.emptyArgument(), null);
+    }
+
+    public static String quoteValue(String value) {
+        return String.format("\"%s\"", value.replace("\"", "\\\""));
+    }
+
+    @Getter(AccessLevel.PRIVATE)
+    private final String alias;
+
+    /**
+     * The "name" TOKEN defined in GraphQL grammar.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final String name;
+
+    /**
+     * Models "arguments".
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final Arguments arguments;
+
+    /**
+     * Models a "selections set".
+     */
+    @Getter(AccessLevel.PRIVATE)
+    private final Serializable selectionSet;
+
+    @Override
+    public String toGraphQLSpec() {
+        return String.format(
+                "%s%s%s%s",
+                getAlias() == null ? "" : getAlias() + ": ",
+                getName(),
+                argument(),
+                selection()
+        );
+    }
+
+    @Override
+    public String toResponse() {
+        if (selectionSet instanceof String || selectionSet instanceof Number) {
+            // scalar response field
+            return String.format(
+                    "\"%s\":%s",
+                    getName(),
+                    getSelectionSet().toString().equals("")
+                            ? "{\"edges\":[]}"
+                            : getSelectionSet().toString()
+            );
+        }
+
+        if (getSelectionSet() == null) {
+            return String.format("\"%s\":%s", getName(), null);
+        }
+        // object response field
+        return String.format("\"%s\":%s", getName(), ((SelectionSet) getSelectionSet()).toResponse());
+    }
+
+    private String argument() {
+        return getArguments().noArgument()
+                ? ""
+                : getArguments().toGraphQLSpec();
+    }
+
+    private String selection() {
+        return getSelectionSet() == null ? "" : " " + ((SelectionSet) getSelectionSet()).toGraphQLSpec();
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Mutation.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Mutation.java
new file mode 100644
index 0000000000..405741e217
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Mutation.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.NonNull;
+
+/**
+ * Represents GraphQL mutation query.
+ */
+public class Mutation extends TypedOperation {
+
+    private static final long serialVersionUID = 1990970251076956044L;
+
+    public Mutation(
+            final String name,
+            final VariableDefinitions variableDefinitions,
+            @NonNull final SelectionSet selectionSet
+    ) {
+        super("mutation", name, variableDefinitions, selectionSet);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Node.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Node.java
new file mode 100644
index 0000000000..f5555fe56e
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Node.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.stream.Collectors;
+
+/**
+ * {@link Node} represents the same concepts as the "node" in Relay's connection pattern
+ * (https://graphql.org/learn/pagination/#pagination-and-edges).
+ */
+@RequiredArgsConstructor
+public class Node extends Selection {
+
+    private static final long serialVersionUID = 2525022170227460587L;
+
+    /**
+     * The selections inside the node.
+     * <p>
+     * For example
+     *
+     */
+    @NonNull
+    @Getter
+    private final SelectionSet fields;
+
+    @Override
+    public String toGraphQLSpec() {
+        return String.format(
+                "node %s",
+                getFields().toGraphQLSpec()
+        );
+    }
+
+    @Override
+    public String toResponse() {
+        return String.format("{\"node\":{%s}}", serializeNode(this));
+    }
+
+    /**
+     * Serializes a node represented by a {@link SelectionSet} into GraphQL response data format.
+     *
+     * @param node  An object containing all fields of an instantiated entity
+     *
+     * @return a sub-string of response data
+     */
+    private static String serializeNode(Node node) {
+        return node.getFields().getSelections().stream()
+                .map(Selection::toResponse)
+                .collect(Collectors.joining(","));
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Query.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Query.java
new file mode 100644
index 0000000000..4c3024b7f2
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Query.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.NonNull;
+
+/**
+ * Represents GraphQL named query.
+ */
+public class Query extends TypedOperation {
+
+    private static final long serialVersionUID = 1990970251076956044L;
+
+    public Query(
+            final String name,
+            final VariableDefinitions variableDefinitions,
+            @NonNull final SelectionSet selectionSet
+    ) {
+        super("query", name, variableDefinitions, selectionSet);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Selection.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Selection.java
new file mode 100644
index 0000000000..4072d14583
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/Selection.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+/**
+ * {@link Selection} represents the same concept as {@link graphql.language.Selection} but specializes in serialization,
+ * in contrast to {@link graphql.language.Selection GraphQL Field Selection}, which is designed for deserialization.
+ */
+public abstract class Selection extends Definition {
+
+    private static final long serialVersionUID = 2555015523902719386L;
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/SelectionSet.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/SelectionSet.java
new file mode 100644
index 0000000000..9625cbf48b
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/SelectionSet.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.LinkedHashSet;
+import java.util.stream.Collectors;
+
+/**
+ * {@link SelectionSet} is a serializable object that models the concept of a group of field selection in GraphQL.
+ */
+@RequiredArgsConstructor
+public class SelectionSet extends Definition {
+
+    private static final long serialVersionUID = -2777133166190446552L;
+
+    /**
+     * Models {@code selection+}.
+     */
+    @Getter
+    @NonNull
+    private final LinkedHashSet<Selection> selections;
+
+    @Override
+    public String toGraphQLSpec() {
+        return getSelections().stream().map(Selection::toGraphQLSpec)
+                .collect(Collectors.joining(" ", "{", "}"));
+    }
+
+    @Override
+    String toResponse() {
+        return getSelections().stream().map(Selection::toResponse)
+                .collect(Collectors.joining(", ", "{", "}"));
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/TypedOperation.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/TypedOperation.java
new file mode 100644
index 0000000000..ed7e7f0539
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/TypedOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * According to GraphQL grammar (6.0):
+ * <pre>
+ * {@code
+ * operationType  name? variableDefinitions? directives? selectionSet;
+ *
+ * operationType : SUBSCRIPTION | MUTATION | QUERY;
+ * }
+ * </pre>
+ * A {@link TypedOperation} comes with required {@code operation type} and {@link SelectionSet} along with optional
+ * operation name and variables used in query.
+ */
+@RequiredArgsConstructor
+public abstract class TypedOperation extends Definition {
+
+    private static final long serialVersionUID = 5049217577677973567L;
+
+    /**
+     * Models the required {@code operation type}.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final String operationType;
+
+    /**
+     * The "name" TOKEN defined in GraphQL grammar.
+     */
+    @Getter(AccessLevel.PRIVATE)
+    private final String name;
+
+    /**
+     * Models the {@code variableDefinitions}.
+     */
+    @Getter(AccessLevel.PRIVATE)
+    private final VariableDefinitions variableDefinitions;
+
+    /**
+     * Models the required {@link SelectionSet}.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final SelectionSet selectionSet;
+
+    @Override
+    public String toGraphQLSpec() {
+        return String.format(
+                "%s %s%s%s",
+                getOperationType(),
+                getName() == null ? "" : getName(),
+                getVariableDefinitions() == null
+                        ? ""
+                        : getVariableDefinitions().toGraphQLSpec() + " ",
+                getSelectionSet().toGraphQLSpec()
+        );
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinition.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinition.java
new file mode 100644
index 0000000000..bcc3d516dd
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinition.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Objects;
+
+/**
+ * {@link VariableDefinition} represents the same concept as
+ * {@link graphql.language.VariableDefinition GraphQL VariableDefinition} but specializes in serialization, in
+ * contrast to {@link graphql.language.VariableDefinition GraphQL VariableDefinition}, which is designed for
+ * deserialization.
+ * <p>
+ * According to GraphQL grammar (6.0),
+ * <pre>
+ * {@code
+ * variableDefinition : variable ':' type defaultValue?;
+ *
+ * variable : '$' name;
+ * }
+ * </pre>
+ * A {@link VariableDefinition} is a key-value pair of string and type literal with optional default value for that
+ * variable.
+ */
+@RequiredArgsConstructor
+public class VariableDefinition extends Definition {
+
+    private static final long serialVersionUID = -899567129301468808L;
+
+    /**
+     * The "name" TOKEN defined in GraphQL grammar.
+     * <p>
+     * Note that there is no "$" in it.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final String variable;
+
+    /**
+     * A simplified String representation of the aforementioned type literal.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final String type;
+
+    /**
+     * Models the aforementioned default value.
+     */
+    @Getter(AccessLevel.PRIVATE)
+    private final Object defaultValue;
+
+    /**
+     * Returns the query string that corresponds to the a {@link graphql.language.VariableDefinition} part
+     * of a GraphQL query.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    public String toGraphQLSpec() {
+        return String.format(
+                "$%s: %s%s",
+                getVariable(),
+                getType(),
+                Objects.isNull(getDefaultValue())
+                        ? ""
+                        : String.format("=%s", getDefaultValue())
+        );
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinitions.java b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinitions.java
new file mode 100644
index 0000000000..a6e900bcc8
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/graphql/elements/VariableDefinitions.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql.elements;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link VariableDefinitions} is a serializable object that models the concept of GraphQL {@code variableDefinitions
+ * } in its grammar.
+ * <p>
+ * According to GraphQL grammar (6.0)
+ * <pre>
+ * {@code
+ * variableDefinitions : '(' variableDefinition+ ')';
+ * }
+ * </pre>
+ * {@link VariableDefinitions} is a space-separated list of {@link VariableDefinition}s surrounded by a pair of
+ * parenthesis.
+ */
+@RequiredArgsConstructor
+public class VariableDefinitions extends Definition {
+
+    private static final long serialVersionUID = 6946714566964868745L;
+    /**
+     * Models the space-separated list of {@link VariableDefinition}s.
+     */
+    @NonNull
+    @Getter(AccessLevel.PRIVATE)
+    private final List<VariableDefinition> variableDefinitions;
+
+    /**
+     * Returns a GraphQL query string that representing an set of variable definition.
+     *
+     * @return a sub-string of a GraphQL query
+     */
+    @Override
+    public String toGraphQLSpec() {
+        return getVariableDefinitions().stream()
+                .map(VariableDefinition::toGraphQLSpec)
+                .collect(Collectors.joining(" ", "(", ")"));
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/JsonApiDSL.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/JsonApiDSL.java
new file mode 100644
index 0000000000..8b413b4cec
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/JsonApiDSL.java
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi;
+
+import com.yahoo.elide.test.jsonapi.elements.Attribute;
+import com.yahoo.elide.test.jsonapi.elements.Attributes;
+import com.yahoo.elide.test.jsonapi.elements.Data;
+import com.yahoo.elide.test.jsonapi.elements.Document;
+import com.yahoo.elide.test.jsonapi.elements.Id;
+import com.yahoo.elide.test.jsonapi.elements.Include;
+import com.yahoo.elide.test.jsonapi.elements.Links;
+import com.yahoo.elide.test.jsonapi.elements.PatchOperation;
+import com.yahoo.elide.test.jsonapi.elements.PatchOperationType;
+import com.yahoo.elide.test.jsonapi.elements.PatchSet;
+import com.yahoo.elide.test.jsonapi.elements.Relation;
+import com.yahoo.elide.test.jsonapi.elements.Relationships;
+import com.yahoo.elide.test.jsonapi.elements.Resource;
+import com.yahoo.elide.test.jsonapi.elements.ResourceLinkage;
+import com.yahoo.elide.test.jsonapi.elements.Type;
+
+/**
+ * Adds helper functions for creating Json API style data.
+ * <p>
+ * Example:
+ * data(
+ * resource(
+ * type("users"),
+ * id("the-user-id")
+ * )
+ * )
+ * <p>
+ * Creates Json in the form:
+ * "data": {
+ * "type": "user",
+ * "id":   "the-user-id"
+ * }
+ */
+public class JsonApiDSL {
+
+    /**
+     * Data data.
+     *
+     * @param resources the resources
+     * @return a data
+     */
+    public static Data data(Resource... resources) {
+        return new Data(resources);
+    }
+
+    /**
+     * Include data.
+     *
+     * @param resources the resources
+     * @return An include
+     */
+    public static Include include(Resource... resources) {
+        return new Include(resources);
+    }
+
+    /**
+     * Data relationships.
+     *
+     * @param links the relationship links
+     * @return A top level JSON-API doc
+     */
+    public static Data data(ResourceLinkage... links) {
+        return new Data(links);
+    }
+
+    /**
+     * Data relationship.
+     *
+     * @param link the singular relationship link
+     * @return A top level JSON-API doc
+     */
+    public static Data datum(ResourceLinkage link) {
+        return new Data(link);
+    }
+
+    /**
+     * A document with data and includes.
+     *
+     * @param resources the data resources
+     * @param includes the included resources
+     * @return A top level JSON-API doc
+     */
+    public static Document document(Data resources, Include includes) {
+        return new Document(resources, includes);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type          the type
+     * @param id            the id
+     * @param attributes    the attributes
+     * @param relationships the relationships
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id, Attributes attributes, Relationships relationships) {
+        return new Resource(id, type, attributes, null, relationships);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type          the type
+     * @param id            the id
+     * @param attributes    the attributes
+     * @param link          the link
+     * @param relationships the relationships
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id, Attributes attributes, Links link, Relationships relationships) {
+        return new Resource(id, type, attributes, link, relationships);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type          the type
+     * @param id            the id
+     * @param attributes    the attributes
+     * @param link          the link
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id, Attributes attributes, Links link) {
+        return new Resource(id, type, attributes, link, null);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type       the type
+     * @param id         the id
+     * @param attributes the attributes
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id, Attributes attributes) {
+        return new Resource(id, type, attributes, null, null);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type       the type
+     * @param id         the id
+     * @param relationships the attributes
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id, Relationships relationships) {
+        return new Resource(id, type, null, null, relationships);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type the type
+     * @param id   the id
+     * @return the resource
+     */
+    public static Resource resource(Type type, Id id) {
+        return new Resource(id, type, null, null, null);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type       the type
+     * @param attributes the attributes
+     * @return the resource
+     */
+    public static Resource resource(Type type, Attributes attributes) {
+        return new Resource(id(null), type, attributes, null, null);
+    }
+
+    /**
+     * Resource resource.
+     *
+     * @param type          the type
+     * @param attributes    the attributes
+     * @param relationships the relationships
+     * @return the resource
+     */
+    public static Resource resource(Type type, Attributes attributes, Relationships relationships) {
+        return new Resource(id(null), type, attributes, null, relationships);
+    }
+
+    /**
+     * Type type.
+     *
+     * @param value the value
+     * @return the type
+     */
+    public static Type type(String value) {
+        return new Type(value);
+    }
+
+    /**
+     * Id id.
+     *
+     * @param id the id
+     * @return the id
+     */
+    public static Id id(Object id) {
+        return new Id(id);
+    }
+
+    /**
+     * Attributes attributes.
+     *
+     * @param attrs the attrs
+     * @return the attributes
+     */
+    public static Attributes attributes(Attribute... attrs) {
+        return new Attributes(attrs);
+    }
+
+    /**
+     * Links links.
+     *
+     * @param attrs the attrs
+     * @return the attributes
+     */
+    public static Links links(Attribute... attrs) {
+        return new Links(attrs);
+    }
+
+    /**
+     * Attr attribute.
+     *
+     * @param key   the key
+     * @param value the value
+     * @return the attribute
+     */
+    public static Attribute attr(String key, Object value) {
+        return new Attribute(key, value);
+    }
+
+    /**
+     * Relationships relationships.
+     *
+     * @param relationships the relationships
+     * @return the relationships
+     */
+    public static Relationships relationships(Relation... relationships) {
+        return new Relationships(relationships);
+    }
+
+    /**
+     * Creates a to-many relationship.
+     *
+     * @param field           the field
+     * @param resourceLinkage the resource linkage
+     * @return the relation
+     */
+    public static Relation relation(String field, ResourceLinkage... resourceLinkage) {
+        return new Relation(field, resourceLinkage);
+    }
+
+    /**
+     * Relation relation.
+     *
+     * @param field           the field
+     * @param toOne           whether or not this is a toOne or toMany relationship
+     * @param resourceLinkage the resource linkage
+     * @return the relation
+     */
+    public static Relation relation(String field, boolean toOne, ResourceLinkage... resourceLinkage) {
+        return new Relation(field, toOne, null, resourceLinkage);
+    }
+
+    /**
+     * Relation relation.
+     *
+     * @param field           the field
+     * @return the relation
+     */
+    public static Relation relation(String field) {
+        return new Relation(field);
+    }
+
+    /**
+     * Relation relation.
+     *
+     * @param field           the field
+     * @param links           the links
+     * @return the relation
+     */
+    public static Relation relation(String field, Links links) {
+        return new Relation(field, links);
+    }
+
+    /**
+     * Relation relation.
+     *
+     * @param field           the field
+     * @param links           the links
+     * @param resourceLinkage the resource linkage
+     * @return the relation
+     */
+    public static Relation relation(String field, Links links, ResourceLinkage... resourceLinkage) {
+        return new Relation(field, links, resourceLinkage);
+    }
+    /**
+     * Relation relation.
+     *
+     * @param field           the field
+     * @param toOne           whether or not this is a toOne or toMany relationship
+     * @return the relation
+     */
+    public static Relation relation(String field, boolean toOne) {
+        return new Relation(field, toOne);
+    }
+
+    /**
+     * Linkage resource linkage.
+     *
+     * @param type the type
+     * @param id   the id
+     * @return the resource linkage
+     */
+    public static ResourceLinkage linkage(Type type, Id id) {
+        return new ResourceLinkage(id, type);
+    }
+
+    /**
+     * Patch Set.
+     *
+     * @param patchOperations the set of patch operation.
+     * @return the patch set
+     */
+    public static PatchSet patchSet(PatchOperation... patchOperations) {
+        return new PatchSet(patchOperations);
+    }
+
+    /**
+     * Patch Operation.
+     *
+     * @param operation the operation type
+     * @param path the operation path
+     * @param value the operation value
+     * @return the patch operation
+     */
+    public static PatchOperation patchOperation(PatchOperationType operation, String path, Resource value) {
+        return new PatchOperation(operation, path, value);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attribute.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attribute.java
new file mode 100644
index 0000000000..dbb65062a5
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attribute.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.jsonapi.elements;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * The type Attribute.
+ */
+@AllArgsConstructor
+public class Attribute {
+    /**
+     * The Key.
+     */
+    @Getter
+    final String key;
+    /**
+     * The Value.
+     */
+    @Getter
+    final Object value;
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attributes.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attributes.java
new file mode 100644
index 0000000000..4276b57560
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Attributes.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+
+/**
+ * The type Attributes.
+ */
+public class Attributes extends LinkedHashMap<String, Object> {
+
+    /**
+     * Instantiates a new Attributes.
+     *
+     * @param attributes the attributes
+     */
+    public Attributes(Attribute... attributes) {
+        for (Attribute attribute : attributes) {
+            this.put(attribute.key, attribute.value);
+        }
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Data.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Data.java
new file mode 100644
index 0000000000..bde0f16a8a
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Data.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.LinkedHashMap;
+
+/**
+ * The type Data.
+ */
+public class Data extends LinkedHashMap<String, Object> {
+    static private final Gson GSON_INSTANCE = new GsonBuilder()
+            .disableHtmlEscaping()
+            .serializeNulls().create();
+
+    /**
+     * Instantiates a singular data object from a single resource.
+     * @param resource  the resources
+     */
+    public Data(Resource resource) {
+        this.put("data", resource);
+    }
+
+    /**
+     * Instantiates a data list based on multiple resources.
+     *
+     * @param resources the resources
+     */
+    public Data(Resource... resources) {
+        if (resources == null) {
+            this.put("data", new Resource[0]);
+        } else {
+            this.put("data", resources);
+        }
+    }
+
+    /**
+     * Instantiates a new data list based on relationships.
+     *
+     * @param links the relationships
+     */
+    public Data(ResourceLinkage... links) {
+        this.put("data", links);
+    }
+
+    /**
+     * Instantiates a singular data object based on a relationship.
+     *
+     * @param link the relationships
+     */
+    public Data(ResourceLinkage link) {
+        this.put("data", link);
+    }
+
+    /**
+     * To json string.
+     *
+     * @return the string
+     */
+    public String toJSON() {
+        return GSON_INSTANCE.toJson(this);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Document.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Document.java
new file mode 100644
index 0000000000..ba3e17c278
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Document.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.LinkedHashMap;
+
+/**
+ * Top Level JSON-API Document.
+ */
+public class Document extends LinkedHashMap<String, Object> {
+    static private final Gson GSON_INSTANCE = new GsonBuilder()
+            .serializeNulls().create();
+
+    /**
+     * Instantiates a new Data based on resources.
+     *
+     * @param resources the resources
+     */
+    public Document(Resource... resources) {
+        // PATCH method does not work on an array of resources, hence sending it as a single element
+        if (resources.length == 1) {
+            this.put("data", resources[0]);
+        }
+        else {
+            this.put("data", resources);
+        }
+    }
+
+    /**
+     * Instantiates a document with resources and corresponding includes.
+     * @param includes The includes
+     * @param resources The resources
+     */
+    public Document(Data resources, Include includes) {
+        this.put("data", resources.get("data"));
+        this.put("included", includes.get("included"));
+    }
+
+    /**
+     * Instantiates a document with relationships and corresponding includes.
+     * @param includes The includes
+     * @param links The relationships
+     */
+    public Document(Include includes, ResourceLinkage... links) {
+        this.put("data", links);
+        this.put("included", includes.get("included"));
+    }
+
+    /**
+     * Instantiates a new Data based on relationship links.
+     * @param links the relationships.
+     */
+    public Document(ResourceLinkage... links) {
+        this.put("data", links);
+    }
+
+    /**
+     * To json string.
+     *
+     * @return the string
+     */
+    public String toJSON() {
+        return GSON_INSTANCE.toJson(this);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Id.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Id.java
new file mode 100644
index 0000000000..aeb30c4b7d
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Id.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * The type Id.
+ */
+@AllArgsConstructor
+public class Id {
+    /**
+     * The Value.
+     */
+    final Object value;
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Include.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Include.java
new file mode 100644
index 0000000000..6f9979ba3f
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Include.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+
+/**
+ * The type Include.
+ */
+public class Include extends LinkedHashMap<String, Object> {
+    /**
+     * Instantiates a new Include based on resources.
+     *
+     * @param resources the resources
+     */
+    public Include(Resource... resources) {
+        this.put("included", resources);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Links.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Links.java
new file mode 100644
index 0000000000..39540a38ac
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Links.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+
+public class Links extends LinkedHashMap<String, Object> {
+    /**
+     * Instantiates a new Attributes.
+     *
+     * @param attributes the attributes
+     */
+    public Links(Attribute... attributes) {
+        for (Attribute attribute : attributes) {
+            this.put(attribute.key, attribute.value);
+        }
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperation.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperation.java
new file mode 100644
index 0000000000..9dd0d48965
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperation.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+
+/**
+ * Patch operation.
+ */
+public class PatchOperation extends LinkedHashMap<String, Object> {
+
+   /**
+    * Patch Operation.
+    *
+    * @param operation the operation type
+    * @param path the operation path
+    * @param value the operation value
+    */
+   public PatchOperation(PatchOperationType operation, String path, Resource value) {
+      this.put("op", operation.name());
+      this.put("path", path);
+      this.put("value", value);
+   }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperationType.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperationType.java
new file mode 100644
index 0000000000..efdf5ec84a
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchOperationType.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+/**
+ * Patch Operation Type enum.
+ */
+public enum PatchOperationType {
+    add, remove, replace
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchSet.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchSet.java
new file mode 100644
index 0000000000..8748e6e4e8
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/PatchSet.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Pat Set.
+ */
+public class PatchSet extends ArrayList {
+
+   static private final Gson GSON_INSTANCE = new GsonBuilder()
+           .serializeNulls().create();
+
+   /**
+    * Patch Set.
+    *
+    * @param patchOperations the set of patch operations
+    */
+   public PatchSet(PatchOperation... patchOperations) {
+      this.addAll(Arrays.asList(patchOperations));
+   }
+
+   /**
+    * To json string.
+    *
+    * @return the string
+    */
+   public String toJSON() {
+      return GSON_INSTANCE.toJson(this);
+   }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relation.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relation.java
new file mode 100644
index 0000000000..d87f47e7ed
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relation.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+
+/**
+ * The type Relation.
+ */
+public class Relation {
+
+    public static final boolean TO_ONE = true;
+    public static final boolean TO_MANY = false;
+
+    /**
+     * The Field.
+     */
+    @Getter private final String field;
+
+    @Expose(serialize = false)
+    @Getter private final boolean toOne;
+
+    /**
+     * The Links.
+     */
+    @Getter private final Links links;
+
+    /**
+     * The Resource linkages.
+     */
+    @Getter private final ResourceLinkage[] resourceLinkages;
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     * @param resourceLinkages the resource linkages
+     */
+    public Relation(String field, ResourceLinkage... resourceLinkages) {
+        this(field, TO_MANY, null, resourceLinkages);
+    }
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     * @param links              the links
+     * @param resourceLinkages the resource linkages
+     */
+    public Relation(String field, Links links, ResourceLinkage... resourceLinkages) {
+        this(field, TO_MANY, links, resourceLinkages);
+    }
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     * @param toOne            whether or not the relation is toOne or toMany.
+     * @param resourceLinkages the resource linkages
+     */
+    public Relation(String field, boolean toOne, Links links, ResourceLinkage... resourceLinkages) {
+        this.field = field;
+        this.toOne = toOne;
+        this.links = links;
+        this.resourceLinkages = resourceLinkages;
+    }
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     */
+    public Relation(String field) {
+        this(field, TO_MANY);
+    }
+
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     * @param links             the links
+     */
+    public Relation(String field, Links links) {
+        this(field, TO_MANY, links);
+    }
+
+    /**
+     * Instantiates a new Relation.
+     *
+     * @param field            the field
+     * @param toOne            whether or not the relation is toOne or toMany.
+     */
+    public Relation(String field, boolean toOne) {
+        this.field = field;
+        this.toOne = toOne;
+        this.links = null;
+        this.resourceLinkages = new ResourceLinkage[0];
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relationships.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relationships.java
new file mode 100644
index 0000000000..cd5864fcd5
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Relationships.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * The type Relationships.
+ */
+public class Relationships extends LinkedHashMap<String, Map<String, ?>> {
+
+    /**
+     * Instantiates a new Relationships.
+     *
+     * @param relations the relations
+     */
+    public Relationships(Relation... relations) {
+        for (Relation relation : relations) {
+            Map<String, Object> data = new LinkedHashMap<>();
+            if (relation.getLinks() != null) {
+                data.put("links", relation.getLinks());
+            }
+            if (relation.isToOne()) {
+                if (relation.getResourceLinkages().length == 0) {
+                    data.put("data", null);
+                } else {
+                    data.put("data", relation.getResourceLinkages()[0]);
+                }
+            } else {
+                data.put("data", relation.getResourceLinkages());
+            }
+            this.put(relation.getField(), data);
+        }
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Resource.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Resource.java
new file mode 100644
index 0000000000..9b58e1ee64
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Resource.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+/**
+ * Holds a Resource.
+ */
+public class Resource extends ResourceLinkage {
+
+    /**
+     * Instantiates a new Resource.
+     *
+     * @param id            the id
+     * @param type          the type
+     * @param attributes    the attributes
+     * @param links         the links
+     * @param relationships the relationships
+     */
+    public Resource(Id id, Type type, Attributes attributes, Links links, Relationships relationships) {
+        super(id, type);
+        if (attributes != null) {
+            this.put("attributes", attributes);
+        }
+        if (relationships != null) {
+            this.put("relationships", relationships);
+        }
+        if (links != null) {
+            this.put("links", links);
+        }
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/ResourceLinkage.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/ResourceLinkage.java
new file mode 100644
index 0000000000..c89bd29679
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/ResourceLinkage.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import java.util.LinkedHashMap;
+
+/**
+ * The type Resource linkage.
+ */
+public class ResourceLinkage extends LinkedHashMap<String, Object> {
+    /**
+     * Instantiates a new Resource linkage.
+     *
+     * @param id   the id
+     * @param type the type
+     */
+    public ResourceLinkage(Id id, Type type) {
+       this.put("type", type.value);
+       this.put("id", id.value);
+    }
+}
diff --git a/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Type.java b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Type.java
new file mode 100644
index 0000000000..55b4fd6ec3
--- /dev/null
+++ b/elide-test/src/main/java/com/yahoo/elide/test/jsonapi/elements/Type.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi.elements;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * The type Type.
+ */
+@AllArgsConstructor
+public class Type {
+    /**
+     * The Value.
+     */
+    final String value;
+}
diff --git a/elide-test/src/test/java/com/yahoo/elide/test/graphql/GraphQLDSLTest.java b/elide-test/src/test/java/com/yahoo/elide/test/graphql/GraphQLDSLTest.java
new file mode 100644
index 0000000000..94002af618
--- /dev/null
+++ b/elide-test/src/test/java/com/yahoo/elide/test/graphql/GraphQLDSLTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.test.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import org.junit.jupiter.api.Test;
+
+public class GraphQLDSLTest {
+
+    @Test
+    public void verifyBasicRequest() {
+        String expected = "{book {edges {node {id title}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selection(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyFieldAliases() {
+        String expected = "{book {edges {node {id shortTitle: title(format: short) longTitle: title(format: long)}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selection(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title", "shortTitle", GraphQLDSL.arguments(
+                                                GraphQLDSL.argument("format", "short")
+                                        )),
+                                        GraphQLDSL.field("title", "longTitle", GraphQLDSL.arguments(
+                                                GraphQLDSL.argument("format", "long")
+                                        ))
+                                )
+                        )
+                )
+        ).toQuery();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyMultipleTopLevelEntitiesSelection() {
+        String expected = "{book {edges {node {user1SecretField}}} book {edges {node {id title}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selection(
+                                        GraphQLDSL.field("user1SecretField")
+                                )
+                        ),
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithRelationship() {
+        String expected = "{book {edges {node {id title authors {edges {node {name}}}}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title"),
+                                        GraphQLDSL.field(
+                                                "authors",
+                                                GraphQLDSL.selection(
+                                                        GraphQLDSL.field("name")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithSingleStringArgument() {
+        String expected = "{book(sort: \"-id\") {edges {node {id title}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.argument(
+                                        GraphQLDSL.argument("sort", "-id", GraphQLDSL.QUOTE_VALUE)
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithMultipleStringArguments() {
+        String expected = "{book(sort: \"-id\" id: \"5\") {edges {node {id title}}}}";
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.arguments(
+                                        GraphQLDSL.argument("sort", "-id", GraphQLDSL.QUOTE_VALUE),
+                                        GraphQLDSL.argument("id", "5", GraphQLDSL.QUOTE_VALUE)
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithNonStringArguments() {
+        String expected = "{book(ids: [1,2] map: {key:\"value\"}) {edges {node {id title}}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.arguments(
+                                        GraphQLDSL.argument("ids", new Long[]{ 1L, 2L }),
+                                        GraphQLDSL.argument("map", ImmutableMap.of("key", "value"))
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithQuotedArgument() {
+        String expected = "{book(desc: \"has \\\"quotes\\\"\") {edges {node {id title}}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selections(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.argument(
+                                        GraphQLDSL.argument("desc", "has \"quotes\"", GraphQLDSL.QUOTE_VALUE)
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id"),
+                                        GraphQLDSL.field("title")
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithVariable() {
+        String expected = "query myQuery($bookId: [String]) {book(ids: $bookId) {edges {node {id title authors {edges"
+                + " {node {name}}}}}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.query(
+                        "myQuery",
+                        GraphQLDSL.variableDefinitions(
+                                GraphQLDSL.variableDefinition("bookId", "[String]")
+                        ),
+                        GraphQLDSL.selections(
+                                GraphQLDSL.field(
+                                        "book",
+                                        GraphQLDSL.arguments(
+                                                GraphQLDSL.argument("ids", "$bookId")
+                                        ),
+                                        GraphQLDSL.selections(
+                                                GraphQLDSL.field("id"),
+                                                GraphQLDSL.field("title"),
+                                                GraphQLDSL.field(
+                                                        "authors",
+                                                        GraphQLDSL.selection(
+                                                                GraphQLDSL.field("name")
+                                                        )
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toQuery();
+
+        assertEquals(expected, actual);
+    }
+
+    /**************************************** Response DSL. ****************************************/
+
+    @Test
+    public void verifyBasicResponse() {
+        String expected = "{\"data\":"
+                + "{\"book\":"
+                + "{\"edges\":"
+                + "[{\"node\":"
+                + "{\"id\":\"1\","
+                + "\"title\":\"My first book\","
+                + "\"authors\":{\"edges\":[{\"node\":{"
+                + "\"name\":\"Ricky Carmichael\"}}]}}}]}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selection(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id", "1"),
+                                        GraphQLDSL.field("title", "My first book"),
+                                        GraphQLDSL.field(
+                                                "authors",
+                                                GraphQLDSL.selection(
+                                                        GraphQLDSL.field("name", "Ricky Carmichael")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyMultipleEntityInstancesResponse() {
+        String expected = "{\"data\":{\"book\":{\"edges\":[{\"node\":{\"id\":\"3\",\"title\":\"Doctor Zhivago\","
+                + "\"publisher\":{\"edges\":[{\"node\":{\"id\":\"2\"}}]}}},{\"node\":{\"id\":\"1\",\"title\":\"Libro "
+                + "Uno\",\"publisher\":{\"edges\":[{\"node\":{\"id\":\"1\"}}]}}},{\"node\":{\"id\":\"2\","
+                + "\"title\":\"Libro Dos\",\"publisher\":{\"edges\":[{\"node\":{\"id\":\"1\"}}]}}}]}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selection(
+                        GraphQLDSL.field(
+                                "book",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id", "3"),
+                                        GraphQLDSL.field("title", "Doctor Zhivago"),
+                                        GraphQLDSL.field(
+                                                "publisher",
+                                                GraphQLDSL.selection(
+                                                        GraphQLDSL.field("id", "2")
+                                                )
+                                        )
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id", "1"),
+                                        GraphQLDSL.field("title", "Libro Uno"),
+                                        GraphQLDSL.field(
+                                                "publisher",
+                                                GraphQLDSL.selection(
+                                                        GraphQLDSL.field("id", "1")
+                                                )
+                                        )
+                                ),
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("id", "2"),
+                                        GraphQLDSL.field("title", "Libro Dos"),
+                                        GraphQLDSL.field(
+                                                "publisher",
+                                                GraphQLDSL.selection(
+                                                        GraphQLDSL.field("id", "1")
+                                                )
+                                        )
+                                )
+                        )
+                )
+        ).toResponse();
+
+        assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void verifyJsonStringField() {
+        String jsonField = new Gson().toJson(ImmutableMap.of("key", "value"));
+        String jsonNode = new Gson().toJson(ImmutableMap.of("json", jsonField));
+        String expected = "{\"data\":{\"container\":{\"edges\":[{\"node\":" + jsonNode + "}]}}}";
+
+        String actual = GraphQLDSL.document(
+                GraphQLDSL.selection(
+                        GraphQLDSL.field(
+                                "container",
+                                GraphQLDSL.selections(
+                                        GraphQLDSL.field("json", jsonField)
+                                )
+                        )
+                )
+        ).toResponse();
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide-test/src/test/java/com/yahoo/elide/test/jsonapi/JsonApiDSLTest.java b/elide-test/src/test/java/com/yahoo/elide/test/jsonapi/JsonApiDSLTest.java
new file mode 100644
index 0000000000..28a9e7129a
--- /dev/null
+++ b/elide-test/src/test/java/com/yahoo/elide/test/jsonapi/JsonApiDSLTest.java
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.test.jsonapi;
+
+import static com.yahoo.elide.test.jsonapi.JsonApiDSL.relation;
+import static com.yahoo.elide.test.jsonapi.elements.PatchOperationType.add;
+import static com.yahoo.elide.test.jsonapi.elements.Relation.TO_ONE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+public class JsonApiDSLTest {
+
+    @Test
+    public void verifyBasicRequest() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":1}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id(1)
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithAttributes() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\",\"attributes\":"
+                + "{\"title\":\"Why You Should use Elide\",\"date\":\"2019-01-01\"}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "Why You Should use Elide"),
+                                JsonApiDSL.attr("date", "2019-01-01")
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithOneToOneRelationship() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},"
+                + "\"relationships\":{\"author\":{\"data\":{\"type\":\"author\",\"id\":\"1\"}}}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "title")
+                        ),
+                        JsonApiDSL.relationships(
+                                relation("author",
+                                        TO_ONE,
+                                        JsonApiDSL.linkage(JsonApiDSL.type("author"), JsonApiDSL.id("1"))
+                                )
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithOneToManyRelationship() {
+        // multi-elements array of resource identifier objects for non-empty to-many relationships.
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},"
+                + "\"relationships\":{"
+                + "\"comments\":{\"data\":[{\"type\":\"comment\",\"id\":\"1\"},"
+                + "{\"type\":\"comment\",\"id\":\"2\"}]}}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "title")
+                        ),
+                        JsonApiDSL.relationships(
+                              JsonApiDSL.relation("comments",
+                                      JsonApiDSL.linkage(JsonApiDSL.type("comment"), JsonApiDSL.id("1")),
+                                      JsonApiDSL.linkage(JsonApiDSL.type("comment"), JsonApiDSL.id("2"))
+                              )
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+
+        // single-element array of resource identifier objects for non-empty to-many relationships.
+        expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},"
+                + "\"relationships\":{"
+                + "\"comments\":{\"data\":[{\"type\":\"comment\",\"id\":\"1\"}]}}}}";
+
+        actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "title")
+                        ),
+                        JsonApiDSL.relationships(
+                                JsonApiDSL.relation("comments",
+                                        JsonApiDSL.linkage(JsonApiDSL.type("comment"), JsonApiDSL.id("1"))
+                                )
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithManyRelationships() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},"
+                + "\"relationships\":{"
+                + "\"author\":{\"data\":[{\"type\":\"author\",\"id\":\"1\"}]},"
+                + "\"comments\":{\"data\":[{\"type\":\"comment\",\"id\":\"2\"}]}}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "title")
+                        ),
+                        JsonApiDSL.relationships(
+                                JsonApiDSL.relation("author",
+                                        JsonApiDSL.linkage(JsonApiDSL.type("author"), JsonApiDSL.id("1"))
+                                ),
+                                JsonApiDSL.relation("comments",
+                                        JsonApiDSL.linkage(JsonApiDSL.type("comment"), JsonApiDSL.id("2"))
+                                )
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyResourcesWithIncludes() {
+        String expected = "{\"data\":[{\"type\":\"blog\",\"id\":1}],\"included\":[{\"type\":\"author\",\"id\":1}]}";
+
+        String actual = JsonApiDSL.document(
+                JsonApiDSL.data(
+                    JsonApiDSL.resource(
+                            JsonApiDSL.type("blog"),
+                            JsonApiDSL.id(1)
+                    )
+                ),
+                JsonApiDSL.include(
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("author"),
+                                JsonApiDSL.id(1)
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyDataWithRelationshipLinks() {
+        String expected = "{\"data\":[{\"type\":\"blog\",\"id\":1},{\"type\":\"blog\",\"id\":2}]}";
+
+        String actual =
+                JsonApiDSL.data(
+                        JsonApiDSL.linkage(
+                                JsonApiDSL.type("blog"),
+                                JsonApiDSL.id(1)
+                        ),
+                        JsonApiDSL.linkage(
+                                JsonApiDSL.type("blog"),
+                                JsonApiDSL.id(2)
+                        )
+                ).toJSON();
+
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyEmptyToOneRelationship() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},\"relationships\":{\"author\":{\"data\":null}}}}";
+
+        String actual =
+                JsonApiDSL.datum(
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("blog"),
+                                JsonApiDSL.id("1"),
+                                JsonApiDSL.attributes(
+                                        JsonApiDSL.attr("title", "title")
+                                ),
+                                JsonApiDSL.relationships(
+                                        relation("author", TO_ONE)
+                                )
+                        )
+                ).toJSON();
+
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyEmptyToManyRelationship() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\","
+                + "\"attributes\":{\"title\":\"title\"},\"relationships\":{\"comments\":{\"data\":[]}}}}";
+
+        String actual =
+                JsonApiDSL.datum(
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("blog"),
+                                JsonApiDSL.id("1"),
+                                JsonApiDSL.attributes(
+                                        JsonApiDSL.attr("title", "title")
+                                ),
+                                JsonApiDSL.relationships(
+                                        JsonApiDSL.relation("comments")
+                                )
+                        )
+                ).toJSON();
+
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRelationshipsButNoAttributes() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\",\"relationships\":{\"comments\":{\"data\":[]},"
+                + "\"author\":{\"data\":[{\"type\":\"author\",\"id\":\"1\"}]}}}}";
+
+        String actual =
+                JsonApiDSL.datum(
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("blog"),
+                                JsonApiDSL.id("1"),
+                                JsonApiDSL.relationships(
+                                        JsonApiDSL.relation("comments"),
+                                        JsonApiDSL.relation("author",
+                                                JsonApiDSL.linkage(JsonApiDSL.type("author"), JsonApiDSL.id("1"))
+                                        )
+                                )
+                        )
+                ).toJSON();
+
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyNoId() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":null,\"attributes\""
+                + ":{\"title\":\"Why You Should use Elide\",\"date\":\"2019-01-01\"}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "Why You Should use Elide"),
+                                JsonApiDSL.attr("date", "2019-01-01")
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyPatchOperation() {
+        String expected = "[{\"op\":\"add\",\"path\":\"/parent\",\"value\":{\"type\":\"parent\",\"id\":\"1\",\"relationships\":{\"children\":{\"data\":[{\"type\":\"child\",\"id\":\"2\"}]},\"spouses\":{\"data\":[{\"type\":\"parent\",\"id\":\"3\"}]}}}},{\"op\":\"add\",\"path\":\"/parent/1/children\",\"value\":{\"type\":\"child\",\"id\":\"2\"}}]";
+
+        String actual = JsonApiDSL.patchSet(
+                JsonApiDSL.patchOperation(add, "/parent",
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("parent"),
+                                JsonApiDSL.id("1"),
+                                JsonApiDSL.relationships(
+                                        JsonApiDSL.relation("children",
+                                                JsonApiDSL.linkage(JsonApiDSL.type("child"), JsonApiDSL.id("2"))
+                                        ),
+                                        JsonApiDSL.relation("spouses",
+                                                JsonApiDSL.linkage(JsonApiDSL.type("parent"), JsonApiDSL.id("3"))
+                                        )
+                                )
+                        )
+                ),
+                JsonApiDSL.patchOperation(add, "/parent/1/children",
+                        JsonApiDSL.resource(
+                                JsonApiDSL.type("child"),
+                                JsonApiDSL.id("2")
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithLinks() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\",\"attributes\":"
+                + "{\"title\":\"Why You Should use Elide\",\"date\":\"2019-01-01\"},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/api/v1/blog/1\"}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "Why You Should use Elide"),
+                                JsonApiDSL.attr("date", "2019-01-01")
+                        ),
+                        JsonApiDSL.links(
+                                JsonApiDSL.attr("self", "http://localhost:8080/json/api/v1/blog/1")
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyRequestWithLinksRelationship() {
+        String expected = "{\"data\":{\"type\":\"blog\",\"id\":\"1\",\"attributes\":"
+                + "{\"title\":\"Why You Should use Elide\"},"
+                + "\"relationships\":{"
+                +   "\"author\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/api/v1/blog/1/relationships/author\",\"related\":\"http://localhost:8080/json/api/v1/blog/1/author\"},"
+                +       "\"data\":[{\"type\":\"author\",\"id\":\"1\"}]"
+                +   "},"
+                +   "\"comments\":{"
+                +       "\"links\":{\"self\":\"http://localhost:8080/json/api/v1/blog/1/relationships/comments\",\"related\":\"http://localhost:8080/json/api/v1/blog/1/comments\"},"
+                +       "\"data\":[]"
+                +   "}},"
+                + "\"links\":{\"self\":\"http://localhost:8080/json/api/v1/blog/1\"}}}";
+
+        String actual = JsonApiDSL.datum(
+                JsonApiDSL.resource(
+                        JsonApiDSL.type("blog"),
+                        JsonApiDSL.id("1"),
+                        JsonApiDSL.attributes(
+                                JsonApiDSL.attr("title", "Why You Should use Elide")
+                        ),
+                        JsonApiDSL.links(
+                                JsonApiDSL.attr("self", "http://localhost:8080/json/api/v1/blog/1")
+                        ),
+                        JsonApiDSL.relationships(
+                                JsonApiDSL.relation("author",
+                                        JsonApiDSL.links(
+                                                JsonApiDSL.attr("self", "http://localhost:8080/json/api/v1/blog/1/relationships/author"),
+                                                JsonApiDSL.attr("related", "http://localhost:8080/json/api/v1/blog/1/author")
+                                        ),
+                                        JsonApiDSL.linkage(JsonApiDSL.type("author"), JsonApiDSL.id("1"))
+                                ),
+                                JsonApiDSL.relation("comments",
+                                        JsonApiDSL.links(
+                                                JsonApiDSL.attr("self", "http://localhost:8080/json/api/v1/blog/1/relationships/comments"),
+                                                JsonApiDSL.attr("related", "http://localhost:8080/json/api/v1/blog/1/comments")
+                                        )
+                                )
+                        )
+                )
+        ).toJSON();
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/elide.svg b/elide.svg
deleted file mode 100644
index 99215090f7..0000000000
--- a/elide.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="355" height="173" viewBox="0, 0, 355, 173">
-  <g id="Layer_1">
-    <text transform="matrix(1, 0, 0, 1, 61.233, 86.5)">
-      <tspan x="-56.016" y="52.5" font-family="HelveticaNeue-Light" font-size="144" fill="#000000">El</tspan>
-    </text>
-    <path d="M152.754,75.109 C169.433,75.109 182.953,78.796 182.953,83.345 C182.953,85.455 180.047,87.379 175.265,88.836 C169.734,90.521 161.698,91.581 152.754,91.581 C143.809,91.581 135.774,90.521 130.243,88.836 C125.461,87.379 122.554,85.455 122.554,83.345 C122.554,78.796 136.074,75.109 152.754,75.109 z M182.953,132.764 C182.953,137.312 169.433,141 152.754,141 C136.074,141 122.554,137.312 122.554,132.764 L122.554,121.78 C122.554,126.33 136.074,130.017 152.754,130.017 C169.433,130.017 182.953,126.33 182.953,121.78 L182.953,132.764 z M182.953,116.291 C182.953,120.839 169.433,124.527 152.754,124.527 C136.074,124.527 122.554,120.839 122.554,116.291 L122.554,105.309 C122.554,109.858 136.074,113.544 152.754,113.544 C169.433,113.544 182.953,109.858 182.953,105.309 L182.953,116.291 z M182.953,99.818 C182.953,104.366 169.433,108.054 152.754,108.054 C136.074,108.054 122.554,104.366 122.554,99.818 L122.554,88.836 C122.554,93.385 136.074,97.072 152.754,97.072 C169.433,97.072 182.953,93.385 182.953,88.836 L182.953,99.818 z" fill="#000000" id="database"/>
-    <path d="M167.915,70.542 L134.61,70.542 Q129.593,70.542 126.03,66.979 Q122.467,63.416 122.467,58.398 Q122.467,54.181 125.012,50.945 Q127.557,47.709 131.556,46.691 L131.556,46.255 Q131.556,38.692 136.901,33.384 Q142.246,28.075 149.736,28.075 Q155.553,28.075 160.243,31.457 Q164.933,34.838 166.824,40.292 Q173.514,39.783 178.277,44.255 Q183.04,48.727 183.04,55.344 Q183.04,61.598 178.604,66.07 Q174.168,70.542 167.915,70.542 z M134.32,52.29 Q131.993,52.29 130.247,54.108 Q128.502,55.926 128.502,58.398 Q128.502,60.871 130.284,62.652 Q132.065,64.434 134.61,64.434 L167.915,64.434 Q171.696,64.434 174.35,61.78 Q177.004,59.125 177.004,55.344 Q177.004,51.563 174.35,48.909 Q171.696,46.255 167.915,46.255 Q166.824,46.255 165.442,46.691 L162.17,47.636 L161.661,44.291 Q160.861,39.928 157.516,37.056 Q154.171,34.184 149.736,34.184 Q144.718,34.184 141.155,37.71 Q137.592,41.237 137.592,46.255 Q137.592,47.127 137.883,48.727 L138.61,52.363 z" fill="#000000" id="cloud"/>
-    <text transform="matrix(1, 0, 0, 1, 268.976, 86.5)">
-      <tspan x="-78.696" y="52.5" font-family="HelveticaNeue-Light" font-size="144" fill="#000000">de</tspan>
-    </text>
-  </g>
-</svg>
diff --git a/java.header b/java.header
index e95e503b14..1e2715f9dc 100644
--- a/java.header
+++ b/java.header
@@ -1,5 +1,5 @@
 ^/\*$
-^ \* Copyright 20[1-2][0-9], Yahoo Inc\.$
+^ \* Copyright 20[1-2][0-9],.*\.$
 ^ \* Licensed under the Apache License, Version 2.0$
 ^ \* See LICENSE file in project root for terms\.$
 ^ \*/$
diff --git a/pom.xml b/pom.xml
index 9dee0ec5fb..bfa11de2d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2016, Yahoo Inc.
+  ~ Copyright 2020, Yahoo Inc.
   ~ Licensed under the Apache License, Version 2.0
   ~ See LICENSE file in project root for terms.
   -->
@@ -8,19 +8,23 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.elide</groupId>
     <artifactId>elide-parent-pom</artifactId>
-    <version>2.3.14-SNAPSHOT</version>
+    <version>6.1.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elide: Parent Pom</name>
     <description>Parent pom for Elide project</description>
     <url>https://github.com/yahoo/elide</url>
 
     <modules>
-        <module>elide-annotations</module>
         <module>elide-core</module>
+        <module>elide-graphql</module>
         <module>elide-datastore</module>
         <module>elide-integration-tests</module>
-        <module>elide-example</module>
-        <module>elide-contrib</module>
+        <module>elide-model-config</module>
+        <module>elide-swagger</module>
+        <module>elide-test</module>
+        <module>elide-async</module>
+        <module>elide-standalone</module>
+        <module>elide-spring</module>
     </modules>
 
     <issueManagement>
@@ -47,9 +51,13 @@
 
     <distributionManagement>
         <repository>
-            <id>bintray-elide-repo</id>
-            <url>https://api.bintray.com/maven/yahoo/maven/elide;publish=1</url>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <scm>
@@ -59,53 +67,74 @@
     </scm>
 
     <prerequisites>
-        <maven>3.0.0</maven>
+        <maven>3.6.3</maven>
     </prerequisites>
 
     <properties>
+        <releaseRepoUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</releaseRepoUrl>
+        <snapshotRepoUrl>https://oss.sonatype.org/content/repositories/snapshots/</snapshotRepoUrl>
         <autoVersionSubmodules>true</autoVersionSubmodules>
-        <min.jdk.version>1.8</min.jdk.version>
-        <max.jdk.version>1.10</max.jdk.version>
+        <min.jdk.version>11</min.jdk.version>
+        <max.jdk.version>12</max.jdk.version>
         <source.jdk.version>${min.jdk.version}</source.jdk.version>
         <target.jdk.version>${min.jdk.version}</target.jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+        <delombok.output>${project.basedir}/target/lombok</delombok.output>
 
         <!-- dependency versions -->
-        <version.logback>1.1.3</version.logback>
-        <version.jetty>9.3.6.v20151106</version.jetty>
-        <version.restassured>2.7.0</version.restassured>
+        <version.antlr4>4.9.3</version.antlr4>
+        <version.logback>1.2.10</version.logback>
+        <version.jetty>9.4.45.v20220203</version.jetty>
+        <version.restassured>4.4.0</version.restassured>
+        <version.jackson>2.13.2</version.jackson>
+        <version.jackson.databind>2.13.2.1</version.jackson.databind>
+        <version.jersey>2.35</version.jersey>
+        <version.junit>5.8.2</version.junit>
+        <version.junit.platform>1.8.2</version.junit.platform>
+        <version.lombok>1.18.22</version.lombok>
+        <jsonpath.version>2.7.0</jsonpath.version>
+        <hibernate5.version>5.6.7.Final</hibernate5.version>
+        <slf4j-api.version>1.7.36</slf4j-api.version>
+        <jedis.version>4.1.1</jedis.version>
+        <embedded-redis.version>0.11.0</embedded-redis.version>
+        <maven-site-plugin-version>3.11.0</maven-site-plugin-version>
+        <mpir.skip>true</mpir.skip>
 
         <!-- TODO: Need to update locations to be relative to the projects using them -->
         <parent.pom.dir>${project.basedir}/..</parent.pom.dir>
         <checkstyle.config.location>${parent.pom.dir}/checkstyle-style.xml</checkstyle.config.location>
-        <checkstyle.suppressions.location>${parent.pom.dir}/checkstyle-suppressions.xml</checkstyle.suppressions.location>
+        <checkstyle.suppressions.location>${parent.pom.dir}/checkstyle-suppressions.xml
+        </checkstyle.suppressions.location>
 
         <dependency.locations.enabled>false</dependency.locations.enabled>
+        <dependency.details.enabled>false</dependency.details.enabled>
     </properties>
 
     <!-- Dependency settings -->
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.yahoo.elide</groupId>
-                <artifactId>elide-annotations</artifactId>
-                <version>2.3.14-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.16.6</version>
+                <version>${version.lombok}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.13</version>
+                <version>${slf4j-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>log4j-over-slf4j</artifactId>
+                <version>1.7.36</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>18.0</version>
+                <version>31.0.1-jre</version>
             </dependency>
             <dependency>
                 <groupId>javax.inject</groupId>
@@ -115,12 +144,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
-                <version>4.1</version>
+                <version>4.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.4</version>
+                <version>3.12.0</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -132,6 +161,17 @@
                 <artifactId>jetty-servlet</artifactId>
                 <version>${version.jetty}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-continuation</artifactId>
+                <version>${version.jetty}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path</artifactId>
+                <version>${jsonpath.version}</version>
+            </dependency>
 
             <!-- Test dependencies -->
             <dependency>
@@ -149,7 +189,13 @@
             <dependency>
                 <groupId>org.glassfish.jersey.containers</groupId>
                 <artifactId>jersey-container-servlet</artifactId>
-                <version>2.22.1</version>
+                <version>${version.jersey}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-hk2</artifactId>
+                <version>${version.jersey}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -158,44 +204,94 @@
                 <version>${version.jetty}</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- JUnit -->
             <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>6.9.9</version>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${version.junit}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>${version.junit}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${version.junit}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-launcher</artifactId>
+                <version>${version.junit.platform}</version>
                 <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>junit</artifactId>
-                        <groupId>junit</groupId>
-                    </exclusion>
-                </exclusions>
             </dependency>
+
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.37</version>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>2.1.210</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.0.31-beta</version>
+                <version>4.3.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>2.4.5</version>
-                <scope>test</scope>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${version.jackson}</version>
             </dependency>
             <dependency>
-                <groupId>com.jayway.restassured</groupId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${version.jackson.databind}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jdk8</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jaxb-annotations</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-parameter-names</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
                 <version>${version.restassured}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.jayway.restassured</groupId>
+                <groupId>io.rest-assured</groupId>
                 <artifactId>json-schema-validator</artifactId>
                 <version>${version.restassured}</version>
                 <scope>test</scope>
@@ -210,8 +306,78 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!-- JPA -->
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>javax.persistence-api</artifactId>
+                <version>2.2</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <profiles>
+        <profile>
+            <id>ossrh</id>
+            <properties>
+                <gpg.executable>gpg</gpg.executable>
+                <gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
+                <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+                <gpg.defaultKeyring>false</gpg.defaultKeyring>
+                <gpg.homedir>${env.SD_SOURCE_DIR}/screwdriver/deploy</gpg.homedir>
+                <gpg.publickeyring>pubring.gpg</gpg.publickeyring>
+                <gpg.secretkeyring>secring.gpg</gpg.secretkeyring>
+            </properties>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.12</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                            </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <build>
         <pluginManagement>
@@ -219,12 +385,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
+                    <version>3.0.0-M5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.17</version>
+                    <version>3.1.2</version>
                     <executions>
                         <execution>
                             <id>validate</id>
@@ -251,7 +422,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>6.12.1</version>
+                            <version>9.3</version>
                             <scope>compile</scope>
                         </dependency>
                     </dependencies>
@@ -264,7 +435,15 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>3.2.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>${maven-site-plugin-version}</version>
+                    <configuration>
+                        <skipDeploy>true</skipDeploy>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.gmaven</groupId>
@@ -288,7 +467,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.10.0</version>
                 <configuration>
                     <source>${source.jdk.version}</source>
                     <target>${target.jdk.version}</target>
@@ -296,12 +475,19 @@
                     <showWarnings>true</showWarnings>
                     <optimize>true</optimize>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${version.lombok}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -311,10 +497,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok-maven-plugin</artifactId>
+                <version>1.18.20.0</version>
+                <configuration>
+                    <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+                    <sourceDirectory>${project.basedir}/target/generated-sources/antlr4</sourceDirectory>
+                    <outputDirectory>${delombok.output}</outputDirectory>
+                    <addOutputDirectory>false</addOutputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>delombok</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.3.2</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -323,6 +528,12 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <doclint>all,-missing</doclint>
+                    <source>${source.jdk.version}</source>
+                    <sourcepath>${delombok.output}</sourcepath>
+                    <sourcepath>${project.basedir}/src/main/java</sourcepath>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -332,7 +543,13 @@
                     <dependency>
                         <groupId>org.apache.maven.scm</groupId>
                         <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.9.4</version>
+                        <version>1.12.2</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.maven.scm</groupId>
+                        <artifactId>maven-scm-api</artifactId>
+                        <version>1.12.2</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -342,48 +559,77 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.5.201505241946</version>
+                <version>0.8.7</version>
                 <executions>
                     <execution>
-                        <id>prepare-agent</id>
+                        <id>default-prepare-agent</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>report</id>
+                        <id>default-prepare-agent-integration</id>
                         <goals>
-                            <goal>report</goal>
+                            <goal>prepare-agent-integration</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
+                        <id>default-report</id>
                         <goals>
-                            <goal>prepare-agent-integration</goal>
+                            <goal>report</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
+                        <id>default-report-integration</id>
                         <goals>
                             <goal>report-integration</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <!-- see https://www.eclemma.org/jacoco/trunk/doc/check-mojo.html -->
+                            <rules>
+                                <rule>
+                                    <element>CLASS</element>
+                                    <excludes>
+                                        <exclude>*Test</exclude>
+                                    </excludes>
+                                    <limits>
+                                        <limit>
+                                            <counter>BRANCH</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0%</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.1.0</version>
+                <version>4.3.0</version>
                 <configuration>
-                    <repoToken>${env.coveralls_repo_token}</repoToken>
+                    <repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.3.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>com.versioneye</groupId>
                 <artifactId>versioneye-maven-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.11.4</version>
                 <configuration>
                     <apiKey>${env.versioneye_api_key}</apiKey>
                     <parentGroupId>com.yahoo.elide</parentGroupId>
@@ -392,6 +638,53 @@
                     <skipScopes>test</skipScopes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-java</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[${min.jdk.version},${max.jdk.version}]</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>6.5.3</version>
+                <configuration>
+                    <failBuildOnCVSS>7</failBuildOnCVSS>
+                    <skipSystemScope>true</skipSystemScope>
+                    <skipTestScope>true</skipTestScope>
+                    <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+                    <suppressionFile>suppressions.xml</suppressionFile>
+                    <retireJsAnalyzerEnabled>false</retireJsAnalyzerEnabled>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>3.5.1</version>
+            </extension>
+        </extensions>
     </build>
 </project>
diff --git a/screwdriver.yaml b/screwdriver.yaml
new file mode 100644
index 0000000000..2d283eae79
--- /dev/null
+++ b/screwdriver.yaml
@@ -0,0 +1,74 @@
+cache:
+   pipeline: ["~/.m2"]
+
+annotations:
+   screwdriver.cd/restrictPR: fork
+
+shared:
+   annotations:
+       screwdriver.cd/cpu: TURBO
+       screwdriver.cd/ram: TURBO
+
+   environment:
+       #Fetches history so Sonar can assign blame.
+       GIT_SHALLOW_CLONE: false
+
+jobs:
+  master-commit:
+    image: maven:3.8.2-openjdk-11
+    requires: [~pr, ~commit]
+    secrets:
+        - COVERALLS_REPO_TOKEN
+    steps:
+      - build: mvn -B clean verify coveralls:report
+
+  elide-6-build:
+    image: maven:3.8.2-openjdk-11
+    requires: [~pr:elide-6.x, ~commit:elide-6.x]
+    secrets:
+        - COVERALLS_REPO_TOKEN
+    steps:
+      - build: mvn -B clean verify coveralls:report
+
+  elide-5-build:
+    image: maven:3.6.3-jdk-8
+    requires: [~pr:elide-5.x, ~commit:elide-5.x]
+    secrets:
+        - COVERALLS_REPO_TOKEN
+    steps:
+      - build: mvn -B clean verify coveralls:report
+
+  elide-4-build:
+    image: maven:3.6.3-jdk-8
+    requires: [~pr:elide-4.x, ~commit:elide-4.x]
+    secrets:
+        - COVERALLS_REPO_TOKEN
+    steps:
+      - build: mvn -B clean verify coveralls:report
+
+  release-java11:
+    image: maven:3.8.2-openjdk-11
+    secrets:
+        - GPG_KEYNAME
+        - GPG_PASSPHRASE
+        - GPG_ENCPHRASE
+        - OSSRH_USER
+        - OSSRH_TOKEN
+    requires: [~tag:/^6/, ~release:/^6/]
+    steps:
+      - build: "screwdriver/scripts/build.sh"
+      - publish: "screwdriver/scripts/publish.sh"
+      
+  release-java8:
+    image: maven:3.6.3-jdk-8
+    secrets:
+        - GPG_KEYNAME
+        - GPG_PASSPHRASE
+        - GPG_ENCPHRASE
+        - OSSRH_USER
+        - OSSRH_TOKEN
+    requires: [~tag:/^4|5/, ~release:/^4|5/]
+    steps:
+      - build: "screwdriver/scripts/build.sh"
+      - publish: "screwdriver/scripts/publish.sh"      
+
diff --git a/screwdriver/pubring.gpg.enc b/screwdriver/pubring.gpg.enc
new file mode 100644
index 0000000000..14239fa721
Binary files /dev/null and b/screwdriver/pubring.gpg.enc differ
diff --git a/screwdriver/scripts/build.sh b/screwdriver/scripts/build.sh
new file mode 100755
index 0000000000..a53d64aa19
--- /dev/null
+++ b/screwdriver/scripts/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export PATH=$PATH:/usr/local/go/bin
+mvn -B install
+
diff --git a/screwdriver/scripts/publish.sh b/screwdriver/scripts/publish.sh
new file mode 100755
index 0000000000..168209b8fb
--- /dev/null
+++ b/screwdriver/scripts/publish.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+
+
+export GPG_TTY=$(tty)
+
+mkdir -p screwdriver/deploy
+chmod 0700 screwdriver/deploy
+
+openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in screwdriver/pubring.gpg.enc -out screwdriver/deploy/pubring.gpg -d
+openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in screwdriver/secring.gpg.enc -out screwdriver/deploy/secring.gpg -d
+
+mvn -B deploy -P ossrh -Dmaven.test.skip=true --settings screwdriver/settings/settings-publish.xml
+
+rm -rf screwdriver/deploy
diff --git a/screwdriver/secring.gpg.enc b/screwdriver/secring.gpg.enc
new file mode 100644
index 0000000000..cab0bd020a
Binary files /dev/null and b/screwdriver/secring.gpg.enc differ
diff --git a/screwdriver/settings/settings-publish.xml b/screwdriver/settings/settings-publish.xml
new file mode 100644
index 0000000000..4793082ecc
--- /dev/null
+++ b/screwdriver/settings/settings-publish.xml
@@ -0,0 +1,9 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.OSSRH_USER}</username>
+      <password>${env.OSSRH_TOKEN}</password>
+    </server>
+  </servers>
+</settings>
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..32dc486875
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,43 @@
+sonar.modules=elide-core,elide-graphql,elide-datastore,elide-integration-tests,elide-model-config,elide-swagger,elide-test,elide-async,elide-standalone,elide-spring
+sonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
+sonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+sonar.dependencyCheck.reportPath=target/dependency-check-report.xml
+sonar.java.binaries=target/classes
+sonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
+sonar.java.cpd.reportPaths=target/cpd.xml
+sonar.java.libraries=/root/.m2/repository/**/*.jar
+sonar.java.pmd.reportPaths=target/pmd.xml
+sonar.java.source=1.8
+sonar.java.spotbugs.reportPaths=target/spotbugs.xml
+sonar.java.test.binaries=target/test-classes
+sonar.junit.reportPaths=target/surefire-reports,target/failsafe-reports
+sonar.sourceEncoding=UTF-8
+sonar.sources=src/main/java
+sonar.tests=src/test/java
+elide-datastore.sonar.modules=elide-datastore-aggregation,elide-datastore-hibernate,elide-datastore-hibernate5,elide-datastore-hibernate3,elide-datastore-jpa,elide-datastore-inmemorydb,elide-datastore-multiplex,elide-datastore-noop,elide-datastore-search
+elide-datastore.sonar.sources=
+elide-datastore.sonar.tests=
+elide-datastore.elide-datastore-aggregation.sonar.sources=src/main/java
+elide-datastore.elide-datastore-aggregation.sonar.tests=src/test/java
+elide-datastore.elide-datastore-hibernate.sonar.sources=src/main/java
+elide-datastore.elide-datastore-hibernate.sonar.tests=src/test/java
+elide-datastore.elide-datastore-hibernate5.sonar.sources=src/main/java
+elide-datastore.elide-datastore-hibernate5.sonar.tests=src/test/java
+elide-datastore.elide-datastore-hibernate3.sonar.sources=src/main/java
+elide-datastore.elide-datastore-hibernate3.sonar.tests=src/test/java
+elide-datastore.elide-datastore-jpa.sonar.sources=src/main/java
+elide-datastore.elide-datastore-jpa.sonar.tests=src/test/java
+elide-datastore.elide-datastore-inmemorydb.sonar.sources=src/main/java
+elide-datastore.elide-datastore-inmemorydb.sonar.tests=src/test/java
+elide-datastore.elide-datastore-multiplex.sonar.sources=src/main/java
+elide-datastore.elide-datastore-multiplex.sonar.tests=src/test/java
+elide-datastore.elide-datastore-noop.sonar.sources=src/main/java
+elide-datastore.elide-datastore-noop.sonar.tests=src/test/java
+elide-datastore.elide-datastore-search.sonar.sources=src/main/java
+elide-datastore.elide-datastore-search.sonar.tests=src/test/java
+elide-spring.sonar.modules=elide-spring-boot-autoconfigure,elide-spring-boot-starter
+elide-spring.sonar.sources=
+elide-spring.sonar.tests=
+elide-spring.elide-spring-boot-autoconfigure.sonar.sources=src/main/java
+elide-spring.elide-spring-boot-autoconfigure.sonar.tests=src/test/java
+elide-integration-tests.sonar.sources=
diff --git a/suppressions.xml b/suppressions.xml
new file mode 100644
index 0000000000..521b48643e
--- /dev/null
+++ b/suppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions
+    xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
+
+
+    <!-- Tomcat - Only related to 'Windows Language Pack Installer" -->
+    <suppress until="2022-12-31">
+        <cve>CVE-2020-0822</cve>
+    </suppress>
+</suppressions>
diff --git a/translations/es/README.md b/translations/es/README.md
new file mode 100644
index 0000000000..51f65245ce
--- /dev/null
+++ b/translations/es/README.md
@@ -0,0 +1,238 @@
+# Elide
+
+> _API's obstinados para aplicaciones móviles y web._
+
+![Elide Logo](../../elide-logo.svg)
+
+[![Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/elide)
+[![Build Status](https://cd.screwdriver.cd/pipelines/6103/badge)](https://cd.screwdriver.cd/pipelines/6103)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core)
+[![Coverage Status](https://coveralls.io/repos/github/yahoo/elide/badge.svg?branch=master)](https://coveralls.io/github/yahoo/elide?branch=master)
+[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/context:java)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/alerts)
+[![Mentioned in Awesome Java](https://awesome.re/mentioned-badge.svg)](https://github.com/akullpp/awesome-java)
+[![Mentioned in Awesome GraphQL](https://awesome.re/mentioned-badge.svg)](https://github.com/chentsulin/awesome-graphql)
+
+*Leer en otros idiomas: [中文](../zh/README.md).*
+
+## Tabla de contenido
+
+- [Antecedentes](#antecedentes)
+- [Documentación](#documentación)
+- [Instalación](#instalación)
+- [Uso](#uso)
+- [Seguridad](#seguridad)
+- [Contribuir](#contribuir)
+- [Licencia](#licencia)
+
+## Antecedentes
+
+[Elide](https://elide.io/) es una biblioteca de Java que permite configurar un servicio web basado en modelos [GraphQL](http://graphql.org) o [JSON API](http://jsonapi.org), con un esfuerzo mínimo. Elide soporta dos variantes de APIs:
+
+1. API's CRUD (crear, leer, actualizar, eliminar (por sus siglas en inglés)). Para leer y manipular modelos.
+
+2. API's analíticas para mediciones de agregación sobre uno o mas atributos del modelo.
+
+Elide soporta un número de características:
+
+### Seguridad se convierte en estándar
+Control de acceso a campos y entidades a trvés de una sintaxis de permisos declarativa e intuitiva.
+
+### API's amigables con el móvil (Mobile friendly)
+
+JSON-API y GraphQL permite a desarrolladores solicitar grafos de objetos enteros en una simple petición. Solo los elementos solicitados del modelo de datos son devueltos.
+Nuestro enfoque obstinado para mutaciones toma en cuenta escenarios comúnes de aplicaciones como:
+* Crear un nuevo objeto y agregarlo a una colección existente en una misma operación.
+* Crear un conjunto de objetos relacionados (un subgrafo) y conectarlo a un grafo existente.
+* Diferenciar entre borrar un objeto y desasociar un objeto de una relación (sin borrarlo).
+* Referenciar un objeto recién creado dentro de otras operaciones de mutación.
+
+Filtrado, ordenado, paginación y búsqueda de texto tienen soporte fuera de la caja.
+
+### Atomicidad para escrituras complejas
+Elide soporta múltiples mutaciones de modelos de datos en una sola petición, ya sea en JSON-API o GrapQL. Crear objetos, agregarlos a relaciones, modificar o eliminar, todo junto en una sola petición atómica.
+
+### Soporte de consulta analítica
+Elide soporta consultas analíticas en los modelos creados gracias a su poderosa capa de semántica. API´s de Elide trabaja de forma nativa con [Yavin](https://github.com/yahoo/yavin) para visualizar, explorar y reportar en sus datos.
+
+### Introspección de esquema
+Explore, entienda y componga consultas en nuestra API Elide a través de documentación generada por Swagger o por el esquema de GraphQL.
+
+### Personalice
+Personalice el comportamiento de las operaciones del modelo de datos con atributos computados, anotaciones de validación de datos y solicite hooks de ciclo de vida.
+
+### Almacenamiento agnóstico
+Elide es agnóstico a su strategia de persistencia particular. Use un ORM o su propia implementación de almacén de datos.
+
+## Documentación
+
+Mas información acerca de Elide en [elide.io](https://elide.io).
+
+## Instalación
+
+Para probar un ejemplo de servicio de Elide, revise este [Projecto de ejemplo en Spring Boot](https://github.com/yahoo/elide-spring-boot-example).
+
+Alternativamente use [elide-standalone](https://github.com/yahoo/elide/tree/master/elide-standalone) que permite una configuración rápida de una instancia local de Elide ejecutándose de manera embebida en una aplicación Jetty.
+
+## Uso
+
+Los siguientes ejemplos aprovechan elide 5 (ahora en pre-lanzamiento). Para documentación en versiones anteriores/estables, visite [aquí](https://elide.io/pages/guide/v4/01-start.html).
+
+### Para aplicaciones CRUD
+
+La manera más simple de utilizar Elide es aprovechando [JPA](https://es.wikipedia.org/wiki/Java_Persistence_API) para mapear sus modelos Elide a persistentes:
+
+Los modelos deben representar un modelo de dominio en su servicio web:
+
+```java
+@Entity
+public class Book {
+
+    @Id
+    private Integer id;
+
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+Agregue anotaciones Elide para exponer sus modelos a un servicio web y definir las políticas de seguridad para su acceso:
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("None")
+@UpdatePermission("None")
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+Agregue hooks de ciclo de vida a sus modelos para embeber lógica de negocios personalizada que se ejecuta junto con las operaciones CRUD en su servicio web:
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("None")
+@UpdatePermission("None")
+@LifeCycleHookBinding(operation = UPDATE, hook = BookCreationHook.class, phase = PRECOMMIT)
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+
+public class BookCreationHook implements LifeCycleHook<Book> {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation,
+                        LifeCycleHookBinding.TransactionPhase phase,
+                        Book book,
+                        RequestScope requestScope,
+                        Optional<ChangeSpec> changes) {
+       //Do something
+    }
+}
+
+```
+
+Mapee expresiones a funciones de seguridad o predicados que son llevados a la capa de persistencia:
+
+```java
+    @SecurityCheck("Admin")
+    public static class IsAdminUser extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return isUserInRole(user, UserRole.admin);
+        }
+    }
+```
+
+Para exponer y consultar estos modelos, siga los pasos documentados en [primeros pasos](https://elide.io/pages/guide/v5/01-start.html).
+
+Para ejemplos de llamadas de API, revise:
+1. [*JSON-API*](https://elide.io/pages/guide/v5/10-jsonapi.html) 
+2. [*GraphQL*](https://elide.io/pages/guide/v5/11-graphql.html)
+
+### Para API´s analíticas
+
+Modelos analítcos incluyen tablas, mediciones, dimensiones y uniones que pueden ser creados con una fácil configuración del lenguaje HJSON
+
+```hjson
+{
+  tables: [
+    {
+      name: Orders
+      table: order_details
+      measures: [
+        {
+          name: orderTotal
+          type: DECIMAL
+          definition: 'SUM({{order_total}})'
+        }
+      ]
+      dimensions: [
+        {
+          name: orderId
+          type: TEXT
+          definition: '{{order_id}}'
+        }
+      ]
+    }
+  ]
+}
+```
+
+Más información en configuración y consulta de modelos analíticos está disponible [aquí](https://elide.io/pages/guide/v5/04-analytics.html).
+
+## Seguridad
+
+La seguridad esta documentada a fondo [aquí](https://elide.io/pages/guide/v5/03-security.html).
+
+## Contribuir
+Porfavor revise [el archivo contributing.md](../../Contribuiting.md) para información de como involucrarse. Aceptamos issues, pull requests y preguntas.
+
+Si está contribuyendo a Elide usando un IDE, como IntelliJ, asegurese de instalar la extensión [Lombok](https://projectlombok.org/).
+
+Discusión está en [spectrum](https://spectrum.chat/elide) o creando issues.
+
+## Licencia
+Este proyecto esta licenciado bajo los términos de licencia open source [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
+
+Por favor revise [LICENSE](../../LICENSE.txt) para los términos completos.
+
+## Artículos
+Video introductorio a Elide
+
+[![Intro to Elide](http://img.youtube.com/vi/WeFzseAKbzs/0.jpg)](http://www.youtube.com/watch?v=WeFzseAKbzs "Intro to Elide")
+
+[Create a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/create-a-json-api-rest-service-with-spring-boot-an)
+
+[Custom Security With a Spring Boot/Elide Json API Server](https://dzone.com/articles/custom-security-with-a-spring-bootelide-json-api-s)
+
+[Logging Into a Spring Boot/Elide JSON API Server](https://dzone.com/articles/logging-into-a-spring-bootelide-json-api-server)
+
+[Securing a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/securing-a-json-api-rest-service-with-spring-boot)
+
+[Creating Entities in a Spring Boot/Elide JSON API Server](https://dzone.com/articles/creating-entities-in-a-spring-bootelide-json-api-s)
+
+[Updating and Deleting with a Spring Boot/Elide JSON API Server](https://dzone.com/articles/updating-and-deleting-with-a-spring-bootelide-json)
diff --git a/translations/zh/CONTRIBUTING.md b/translations/zh/CONTRIBUTING.md
new file mode 100644
index 0000000000..bbc29c0807
--- /dev/null
+++ b/translations/zh/CONTRIBUTING.md
@@ -0,0 +1,14 @@
+# 开发 Elide
+
+提交 pull request (PR) 时，请遵循如下要求：
+
+- 代码必须和现有的代码风格一致。修改代码的话，新的代码要和之前写好的风格一致。如果您使用 IntelliJ，
+  可以使用我们的代码风格配置文件：[elide-intellij-codestyle.xml](https://github.com/yahoo/elide/raw/master/elide-intellij-codestyle.xml).
+- 修改代码，请同时添加或修[文档](https://github.com/yahoo/elide-doc)。
+- 修 Bug 需要有单元测试和集成测试，测试的内容必须是和 bug 相关的。
+- 请勿在代码中包含 `author` 相关的 Javadoc 或信息。
+- 每个代码文件必须包含开源许可抬头。详见[举例](https://github.com/yahoo/elide/blob/master/elide-core/src/main/java/com/yahoo/elide/Elide.java)
+- 请尽量控制 pull requests 的大小，不用的问题请分开提交 pull requests，单独的小 bug 修复和测试除外。
+- 请尽量减少 commit 的数量，相关的 commits 请和合并。每个 commit 需要完全通过测试。
+- 代码风格小时需要放入单独的 commit，这样可以简化代码审核，便于与代码修改区分开来。
+- 请严格遵循[开发守则](Code-Of-Conduct.md)
diff --git a/translations/zh/README.md b/translations/zh/README.md
new file mode 100644
index 0000000000..acf9f82faa
--- /dev/null
+++ b/translations/zh/README.md
@@ -0,0 +1,223 @@
+# Elide
+
+> _互联网 & 移动端应标准化API_
+
+![Elide Logo](../../elide-logo.svg)
+
+[![Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/elide)
+[![Build Status](https://travis-ci.org/yahoo/elide.svg?branch=master)](https://travis-ci.org/yahoo/elide) 
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.yahoo.elide/elide-core)
+[![Coverage Status](https://coveralls.io/repos/github/yahoo/elide/badge.svg?branch=master)](https://coveralls.io/github/yahoo/elide?branch=master)
+[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/context:java)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/yahoo/elide.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/yahoo/elide/alerts)
+
+## 目录
+
+- [简介](#简介)
+- [文档](#文档)
+- [安装使用](#安装使用)
+- [用法介绍](#用法介绍)
+- [数据安全](#数据安全)
+- [开发](#开发)
+- [开源许可](#开源许可)
+
+## 简介
+
+Elide是一个互联网和移动端应用数据API搭建平台，只需要一个简单的[JPA注释模型](http://blog.csdn.net/superdog007/article/details/22651577)
+就能帮您轻松搭建[GraphQL](https://graphql.org/)和[JSON](http://jsonapi.org.cn/) API web 服务。 
+
+Elide 功能强大，包括：
+
+### 标准完善的数据安全保障
+
+Elide提供极具规则性，简单易懂的语法规则，让您轻松搞定实体（entity）的安全访问。
+
+### 移动端性能优化 API
+
+JSON-API和GraphQL使得开发者能够通过单次API接口访问获取与某个实体相关的所有数据，而且在移动端传输过程中过滤所有不
+必要的数据，只返回被请求的数据部分。我们为您精心设计的数据处理系统帮助您解决很多常见的数据应用开发问题，例如：
+
+* 在单次请求操作中实现创建实体数据，同时将其加入现有的实体库
+* 创建存储关系复杂的多个相关实体（实体关联图），并将它们并入现有的实体库
+* 你可以选择完全删除某个实体数据，也可以选择解除实体关联（并不删除任何数据）
+* 完全自由地修改实体关联定义
+* 修改实体数据的同时还可以访问新建的实体
+
+Elide还完全支持数据筛选，排序，分页。
+
+### 任何数据写入都可以保证原子性
+
+无论是JSON-API还是GraphQL，Elide支持单个请求中实现多个数据模型的修改操作。创建新的实体，添加实体关系，修改和删除实体保证
+事务的原子性（Atomicity）。
+
+### 支持自定义数据持久化机制
+
+你可以用Elide自定义您的持久化方法策略。您可以使用Elide默认支持的ORM或者使用自行开发的数据存储机制。
+
+### 数据模型一览无余
+
+您可以借助自动生成的Swagger文档或者GraphQL数据模型了解，学习，和编写Elide API查询语句。
+
+### 配置轻松自由
+
+您可以按照您的意愿轻松配置您需要的数据模型操作，比如添加复杂的二次实体数据运算，数据标注检查（data validation
+annotations），或者是自动以的访问请求中间链模块。
+
+## 文档
+
+更多使用指南，请参见[elide.io](http://elide.io/).
+
+### 教程（英文）
+
+[Create a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/create-a-json-api-rest-service-with-spring-boot-an)
+
+[Custom Security With a Spring Boot/Elide Json API Server](https://dzone.com/articles/custom-security-with-a-spring-bootelide-json-api-s)
+
+[Logging Into a Spring Boot/Elide JSON API Server](https://dzone.com/articles/logging-into-a-spring-bootelide-json-api-server)
+
+[Securing a JSON API REST Service With Spring Boot and Elide](https://dzone.com/articles/securing-a-json-api-rest-service-with-spring-boot)
+
+[Creating Entities in a Spring Boot/Elide JSON API Server](https://dzone.com/articles/creating-entities-in-a-spring-bootelide-json-api-s)
+
+[Updating and Deleting with a Spring Boot/Elide JSON API Server](https://dzone.com/articles/updating-and-deleting-with-a-spring-bootelide-json)
+
+## 安装使用
+
+使用Elide最快捷的方法是用 [elide-standalone](https://github.com/yahoo/elide/tree/master/elide-standalone)，在一个嵌入式
+Jetty（embedded Jetty）服务器里运行一个单独的 Elide 软件。
+
+## 用法介绍
+
+要使用 Elide，需要创建一个用 JPA 注释过的数据模型（data models），作为你的 web service 的 domain model。
+
+```java
+@Entity
+public class Book {
+
+    @Id
+    private Integer id;
+
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+下一步是添加 Elide 注释，将你的数据模型在 web service 开放出来，然后配置访问权限：
+
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("Noone")
+@UpdatePermission("Noone")
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+```
+
+您可以给你的数据模型添加运行插件，以实现单独的业务需求，这主要是通过建立、读取、更新、删除（CRUD）来运行的：
+
+```java
+@Entity
+@Include(rootLevel = true)
+@ReadPermission("Everyone")
+@CreatePermission("Admin OR Publisher")
+@DeletePermission("Noone"
+@UpdatePermission("Noone")
+@LifeCycleHookBinding(operation = UPDATE, hook = BookCreationHook.class, phase = PRECOMMIT)
+public class Book {
+
+    @Id
+    private Integer id;
+
+    @UpdatePermission("Admin OR Publisher")
+    private String title;
+
+    @ManyToMany(mappedBy = "books")
+    private Set<Author> authors;
+}
+
+public class BookCreationHook implements LifeCycleHook<Book> {
+
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, Book book,
+                        RequestScope requestScope, Optional<ChangeSpec> changes) {
+       //Do something
+    }
+}
+```
+
+您可以将一些表达式转化成访问权限设置，直接控制数据库存储访问：
+
+```java
+    public static class IsAdminUser extends UserCheck {
+        @Override
+        public boolean ok(User user) {
+            return isUserInRole(user, UserRole.admin);
+        }
+    }
+```
+
+最后需要将这些设置挂载到数据模型上，方法请参见 [elide-standalone](https://github.com/yahoo/elide/tree/master/elide-standalone):
+
+```java
+public class YourMain {
+  public static void main(String[] args) {
+
+    ElideStandaloneSettings settings = new ElideStandaloneSettings() {
+
+        @Override
+        public String getModelPackageName() {
+            //This needs to be changed to the package where your models live.
+            return "your.model.package";
+        }
+    
+        @Override
+        public Map<String, Class<? extends Check>> getCheckMappings() {
+            //Maps expression clauses to your security check functions & predicates
+            return new HashMap<String, Class<? extends Check>>() { {
+                put("Admin", IsAdminUser.class);
+            }
+        };
+    });
+
+    ElideStandalone elide = new ElideStandalone(settings);
+
+    elide.start();
+  }
+}
+```
+
+更多 API 功能，请详见：
+
+1. [*JSON-API*](http://elide.io/pages/guide/10-jsonapi.html)
+2. [*GraphQL*](http://elide.io/pages/guide/11-graphql.html)
+
+## 数据安全
+
+具体的权限访问详情请参见[该文档](http://elide.io/pages/guide/03-security.html).
+
+## 开发
+
+请阅读[开发文档](CONTRIBUTING.md)，了解如何贡献代码。遇到bug或问题，我们欢迎您提交 issues，咨询，或者提交 pull
+requests.
+
+如果您想给Elide贡献代码，请在IDE中添加[Lombok](https://projectlombok.org/)插件。
+
+开源社区设在[spectrum](https://spectrum.chat/elide)，您也可以提交 issues。
+
+## 开源许可
+The use and distribution terms for this software are covered by the Apache License, Version 2.0
+(http://www.apache.org/licenses/LICENSE-2.0.html).
diff --git a/travis/bintray_template.json b/travis/bintray_template.json
deleted file mode 100644
index a0fec66793..0000000000
--- a/travis/bintray_template.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "package": {
-    "name": "elide",
-    "repo": "maven",
-    "subject": "yahoo"
-  },
-  "version": {
-    "name": "${TRAVIS_TAG}",
-    "desc": "This is a version",
-    "released": "2015-01-04",
-    "vcs_tag": "${TRAVIS_TAG}"
-  },
-  "files":
-  [
-    {
-      "includePattern": "pom.xml",
-      "uploadPattern": "elide-parent-pom/${TRAVIS_TAG}/elide-parent-pom-${TRAVIS_TAG}.pom"
-    },
-    {
-      "includePattern": "elide-core\/pom.xml",
-      "uploadPattern": "elide-core/${TRAVIS_TAG}/elide-core-${TRAVIS_TAG}.pom"
-    },
-    {
-      "includePattern": "elide-core\/target\/(elide-core-${TRAVIS_TAG}\\.jar)",
-      "uploadPattern": "elide-core/${TRAVIS_TAG}/$1"},
-    {
-      "includePattern": "elide-annotations\/pom.xml",
-      "uploadPattern": "elide-annotations/${TRAVIS_TAG}/elide-annotations-${TRAVIS_TAG}.pom"
-    },
-    {
-      "includePattern": "elide-annotations\/target\/(elide-annotations-${TRAVIS_TAG}\\.jar)",
-      "uploadPattern": "elide-annotations/${TRAVIS_TAG}/$1"},
-    {
-      "includePattern": "elide-datastore\/(elide-datastore-[^\/]*)/pom.xml",
-      "uploadPattern": "$1/${TRAVIS_TAG}/$1.pom"
-    },
-    {
-      "includePattern": "elide-datastore\/(elide-datastore-[^\/]*)\/target\/(elide-datastore.*\\.jar)",
-      "uploadPattern": "$1/${TRAVIS_TAG}/$2"
-    },
-    {
-      "includePattern": "elide-contrib\/dropwizard-elide\/target\/(dropwizard-elide-${TRAVIS_TAG}\\.jar)",
-      "uploadPattern": "elide-contrib/${TRAVIS_TAG}/$1"
-    }
-  ],
-  "publish": true
-}
diff --git a/travis/settings.xml b/travis/settings.xml
deleted file mode 100644
index 63faeb3c39..0000000000
--- a/travis/settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <servers>
-    <server>
-      <id>bintray-elide-repo</id>
-      <username>${env.BINTRAY_USER}</username>
-      <password>${env.BINTRAY_API_KEY}</password>
-    </server>
-  </servers>
-</settings>
diff --git a/xml.header b/xml.header
index 2c3786e112..b0202ecf11 100644
--- a/xml.header
+++ b/xml.header
@@ -1,6 +1,6 @@
 ^<\?xml version="1.0" encoding="UTF-8"\?>$
 ^<!--$
-^  ~ Copyright 20[0-1][0-9], Yahoo Inc\.$
+^  ~ Copyright 20[0-3][0-9],.*\.$
 ^  ~ Licensed under the Apache License, Version 2.0$
 ^  ~ See LICENSE file in project root for terms\.$
 ^  -->$